From aec18c74be65c9305b9e404db6a47e36771e7695 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Thu, 1 Aug 2024 06:40:30 +0530
Subject: [PATCH] Move item view mode composable

---
 .../newpipe/ui/components/common/Utils.kt     | 34 -------------------
 .../ui/components/stream/StreamList.kt        | 28 ++++++++++++++-
 2 files changed, 27 insertions(+), 35 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/ui/components/common/Utils.kt

diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/common/Utils.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/Utils.kt
deleted file mode 100644
index 5a7be7fbd..000000000
--- a/app/src/main/java/org/schabi/newpipe/ui/components/common/Utils.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.schabi.newpipe.ui.components.common
-
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.preference.PreferenceManager
-import androidx.window.core.layout.WindowWidthSizeClass
-import org.schabi.newpipe.R
-import org.schabi.newpipe.info_list.ItemViewMode
-
-@Composable
-fun determineItemViewMode(): ItemViewMode {
-    val listMode = PreferenceManager.getDefaultSharedPreferences(LocalContext.current)
-        .getString(
-            stringResource(R.string.list_view_mode_key),
-            stringResource(R.string.list_view_mode_value)
-        )
-
-    return when (listMode) {
-        stringResource(R.string.list_view_mode_list_key) -> ItemViewMode.LIST
-        stringResource(R.string.list_view_mode_grid_key) -> ItemViewMode.GRID
-        stringResource(R.string.list_view_mode_card_key) -> ItemViewMode.CARD
-        else -> {
-            // Auto mode - evaluate whether to use Grid based on screen real estate.
-            val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
-            if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.EXPANDED) {
-                ItemViewMode.GRID
-            } else {
-                ItemViewMode.LIST
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/stream/StreamList.kt b/app/src/main/java/org/schabi/newpipe/ui/components/stream/StreamList.kt
index d4745943a..6d4569de1 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/stream/StreamList.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/stream/StreamList.kt
@@ -14,15 +14,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
 import androidx.paging.compose.LazyPagingItems
+import androidx.preference.PreferenceManager
 import androidx.window.core.layout.WindowWidthSizeClass
 import my.nanihadesuka.compose.LazyColumnScrollbar
 import my.nanihadesuka.compose.LazyVerticalGridScrollbar
+import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.info_list.ItemViewMode
-import org.schabi.newpipe.ui.components.common.determineItemViewMode
 import org.schabi.newpipe.util.NavigationHelper
 
 @Composable
@@ -98,3 +100,27 @@ fun StreamList(
         }
     }
 }
+
+@Composable
+private fun determineItemViewMode(): ItemViewMode {
+    val listMode = PreferenceManager.getDefaultSharedPreferences(LocalContext.current)
+        .getString(
+            stringResource(R.string.list_view_mode_key),
+            stringResource(R.string.list_view_mode_value)
+        )
+
+    return when (listMode) {
+        stringResource(R.string.list_view_mode_list_key) -> ItemViewMode.LIST
+        stringResource(R.string.list_view_mode_grid_key) -> ItemViewMode.GRID
+        stringResource(R.string.list_view_mode_card_key) -> ItemViewMode.CARD
+        else -> {
+            // Auto mode - evaluate whether to use Grid based on screen real estate.
+            val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
+            if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.EXPANDED) {
+                ItemViewMode.GRID
+            } else {
+                ItemViewMode.LIST
+            }
+        }
+    }
+}