Remove redundant preference composables

(cherry picked from commit dd1923fe88)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/Preferences.kt

app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt

@@ -44,43 +44,42 @@ internal fun BasePreferenceWidget(
     widget: @Composable (() -> Unit)? = null,
 ) {
     val highlighted = LocalPreferenceHighlighted.current
-    Box(modifier = Modifier.highlightBackground(highlighted)) {
-        Row(
-            modifier = modifier
-                .sizeIn(minHeight = 56.dp)
-                .clickable(enabled = onClick != null, onClick = { onClick?.invoke() })
-                .fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
+    Row(
+        modifier = modifier
+            .highlightBackground(highlighted)
+            .sizeIn(minHeight = 56.dp)
+            .clickable(enabled = onClick != null, onClick = { onClick?.invoke() })
+            .fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (icon != null) {
+            Box(
+                modifier = Modifier.padding(start = PrefsHorizontalPadding, end = 8.dp),
+                content = { icon() },
+            )
+        }
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .padding(vertical = PrefsVerticalPadding),
         ) {
-            if (icon != null) {
-                Box(
-                    modifier = Modifier.padding(start = PrefsHorizontalPadding, end = 8.dp),
-                    content = { icon() },
-                )
-            }
-            Column(
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(vertical = PrefsVerticalPadding),
-            ) {
-                if (!title.isNullOrBlank()) {
-                    Text(
-                        modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
-                        text = title,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 2,
-                        style = MaterialTheme.typography.titleLarge,
-                        fontSize = TitleFontSize,
-                    )
-                }
-                subcomponent?.invoke(this)
-            }
-            if (widget != null) {
-                Box(
-                    modifier = Modifier.padding(end = PrefsHorizontalPadding),
-                    content = { widget() },
+            if (!title.isNullOrBlank()) {
+                Text(
+                    modifier = Modifier.padding(horizontal = PrefsHorizontalPadding),
+                    text = title,
+                    overflow = TextOverflow.Ellipsis,
+                    maxLines = 2,
+                    style = MaterialTheme.typography.titleLarge,
+                    fontSize = TitleFontSize,
                 )
             }
+            subcomponent?.invoke(this)
+        }
+        if (widget != null) {
+            Box(
+                modifier = Modifier.padding(end = PrefsHorizontalPadding),
+                content = { widget() },
+            )
         }
     }
 }

app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun SwitchPreferenceWidget(
+    modifier: Modifier = Modifier,
     title: String,
     subtitle: String? = null,
     icon: ImageVector? = null,
@@ -21,6 +22,7 @@ fun SwitchPreferenceWidget(
     onCheckedChanged: (Boolean) -> Unit,
 ) {
     TextPreferenceWidget(
+        modifier = modifier,
         title = title,
         subtitle = subtitle,
         icon = icon,

app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt

@@ -67,7 +67,7 @@ fun TextPreferenceWidget(
 fun TextPreferenceWidget(
     modifier: Modifier = Modifier,
     title: String? = null,
-    subtitle: AnnotatedString,
+    subtitle: AnnotatedString?,
     icon: ImageVector? = null,
     iconTint: Color = MaterialTheme.colorScheme.primary,
     widget: @Composable (() -> Unit)? = null,
@@ -76,15 +76,19 @@ fun TextPreferenceWidget(
     BasePreferenceWidget(
         modifier = modifier,
         title = title,
-        subcomponent = {
-            Text(
-                text = subtitle,
-                modifier = Modifier
-                    .padding(horizontal = PrefsHorizontalPadding)
-                    .secondaryItemAlpha(),
-                style = MaterialTheme.typography.bodySmall,
-                maxLines = 10,
-            )
+        subcomponent = if (!subtitle.isNullOrBlank()) {
+            {
+                Text(
+                    text = subtitle,
+                    modifier = Modifier
+                        .padding(horizontal = PrefsHorizontalPadding)
+                        .secondaryItemAlpha(),
+                    style = MaterialTheme.typography.bodySmall,
+                    maxLines = 10,
+                )
+            }
+        } else {
+            null
         },
         icon = if (icon != null) {
             {