mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-23 17:13:10 +00:00
appearance
This commit is contained in:
1 parent
4f0933204f
commit
de4fa27a1c
5 files changed
+11
-10
No files matched your search
+1
-1
@@ -16,7 +16,7 @@ actual fun SettingsSectionApp(
|
||||
showVersion: () -> Unit,
|
||||
withAuth: (title: String, desc: String, block: () -> Unit) -> Unit
|
||||
) {
|
||||
SectionView(stringResource(MR.strings.settings_section_title_app)) {
|
||||
SectionView(stringResource(MR.strings.settings_section_title_app), card = true) {
|
||||
SettingsActionItem(painterResource(MR.images.ic_restart_alt), stringResource(MR.strings.settings_restart_app), ::restartApp)
|
||||
SettingsActionItem(painterResource(MR.images.ic_power_settings_new), stringResource(MR.strings.settings_shutdown), { shutdownAppAlert(::shutdownApp) })
|
||||
SettingsActionItem(painterResource(MR.images.ic_code), stringResource(MR.strings.settings_developer_tools), showSettingsModal { DeveloperView(withAuth) })
|
||||
|
||||
+6
-5
@@ -59,7 +59,7 @@ object AppearanceScope {
|
||||
fun ProfileImageSection() {
|
||||
SectionView(stringResource(MR.strings.settings_section_title_profile_images), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING), card = true) {
|
||||
val image = remember { chatModel.currentUser }.value?.image
|
||||
Row(Modifier.padding(top = 10.dp), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) {
|
||||
Row(Modifier.padding(vertical = 10.dp), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) {
|
||||
val size = 60
|
||||
Box(Modifier.offset(x = -(size / 12).dp)) {
|
||||
if (!image.isNullOrEmpty()) {
|
||||
@@ -93,6 +93,7 @@ object AppearanceScope {
|
||||
SectionView(stringResource(MR.strings.appearance_app_toolbars), card = true) {
|
||||
SectionItemViewWithoutMinPadding {
|
||||
Box(Modifier.weight(1f)) {
|
||||
var fontScale by remember { mutableStateOf(1f) }
|
||||
Text(
|
||||
stringResource(MR.strings.appearance_in_app_bars_alpha),
|
||||
Modifier.clickable(
|
||||
@@ -101,7 +102,9 @@ object AppearanceScope {
|
||||
) {
|
||||
appPrefs.inAppBarsAlpha.set(appPrefs.inAppBarsDefaultAlpha)
|
||||
},
|
||||
maxLines = 1
|
||||
maxLines = 1,
|
||||
fontSize = MaterialTheme.typography.body1.fontSize * fontScale,
|
||||
onTextLayout = { if (it.hasVisualOverflow && fontScale > 0.5f) fontScale -= 0.05f }
|
||||
)
|
||||
}
|
||||
Spacer(Modifier.padding(end = 10.dp))
|
||||
@@ -205,7 +208,7 @@ object AppearanceScope {
|
||||
fun FontScaleSection() {
|
||||
val localFontScale = remember { mutableStateOf(appPrefs.fontScale.get()) }
|
||||
SectionView(stringResource(MR.strings.appearance_font_size), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING), card = true) {
|
||||
Row(Modifier.padding(top = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Row(Modifier.padding(vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(Modifier.size(50.dp)
|
||||
.background(MaterialTheme.colors.surface, RoundedCornerShape(percent = 22))
|
||||
.clip(RoundedCornerShape(percent = 22))
|
||||
@@ -520,9 +523,7 @@ object AppearanceScope {
|
||||
}
|
||||
|
||||
SectionView(stringResource(MR.strings.settings_section_title_themes), card = true) {
|
||||
Spacer(Modifier.height(DEFAULT_PADDING_HALF))
|
||||
ThemeDestinationPicker(themeUserDestination)
|
||||
Spacer(Modifier.height(DEFAULT_PADDING_HALF))
|
||||
|
||||
val importWallpaperLauncher = rememberFileChooserLauncher(true) { to: URI? ->
|
||||
if (to != null) onImport(to)
|
||||
|
||||
@@ -3096,6 +3096,6 @@
|
||||
<string name="tray_quit">Quit SimpleX</string>
|
||||
<string name="tray_tooltip">SimpleX</string>
|
||||
<string name="tray_tooltip_unread">SimpleX — %d unread</string>
|
||||
<string name="appearance_minimize_to_tray">Minimize to tray when closing window</string>
|
||||
<string name="appearance_minimize_to_tray_desc">Keep SimpleX running in the background to receive messages.</string>
|
||||
<string name="appearance_minimize_to_tray">Close to tray</string>
|
||||
<string name="appearance_minimize_to_tray_desc">Runs in background to receive messages</string>
|
||||
</resources>
|
||||
+1
-1
@@ -110,7 +110,7 @@ private fun MinimizeToTraySection() {
|
||||
fun DensityScaleSection() {
|
||||
val localDensityScale = remember { mutableStateOf(appPrefs.densityScale.get()) }
|
||||
SectionView(stringResource(MR.strings.appearance_zoom), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING), card = true) {
|
||||
Row(Modifier.padding(top = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Row(Modifier.padding(vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(Modifier.size(50.dp)
|
||||
.background(MaterialTheme.colors.surface, RoundedCornerShape(percent = 22))
|
||||
.clip(RoundedCornerShape(percent = 22))
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ actual fun SettingsSectionApp(
|
||||
showVersion: () -> Unit,
|
||||
withAuth: (title: String, desc: String, block: () -> Unit) -> Unit
|
||||
) {
|
||||
SectionView(stringResource(MR.strings.settings_section_title_app)) {
|
||||
SectionView(stringResource(MR.strings.settings_section_title_app), card = true) {
|
||||
SettingsActionItem(painterResource(MR.images.ic_code), stringResource(MR.strings.settings_developer_tools), showSettingsModal { DeveloperView(withAuth) })
|
||||
val selectedChannel = remember { appPrefs.appUpdateChannel.state }
|
||||
val values = AppUpdatesChannel.entries.map { it to it.text }
|
||||
|
||||
Reference in new issue
Block a user