Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-19 07:15:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: Improve SaveFolderTile selected value and order of selectionsheet

Browse Source
This commit is contained in:
Myzel394 2023-12-31 21:11:31 +01:00
parent d6ab56f027
commit de72f88953
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
2 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/Tiles/SaveFolderTile.kt
View File

@ -194,6 +194,17 @@ fun SaveFolderTile(
Divider() Divider()
SelectionButton(
label = stringResource(R.string.ui_settings_option_saveFolder_action_dcim_label),
icon = Icons.Default.PermMedia,
onClick = {
hideSheet()
updateValue(RECORDER_MEDIA_SELECTED_VALUE)
},
)
Divider()
Column { Column {
SelectionButton( SelectionButton(
label = stringResource(R.string.ui_settings_option_saveFolder_action_custom_label), label = stringResource(R.string.ui_settings_option_saveFolder_action_custom_label),
@ -221,17 +232,6 @@ fun SaveFolderTile(
} }
} }
} }
Divider()
SelectionButton(
label = stringResource(R.string.ui_settings_option_saveFolder_action_dcim_label),
icon = Icons.Default.PermMedia,
onClick = {
hideSheet()
updateValue(RECORDER_MEDIA_SELECTED_VALUE)
},
)
} }
} }
} }
@ -267,48 +267,20 @@ fun SaveFolderTile(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
if (settings.saveFolder != null) {
Text( Text(
text = stringResource( text = stringResource(
R.string.form_value_selected, R.string.form_value_selected,
splitPath(settings.saveFolder).joinToString(" > ") when (settings.saveFolder) {
RECORDER_MEDIA_SELECTED_VALUE -> stringResource(R.string.ui_settings_option_saveFolder_dcimValue)
null -> stringResource(R.string.ui_settings_option_saveFolder_defaultValue)
else -> splitPath(settings.saveFolder).joinToString(" > ")
}
), ),
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) )
Button(
colors = ButtonDefaults.filledTonalButtonColors(),
contentPadding = ButtonDefaults.ButtonWithIconContentPadding,
onClick = {
updateValue(null)
}
) {
Icon(
Icons.Default.Lock,
contentDescription = null,
modifier = Modifier.size(ButtonDefaults.IconSize),
)
Spacer(
modifier = Modifier.size(ButtonDefaults.IconSpacing)
)
Text(
text = stringResource(R.string.ui_settings_option_saveFolder_action_default_label),
)
}
} else {
Text(
text = stringResource(
R.string.form_value_selected,
stringResource(R.string.ui_settings_option_saveFolder_defaultValue)
),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth(),
)
}
} }
} }
) )

1
app/src/main/res/values/strings.xml
View File

@ -171,4 +171,5 @@
<string name="ui_minApiRequired">You will need an Android phone running at least Android %s (API-Level: %s) to use this feature</string> <string name="ui_minApiRequired">You will need an Android phone running at least Android %s (API-Level: %s) to use this feature</string>
<string name="ui_settings_option_saveFolder_action_custom_label">Select a custom location</string> <string name="ui_settings_option_saveFolder_action_custom_label">Select a custom location</string>
<string name="ui_settings_option_saveFolder_action_dcim_label">Use the DCIM folder</string> <string name="ui_settings_option_saveFolder_action_dcim_label">Use the DCIM folder</string>
<string name="ui_settings_option_saveFolder_dcimValue">DCIM Folder</string>
</resources> </resources>