fix: use font face and size in selection bottom sheets (#74)

LiveFastEatTrashRaccoon · Nov 4, 2024 · f4e0ef5 · f4e0ef5
1 parent 95d7e54
commit f4e0ef5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...m/livefast/eattrash/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt b/...m/livefast/eattrash/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt
@@ -57,6 +57,7 @@ import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.IconSize
 import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.Spacing
 import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.toColor
 import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.toReadableName
+import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.toTypography
 import com.livefast.eattrash.raccoonforlemmy.core.commonui.components.MultiColorPreview
 import com.livefast.eattrash.raccoonforlemmy.core.commonui.lemmyui.SettingsRow
 import com.livefast.eattrash.raccoonforlemmy.core.commonui.lemmyui.SettingsSwitchRow
@@ -575,6 +576,11 @@ class SettingsColorAndFontScreen : Screen {
                     items.map { fontFamily ->
                         CustomModalBottomSheetItem(
                             label = fontFamily.toUiFontFamily().toReadableName(),
+                            customLabelStyle =
+                                fontFamily
+                                    .toUiFontFamily()
+                                    .toTypography()
+                                    .titleMedium,
                         )
                     },
                 onSelected = { index ->
@@ -605,6 +611,10 @@ class SettingsColorAndFontScreen : Screen {
                     items.map { font ->
                         CustomModalBottomSheetItem(
                             label = font.toFontScale().toReadableName(),
+                            customLabelStyle =
+                                MaterialTheme.typography.titleMedium.let {
+                                    it.copy(fontSize = it.fontSize * font)
+                                },
                         )
                     },
                 onSelected = { index ->

diff --git a/...livefast/eattrash/raccoonforlemmy/unit/configurecontentview/ConfigureContentViewScreen.kt b/...livefast/eattrash/raccoonforlemmy/unit/configurecontentview/ConfigureContentViewScreen.kt
@@ -45,6 +45,7 @@ import com.livefast.eattrash.raccoonforlemmy.core.appearance.data.toReadableName
 import com.livefast.eattrash.raccoonforlemmy.core.appearance.data.toUiFontFamily
 import com.livefast.eattrash.raccoonforlemmy.core.appearance.repository.ContentFontClass
 import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.Spacing
+import com.livefast.eattrash.raccoonforlemmy.core.appearance.theme.toTypography
 import com.livefast.eattrash.raccoonforlemmy.core.commonui.lemmyui.SettingsHeader
 import com.livefast.eattrash.raccoonforlemmy.core.commonui.lemmyui.SettingsIntValueRow
 import com.livefast.eattrash.raccoonforlemmy.core.commonui.lemmyui.SettingsRow
@@ -360,6 +361,11 @@ class ConfigureContentViewScreen : Screen {
                     items.map { fontFamily ->
                         CustomModalBottomSheetItem(
                             label = fontFamily.toUiFontFamily().toReadableName(),
+                            customLabelStyle =
+                                fontFamily
+                                    .toUiFontFamily()
+                                    .toTypography()
+                                    .titleMedium,
                         )
                     },
                 onSelected = { index ->
@@ -390,6 +396,10 @@ class ConfigureContentViewScreen : Screen {
                     items.map { font ->
                         CustomModalBottomSheetItem(
                             label = font.toFontScale().toReadableName(),
+                            customLabelStyle =
+                                MaterialTheme.typography.titleMedium.let {
+                                    it.copy(fontSize = it.fontSize * font)
+                                },
                         )
                     },
                 onSelected = { index ->