refactor settings screen, debug, viewmodels, etc

Author: Idadelveloper

app/src/main/java/org/schabi/newpipe/settings/DebugScreen.kt

@@ -10,7 +10,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import dagger.hilt.android.AndroidEntryPoint
-import org.schabi.newpipe.settings.navigation.SettingsNavigation
+import org.schabi.newpipe.ui.screens.settings.navigation.SettingsNavigation
 import org.schabi.newpipe.ui.theme.AppTheme
 
 @AndroidEntryPoint
@@ -22,7 +22,7 @@ class SettingsV2Activity : ComponentActivity() {
         setContent {
             AppTheme {
                 SettingsNavigation(
-                    onExitSettings = { finish() },
+                    onExitSettings = { finish() }
                 )
             }
         }

app/src/main/java/org/schabi/newpipe/settings/SettingsV2Activity.kt

@@ -6,7 +6,6 @@
 
 package org.schabi.newpipe.ui
 
-import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -22,10 +21,10 @@ import org.schabi.newpipe.ui.theme.SizeTokens
 @Composable
 fun SwitchPreference(
     modifier: Modifier = Modifier,
-    @StringRes title: Int,
+    title: String,
     isChecked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
-    @StringRes summary: Int? = null,
+    summary: String? = null,
     enabled: Boolean = true
 ) {
     Row(

app/src/main/java/org/schabi/newpipe/ui/SwitchPreference.kt

@@ -5,41 +5,38 @@
 
 package org.schabi.newpipe.ui
 
-import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import org.schabi.newpipe.R
 
 /**
  * A base composable that displays a title and an optional summary text. Used in settings preference
- * items such as TextPreference and SwitchPreference
+ * items such as TextPreference and SwitchPreference.
  *
- * @param title the resource ID of the string to be used as the title
- * @param summary the optional resource ID of the string to be used as the summary
+ * @param title the title text to display
+ * @param summary the optional summary text to display below the title
  * @param enabled whether the text should be displayed in an enabled or disabled state
  */
 @Composable
 internal fun TextBase(
-    @StringRes title: Int,
-    @StringRes summary: Int?,
+    title: String,
+    summary: String?,
     enabled: Boolean = true
 ) {
     Column {
         Text(
-            text = stringResource(id = title),
+            text = title,
             style = MaterialTheme.typography.titleSmall,
             textAlign = TextAlign.Start,
             color = if (enabled) Color.Unspecified else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
         )
         summary?.let {
             Text(
-                text = stringResource(id = summary),
+                text = it,
                 style = MaterialTheme.typography.bodySmall,
                 textAlign = TextAlign.Start,
                 color = if (enabled) Color.Unspecified else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.38f)
@@ -50,6 +47,6 @@ internal fun TextBase(
 
 @Preview(showBackground = true, backgroundColor = 0xFFFFFFFF)
 @Composable
-fun TextBasePreview() {
-    TextBase(R.string.settings_category_debug_title, R.string.settings_category_debug_title)
+private fun TextBasePreview() {
+    TextBase("Debug", "Debug settings summary")
 }

app/src/main/java/org/schabi/newpipe/ui/TextBase.kt

@@ -7,7 +7,6 @@
 package org.schabi.newpipe.ui
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,9 +28,9 @@ import org.schabi.newpipe.ui.theme.SizeTokens
 @Composable
 fun TextPreference(
     modifier: Modifier = Modifier,
-    @StringRes title: Int,
+    title: String,
     @DrawableRes icon: Int? = null,
-    @StringRes summary: Int? = null,
+    summary: String? = null,
     onClick: () -> Unit,
     enabled: Boolean = true
 ) {
@@ -47,7 +46,7 @@ fun TextPreference(
         icon?.let {
             Icon(
                 painter = painterResource(id = icon),
-                contentDescription = "icon for $title preference",
+                contentDescription = null,
                 tint = if (enabled) Color.Unspecified else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
             )
             Spacer(modifier = Modifier.width(SizeTokens.SpacingSmall))

app/src/main/java/org/schabi/newpipe/ui/TextPreference.kt

@@ -86,7 +86,7 @@ fun ScaffoldWithToolbar(
                         )
                     },
                     expanded = true,
-                    onExpandedChange = { isSearchActive = it },
+                    onExpandedChange = { isSearchActive = it }
                 ) {
                     val suggestions = onSearchQueryChange?.invoke(query) ?: emptyList()
                     if (suggestions.isNotEmpty()) {
@@ -96,7 +96,7 @@ fun ScaffoldWithToolbar(
                             }
                         }
                     } else {
-                            DefaultSearchNoResults()
+                        DefaultSearchNoResults()
                     }
                 }
             } else {
@@ -107,7 +107,7 @@ fun ScaffoldWithToolbar(
                         scrolledContainerColor = MaterialTheme.colorScheme.primaryContainer,
                         navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
                         titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
-                        actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                        actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer
                     ),
                     navigationIcon = {
                         IconButton(onClick = onBackClick) {