X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutTabFragment.java;h=4c7a0f4ec84116e3dc6536a97c7b25c72e663058;hb=65ff2d87f3a8fd1c26a26678498a7451e76ebb16;hp=ffac619f0e97b9d201df5328fe8bef908e8dcba2;hpb=e3ed631a52f5e8eac2d5c938b2d475ed6c9362bb;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java index ffac619f..4c7a0f4e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java @@ -22,8 +22,6 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; import android.content.pm.PackageManager; import android.content.pm.Signature; -import android.graphics.ColorMatrixColorFilter; -import android.graphics.Paint; import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -53,21 +51,28 @@ import java.util.Date; public class AboutTabFragment extends Fragment { private int tabNumber; - // `AboutTabFragment.createTab` stores the tab number in the bundle arguments so it can be referenced from `onCreate()`. + // Store the tab number in the arguments bundle. public static AboutTabFragment createTab(int tab) { - Bundle thisTabArguments = new Bundle(); - thisTabArguments.putInt("Tab", tab); + // Create a bundle. + Bundle bundle = new Bundle(); - AboutTabFragment thisTab = new AboutTabFragment(); - thisTab.setArguments(thisTabArguments); - return thisTab; + // Store the tab number in the bundle. + bundle.putInt("Tab", tab); + + // Add the bundle to the fragment. + AboutTabFragment aboutTabFragment = new AboutTabFragment(); + aboutTabFragment.setArguments(bundle); + + // Return the new fragment. + return aboutTabFragment; } @Override public void onCreate(Bundle savedInstanceState) { + // Run the default commands. super.onCreate(savedInstanceState); - // Store the tab number in `tabNumber`. + // Store the tab number in a class variable. tabNumber = getArguments().getInt("Tab"); } @@ -77,12 +82,8 @@ public class AboutTabFragment extends Fragment { // Load the tabs. Tab numbers start at 0. if (tabNumber == 0) { // Load the about tab. - // Inflate the layout according to the theme. 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. - if (MainWebViewActivity.darkTheme) { - tabLayout = inflater.inflate(R.layout.about_tab_version_dark, container, false); - } else { - tabLayout = inflater.inflate(R.layout.about_tab_version_light, 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. + tabLayout = inflater.inflate(R.layout.about_tab_version, container, false); // Get handles for the `TextViews`. TextView versionNumberTextView = (TextView) tabLayout.findViewById(R.id.about_version_number); @@ -287,66 +288,74 @@ public class AboutTabFragment extends Fragment { } catch (PackageManager.NameNotFoundException e) { // Do nothing if `PackageManager` says Privacy Browser isn't installed. } - } else { // load a WebView for all the other tabs. Tab numbers start at 0. + } else { // load a `WebView` for all the other tabs. Tab numbers start at 0. // 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. 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); - } - - switch (tabNumber) { - case 1: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_permissions.html"); - break; + // Load the tabs according to the theme. + if (MainWebViewActivity.darkTheme) { // The dark theme is applied. + // Set the background color. We have to use the deprecated `.getColor()` until API >= 23. + //noinspection deprecation + tabWebView.setBackgroundColor(getResources().getColor(R.color.gray_850)); - case 2: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_privacy_policy.html"); - break; + switch (tabNumber) { + case 1: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_permissions_dark.html"); + break; - case 3: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_changelog.html"); - break; + case 2: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_privacy_policy_dark.html"); + break; - case 4: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_licenses.html"); - break; + case 3: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_changelog_dark.html"); + break; - case 5: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_contributors.html"); - break; + case 4: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_licenses_dark.html"); + break; - case 6: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_links.html"); - break; + case 5: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_contributors_dark.html"); + break; - default: - break; + case 6: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_links_dark.html"); + break; + } + } else { // The light theme is applied. + switch (tabNumber) { + case 1: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_permissions_light.html"); + break; + + case 2: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_privacy_policy_light.html"); + break; + + case 3: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_changelog_light.html"); + break; + + case 4: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_licenses_light.html"); + break; + + case 5: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_contributors_light.html"); + break; + + case 6: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/about_links_light.html"); + break; + } } } + // Return the formatted `tabLayout`. return tabLayout; } } \ No newline at end of file