FINALLY fix UI bug

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt

@@ -112,7 +112,7 @@ class DownloadFragment : Fragment() {
         }
         observe(downloadsViewModel.selectedIds) {
             handleSelectedChange(it)
-            binding?.downloadDeleteToolbar?.btnDelete?.text =
+            binding?.btnDelete?.text =
                 getString(R.string.delete_count).format(it.count())
         }
 
@@ -203,26 +203,26 @@ class DownloadFragment : Fragment() {
     private fun handleSelectedChange(selected: HashMap<Int, String>) {
         val adapter = binding?.downloadList?.adapter as? DownloadAdapter
         if (selected.isNotEmpty()) {
-            binding?.downloadDeleteToolbar?.downloadDeleteToolbar?.isVisible = true
+            binding?.downloadDeleteAppbar?.isVisible = true
             binding?.downloadStorageAppbar?.isVisible = false
 
-            binding?.downloadDeleteToolbar?.btnDelete?.setOnClickListener {
+            binding?.btnDelete?.setOnClickListener {
                 context?.let { ctx -> downloadsViewModel.handleMultiDelete(ctx) }
             }
 
-            binding?.downloadDeleteToolbar?.btnCancel?.setOnClickListener {
+            binding?.btnCancel?.setOnClickListener {
                 adapter?.setIsMultiDeleteState(false)
                 downloadsViewModel.clearSelectedIds()
             }
 
-            binding?.downloadDeleteToolbar?.btnSelectAll?.setOnClickListener {
+            binding?.btnSelectAll?.setOnClickListener {
                 adapter?.selectAllItems()
                 downloadsViewModel.selectAllItems()
             }
 
             adapter?.setIsMultiDeleteState(true)
         } else {
-            binding?.downloadDeleteToolbar?.downloadDeleteToolbar?.isVisible = false
+            binding?.downloadDeleteAppbar?.isVisible = false
             binding?.downloadStorageAppbar?.isVisible =
                 // Make sure we don't display it early
                 !downloadsViewModel.headerCards.value.isNullOrEmpty() &&

app/src/main/res/layout/download_delete_toolbar.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/primaryGrayBackground"
-    tools:layout_height="100dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="?attr/colorPrimary"
-        android:padding="8dp"
-        android:id="@+id/download_delete_toolbar"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/btnCancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_baseline_close_24"
-            android:contentDescription="@string/cancel"
-            android:padding="8dp"
-            android:layout_gravity="center_vertical"
-            app:tint="@android:color/white" />
-
-        <Button
-            android:id="@+id/btnDelete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:text="@string/delete"
-            android:textColor="@android:color/white"
-            android:layout_gravity="center_vertical" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/btnSelectAll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:text="@string/select_all"
-            android:textColor="@android:color/white"
-            android:layout_marginEnd="8dp" />
-
-    </LinearLayout>
-</com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/fragment_downloads.xml

@@ -8,10 +8,6 @@
     android:orientation="vertical"
     tools:context=".ui.download.DownloadFragment">
 
-    <include
-        layout="@layout/download_delete_toolbar"
-        android:id="@+id/download_delete_toolbar" />
-
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,6 +17,54 @@
         For Scroll add to LinearLayout
         app:layout_scrollFlags="scroll|enterAlways"
         -->
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:id="@+id/download_delete_appbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:background="?attr/colorPrimary"
+                android:padding="8dp"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/btnCancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_baseline_close_24"
+                    android:contentDescription="@string/cancel"
+                    android:padding="8dp"
+                    android:layout_gravity="center_vertical"
+                    app:tint="@android:color/white" />
+
+                <Button
+                    android:id="@+id/btnDelete"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:text="@string/delete"
+                    android:textColor="@android:color/white"
+                    android:layout_gravity="center_vertical" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/btnSelectAll"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:text="@string/select_all"
+                    android:textColor="@android:color/white"
+                    android:layout_marginEnd="8dp" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/download_storage_appbar"
                 android:layout_width="match_parent"
@@ -130,6 +174,7 @@
                         tools:text="Free • 30.58GB" />
                 </LinearLayout>
             </LinearLayout>
+        </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -186,15 +231,10 @@
             android:orientation="vertical">
 
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
         </LinearLayout>
     </com.facebook.shimmer.ShimmerFrameLayout>