X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout_top_appbar.xml;h=ea289cd7f9900747277ea7b3e72fa0c95663ee0c;hb=HEAD;hp=ec3aa96bf7273bdf706d902fb5a8740166f43fdc;hpb=c51155ed36754975d2b8673e37e58df6201702b8;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_framelayout_top_appbar.xml b/app/src/main/res/layout/main_framelayout_top_appbar.xml
index ec3aa96b..ea289cd7 100644
--- a/app/src/main/res/layout/main_framelayout_top_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017,2019-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   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
@@ -87,44 +87,44 @@
                     <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                     <ImageView
                         android:id="@+id/find_previous"
-                        android:src="@drawable/previous"
-                        android:layout_width="35dp"
                         android:layout_height="35dp"
+                        android:layout_width="35dp"
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="4dp"
                         android:layout_gravity="center_vertical"
+                        android:src="@drawable/previous"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/previous"
                         android:onClick="findPreviousOnPage"
-                        app:tint="?attr/findOnPageIconTintColor" />
+                        app:tint="@color/blue_icon" />
 
                     <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                     <ImageView
                         android:id="@+id/find_next"
-                        android:src="@drawable/next"
-                        android:layout_width="35dp"
                         android:layout_height="35dp"
+                        android:layout_width="35dp"
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="4dp"
                         android:layout_gravity="center_vertical"
+                        android:src="@drawable/next"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/next"
                         android:onClick="findNextOnPage"
-                        app:tint="?attr/findOnPageIconTintColor" />
+                        app:tint="@color/blue_icon" />
 
                     <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                     <ImageView
                         android:id="@+id/close_find"
-                        android:src="@drawable/close"
-                        android:layout_width="35dp"
                         android:layout_height="35dp"
+                        android:layout_width="35dp"
                         android:layout_marginStart="4dp"
                         android:layout_marginEnd="8dp"
                         android:layout_gravity="center_vertical"
+                        android:src="@drawable/close"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/close"
                         android:onClick="closeFindOnPage"
-                        app:tint="?attr/findOnPageIconTintColor" />
+                        app:tint="@color/blue_icon" />
                 </LinearLayout>
 
                 <!-- The tab linear layout.  It sets the background to the right of the add tab button. -->
@@ -172,12 +172,12 @@
             <!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swiperefreshlayout"
-                android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_width="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" >
 
-                    <com.stoutner.privacybrowser.views.NoSwipeViewPager
-                        android:id="@+id/webviewpager"
+                    <androidx.viewpager2.widget.ViewPager2
+                        android:id="@+id/webview_viewpager2"
                         android:layout_height="match_parent"
                         android:layout_width="match_parent" />
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -190,7 +190,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="start"
             app:menu="@menu/webview_navigation_menu_top_appbar"
-            app:itemIconTint="?attr/navigationIconTintColor" />
+            app:itemIconTint="@color/blue_icon" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer_top_appbar" />
@@ -206,8 +206,8 @@
     <!-- The loading filter lists relative layout displays when the app first starts.  It is hidden once the filter lists are populated. -->
     <RelativeLayout
         android:id="@+id/loading_filterlists_relativelayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_width="match_parent" >
 
         <ImageView
             android:id="@+id/privacy_browser_logo"
@@ -219,8 +219,8 @@
 
         <TextView
             android:id="@+id/loading_filterlist_textview"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_below="@id/privacy_browser_logo"
             android:layout_centerHorizontal="true"
             android:layout_margin="10dp"