瀏覽代碼

Fix Clear Database item trying to display language when empty (#7651)

Andreas 2 年之前
父節點
當前提交
039fe4a618

+ 5 - 2
app/src/main/java/eu/kanade/domain/source/model/Source.kt

@@ -17,8 +17,11 @@ data class Source(
     val isUsedLast: Boolean = false,
 ) {
 
-    val nameWithLanguage: String
-        get() = "$name (${lang.uppercase()})"
+    val visualName: String
+        get() = when {
+            lang.isEmpty() -> name
+            else -> "$name (${lang.uppercase()})"
+        }
 
     val icon: ImageBitmap?
         get() {

+ 1 - 3
app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt

@@ -20,8 +20,6 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -218,7 +216,7 @@ fun SourceOptionsDialog(
 ) {
     AlertDialog(
         title = {
-            Text(text = source.nameWithLanguage)
+            Text(text = source.visualName)
         },
         text = {
             Column {

+ 1 - 1
app/src/main/java/eu/kanade/presentation/more/settings/database/components/ClearDatabaseItem.kt

@@ -40,7 +40,7 @@ fun ClearDatabaseItem(
                 .weight(1f),
         ) {
             Text(
-                text = source.nameWithLanguage,
+                text = source.visualName,
                 style = MaterialTheme.typography.bodyMedium,
             )
             Text(text = stringResource(id = R.string.clear_database_source_item_count, count))