X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout_bottom_appbar.xml;h=f9bfce5f7aafe1f94ad4fd63ee7eba7f41684031;hp=521c03f8b78ef11f2f29f5d9ebfad07b47735046;hb=HEAD;hpb=484f0b0f0143c53a4722cee3a31e714df0c8c49a

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 521c03f8..d11ae7cf 100644
--- a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2017,2019-2021 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <FrameLayout
     android:id="@+id/root_framelayout"
@@ -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>
@@ -60,14 +60,12 @@
                     android:layout_gravity="bottom"
                     app:layout_dodgeInsetEdges="bottom" >
 
-                    <!-- The tab linear layout.  It sets the background to the right of the add tab button.
-                        It is initially `visibility="gone"` so it doesn't display while the blocklists are loading. -->
+                    <!-- The tab linear layout.  It sets the background to the right of the add tab button. -->
                     <LinearLayout
                         android:id="@+id/tabs_linearlayout"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:orientation="horizontal"
-                        android:visibility="gone" >
+                        android:orientation="horizontal" >
 
                         <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                         <ImageView
@@ -76,11 +74,10 @@
                             android:layout_gravity="center_vertical"
                             android:paddingStart="10dp"
                             android:paddingEnd="10dp"
-                            android:src="@drawable/close_day"
+                            android:src="@drawable/close"
                             android:background="?attr/selectableItemBackground"
                             android:onClick="closeTab"
-                            android:contentDescription="@string/close_tab"
-                            app:tint="?attr/addTabIconTintColor" />
+                            android:contentDescription="@string/close_tab" />
 
                         <com.google.android.material.tabs.TabLayout
                             android:id="@+id/tablayout"
@@ -99,11 +96,10 @@
                             android:src="@drawable/add"
                             android:background="?attr/selectableItemBackground"
                             android:onClick="addTab"
-                            android:contentDescription="@string/add_tab"
-                            app:tint="?attr/addTabIconTintColor" />
+                            android:contentDescription="@string/add_tab" />
                     </LinearLayout>
 
-                    <!-- The find on page linear layout.  It is initially `visibility="gone"` so it doesn't display while the blocklists are loading. -->
+                    <!-- The find on page linear layout.  It is initially `visibility="gone"` and is only displayed when requested. -->
                     <LinearLayout
                         android:id="@+id/find_on_page_linearlayout"
                         android:layout_height="wrap_content"
@@ -136,52 +132,51 @@
                         <!-- `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_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_day"
                             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"
-                            app:tint="?attr/findOnPageIconTintColor" />
+                            app:tint="@color/blue_icon" />
                     </LinearLayout>
 
-                    <!-- The toolbar.  It is initially `visibility="gone"` so it doesn't display while the blocklists are loading. -->
+                    <!-- The toolbar. -->
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:visibility="gone" />
+                        android:layout_width="match_parent" />
                 </com.google.android.material.appbar.AppBarLayout>
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -192,7 +187,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="start"
             app:menu="@menu/webview_navigation_menu_bottom_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_bottom_appbar" />
@@ -205,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"
@@ -220,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"
@@ -230,4 +225,4 @@
             android:textAlignment="center"
             android:textColor="?android:attr/textColorPrimary" />
     </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>