X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout.xml;h=a5ed4bf8289c6b61a9d06319cdb313a3b9a4f764;hp=9642decb6ab0fdc364ae7f35507055ed27a430ae;hb=1a9be53186a8a4f16017c6dcc1f2f1e85289358e;hpb=be5c6472390dd054ffb15593388bc103944a99e4

diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml
index 9642decb..a5ed4bf8 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:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_framelayout"
     android:layout_height="match_parent"
@@ -57,99 +57,104 @@
                     android:layout_width="match_parent"
                     android:theme="@style/PrivacyBrowserAppBarLight" >
 
-                    <!-- The frame layout allows the toolbar, progress bar, and find on page bar to occupy the same space.  The scroll flags should be set on the immediate child of AppBarLayout. -->
-                    <FrameLayout
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolbar"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        app:layout_scrollFlags="scroll|enterAlways|snap" >
+                        android.support.design:layout_scrollFlags="scroll|enterAlways|snap" />
 
-                        <androidx.appcompat.widget.Toolbar
-                            android:id="@+id/toolbar"
+                    <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="match_parent" />
-
-                        <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
-                            `android:layout_height="2dp"` works best for API >= 23, but `3dp` is required for visibility on API <= 22.
-                            `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
-                        <ProgressBar
-                            android:id="@+id/progress_bar"
-                            style="?android:attr/progressBarStyleHorizontal"
-                            android:layout_height="3dp"
-                            android:layout_width="match_parent"
-                            android:layout_gravity="bottom"
-                            android:max="100"
-                            android:progressTint="?attr/progressTintColor"
-                            android:progressBackgroundTint="@color/transparent"
-                            android:visibility="gone"
-                            tools:ignore="UnusedAttribute" />
-
-                        <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
-                        <LinearLayout
-                            android:id="@+id/find_on_page_linearlayout"
+                            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="match_parent"
-                            android:orientation="horizontal"
-                            android:visibility="gone" >
-
-                            <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
-                            <EditText
-                                android:id="@+id/find_on_page_edittext"
-                                android:layout_height="wrap_content"
-                                android:layout_width="0dp"
-                                android:layout_weight="1"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginEnd="4dp"
-                                android:hint="@string/find_on_page"
-                                android:lines="1"
-                                android:imeOptions="actionDone"
-                                android:inputType="text"
-                                tools:ignore="Autofill" />
-
-                            <TextView
-                                android:id="@+id/find_on_page_count_textview"
-                                android:layout_height="wrap_content"
-                                android:layout_width="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:layout_marginEnd="4dp"
-                                android:text="@string/zero_of_zero" />
-
-                            <ImageView
-                                android:id="@+id/find_previous"
-                                android:src="@drawable/previous"
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_marginStart="4dp"
-                                android:layout_marginEnd="4dp"
-                                android:layout_gravity="center_vertical"
-                                android:tint="?attr/findOnPageIconTintColor"
-                                android:contentDescription="@string/previous"
-                                android:onClick="findPreviousOnPage" />
-
-                            <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:tint="?attr/findOnPageIconTintColor"
-                                android:contentDescription="@string/next"
-                                android:onClick="findNextOnPage" />
-
-                            <ImageView
-                                android:id="@+id/close_find"
-                                android:src="@drawable/close_light"
-                                android:layout_width="35dp"
-                                android:layout_height="35dp"
-                                android:layout_marginStart="4dp"
-                                android:layout_marginEnd="8dp"
-                                android:layout_gravity="center_vertical"
-                                android:tint="?attr/findOnPageIconTintColor"
-                                android:contentDescription="@string/close"
-                                android:onClick="closeFindOnPage" />
-                        </LinearLayout>
-                    </FrameLayout>
+                            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>
+
+                    <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
+                    <LinearLayout
+                        android:id="@+id/find_on_page_linearlayout"
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent"
+                        android:orientation="horizontal"
+                        android:visibility="gone" >
+
+                        <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
+                        <EditText
+                            android:id="@+id/find_on_page_edittext"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginEnd="4dp"
+                            android:hint="@string/find_on_page"
+                            android:lines="1"
+                            android:imeOptions="actionDone"
+                            android:inputType="text"
+                            tools:ignore="Autofill" />
+
+                        <TextView
+                            android:id="@+id/find_on_page_count_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:text="@string/zero_of_zero" />
+
+                        <ImageView
+                            android:id="@+id/find_previous"
+                            android:src="@drawable/previous"
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="4dp"
+                            android:layout_gravity="center_vertical"
+                            android:tint="?attr/findOnPageIconTintColor"
+                            android:contentDescription="@string/previous"
+                            android:onClick="findPreviousOnPage" />
+
+                        <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:tint="?attr/findOnPageIconTintColor"
+                            android:contentDescription="@string/next"
+                            android:onClick="findNextOnPage" />
+
+                        <ImageView
+                            android:id="@+id/close_find"
+                            android:src="@drawable/close_light"
+                            android:layout_width="35dp"
+                            android:layout_height="35dp"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginEnd="8dp"
+                            android:layout_gravity="center_vertical"
+                            android:tint="?attr/findOnPageIconTintColor"
+                            android:contentDescription="@string/close"
+                            android:onClick="closeFindOnPage" />
+                    </LinearLayout>
                 </com.google.android.material.appbar.AppBarLayout>
 
                 <!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->
@@ -157,14 +162,12 @@
                     android:id="@+id/swiperefreshlayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+                    android.support.design:layout_behavior="@string/appbar_scrolling_view_behavior" >
 
-                    <com.stoutner.privacybrowser.views.NestedScrollWebView
-                        android:id="@+id/main_webview"
-                        android:layout_height="match_parent"
-                        android:layout_width="match_parent"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true" />
+                        <androidx.viewpager.widget.ViewPager
+                            android:id="@+id/webviewpager"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             </androidx.coordinatorlayout.widget.CoordinatorLayout>
         </RelativeLayout>
@@ -175,9 +178,9 @@
             android:layout_height="match_parent"
             android:layout_width="wrap_content"
             android:layout_gravity="start"
-            app:headerLayout="@layout/navigation_header"
-            app:menu="@menu/webview_navigation_menu"
-            app:itemIconTint="?attr/navigationIconTintColor" />
+            android.support.design:headerLayout="@layout/navigation_header"
+            android.support.design:menu="@menu/webview_navigation_menu"
+            android.support.design:itemIconTint="?attr/navigationIconTintColor" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer" />