fix: monogram text render

urFate · Jan 20, 2025 · d4264e1 · d4264e1
1 parent 3ae931f
commit d4264e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/org/shirabox/app/ui/component/general/ListItem.kt b/app/src/main/java/org/shirabox/app/ui/component/general/ListItem.kt
@@ -132,7 +132,7 @@ fun ExtendedListItem(
                         else -> Monogram(str = headlineText)
                     }
                 }
-            }
+            } ?: Monogram(str = headlineText)
         }
     )
 }
diff --git a/app/src/main/java/org/shirabox/app/ui/component/general/Monogram.kt b/app/src/main/java/org/shirabox/app/ui/component/general/Monogram.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
@@ -19,8 +20,11 @@ fun Monogram(modifier: Modifier = Modifier, str: String) {
     val background = MaterialTheme.colorScheme.primary
     val onPrimary = MaterialTheme.colorScheme.onPrimary
 
-    val text = str.replace(Regex("[a-z]"), "")
-        .replace(Regex("[а-я]"), "").uppercase().take(2)
+    val text = remember {
+        str.filter { it.isUpperCase() }
+            .take(2)
+            .takeIf { it.length == 2 } ?: str.uppercase().take(2)
+    }
 
     Box(
         modifier = Modifier
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,7 +132,7 @@ fun ExtendedListItem( @@
                             else -> Monogram(str = headlineText)
                         }
                     }
-                }
+                } ?: Monogram(str = headlineText)
             }
         )
     }