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

Fix focus issues on TV

Browse source
This commit is contained in:
Luna712 2024-07-13 15:22:36 -06:00 • committed by GitHub
parent a93163ff88
commit b69bc9069d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
View file

@ -97,6 +97,8 @@ class DownloadChildFragment : Fragment() {
setAppBarNoScrollFlagsOnTV() setAppBarNoScrollFlagsOnTV()
} }
binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV()
observe(downloadsViewModel.childCards) { observe(downloadsViewModel.childCards) {
if (it.isEmpty()) { if (it.isEmpty()) {
activity?.onBackPressedDispatcher?.onBackPressed() activity?.onBackPressedDispatcher?.onBackPressed()
@ -126,8 +128,9 @@ class DownloadChildFragment : Fragment() {
binding?.selectItemsText?.isVisible = it.isEmpty() binding?.selectItemsText?.isVisible = it.isEmpty()
val allSelected = downloadsViewModel.isAllSelected() val allSelected = downloadsViewModel.isAllSelected()
binding?.btnSelectAll?.isVisible = !allSelected if (allSelected) {
binding?.btnDeselectAll?.isVisible = allSelected binding?.btnToggleAll?.setText(R.string.deselect_all)
} else binding?.btnToggleAll?.setText(R.string.select_all)
} }
val adapter = DownloadAdapter( val adapter = DownloadAdapter(
@ -180,14 +183,16 @@ class DownloadChildFragment : Fragment() {
downloadsViewModel.setIsMultiDeleteState(false) downloadsViewModel.setIsMultiDeleteState(false)
} }
binding?.btnSelectAll?.setOnClickListener { binding?.btnToggleAll?.setOnClickListener {
(binding?.downloadChildList?.adapter as? DownloadAdapter)?.selectAllItems() val allSelected = downloadsViewModel.isAllSelected()
downloadsViewModel.selectAllItems() val binding = binding?.downloadChildList?.adapter as? DownloadAdapter
} if (allSelected) {
binding?.clearSelectedItems()
binding?.btnDeselectAll?.setOnClickListener { downloadsViewModel.clearSelectedItems()
(binding?.downloadChildList?.adapter as? DownloadAdapter)?.clearSelectedItems() } else {
downloadsViewModel.clearSelectedItems() binding?.selectAllItems()
downloadsViewModel.selectAllItems()
}
} }
downloadsViewModel.setIsMultiDeleteState(true) downloadsViewModel.setIsMultiDeleteState(true)

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

@ -94,6 +94,7 @@ class DownloadFragment : Fragment() {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
hideKeyboard() hideKeyboard()
binding?.downloadStorageAppbar?.setAppBarNoScrollFlagsOnTV() binding?.downloadStorageAppbar?.setAppBarNoScrollFlagsOnTV()
binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV()
/** /**
* We never want to retain multi-delete state * We never want to retain multi-delete state
@ -167,8 +168,9 @@ class DownloadFragment : Fragment() {
binding?.selectItemsText?.isVisible = it.isEmpty() binding?.selectItemsText?.isVisible = it.isEmpty()
val allSelected = downloadsViewModel.isAllSelected() val allSelected = downloadsViewModel.isAllSelected()
binding?.btnSelectAll?.isVisible = !allSelected if (allSelected) {
binding?.btnDeselectAll?.isVisible = allSelected binding?.btnToggleAll?.setText(R.string.deselect_all)
} else binding?.btnToggleAll?.setText(R.string.select_all)
} }
val adapter = DownloadAdapter( val adapter = DownloadAdapter(
@ -193,7 +195,6 @@ class DownloadFragment : Fragment() {
setLinearListLayout( setLinearListLayout(
isHorizontal = false, isHorizontal = false,
nextRight = FOCUS_SELF, nextRight = FOCUS_SELF,
nextUp = FOCUS_SELF,
nextDown = FOCUS_SELF, nextDown = FOCUS_SELF,
) )
} }
@ -257,14 +258,16 @@ class DownloadFragment : Fragment() {
downloadsViewModel.setIsMultiDeleteState(false) downloadsViewModel.setIsMultiDeleteState(false)
} }
binding?.btnSelectAll?.setOnClickListener { binding?.btnToggleAll?.setOnClickListener {
(binding?.downloadList?.adapter as? DownloadAdapter)?.selectAllItems() val allSelected = downloadsViewModel.isAllSelected()
downloadsViewModel.selectAllItems() val binding = binding?.downloadList?.adapter as? DownloadAdapter
} if (allSelected) {
binding?.clearSelectedItems()
binding?.btnDeselectAll?.setOnClickListener { downloadsViewModel.clearSelectedItems()
(binding?.downloadList?.adapter as? DownloadAdapter)?.clearSelectedItems() } else {
downloadsViewModel.clearSelectedItems() binding?.selectAllItems()
downloadsViewModel.selectAllItems()
}
} }
downloadsViewModel.setIsMultiDeleteState(true) downloadsViewModel.setIsMultiDeleteState(true)

4
app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
View file

@ -92,7 +92,9 @@ class DownloadViewModel : ViewModel() {
} }
fun clearSelectedItems() { fun clearSelectedItems() {
_selectedItems.postValue(mutableListOf()) // We need this to be done immediately
// so we can't use postValue
_selectedItems.value = mutableListOf()
} }
fun isAllSelected(): Boolean { fun isAllSelected(): Boolean {

16
app/src/main/res/layout/fragment_child_downloads.xml
View file

@ -23,7 +23,7 @@
android:padding="8dp" android:padding="8dp"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageButton
android:id="@+id/btnCancel" android:id="@+id/btnCancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -32,6 +32,7 @@
android:contentDescription="@string/cancel" android:contentDescription="@string/cancel"
android:padding="8dp" android:padding="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:nextFocusLeft="@id/nav_rail_view"
app:tint="@android:color/white" /> app:tint="@android:color/white" />
<Button <Button
@ -59,23 +60,14 @@
android:layout_weight="1" /> android:layout_weight="1" />
<Button <Button
android:id="@+id/btnSelectAll" android:id="@+id/btnToggleAll"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:text="@string/select_all" android:text="@string/select_all"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:layout_marginEnd="8dp" />
<Button
android:id="@+id/btnDeselectAll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:text="@string/deselect_all"
android:textColor="@android:color/white"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" /> android:nextFocusDown="@id/download_child_list" />
</LinearLayout> </LinearLayout>
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar

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

@ -26,7 +26,7 @@
android:padding="8dp" android:padding="8dp"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageButton
android:id="@+id/btnCancel" android:id="@+id/btnCancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -35,6 +35,7 @@
android:contentDescription="@string/cancel" android:contentDescription="@string/cancel"
android:padding="8dp" android:padding="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:nextFocusLeft="@id/nav_rail_view"
app:tint="@android:color/white" /> app:tint="@android:color/white" />
<Button <Button
@ -62,23 +63,14 @@
android:layout_weight="1" /> android:layout_weight="1" />
<Button <Button
android:id="@+id/btnSelectAll" android:id="@+id/btnToggleAll"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:text="@string/select_all" android:text="@string/select_all"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:layout_marginEnd="8dp" />
<Button
android:id="@+id/btnDeselectAll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:text="@string/deselect_all"
android:textColor="@android:color/white"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" /> android:nextFocusDown="@id/download_list" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout