diff --git a/src/screens/Settings/AppearanceSettings.tsx b/src/screens/Settings/AppearanceSettings.tsx index 57d7eff066..04f39af6eb 100644 --- a/src/screens/Settings/AppearanceSettings.tsx +++ b/src/screens/Settings/AppearanceSettings.tsx @@ -16,6 +16,7 @@ import {useSetThemePrefs, useThemePrefs} from '#/state/shell' import {SimpleViewHeader} from '#/view/com/util/SimpleViewHeader' import {ScrollView} from '#/view/com/util/Views' import {atoms as a, native, useAlf, useTheme} from '#/alf' +import {Divider} from '#/components/Divider' import * as Toggle from '#/components/forms/Toggle' import * as ToggleButton from '#/components/forms/ToggleButton' import {Moon_Stroke2_Corner0_Rounded as MoonIcon} from '#/components/icons/Moon' @@ -81,52 +82,27 @@ export function AppearanceSettingsScreen({}: Props) { - - - - - Mode - - - - - - System - - - - - Light - - - - - Dark - - - - {colorMode !== 'light' && ( - + + + - + - Dark theme + Mode - - + label={_(msg`Dark mode`)} + values={[colorMode]} + onChange={onChangeAppearance}> + - Dim + System + + + + + Light @@ -135,37 +111,137 @@ export function AppearanceSettingsScreen({}: Props) { - + + + {colorMode !== 'light' && ( + + + + + Dark theme + + + + + + + Dim + + + + + Dark + + + + + )} + + + {neue && ( + + Typography + + + + + + + Theme font + + + + Enables a consistent typeface for a clean user + experience across devices. To use your default system + font, disable this. + + + + + { + setFontFamily(checked) + fonts.setFontFamily(checked ? 'theme' : 'system') + }}> + + {fontFamily ? ( + Enabled + ) : ( + Disabled + )} + + + + + + + + + + + Theme font size + + + + Subtly scales the type size for a clean user experience + across devices. To use the font size defined by your + operating system, disable this. + + + + + { + setFontScale(checked) + fonts.setFontScale(checked ? 0.9375 : 1) + }}> + + {fontScale ? ( + Enabled + ) : ( + Disabled + )} + + + + + )} - - {neue && ( - - Neue options - { - setFontScale(checked) - fonts.setFontScale(checked ? 0.9375 : 1) - }}> - Enable new font scale - - - { - setFontFamily(checked) - fonts.setFontFamily(checked ? 'theme' : 'system') - }}> - Use theme font - - - - )}