X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout_top_appbar.xml;h=12258ec17364067a6243369148efcf2eb3581740;hb=5dd60cebd26469bcc597e1ccede8706fb403dfc1;hp=73201e53e6d10922e7bd1a89972f77d81cbfa884;hpb=c906043ffe9b4d139e8d851e581a0eb46b935e42;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 73201e53..12258ec1 100644
--- a/app/src/main/res/layout/main_framelayout_top_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_top_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-2023 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"
@@ -36,7 +36,6 @@
             android:id="@+id/coordinatorlayout"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
-            android:layout_above="@id/adview"
             android:focusable="true"
             android:focusableInTouchMode="true" >
 
@@ -47,15 +46,14 @@
                 android:layout_width="match_parent"
                 android:theme="@style/PrivacyBrowserAppBar" >
 
-                <!-- 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"
                     app:layout_scrollFlags="scroll|enterAlways|snap" />
 
-                <!-- 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"
@@ -117,7 +115,7 @@
                     <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                     <ImageView
                         android:id="@+id/close_find"
-                        android:src="@drawable/close_day"
+                        android:src="@drawable/close"
                         android:layout_width="35dp"
                         android:layout_height="35dp"
                         android:layout_marginStart="4dp"
@@ -129,13 +127,12 @@
                         app:tint="?attr/findOnPageIconTintColor" />
                 </LinearLayout>
 
-                <!-- 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"
                     app:layout_scrollFlags="scroll|enterAlways|snap" >
 
                     <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
@@ -145,11 +142,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"
@@ -169,8 +165,7 @@
                         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>
             </com.google.android.material.appbar.AppBarLayout>
 
@@ -181,8 +176,8 @@
                 android:layout_height="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>
@@ -208,9 +203,9 @@
         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:id="@+id/loading_filterlists_relativelayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -223,7 +218,7 @@
             tools:ignore="contentDescription" />
 
         <TextView
-            android:id="@+id/loading_blocklist_textview"
+            android:id="@+id/loading_filterlist_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/privacy_browser_logo"
@@ -233,4 +228,4 @@
             android:textAlignment="center"
             android:textColor="?android:attr/textColorPrimary" />
     </RelativeLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>