X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fguide_coordinatorlayout.xml;h=5140dcc025d3a735b71aa350b11a87a031b37c1d;hp=645c453c8c341f3aca19c2b6683079d185e46ebe;hb=9cb208c1f5c7a905f787f4ec4795a92e72195fba;hpb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e

diff --git a/app/src/main/res/layout/guide_coordinatorlayout.xml b/app/src/main/res/layout/guide_coordinatorlayout.xml
index 645c453c..5140dcc0 100644
--- a/app/src/main/res/layout/guide_coordinatorlayout.xml
+++ b/app/src/main/res/layout/guide_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,45 +18,37 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- android:fitsSystemWindows="true" moves the AppBar below the status bar.
-When it is specified the theme should include <item name="android:windowTranslucentStatus">true</item> to make the status bar a transparent, darkened overlay. -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/guide_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:fitsSystemWindows="true" >
+    android:layout_width="match_parent" >
 
-    <!-- The `LinearLayout` with `orientation="vertical"` moves the `ViewPager` below the `AppBarLayout`. -->
+    <!-- The linear layout with `orientation="vertical"` moves the view pager below the app bar layout. -->
     <LinearLayout
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
-        <!-- `android:background="?attr/colorPrimaryDark"` needs to be set here or any space to the right of the `TabLayout` on large devices will be the theme background color. -->
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/guide_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?attr/colorPrimaryDark" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
-            <!-- `android:theme="?attr/appBarTextTheme"` sets the color of the text and icons in the `AppBar`. -->
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/guide_toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:background="?attr/colorPrimaryDark"
-                android:theme="?attr/appBarTextTheme" />
+                android:layout_width="match_parent" />
 
-            <!-- For some reason `tabIndicatorColor` does not pull from the style unless specified explicitly here. -->
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/guide_tablayout"
-                xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android.support.design:tabMode="scrollable"
-                android.support.design:tabIndicatorColor="?attr/tabIndicatorColor"
-                android:theme="?attr/tabLayoutTheme" />
+                app:tabMode="scrollable" />
         </com.google.android.material.appbar.AppBarLayout>
 
         <!-- `android:layout_weight="1"` makes `about_viewpager` fill the rest of the screen. -->