Disable column slider when on Android TV

GitHub Source: Add support for ImageToolBox, SuperImage, EasyWatermark
rumboalla · Aug 25, 2023 · 9e3d20b · 9e3d20b
1 parent 4c7e028
commit 9e3d20b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/app/src/main/kotlin/com/apkupdater/data/github/GitHubApp.kt b/app/src/main/kotlin/com/apkupdater/data/github/GitHubApp.kt
@@ -21,10 +21,12 @@ val GitHubApps = listOf(
     GitHubApp("de.tutao.tutanota", "tutao", "tutanota"),
     GitHubApp("com.shabinder.spotiflyer", "Shabinder", "SpotiFlyer"),
     GitHubApp("org.koreader.launcher", "koreader", "koreader"),
-    GitHubApp("org.koreader.launcher", "koreader", "koreader"),
     GitHubApp("com.amaze.filemanager", "TeamAmaze", "AmazeFileManager"),
     GitHubApp("me.zhanghai.android.files", "zhanghai", "MaterialFiles"),
     GitHubApp("dev.ukanth.ufirewall", "ukanth", "afwall"),
     GitHubApp("com.ichi2.anki", "ankidroid", "Anki-Android"),
-    GitHubApp("com.simplemobiletools.flashlight", "SimpleMobileTools", "Simple-Flashlight")
+    GitHubApp("com.simplemobiletools.flashlight", "SimpleMobileTools", "Simple-Flashlight"),
+    GitHubApp("ru.tech.imageresizershrinker", "T8RIN", "ImageToolbox"),
+    GitHubApp("com.zhenxiang.superimage", "Lucchetto", "SuperImage"),
+    GitHubApp("me.rosuh.easywatermark", "rosuH", "EasyWatermark")
 )
diff --git a/app/src/main/kotlin/com/apkupdater/ui/screen/SettingsScreen.kt b/app/src/main/kotlin/com/apkupdater/ui/screen/SettingsScreen.kt
@@ -25,6 +25,8 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
@@ -148,28 +150,34 @@ fun AboutItem(
 fun Settings(viewModel: SettingsViewModel) = LazyColumn {
 	item {
 		LargeTitle(stringResource(R.string.settings_ui), Modifier.padding(start = 16.dp, top = 16.dp))
+		val tvUi = remember { mutableStateOf(viewModel.getAndroidTvUi()) }
 		SwitchSetting(
 			getValue = { viewModel.getAndroidTvUi() },
-			setValue = { viewModel.setAndroidTvUi(it) },
+			setValue = {
+				viewModel.setAndroidTvUi(it)
+				tvUi.value = it
+		   	},
 			text = stringResource(R.string.settings_android_tv_ui),
 			icon = R.drawable.ic_androidtv
 		)
-		SliderSetting(
-			{ viewModel.getPortraitColumns().toFloat() },
-			{ viewModel.setPortraitColumns(it.toInt()) },
-			stringResource(R.string.settings_portrait_columns),
-			1f..4f,
-			2,
-			R.drawable.ic_portrait
-		)
-		SliderSetting(
-			{ viewModel.getLandscapeColumns().toFloat() },
-			{ viewModel.setLandscapeColumns(it.toInt()) },
-			stringResource(R.string.settings_landscape_columns),
-			1f..8f,
-			6,
-			R.drawable.ic_landscape
-		)
+		if (!tvUi.value) {
+			SliderSetting(
+				{ viewModel.getPortraitColumns().toFloat() },
+				{ viewModel.setPortraitColumns(it.toInt()) },
+				stringResource(R.string.settings_portrait_columns),
+				1f..4f,
+				2,
+				R.drawable.ic_portrait
+			)
+			SliderSetting(
+				{ viewModel.getLandscapeColumns().toFloat() },
+				{ viewModel.setLandscapeColumns(it.toInt()) },
+				stringResource(R.string.settings_landscape_columns),
+				1f..8f,
+				6,
+				R.drawable.ic_landscape
+			)
+		}
 		SegmentedButtonSetting(
 			stringResource(R.string.theme),
 			listOf(