X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout.xml;h=36dbf3654211f851d20aabc5b2255bb5badea83b;hp=20dfc9bf52a9b5a300b7fbca5be4c70338e21400;hb=f68d82ddcd76aafdba7f215c6a731b19beb35711;hpb=fd2c21ea8241dce9c86a3213b9b9e325d5e7ce4a

diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml
index 20dfc9bf..36dbf365 100644
--- a/app/src/main/res/layout/main_framelayout.xml
+++ b/app/src/main/res/layout/main_framelayout.xml
@@ -20,7 +20,7 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_framelayout"
     android:layout_height="match_parent"
@@ -53,6 +53,7 @@
 
                 <!-- The theme has to be defined here because the activity uses a `NoActionBar` theme. -->
                 <com.google.android.material.appbar.AppBarLayout
+                    android:id="@+id/appbar_layout"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
                     android:theme="@style/PrivacyBrowserAppBarLight" >
@@ -61,34 +62,7 @@
                         android:id="@+id/toolbar"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        android.support.design:layout_scrollFlags="scroll|enterAlways|snap" />
-
-                    <LinearLayout
-                        android:id="@+id/tabs_linearlayout"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:orientation="horizontal"
-                        android.support.design:layout_scrollFlags="scroll|enterAlways|snap" >
-
-                        <com.google.android.material.tabs.TabLayout
-                            android:id="@+id/tablayout"
-                            android:layout_height="wrap_content"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android.support.design:tabIndicatorGravity="top"
-                            android.support.design:tabMode="scrollable" />
-
-                        <ImageView
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="10dp"
-                            android:src="@drawable/add_light"
-                            android:tint="?attr/addTabIconTintColor"
-                            android:onClick="addTab"
-                            android:contentDescription="@string/add_tab" />
-                    </LinearLayout>
+                        app:layout_scrollFlags="scroll|enterAlways|snap" />
 
                     <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
                     <LinearLayout
@@ -96,7 +70,8 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:orientation="horizontal"
-                        android:visibility="gone" >
+                        android:visibility="gone"
+                        app:layout_scrollFlags="scroll|enterAlways|snap" >
 
                         <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
                         <EditText
@@ -156,6 +131,44 @@
                             android:contentDescription="@string/close"
                             android:onClick="closeFindOnPage" />
                     </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/tabs_linearlayout"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_scrollFlags="scroll|enterAlways|snap" >
+
+                        <ImageView
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="10dp"
+                            android:src="@drawable/close_light"
+                            android:tint="?attr/addTabIconTintColor"
+                            android:onClick="closeTab"
+                            android:contentDescription="@string/close_tab" />
+
+                        <com.google.android.material.tabs.TabLayout
+                            android:id="@+id/tablayout"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            app:tabIndicatorGravity="top"
+                            app:tabMode="scrollable" />
+
+                        <ImageView
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="10dp"
+                            android:src="@drawable/add_light"
+                            android:tint="?attr/addTabIconTintColor"
+                            android:onClick="addTab"
+                            android:contentDescription="@string/add_tab" />
+                    </LinearLayout>
                 </com.google.android.material.appbar.AppBarLayout>
 
                 <!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->
@@ -163,9 +176,9 @@
                     android:id="@+id/swiperefreshlayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android.support.design:layout_behavior="@string/appbar_scrolling_view_behavior" >
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior" >
 
-                        <androidx.viewpager.widget.ViewPager
+                        <com.stoutner.privacybrowser.views.NoSwipeViewPager
                             android:id="@+id/webviewpager"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent" />
@@ -179,9 +192,9 @@
             android:layout_height="match_parent"
             android:layout_width="wrap_content"
             android:layout_gravity="start"
-            android.support.design:headerLayout="@layout/navigation_header"
-            android.support.design:menu="@menu/webview_navigation_menu"
-            android.support.design:itemIconTint="?attr/navigationIconTintColor" />
+            app:headerLayout="@layout/navigation_header"
+            app:menu="@menu/webview_navigation_menu"
+            app:itemIconTint="?attr/navigationIconTintColor" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer" />