Reenable dark WebViews on API 33. https://redmine.stoutner.com/issues/903

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / activities / GuideActivity.java

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
index 00872252abe550c99e89876503bfcbab0a633133..7a165d737d334c735a0f873381507e325aa5135a 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
@@ -1,20 +1,20 @@
 /*
- * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.activities;
@@ -40,30 +40,29 @@ public class GuideActivity extends AppCompatActivity {
         // Get a handle for the shared preferences.
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
-        // Get the theme and screenshot preferences.
-        boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
-        boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+        // Get the preferences.
+        boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false);
+        boolean bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false);
 
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
-        // Set the theme.
-        if (darkTheme) {
-            setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
-        } else {
-            setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
-        }
-
         // Run the default commands.
         super.onCreate(savedInstanceState);
 
         // Set the content view.
-        setContentView(R.layout.guide_coordinatorlayout);
+        if (bottomAppBar) {
+            setContentView(R.layout.guide_bottom_appbar);
+        } else {
+            setContentView(R.layout.guide_top_appbar);
+        }
 
-        // The AndroidX toolbar must be used until the minimum API is >= 21.
+        // Get a handle for the toolbar.
         Toolbar toolbar = findViewById(R.id.guide_toolbar);
+
+        // Set the support action bar.
         setSupportActionBar(toolbar);
 
         // Get a handle for the action bar.
@@ -75,14 +74,21 @@ public class GuideActivity extends AppCompatActivity {
         // Display the home arrow on the action bar.
         actionBar.setDisplayHomeAsUpEnabled(true);
 
-        //  Setup the ViewPager.
+        //  Get a handle for the view pager and the tab layout.
         ViewPager aboutViewPager = findViewById(R.id.guide_viewpager);
-        assert aboutViewPager != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutViewPager might be null.
+        TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout);
+
+        // Remove the incorrect lint warnings that the views might be null
+        assert aboutViewPager != null;
+        assert aboutTabLayout != null;
+
+        // Set the view pager adapter.
         aboutViewPager.setAdapter(new GuidePagerAdapter(getSupportFragmentManager(), getApplicationContext()));
 
-        // Setup the TabLayout and connect it to the ViewPager.
-        TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout);
-        assert aboutTabLayout != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutTabLayout might be null.
+        // Keep all the tabs in memory.
+        aboutViewPager.setOffscreenPageLimit(10);
+
+        // Link the tab layout to the view pager.
         aboutTabLayout.setupWithViewPager(aboutViewPager);
     }
-}
+}
\ No newline at end of file