recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

FINALLY fix UI bug

Browse source
This commit is contained in:
Luna712 2024-07-07 14:38:58 -06:00 • committed by GitHub
parent 0f04e20637
commit 9a1949e452
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 167 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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() &&

55
app/src/main/res/layout/download_delete_toolbar.xml
View file

@ -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>

60
app/src/main/res/layout/fragment_downloads.xml
View file

@ -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
@ -141,7 +186,7 @@
android:background="?attr/primaryBlackBackground"
android:descendantFocusability="afterDescendants"
android:nextFocusLeft="@id/nav_rail_view"
android:tag = "@string/tv_no_focus_tag"
android:tag="@string/tv_no_focus_tag"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:listitem="@layout/download_header_episode" />
@ -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>