X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout.xml;h=925643b526fbfc387bd125a2ac712bfe3ab0b6e0;hb=72965ce9cf438450a9f243b0e8952b66661d1b30;hp=b04c6bc86641f9de7c42d567a3a1c404a0cac63c;hpb=84989e138cb593d5a2f70be848db4889aaa8da88;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml
index b04c6bc8..925643b5 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"
@@ -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,36 +62,7 @@
                         android:id="@+id/toolbar"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        app:layout_scrollFlags="scroll|enterAlways|snap" />
-
-                    <HorizontalScrollView
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        app:layout_scrollFlags="scroll|enterAlways|snap" >
-
-                        <LinearLayout
-                            android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:orientation="horizontal" >
-
-                            <com.google.android.material.tabs.TabLayout
-                                android:id="@+id/tablayout"
-                                android:layout_height="wrap_content"
-                                android:layout_width="wrap_content"
-                                app:tabMode="scrollable" />
-
-                            <ImageView
-                                android:layout_height="wrap_content"
-                                android:layout_width="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:paddingStart="15dp"
-                                android:paddingEnd="15dp"
-                                android:src="@drawable/add_light"
-                                android:tint="@color/gray_700"
-                                android:onClick="addTab"
-                                android:contentDescription="@string/add_tab" />
-                        </LinearLayout>
-                    </HorizontalScrollView>
+                        android.support.design:layout_scrollFlags="scroll|enterAlways|snap" />
 
                     <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
                     <LinearLayout
@@ -98,7 +70,8 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:orientation="horizontal"
-                        android:visibility="gone" >
+                        android:visibility="gone"
+                        android.support.design:layout_scrollFlags="scroll|enterAlways|snap" >
 
                         <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
                         <EditText
@@ -158,6 +131,33 @@
                             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"
+                        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>
                 </com.google.android.material.appbar.AppBarLayout>
 
                 <!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->
@@ -165,32 +165,12 @@
                     android:id="@+id/swiperefreshlayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior" >
-
-                    <!-- The frame layout allows the progress bar to float above the WebView. -->
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
+                    android.support.design:layout_behavior="@string/appbar_scrolling_view_behavior" >
 
                         <androidx.viewpager.widget.ViewPager
                             android:id="@+id/webviewpager"
                             android:layout_width="match_parent"
                             android:layout_height="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:max="100"
-                            android:progressTint="?attr/progressTintColor"
-                            android:progressBackgroundTint="@color/transparent"
-                            android:visibility="gone"
-                            tools:ignore="UnusedAttribute" />
-                    </FrameLayout>
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             </androidx.coordinatorlayout.widget.CoordinatorLayout>
         </RelativeLayout>
@@ -201,9 +181,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" />