chore: final touches adjustments

wireapp · Aug 30, 2024 · 83541cd · 83541cd
1 parent e192760
commit 83541cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/common/UserProfileAvatar.kt b/app/src/main/kotlin/com/wire/android/ui/common/UserProfileAvatar.kt
@@ -58,6 +58,7 @@ import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.android.ui.theme.Accent
 import com.wire.android.ui.theme.WireTheme
+import com.wire.android.ui.theme.nonScaledSp
 import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireDimensions
 import com.wire.android.util.ui.PreviewMultipleThemes
@@ -209,7 +210,7 @@ private fun DefaultInitialsAvatar(
             textAlign = TextAlign.Center,
             style = MaterialTheme.typography.titleLarge,
             maxLines = 1,
-            fontSize = size.value.sp / 3
+            fontSize =( size.value.sp / 3).nonScaledSp
         )
     }
 }
@@ -404,7 +405,7 @@ fun PreviewUserProfileAvatarWithInitialsBig() {
     }
 }
 
-@Preview(fontScale = 1f)
+@Preview(fontScale = 3f)
 @Composable
 fun PreviewUserProfileAvatarSmallest() {
     WireTheme {

diff --git a/core/ui-common/src/main/kotlin/com/wire/android/ui/theme/WireTypography.kt b/core/ui-common/src/main/kotlin/com/wire/android/ui/theme/WireTypography.kt
@@ -21,8 +21,12 @@
 package com.wire.android.ui.theme
 
 import androidx.compose.material3.Typography
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.sp
 import io.github.esentsov.PackagePrivate
 
 @Immutable
@@ -75,3 +79,7 @@ val WireTypographyTypes: ScreenSizeDependent<WireTypography> = ScreenSizeDepende
     tablet7 = DefaultWireTypography,
     tablet10 = DefaultWireTypography
 )
+
+val TextUnit.nonScaledSp
+    @Composable
+    get() = (this.value / LocalDensity.current.fontScale).sp