Fix the app bar and options menu icon colors. https://redmine.stoutner.com/issues/618

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / logcat_coordinatorlayout.xml

diff --git a/app/src/main/res/layout/logcat_coordinatorlayout.xml b/app/src/main/res/layout/logcat_coordinatorlayout.xml
index ac2400aed943c5709b51346c17c0820e61100f67..12345a767535962cd68ca4660ae0e6db3b07f85b 100644 (file)
--- a/app/src/main/res/layout/logcat_coordinatorlayout.xml
+++ b/app/src/main/res/layout/logcat_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2018-2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,15 +18,11 @@
   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. -->
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/logcat_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 content below the AppBarLayout. -->
     <LinearLayout
@@ -34,26 +30,27 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
-        <android.support.design.widget.AppBarLayout
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme.  The background is set programmatically based on the proxy status. -->
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/logcat_appbarlayout"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent" >
+            android:layout_width="match_parent"
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/logcat_toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:background="?attr/colorPrimaryDark"
-                android:theme="?attr/appBarTextTheme"
-                app:popupTheme="?attr/popupsTheme" />
-        </android.support.design.widget.AppBarLayout>
+                android:layout_width="match_parent" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/logcat_swiperefreshlayout"
             android:layout_height="match_parent"
             android:layout_width="match_parent" >
 
             <ScrollView
+                android:id="@+id/logcat_scrollview"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent" >
 
@@ -64,6 +61,6 @@
                     android:layout_margin="10dp"
                     android:textIsSelectable="true" />
             </ScrollView>
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file