Feat(TV): Added network stream to downloads tab, and updated nextfocus for easier navigation. Closes #1283

Author: fire-light42

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -699,6 +699,36 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         // Check if we are already at the selected destination
         if (navController.currentDestination?.id == destinationId) return false
 
+        // Make all nav buttons focus on this specific view when nextFocusRightId
+        val targetView = when (destinationId) {
+            // Please note that if R.id.navigation_home is readded, then it will only take affect when
+            // navigation to home for the second time as onNavDestinationSelected will not get called
+            // when first loading up the app
+
+            // R.id.navigation_home -> R.id.home_preview_change_api
+            R.id.navigation_search -> R.id.main_search
+            R.id.navigation_library -> R.id.main_search
+            R.id.navigation_downloads -> R.id.download_appbar
+            else -> null
+        }
+        if (targetView != null && isLayout(TV or EMULATOR)) {
+            val fromView = binding?.navRailView
+            if (fromView != null) {
+                fromView.nextFocusRightId = targetView
+
+                for (focusView in arrayOf(
+                    R.id.navigation_downloads,
+                    R.id.navigation_home,
+                    R.id.navigation_search,
+                    R.id.navigation_library,
+                    R.id.navigation_settings,
+                )) {
+                    fromView.findViewById<View?>(focusView)?.nextFocusRightId = targetView
+                }
+            }
+        }
+
+
         val builder = NavOptions.Builder().setLaunchSingleTop(true).setRestoreState(true)
             .setEnterAnim(R.anim.enter_anim)
             .setExitAnim(R.anim.exit_anim)

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

@@ -87,7 +87,7 @@ class DownloadFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         hideKeyboard()
-        binding?.downloadStorageAppbar?.setAppBarNoScrollFlagsOnTV()
+        binding?.downloadAppbar?.setAppBarNoScrollFlagsOnTV()
         binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV()
 
         /**
@@ -136,12 +136,15 @@ class DownloadFragment : Fragment() {
                 binding?.downloadUsed
             )
 
-            // Prevent race condition and make sure
-            // we don't display it early
-            if (
-                downloadsViewModel.isMultiDeleteState.value == null ||
-                downloadsViewModel.isMultiDeleteState.value == false
-            ) binding?.downloadStorageAppbar?.isVisible = it > 0
+            val hasBytes = it > 0
+            if(hasBytes) {
+                binding?.downloadLoadingBytes?.stopShimmer()
+            } else {
+                binding?.downloadLoadingBytes?.startShimmer()
+            }
+
+            binding?.downloadBytesBar?.isVisible = hasBytes
+            binding?.downloadLoadingBytes?.isGone = hasBytes
         }
         observe(downloadsViewModel.downloadBytes) {
             updateStorageInfo(
@@ -165,7 +168,7 @@ class DownloadFragment : Fragment() {
                 // Prevent race condition and make sure
                 // we don't display it early
                 if (downloadsViewModel.usedBytes.value?.let { it > 0 } == true) {
-                    binding?.downloadStorageAppbar?.isVisible = true
+                    binding?.downloadAppbar?.isVisible = true
                 }
             }
         }
@@ -218,6 +221,12 @@ class DownloadFragment : Fragment() {
                 isGone = isLayout(TV)
                 setOnClickListener { showStreamInputDialog(it.context) }
             }
+
+            downloadStreamButtonTv.isFocusableInTouchMode = isLayout(TV)
+            downloadAppbar.isFocusableInTouchMode = isLayout(TV)
+
+            downloadStreamButtonTv.setOnClickListener { showStreamInputDialog(it.context) }
+            steamImageviewHolder.isVisible = isLayout(TV)
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -252,7 +261,7 @@ class DownloadFragment : Fragment() {
     private fun handleSelectedChange(selected: MutableSet<Int>) {
         if (selected.isNotEmpty()) {
             binding?.downloadDeleteAppbar?.isVisible = true
-            binding?.downloadStorageAppbar?.isVisible = false
+            binding?.downloadAppbar?.isVisible = false
             activity?.attachBackPressedCallback("Downloads") {
                 downloadsViewModel.setIsMultiDeleteState(false)
             }

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

@@ -32,7 +32,7 @@
                 android:contentDescription="@string/cancel"
                 android:padding="8dp"
                 android:layout_gravity="center_vertical"
-                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusLeft="@id/navigation_downloads"
                 app:tint="@android:color/white" />
 
             <Button
@@ -87,7 +87,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBlackBackground"
-        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusLeft="@id/navigation_downloads"
         android:nextFocusUp="@id/download_child_toolbar"
         android:padding="10dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"