Add a ripple touch animation to the New Tab and Close Tab buttons. https://redmine...

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / main_framelayout.xml

diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml
index b04c6bc86641f9de7c42d567a3a1c404a0cac63c..5e330e2418fa072ab8fcf19e12a86f4949565d83 100644 (file)
--- a/app/src/main/res/layout/main_framelayout.xml
+++ b/app/src/main/res/layout/main_framelayout.xml
@@ -53,6 +53,7 @@
 
                 <!-- The theme has to be defined here because the activity uses a `NoActionBar` theme. -->
                 <com.google.android.material.appbar.AppBarLayout
 
                 <!-- 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" >
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
                     android:theme="@style/PrivacyBrowserAppBarLight" >


@@ -61,36 +62,8 @@
                         android:id="@+id/toolbar"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         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>
+                        app:layout_scrollFlags="scroll|enterAlways|snap"
+                        android:visibility="gone" />

 
                     <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
                     <LinearLayout
 
                     <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
                     <LinearLayout


@@ -98,7 +71,8 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:orientation="horizontal"
                         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
 
                         <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
                         <EditText


@@ -158,6 +132,49 @@
                             android:contentDescription="@string/close"
                             android:onClick="closeFindOnPage" />
                     </LinearLayout>
                             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"
+                        android:visibility="gone" >
+
+                        <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
+                        <ImageView
+                            android:layout_height="match_parent"
+                            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:background="?attr/selectableItemBackground"
+                            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" />
+
+                        <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
+                        <ImageView
+                            android:layout_height="match_parent"
+                            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:background="?attr/selectableItemBackground"
+                            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. -->
                 </com.google.android.material.appbar.AppBarLayout>
 
                 <!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->


@@ -167,30 +184,10 @@
                     android:layout_height="match_parent"
                     app:layout_behavior="@string/appbar_scrolling_view_behavior" >
 
                     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">
-
-                        <androidx.viewpager.widget.ViewPager
+                        <com.stoutner.privacybrowser.views.NoSwipeViewPager

                             android:id="@+id/webviewpager"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent" />
                             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>
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             </androidx.coordinatorlayout.widget.CoordinatorLayout>
         </RelativeLayout>


@@ -209,10 +206,36 @@
         <include layout="@layout/bookmarks_drawer" />
     </androidx.drawerlayout.widget.DrawerLayout>
 
         <include layout="@layout/bookmarks_drawer" />
     </androidx.drawerlayout.widget.DrawerLayout>
 

-    <!-- `The full screen video frame layout is used to display full screen videos.  It is initially `android:visibility="gone"` to hide it from view. -->
+    <!-- The full screen video frame layout is used to display full screen videos.  It is initially `android:visibility="gone"` to hide it from view. -->

     <FrameLayout
         android:id="@+id/full_screen_video_framelayout"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:visibility="gone" />
     <FrameLayout
         android:id="@+id/full_screen_video_framelayout"
         android:layout_height="match_parent"
         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. -->
+    <RelativeLayout
+        android:id="@+id/loading_blocklists_relativelayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/privacy_browser_logo"
+            android:layout_height="256dp"
+            android:layout_width="256dp"
+            android:layout_centerInParent="true"
+            android:src="@drawable/privacy_browser_foreground"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:id="@+id/loading_blocklist_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/privacy_browser_logo"
+            android:layout_centerHorizontal="true"
+            android:layout_margin="10dp"
+            android:textSize="16sp"
+            android:textAlignment="center"
+            android:textColor="?android:textColorPrimary" />
+    </RelativeLayout>

 </FrameLayout>
\ No newline at end of file
 </FrameLayout>
\ No newline at end of file