Expand the options for selecting a download provider. https://redmine.stoutner.com...

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

diff --git a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
index f9bfce5f7aafe1f94ad4fd63ee7eba7f41684031..18f86af2b01c4202064682e22c7e7eccd6243731 100644 (file)
--- a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017,2019-2022 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>.
 
@@ -41,11 +41,11 @@
 
                 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                     android:id="@+id/swiperefreshlayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" >
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent" >
 
-                    <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>
@@ -132,12 +132,12 @@
                         <!-- `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"
@@ -146,12 +146,12 @@
                         <!-- `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_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"
@@ -160,12 +160,12 @@
                         <!-- `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_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"
@@ -200,11 +200,11 @@
         android:layout_width="match_parent"
         android:visibility="gone" />
 
-    <!-- The loading blocklists relative layout displays when the app first starts.  It is hidden once the blocklists are populated. -->
+    <!-- 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_blocklists_relativelayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:id="@+id/loading_filterlists_relativelayout"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent" >
 
         <ImageView
             android:id="@+id/privacy_browser_logo"
@@ -215,9 +215,9 @@
             tools:ignore="contentDescription" />
 
         <TextView
-            android:id="@+id/loading_blocklist_textview"
-            android:layout_width="wrap_content"
+            android:id="@+id/loading_filterlist_textview"
             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"