X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_framelayout.xml;h=5e330e2418fa072ab8fcf19e12a86f4949565d83;hb=26947f6f7ad8b544a8d20f3397f157d079c7362e;hp=6e7c2aba3b3c579acaba8b52b3f69235f098a225;hpb=3155170e069e8a064b8b7d3dfd57f831772c9184;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml
index 6e7c2aba..5e330e24 100644
--- a/app/src/main/res/layout/main_framelayout.xml
+++ b/app/src/main/res/layout/main_framelayout.xml
@@ -62,7 +62,8 @@
                         android:id="@+id/toolbar"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        app:layout_scrollFlags="scroll|enterAlways|snap" />
+                        app:layout_scrollFlags="scroll|enterAlways|snap"
+                        android:visibility="gone" />
 
                     <!-- The find on page linear layout.  It is initially `visibility="gone"`. -->
                     <LinearLayout
@@ -137,7 +138,21 @@
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:orientation="horizontal"
-                        app:layout_scrollFlags="scroll|enterAlways|snap" >
+                        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"
@@ -147,14 +162,16 @@
                             app:tabIndicatorGravity="top"
                             app:tabMode="scrollable" />
 
+                        <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                         <ImageView
-                            android:layout_height="wrap_content"
+                            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>
@@ -189,10 +206,36 @@
         <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" />
+
+    <!-- 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