Fix a crash when opening a drawer while restarting. https://redmine.stoutner.com...

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt
index 94023b37028070ddba86b477e018cc9922602bff..b275e6e078698de8e271774a17ce3e95c26fa794 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt
@@ -60,8 +60,9 @@ class AboutActivity : AppCompatActivity(), SaveListener {
         // Get a handle for the shared preferences.
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
 
-        // Get the screenshot preference.
+        // Get the preferences.
         val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
+        val bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false)
 
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {
@@ -81,20 +82,24 @@ class AboutActivity : AppCompatActivity(), SaveListener {
         val blocklistVersions = launchingIntent.getStringArrayExtra(BLOCKLIST_VERSIONS)!!
 
         // Set the content view.
-        setContentView(R.layout.about_coordinatorlayout)
+        if (bottomAppBar) {
+            setContentView(R.layout.about_bottom_appbar)
+        } else {
+            setContentView(R.layout.about_top_appbar)
+        }
 
         // Get handles for the views.
         val toolbar = findViewById<Toolbar>(R.id.about_toolbar)
         val aboutTabLayout = findViewById<TabLayout>(R.id.about_tablayout)
         val aboutViewPager = findViewById<ViewPager>(R.id.about_viewpager)
 
-        // Set the action bar.  `SupportActionBar` must be used until the minimum API is >= 21.
+        // Set the support action bar.
         setSupportActionBar(toolbar)
 
         // Get a handle for the action bar.
         val actionBar = supportActionBar!!
 
-        // Display the home arrow on action bar.
+        // Display the home arrow on the action bar.
         actionBar.setDisplayHomeAsUpEnabled(true)
 
         // Initialize the about pager adapter.
@@ -190,4 +195,4 @@ class AboutActivity : AppCompatActivity(), SaveListener {
                 SaveAboutVersionImage(this, fileNameString, aboutVersionLinearLayout).execute()
         }
     }
-}
\ No newline at end of file
+}