From a6d829c39b356e9134cb488c4ae7e0e29bf9df96 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 14 Jun 2017 13:25:22 -0700 Subject: [PATCH] Create a dark theme for `GuideActivity`. --- app/src/main/AndroidManifest.xml | 1 - .../activities/GuideActivity.java | 16 ++++- .../activities/MainWebViewActivity.java | 2 +- .../fragments/GuideTabFragment.java | 33 ++++++++- app/src/main/res/drawable/about.xml | 2 +- app/src/main/res/drawable/add.xml | 2 +- app/src/main/res/drawable/back.xml | 2 +- .../main/res/drawable/block_ads_disabled.xml | 2 +- .../main/res/drawable/block_ads_enabled.xml | 2 +- app/src/main/res/drawable/bookmarks.xml | 2 +- app/src/main/res/drawable/cache_cleared.xml | 2 +- app/src/main/res/drawable/cache_warning.xml | 2 +- .../drawable/clear_everything_disabled.xml | 2 +- .../res/drawable/clear_everything_enabled.xml | 2 +- app/src/main/res/drawable/close.xml | 2 +- app/src/main/res/drawable/cookies_cleared.xml | 2 +- .../main/res/drawable/cookies_disabled.xml | 2 +- app/src/main/res/drawable/cookies_enabled.xml | 2 +- app/src/main/res/drawable/cookies_ghosted.xml | 2 +- app/src/main/res/drawable/cookies_warning.xml | 2 +- app/src/main/res/drawable/create_folder.xml | 2 +- .../drawable/custom_user_agent_enabled.xml | 2 +- .../drawable/custom_user_agent_ghosted.xml | 2 +- app/src/main/res/drawable/delete.xml | 2 +- app/src/main/res/drawable/delete_blue.xml | 2 +- .../res/drawable/do_not_track_disabled.xml | 2 +- .../res/drawable/do_not_track_enabled.xml | 2 +- .../main/res/drawable/dom_storage_cleared.xml | 2 +- .../res/drawable/dom_storage_disabled.xml | 2 +- .../main/res/drawable/dom_storage_enabled.xml | 2 +- .../main/res/drawable/dom_storage_ghosted.xml | 2 +- .../main/res/drawable/dom_storage_warning.xml | 2 +- app/src/main/res/drawable/domains.xml | 2 +- .../res/drawable/domains_list_selector.xml | 2 +- app/src/main/res/drawable/downloads.xml | 2 +- app/src/main/res/drawable/edit.xml | 2 +- app/src/main/res/drawable/exit.xml | 2 +- .../main/res/drawable/folder_dark_blue.xml | 2 +- app/src/main/res/drawable/folder_gray.xml | 2 +- app/src/main/res/drawable/font_size.xml | 2 +- .../main/res/drawable/form_data_cleared.xml | 2 +- .../main/res/drawable/form_data_disabled.xml | 2 +- .../main/res/drawable/form_data_enabled.xml | 2 +- .../main/res/drawable/form_data_warning.xml | 2 +- app/src/main/res/drawable/forward.xml | 2 +- .../res/drawable/full_screen_disabled.xml | 2 +- .../main/res/drawable/full_screen_enabled.xml | 2 +- app/src/main/res/drawable/guide.xml | 2 +- .../drawable/hide_system_bars_disabled.xml | 2 +- .../res/drawable/hide_system_bars_enabled.xml | 2 +- .../res/drawable/hide_system_bars_ghosted.xml | 2 +- app/src/main/res/drawable/history.xml | 2 +- app/src/main/res/drawable/home_enabled.xml | 2 +- app/src/main/res/drawable/home_ghosted.xml | 2 +- app/src/main/res/drawable/images_disabled.xml | 2 +- app/src/main/res/drawable/images_enabled.xml | 2 +- .../res/drawable/incognito_mode_disabled.xml | 2 +- .../res/drawable/incognito_mode_enabled.xml | 2 +- .../main/res/drawable/javascript_enabled.xml | 8 +-- .../listview_item_background_selector.xml | 2 +- app/src/main/res/drawable/more_disabled.xml | 2 +- app/src/main/res/drawable/more_enabled.xml | 2 +- .../drawable/move_bookmark_down_disabled.xml | 2 +- .../drawable/move_bookmark_down_enabled.xml | 2 +- .../drawable/move_bookmark_up_disabled.xml | 2 +- .../res/drawable/move_bookmark_up_enabled.xml | 2 +- app/src/main/res/drawable/move_to_folder.xml | 2 +- app/src/main/res/drawable/next.xml | 2 +- app/src/main/res/drawable/orbot_disabled.xml | 2 +- app/src/main/res/drawable/orbot_enabled.xml | 2 +- app/src/main/res/drawable/previous.xml | 2 +- app/src/main/res/drawable/privacy_mode.xml | 8 +-- .../main/res/drawable/refresh_disabled.xml | 2 +- app/src/main/res/drawable/refresh_enabled.xml | 2 +- .../drawable/search_custom_url_disabled.xml | 2 +- .../drawable/search_custom_url_enabled.xml | 2 +- .../drawable/search_custom_url_ghosted.xml | 2 +- app/src/main/res/drawable/search_enabled.xml | 2 +- app/src/main/res/drawable/search_ghosted.xml | 2 +- app/src/main/res/drawable/select_all.xml | 2 +- app/src/main/res/drawable/settings.xml | 2 +- app/src/main/res/drawable/theme_dark.xml | 4 +- app/src/main/res/drawable/theme_light.xml | 2 +- .../res/drawable/translucent_bar_disabled.xml | 2 +- .../res/drawable/translucent_bar_enabled.xml | 2 +- .../res/drawable/translucent_bar_ghosted.xml | 2 +- .../drawable/url_bar_background_dark_blue.xml | 2 +- .../url_bar_background_light_green.xml | 2 +- .../url_bar_background_transparent.xml | 2 +- app/src/main/res/drawable/user_agent.xml | 2 +- app/src/main/res/drawable/warning.xml | 8 +-- .../layout/about_coordinatorlayout_dark.xml | 20 +++--- .../layout/about_coordinatorlayout_light.xml | 20 +++--- .../layout/guide_coordinatorlayout_dark.xml | 70 +++++++++++++++++++ ....xml => guide_coordinatorlayout_light.xml} | 30 ++++---- app/src/main/res/layout/guide_tab_webview.xml | 26 ------- app/src/main/res/values/colors.xml | 3 + app/src/main/res/values/styles.xml | 14 ++++ 98 files changed, 263 insertions(+), 166 deletions(-) create mode 100644 app/src/main/res/layout/guide_coordinatorlayout_dark.xml rename app/src/main/res/layout/{guide_coordinatorlayout.xml => guide_coordinatorlayout_light.xml} (70%) delete mode 100644 app/src/main/res/layout/guide_tab_webview.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cca1063f..48e48789 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -149,7 +149,6 @@ = 21. Toolbar guideAppBar = (Toolbar) findViewById(R.id.guide_toolbar); diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index e7286522..0012898e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -122,7 +122,7 @@ import java.util.Set; public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcutDialog.CreateHomeScreenSchortcutListener, SslCertificateErrorDialog.SslCertificateErrorListener, DownloadFileDialog.DownloadFileListener, DownloadImageDialog.DownloadImageListener, UrlHistoryDialog.UrlHistoryListener { - // `darkTheme` is public static so it can be accessed from `AboutActivity`. It is also used in `onCreate()`, `applyAppSettings()`, and `applyDomainSettings()`. + // `darkTheme` is public static so it can be accessed from `AboutActivity` and `GuideActivity`. It is also used in `onCreate()`, `applyAppSettings()`, and `applyDomainSettings()`. public static boolean darkTheme; // `favoriteIconBitmap` is public static so it can be accessed from `CreateHomeScreenShortcutDialog`, `BookmarksActivity`, `CreateBookmarkDialog`, `CreateBookmarkFolderDialog`, `EditBookmarkDialog`, `EditBookmarkFolderDialog`, `ViewSslCertificateDialog`. diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java index a3b2249a..7cec388b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java @@ -19,6 +19,8 @@ package com.stoutner.privacybrowser.fragments; +import android.graphics.ColorMatrixColorFilter; +import android.graphics.Paint; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; @@ -27,6 +29,7 @@ import android.view.ViewGroup; import android.webkit.WebView; import com.stoutner.privacybrowser.R; +import com.stoutner.privacybrowser.activities.MainWebViewActivity; public class GuideTabFragment extends Fragment { // `tabNumber` is used in `onCreate()` and `onCreateView()`. @@ -52,11 +55,35 @@ public class GuideTabFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. - // The fragment will take care of attaching the root automatically. - View tabLayout = inflater.inflate(R.layout.guide_tab_webview, container, false); + // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. The fragment will take care of attaching the root automatically. + View tabLayout = inflater.inflate(R.layout.bare_webview, container, false); + + // Get a handle for `tabWebView`. WebView tabWebView = (WebView) tabLayout; + // Filter the colors if `darkTheme` is `true`. + if (MainWebViewActivity.darkTheme) { + // Initialize `darkPaint`. + Paint darkPaint = new Paint(); + + // Setup a float array that inverts and tempers the colors (no hard whites or blacks). + float[] darkFilterFloatArray = { + -.8f, 0, 0, 0, 255, // Red. + 0, -.8f, 0, 0, 255, // Green. + 0, 0, -.8f, 0, 255, // Blue. + 0, 0, 0, .8f, 0 // Alpha. + }; + + // Set `darkPaint` to use `darkFilterFloatArray`. + darkPaint.setColorFilter(new ColorMatrixColorFilter(darkFilterFloatArray)); + + // Apply `darkPaint` to `tabWebView`. + tabWebView.setLayerType(View.LAYER_TYPE_HARDWARE, darkPaint); + } else { + // Reset `tabWebView` to use the normal colors. + tabWebView.setLayerType(View.LAYER_TYPE_HARDWARE, null); + } + // Tab numbers start at 0. switch (tabNumber) { case 0: diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml index b61f8172..8a20c678 100644 --- a/app/src/main/res/drawable/about.xml +++ b/app/src/main/res/drawable/about.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml index 752e75c9..d902679e 100644 --- a/app/src/main/res/drawable/add.xml +++ b/app/src/main/res/drawable/add.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml index b8581cf3..51dc3f07 100644 --- a/app/src/main/res/drawable/back.xml +++ b/app/src/main/res/drawable/back.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/block_ads_disabled.xml b/app/src/main/res/drawable/block_ads_disabled.xml index 90199e1f..e4b999a7 100644 --- a/app/src/main/res/drawable/block_ads_disabled.xml +++ b/app/src/main/res/drawable/block_ads_disabled.xml @@ -5,7 +5,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/block_ads_enabled.xml b/app/src/main/res/drawable/block_ads_enabled.xml index de1efc61..b71fce2f 100644 --- a/app/src/main/res/drawable/block_ads_enabled.xml +++ b/app/src/main/res/drawable/block_ads_enabled.xml @@ -5,7 +5,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/bookmarks.xml b/app/src/main/res/drawable/bookmarks.xml index 995775bc..d2825600 100644 --- a/app/src/main/res/drawable/bookmarks.xml +++ b/app/src/main/res/drawable/bookmarks.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/cache_cleared.xml b/app/src/main/res/drawable/cache_cleared.xml index 4edfd872..4eea31a9 100644 --- a/app/src/main/res/drawable/cache_cleared.xml +++ b/app/src/main/res/drawable/cache_cleared.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/cache_warning.xml b/app/src/main/res/drawable/cache_warning.xml index add2185f..7b997605 100644 --- a/app/src/main/res/drawable/cache_warning.xml +++ b/app/src/main/res/drawable/cache_warning.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/clear_everything_disabled.xml b/app/src/main/res/drawable/clear_everything_disabled.xml index fcf007af..9432434e 100644 --- a/app/src/main/res/drawable/clear_everything_disabled.xml +++ b/app/src/main/res/drawable/clear_everything_disabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/clear_everything_enabled.xml b/app/src/main/res/drawable/clear_everything_enabled.xml index 6c901aba..9cebc872 100644 --- a/app/src/main/res/drawable/clear_everything_enabled.xml +++ b/app/src/main/res/drawable/clear_everything_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml index c0dff6b8..afb25c0b 100644 --- a/app/src/main/res/drawable/close.xml +++ b/app/src/main/res/drawable/close.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/cookies_cleared.xml b/app/src/main/res/drawable/cookies_cleared.xml index f0ba32b1..32c1abee 100644 --- a/app/src/main/res/drawable/cookies_cleared.xml +++ b/app/src/main/res/drawable/cookies_cleared.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled.xml index df2fe2ae..ea28b274 100644 --- a/app/src/main/res/drawable/cookies_disabled.xml +++ b/app/src/main/res/drawable/cookies_disabled.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/cookies_enabled.xml b/app/src/main/res/drawable/cookies_enabled.xml index 383573d6..df39e058 100644 --- a/app/src/main/res/drawable/cookies_enabled.xml +++ b/app/src/main/res/drawable/cookies_enabled.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/cookies_ghosted.xml b/app/src/main/res/drawable/cookies_ghosted.xml index aa265522..cd1cc86b 100644 --- a/app/src/main/res/drawable/cookies_ghosted.xml +++ b/app/src/main/res/drawable/cookies_ghosted.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/cookies_warning.xml b/app/src/main/res/drawable/cookies_warning.xml index d8efc4d0..55678cd6 100644 --- a/app/src/main/res/drawable/cookies_warning.xml +++ b/app/src/main/res/drawable/cookies_warning.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/create_folder.xml b/app/src/main/res/drawable/create_folder.xml index 7d060b8c..78c67f21 100644 --- a/app/src/main/res/drawable/create_folder.xml +++ b/app/src/main/res/drawable/create_folder.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/custom_user_agent_enabled.xml b/app/src/main/res/drawable/custom_user_agent_enabled.xml index 817d6233..bb47570e 100644 --- a/app/src/main/res/drawable/custom_user_agent_enabled.xml +++ b/app/src/main/res/drawable/custom_user_agent_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted.xml b/app/src/main/res/drawable/custom_user_agent_ghosted.xml index 86bdf912..d6c46e83 100644 --- a/app/src/main/res/drawable/custom_user_agent_ghosted.xml +++ b/app/src/main/res/drawable/custom_user_agent_ghosted.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml index 853d272c..eb9ac2ce 100644 --- a/app/src/main/res/drawable/delete.xml +++ b/app/src/main/res/drawable/delete.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/delete_blue.xml b/app/src/main/res/drawable/delete_blue.xml index 83e524cf..ac23cef7 100644 --- a/app/src/main/res/drawable/delete_blue.xml +++ b/app/src/main/res/drawable/delete_blue.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/do_not_track_disabled.xml b/app/src/main/res/drawable/do_not_track_disabled.xml index 7303b01e..89101050 100644 --- a/app/src/main/res/drawable/do_not_track_disabled.xml +++ b/app/src/main/res/drawable/do_not_track_disabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled.xml index dafb11e6..4aa90fdd 100644 --- a/app/src/main/res/drawable/do_not_track_enabled.xml +++ b/app/src/main/res/drawable/do_not_track_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/dom_storage_cleared.xml b/app/src/main/res/drawable/dom_storage_cleared.xml index a20c8ca2..6e8a9e29 100644 --- a/app/src/main/res/drawable/dom_storage_cleared.xml +++ b/app/src/main/res/drawable/dom_storage_cleared.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml index d6180570..50678912 100644 --- a/app/src/main/res/drawable/dom_storage_disabled.xml +++ b/app/src/main/res/drawable/dom_storage_disabled.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/dom_storage_enabled.xml b/app/src/main/res/drawable/dom_storage_enabled.xml index 0c297bda..19a910f0 100644 --- a/app/src/main/res/drawable/dom_storage_enabled.xml +++ b/app/src/main/res/drawable/dom_storage_enabled.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted.xml index 6ae15e56..6f00eb0d 100644 --- a/app/src/main/res/drawable/dom_storage_ghosted.xml +++ b/app/src/main/res/drawable/dom_storage_ghosted.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/dom_storage_warning.xml b/app/src/main/res/drawable/dom_storage_warning.xml index ee18ccf1..f036ad88 100644 --- a/app/src/main/res/drawable/dom_storage_warning.xml +++ b/app/src/main/res/drawable/dom_storage_warning.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/domains.xml b/app/src/main/res/drawable/domains.xml index 3d756b69..07bde4aa 100644 --- a/app/src/main/res/drawable/domains.xml +++ b/app/src/main/res/drawable/domains.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/domains_list_selector.xml b/app/src/main/res/drawable/domains_list_selector.xml index 254cc974..904cf996 100644 --- a/app/src/main/res/drawable/domains_list_selector.xml +++ b/app/src/main/res/drawable/domains_list_selector.xml @@ -1,7 +1,7 @@ + diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml index 115d4bfd..93320210 100644 --- a/app/src/main/res/drawable/edit.xml +++ b/app/src/main/res/drawable/edit.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml index 9adf3d84..49b5841c 100644 --- a/app/src/main/res/drawable/exit.xml +++ b/app/src/main/res/drawable/exit.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/folder_dark_blue.xml b/app/src/main/res/drawable/folder_dark_blue.xml index 501733d9..4a5436c0 100644 --- a/app/src/main/res/drawable/folder_dark_blue.xml +++ b/app/src/main/res/drawable/folder_dark_blue.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/folder_gray.xml b/app/src/main/res/drawable/folder_gray.xml index 18dfc195..2b45fce0 100644 --- a/app/src/main/res/drawable/folder_gray.xml +++ b/app/src/main/res/drawable/folder_gray.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/font_size.xml b/app/src/main/res/drawable/font_size.xml index c8d11837..9371c71b 100644 --- a/app/src/main/res/drawable/font_size.xml +++ b/app/src/main/res/drawable/font_size.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/form_data_cleared.xml b/app/src/main/res/drawable/form_data_cleared.xml index 4437a3e0..4b5a1bb7 100644 --- a/app/src/main/res/drawable/form_data_cleared.xml +++ b/app/src/main/res/drawable/form_data_cleared.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml index 57cf70a6..5cd02765 100644 --- a/app/src/main/res/drawable/form_data_disabled.xml +++ b/app/src/main/res/drawable/form_data_disabled.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml index 53546ce6..fa609665 100644 --- a/app/src/main/res/drawable/form_data_enabled.xml +++ b/app/src/main/res/drawable/form_data_enabled.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/form_data_warning.xml b/app/src/main/res/drawable/form_data_warning.xml index 71d77a71..8205e883 100644 --- a/app/src/main/res/drawable/form_data_warning.xml +++ b/app/src/main/res/drawable/form_data_warning.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml index 593cd840..47e77405 100644 --- a/app/src/main/res/drawable/forward.xml +++ b/app/src/main/res/drawable/forward.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/full_screen_disabled.xml b/app/src/main/res/drawable/full_screen_disabled.xml index d7d02a37..76ecc6b6 100644 --- a/app/src/main/res/drawable/full_screen_disabled.xml +++ b/app/src/main/res/drawable/full_screen_disabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/full_screen_enabled.xml b/app/src/main/res/drawable/full_screen_enabled.xml index 533a5eb2..e9a72ca9 100644 --- a/app/src/main/res/drawable/full_screen_enabled.xml +++ b/app/src/main/res/drawable/full_screen_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/guide.xml b/app/src/main/res/drawable/guide.xml index daa8d2ed..6a458f66 100644 --- a/app/src/main/res/drawable/guide.xml +++ b/app/src/main/res/drawable/guide.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/hide_system_bars_disabled.xml b/app/src/main/res/drawable/hide_system_bars_disabled.xml index 82f5ba16..819a896f 100644 --- a/app/src/main/res/drawable/hide_system_bars_disabled.xml +++ b/app/src/main/res/drawable/hide_system_bars_disabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/hide_system_bars_enabled.xml b/app/src/main/res/drawable/hide_system_bars_enabled.xml index 36fb7a61..b9d95944 100644 --- a/app/src/main/res/drawable/hide_system_bars_enabled.xml +++ b/app/src/main/res/drawable/hide_system_bars_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted.xml b/app/src/main/res/drawable/hide_system_bars_ghosted.xml index 59a673b6..831e33b5 100644 --- a/app/src/main/res/drawable/hide_system_bars_ghosted.xml +++ b/app/src/main/res/drawable/hide_system_bars_ghosted.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/history.xml b/app/src/main/res/drawable/history.xml index 17118dd4..43612110 100644 --- a/app/src/main/res/drawable/history.xml +++ b/app/src/main/res/drawable/history.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/home_enabled.xml b/app/src/main/res/drawable/home_enabled.xml index 349e6099..c2a19a77 100644 --- a/app/src/main/res/drawable/home_enabled.xml +++ b/app/src/main/res/drawable/home_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/home_ghosted.xml b/app/src/main/res/drawable/home_ghosted.xml index 44c366c8..1cded8c3 100644 --- a/app/src/main/res/drawable/home_ghosted.xml +++ b/app/src/main/res/drawable/home_ghosted.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/images_disabled.xml b/app/src/main/res/drawable/images_disabled.xml index bd8526c0..0051e2e3 100644 --- a/app/src/main/res/drawable/images_disabled.xml +++ b/app/src/main/res/drawable/images_disabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/images_enabled.xml b/app/src/main/res/drawable/images_enabled.xml index ee3387bc..0b4c4054 100644 --- a/app/src/main/res/drawable/images_enabled.xml +++ b/app/src/main/res/drawable/images_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/incognito_mode_disabled.xml b/app/src/main/res/drawable/incognito_mode_disabled.xml index 277149c9..cde555b6 100644 --- a/app/src/main/res/drawable/incognito_mode_disabled.xml +++ b/app/src/main/res/drawable/incognito_mode_disabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/incognito_mode_enabled.xml b/app/src/main/res/drawable/incognito_mode_enabled.xml index a8fee863..9bfa3c14 100644 --- a/app/src/main/res/drawable/incognito_mode_enabled.xml +++ b/app/src/main/res/drawable/incognito_mode_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml index 02c9b168..5631974e 100644 --- a/app/src/main/res/drawable/javascript_enabled.xml +++ b/app/src/main/res/drawable/javascript_enabled.xml @@ -1,5 +1,5 @@ + Modifications copyright © 2016-2017 Soren Stoutner . The resulting image is released under the GPLv3+ license. --> - + - + - + + diff --git a/app/src/main/res/drawable/more_enabled.xml b/app/src/main/res/drawable/more_enabled.xml index 458c8d29..127938b9 100644 --- a/app/src/main/res/drawable/more_enabled.xml +++ b/app/src/main/res/drawable/more_enabled.xml @@ -11,7 +11,7 @@ android:width="24dp" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/move_bookmark_down_disabled.xml b/app/src/main/res/drawable/move_bookmark_down_disabled.xml index e6217f08..4148b5e4 100644 --- a/app/src/main/res/drawable/move_bookmark_down_disabled.xml +++ b/app/src/main/res/drawable/move_bookmark_down_disabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/move_bookmark_down_enabled.xml b/app/src/main/res/drawable/move_bookmark_down_enabled.xml index 0b86a9ca..dc9806db 100644 --- a/app/src/main/res/drawable/move_bookmark_down_enabled.xml +++ b/app/src/main/res/drawable/move_bookmark_down_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/move_bookmark_up_disabled.xml b/app/src/main/res/drawable/move_bookmark_up_disabled.xml index 3245337a..20851821 100644 --- a/app/src/main/res/drawable/move_bookmark_up_disabled.xml +++ b/app/src/main/res/drawable/move_bookmark_up_disabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/move_bookmark_up_enabled.xml b/app/src/main/res/drawable/move_bookmark_up_enabled.xml index 74609253..c0d2986c 100644 --- a/app/src/main/res/drawable/move_bookmark_up_enabled.xml +++ b/app/src/main/res/drawable/move_bookmark_up_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/move_to_folder.xml b/app/src/main/res/drawable/move_to_folder.xml index 6fb70c2e..410ad13e 100644 --- a/app/src/main/res/drawable/move_to_folder.xml +++ b/app/src/main/res/drawable/move_to_folder.xml @@ -11,7 +11,7 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml index 42f665ca..4a7cfd60 100644 --- a/app/src/main/res/drawable/next.xml +++ b/app/src/main/res/drawable/next.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/orbot_disabled.xml b/app/src/main/res/drawable/orbot_disabled.xml index f52197c1..a431e87a 100644 --- a/app/src/main/res/drawable/orbot_disabled.xml +++ b/app/src/main/res/drawable/orbot_disabled.xml @@ -12,7 +12,7 @@ android:viewportWidth="33.866665" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/orbot_enabled.xml b/app/src/main/res/drawable/orbot_enabled.xml index 1b3c2cc7..43ab496f 100644 --- a/app/src/main/res/drawable/orbot_enabled.xml +++ b/app/src/main/res/drawable/orbot_enabled.xml @@ -12,7 +12,7 @@ android:viewportWidth="33.866665" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml index c10bb3d4..46c3762c 100644 --- a/app/src/main/res/drawable/previous.xml +++ b/app/src/main/res/drawable/previous.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml index 30fdd776..d5879ce9 100644 --- a/app/src/main/res/drawable/privacy_mode.xml +++ b/app/src/main/res/drawable/privacy_mode.xml @@ -1,5 +1,5 @@ + Modifications copyright © 2016-2017 Soren Stoutner . The resulting image is released under the GPLv3+ license. --> - + - + - + - + diff --git a/app/src/main/res/drawable/refresh_enabled.xml b/app/src/main/res/drawable/refresh_enabled.xml index 9d1b023e..c9786fea 100644 --- a/app/src/main/res/drawable/refresh_enabled.xml +++ b/app/src/main/res/drawable/refresh_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/search_custom_url_disabled.xml b/app/src/main/res/drawable/search_custom_url_disabled.xml index ff0969b9..88677668 100644 --- a/app/src/main/res/drawable/search_custom_url_disabled.xml +++ b/app/src/main/res/drawable/search_custom_url_disabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/search_custom_url_enabled.xml b/app/src/main/res/drawable/search_custom_url_enabled.xml index 5ecb30d7..3b9579a3 100644 --- a/app/src/main/res/drawable/search_custom_url_enabled.xml +++ b/app/src/main/res/drawable/search_custom_url_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/search_custom_url_ghosted.xml b/app/src/main/res/drawable/search_custom_url_ghosted.xml index c2cc1177..08aed01c 100644 --- a/app/src/main/res/drawable/search_custom_url_ghosted.xml +++ b/app/src/main/res/drawable/search_custom_url_ghosted.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/search_enabled.xml b/app/src/main/res/drawable/search_enabled.xml index 7f4a880e..cab15922 100644 --- a/app/src/main/res/drawable/search_enabled.xml +++ b/app/src/main/res/drawable/search_enabled.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/search_ghosted.xml b/app/src/main/res/drawable/search_ghosted.xml index e078033b..596682ba 100644 --- a/app/src/main/res/drawable/search_ghosted.xml +++ b/app/src/main/res/drawable/search_ghosted.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml index c27e108e..54151e54 100644 --- a/app/src/main/res/drawable/select_all.xml +++ b/app/src/main/res/drawable/select_all.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml index ba3e1e43..f486b75c 100644 --- a/app/src/main/res/drawable/settings.xml +++ b/app/src/main/res/drawable/settings.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/theme_dark.xml b/app/src/main/res/drawable/theme_dark.xml index d294217b..2755effe 100644 --- a/app/src/main/res/drawable/theme_dark.xml +++ b/app/src/main/res/drawable/theme_dark.xml @@ -11,8 +11,8 @@ android:viewportHeight="24.0" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/theme_light.xml b/app/src/main/res/drawable/theme_light.xml index 339b1e02..df0b9bce 100644 --- a/app/src/main/res/drawable/theme_light.xml +++ b/app/src/main/res/drawable/theme_light.xml @@ -11,7 +11,7 @@ android:viewportHeight="24.0" tools:ignore="VectorRaster"> - + diff --git a/app/src/main/res/drawable/translucent_bar_disabled.xml b/app/src/main/res/drawable/translucent_bar_disabled.xml index 395dea04..4120c40f 100644 --- a/app/src/main/res/drawable/translucent_bar_disabled.xml +++ b/app/src/main/res/drawable/translucent_bar_disabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/translucent_bar_enabled.xml b/app/src/main/res/drawable/translucent_bar_enabled.xml index d7b10efc..18a5f8b4 100644 --- a/app/src/main/res/drawable/translucent_bar_enabled.xml +++ b/app/src/main/res/drawable/translucent_bar_enabled.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/translucent_bar_ghosted.xml b/app/src/main/res/drawable/translucent_bar_ghosted.xml index efa1137d..3d64eb57 100644 --- a/app/src/main/res/drawable/translucent_bar_ghosted.xml +++ b/app/src/main/res/drawable/translucent_bar_ghosted.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/url_bar_background_dark_blue.xml b/app/src/main/res/drawable/url_bar_background_dark_blue.xml index 12bf4e84..ab78b691 100644 --- a/app/src/main/res/drawable/url_bar_background_dark_blue.xml +++ b/app/src/main/res/drawable/url_bar_background_dark_blue.xml @@ -1,7 +1,7 @@ + diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml index 6225884c..c123ebb4 100644 --- a/app/src/main/res/drawable/warning.xml +++ b/app/src/main/res/drawable/warning.xml @@ -1,5 +1,5 @@ + Modifications copyright © 2016-2017 Soren Stoutner . The resulting image is released under the GPLv3+ license. --> - + - + - + - + - + + android:layout_width="match_parent" + android:background="?attr/colorPrimaryDark" > - + + + android.support.design:tabMode="scrollable" + android.support.design:tabIndicatorColor="?attr/tabIndicatorColor" + android:theme="@style/PrivacyBrowserTabLayoutDark" /> - + - + - + + android:layout_width="match_parent" + android:background="?attr/colorPrimaryDark" > - + + + android.support.design:tabMode="scrollable" + android.support.design:tabIndicatorColor="?attr/tabIndicatorColor" + android:theme="@style/PrivacyBrowserTabLayoutLight" /> - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/guide_coordinatorlayout.xml b/app/src/main/res/layout/guide_coordinatorlayout_light.xml similarity index 70% rename from app/src/main/res/layout/guide_coordinatorlayout.xml rename to app/src/main/res/layout/guide_coordinatorlayout_light.xml index 233da963..506985db 100644 --- a/app/src/main/res/layout/guide_coordinatorlayout.xml +++ b/app/src/main/res/layout/guide_coordinatorlayout_light.xml @@ -24,47 +24,43 @@ - + - + + android:background="?attr/colorPrimaryDark" > - + + android:layout_width="match_parent" + android:background="?attr/colorPrimaryDark" + android:theme="@style/PrivacyBrowserAppBarWhiteText" /> + + android.support.design:tabMode="scrollable" + android.support.design:tabIndicatorColor="?attr/tabIndicatorColor" + android:theme="@style/PrivacyBrowserTabLayoutLight" /> - + - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ec44da43..e454aaad 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -50,6 +50,9 @@ #FFE0E0E0 #FFBDBDBD #FF9E9E9E + #FF757575 + #FF616161 + #FF424242 #FF212121 #FFE8F5E9 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5e76c6e4..b9706c69 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -55,6 +55,13 @@ + @@ -79,6 +86,13 @@ @color/gray_300 + + + -- 2.45.2