X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FAboutTabFragment.java;h=374f991511674f9ede24ab577ee1bafefb8ac546;hb=9f551f25b53a30cca7b19b6e6bfc2d2520d9aa1b;hp=59891f0083b915069911b875b3af8b810c14cbab;hpb=fc7bcfdefc4b555623006c2879d95ae727517b14;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 59891f00..374f9915 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java @@ -36,6 +36,7 @@ import android.widget.TextView; import com.stoutner.privacybrowser.BuildConfig; import com.stoutner.privacybrowser.R; +import com.stoutner.privacybrowser.activities.MainWebViewActivity; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -50,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"); } @@ -74,31 +82,30 @@ public class AboutTabFragment extends Fragment { // Load the tabs. Tab numbers start at 0. if (tabNumber == 0) { // Load the about tab. - // 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. + // 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); - TextView versionBrandTextView = (TextView) tabLayout.findViewById(R.id.about_version_brand); - TextView versionManufacturerTextView = (TextView) tabLayout.findViewById(R.id.about_version_manufacturer); - TextView versionModelTextView = (TextView) tabLayout.findViewById(R.id.about_version_model); - TextView versionDeviceTextView = (TextView) tabLayout.findViewById(R.id.about_version_device); - TextView versionBootloaderTextView = (TextView) tabLayout.findViewById(R.id.about_version_bootloader); - TextView versionRadioTextView = (TextView) tabLayout.findViewById(R.id.about_version_radio); - TextView versionAndroidTextView = (TextView) tabLayout.findViewById(R.id.about_version_android); - TextView versionBuildTextView = (TextView) tabLayout.findViewById(R.id.about_version_build); - TextView versionSecurityPatchTextView = (TextView) tabLayout.findViewById(R.id.about_version_securitypatch); - TextView versionWebKitTextView = (TextView) tabLayout.findViewById(R.id.about_version_webkit); - TextView versionChromeTextView = (TextView) tabLayout.findViewById(R.id.about_version_chrome); - TextView versionOrbotTextView = (TextView) tabLayout.findViewById(R.id.about_version_orbot); - TextView certificateIssuerDNTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_issuer_dn); - TextView certificateSubjectDNTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_subject_dn); - TextView certificateStartDateTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_start_date); - TextView certificateEndDateTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_end_date); - TextView certificateVersionTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_version); - TextView certificateSerialNumberTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_serial_number); - TextView certificateSignatureAlgorithmTextView = (TextView) tabLayout.findViewById(R.id.about_version_certificate_signature_algorithm); + TextView versionNumberTextView = tabLayout.findViewById(R.id.about_version_number); + TextView versionBrandTextView = tabLayout.findViewById(R.id.about_version_brand); + TextView versionManufacturerTextView = tabLayout.findViewById(R.id.about_version_manufacturer); + TextView versionModelTextView = tabLayout.findViewById(R.id.about_version_model); + TextView versionDeviceTextView = tabLayout.findViewById(R.id.about_version_device); + TextView versionBootloaderTextView = tabLayout.findViewById(R.id.about_version_bootloader); + TextView versionRadioTextView = tabLayout.findViewById(R.id.about_version_radio); + TextView versionAndroidTextView = tabLayout.findViewById(R.id.about_version_android); + TextView versionSecurityPatchTextView = tabLayout.findViewById(R.id.about_version_securitypatch); + TextView versionBuildTextView = tabLayout.findViewById(R.id.about_version_build); + TextView versionWebKitTextView = tabLayout.findViewById(R.id.about_version_webkit); + TextView versionChromeTextView = tabLayout.findViewById(R.id.about_version_chrome); + TextView versionOrbotTextView = tabLayout.findViewById(R.id.about_version_orbot); + TextView certificateIssuerDNTextView = tabLayout.findViewById(R.id.about_version_certificate_issuer_dn); + TextView certificateSubjectDNTextView = tabLayout.findViewById(R.id.about_version_certificate_subject_dn); + TextView certificateStartDateTextView = tabLayout.findViewById(R.id.about_version_certificate_start_date); + TextView certificateEndDateTextView = tabLayout.findViewById(R.id.about_version_certificate_end_date); + TextView certificateVersionTextView = tabLayout.findViewById(R.id.about_version_certificate_version); + TextView certificateSerialNumberTextView = tabLayout.findViewById(R.id.about_version_certificate_serial_number); + TextView certificateSignatureAlgorithmTextView = tabLayout.findViewById(R.id.about_version_certificate_signature_algorithm); // Setup the labels. String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + Integer.toString(BuildConfig.VERSION_CODE) + ")"; @@ -121,7 +128,7 @@ public class AboutTabFragment extends Fragment { // `webViewLayout` is only used to get the default user agent from `bare_webview`. It is not used to render content on the screen. View webViewLayout = inflater.inflate(R.layout.bare_webview, container, false); - WebView tabLayoutWebView = (WebView) webViewLayout.findViewById(R.id.bare_webview); + WebView tabLayoutWebView = webViewLayout.findViewById(R.id.bare_webview); String userAgentString = tabLayoutWebView.getSettings().getUserAgentString(); // Get the device's information and store it in strings. @@ -158,8 +165,17 @@ public class AboutTabFragment extends Fragment { SpannableStringBuilder webKitStringBuilder = new SpannableStringBuilder(webKitLabel + webKit); SpannableStringBuilder chromeStringBuilder = new SpannableStringBuilder(chromeLabel + chrome); - // Create a blue `ForegroundColorSpan`. We have to use the deprecated `getColor()` until API >= 23. - @SuppressWarnings("deprecation") ForegroundColorSpan blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); + // Create the `blueColorSpan` variable. + ForegroundColorSpan blueColorSpan; + + // Set `blueColorSpan` according to the theme. We have to use the deprecated `getColor()` until API >= 23. + if (MainWebViewActivity.darkTheme) { + //noinspection deprecation + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + } else { + //noinspection deprecation + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); + } // Setup the spans to display the device information in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. brandStringBuilder.setSpan(blueColorSpan, brandLabel.length(), brandStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); @@ -272,42 +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. - // 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. + } 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; - 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