Skip to content

Commit 0b270ef

Browse files
committed
Refactor settings screen layout and improve contributors/document sources sections
1 parent 26d0f57 commit 0b270ef

8 files changed

Lines changed: 325 additions & 211 deletions

File tree

app/src/main/java/com/example/checklist_interactive/data/prefs/PreferencesManager.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,10 +723,10 @@ class PreferencesManager(context: Context) {
723723
}
724724

725725
/**
726-
* Sets the FAB size preference: "small", "medium", or "large"
726+
* Sets the FAB size preference: "tiny", "small", "medium", or "large"
727727
*/
728728
fun setFabSize(size: String) {
729-
val validSizes = listOf("small", "medium", "large")
729+
val validSizes = listOf("tiny", "small", "medium", "large")
730730
val normalizedSize = size.lowercase().trim()
731731
if (normalizedSize in validSizes) {
732732
prefs.edit().putString(KEY_FAB_SIZE, normalizedSize).apply()
@@ -735,7 +735,7 @@ class PreferencesManager(context: Context) {
735735

736736
/**
737737
* Gets the FAB size preference (default: "medium")
738-
* Returns one of: "small", "medium", "large"
738+
* Returns one of: "tiny", "small", "medium", "large"
739739
*/
740740
fun getFabSize(): String {
741741
return prefs.getString(KEY_FAB_SIZE, DEFAULT_FAB_SIZE) ?: DEFAULT_FAB_SIZE
@@ -746,8 +746,9 @@ class PreferencesManager(context: Context) {
746746
*/
747747
fun getFabSizeDp(): Int {
748748
return when (getFabSize()) {
749+
"tiny" -> 32
749750
"small" -> 40
750-
"large" -> 72
751+
"large" -> 56 // Changed from 72 to match medium
751752
else -> 56 // medium (default Material3 FAB size)
752753
}
753754
}

app/src/main/java/com/example/checklist_interactive/data/prefs/SourceEntry.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ data class SourceEntry(
77
val name: String,
88
val website: String? = null,
99
val license: String? = null,
10-
val author: String? = null
10+
val author: String? = null,
11+
val usage: String? = null,
12+
val artifacts: List<String>? = null,
13+
val included_file: String? = null,
14+
val notes: String? = null
1115
)

app/src/main/java/com/example/checklist_interactive/ui/common/FABOverlay.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ object MapViewerFABs {
285285
containerColor = if (rotationGestureEnabled) containerColorPrimary else containerColorSurface,
286286
defaultX = 0.95f,
287287
defaultY = 0.45f,
288-
defaultLandscapeX = 0.92f,
289-
defaultLandscapeY = 0.60f,
288+
defaultLandscapeX = 0.88f,
289+
defaultLandscapeY = 0.15f,
290290
scope = "map"
291291
),
292292
FABConfig(
@@ -297,8 +297,8 @@ object MapViewerFABs {
297297
containerColor = if (isDrawingMode) containerColorPrimary else containerColorTertiary,
298298
defaultX = 0.95f,
299299
defaultY = 0.50f,
300-
defaultLandscapeX = 0.92f,
301-
defaultLandscapeY = 0.70f,
300+
defaultLandscapeX = 0.88f,
301+
defaultLandscapeY = 0.25f,
302302
scope = "map"
303303
),
304304
FABConfig(
@@ -310,8 +310,8 @@ object MapViewerFABs {
310310
containerColor = containerColorTertiary,
311311
defaultX = 0.95f,
312312
defaultY = datapadY,
313-
defaultLandscapeX = 0.95f,
314-
defaultLandscapeY = 0.05f,
313+
defaultLandscapeX = 0.88f,
314+
defaultLandscapeY = 0.35f,
315315
scope = "map"
316316
),
317317
FABConfig(
@@ -322,8 +322,8 @@ object MapViewerFABs {
322322
containerColor = containerColorPrimary,
323323
defaultX = 0.95f,
324324
defaultY = quickAccessY,
325-
defaultLandscapeX = 0.92f,
326-
defaultLandscapeY = 0.80f,
325+
defaultLandscapeX = 0.88f,
326+
defaultLandscapeY = 0.45f,
327327
scope = "map"
328328
)
329329
)

app/src/main/java/com/example/checklist_interactive/ui/settings/SettingsScreen.kt

Lines changed: 303 additions & 198 deletions
Large diffs are not rendered by default.

app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
<string name="settings_fab_positions_explain">Setzt die benutzerdefinierten Floating-Button-Positionen in allen Viewern (PDF, Markdown, interner Viewer) zurück. Zum Verschieben lange auf einen FAB drücken.</string>
707707
<string name="settings_fab_size">FAB-Größe</string>
708708
<string name="settings_fab_size_explain">Ändert die Größe aller Floating Action Buttons</string>
709+
<string name="settings_fab_size_tiny">Winzig</string>
709710
<string name="settings_fab_size_small">Klein</string>
710711
<string name="settings_fab_size_medium">Mittel</string>
711712
<string name="settings_fab_size_large">Groß</string>

app/src/main/res/values-es/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@
730730
<string name="settings_fab_positions_explain">Restablecer posiciones de botones flotantes a predeterminados</string>
731731
<string name="settings_fab_size">Tamaño FAB</string>
732732
<string name="settings_fab_size_explain">Cambiar tamaño de todos los botones flotantes</string>
733+
<string name="settings_fab_size_tiny">Diminuto</string>
733734
<string name="settings_fab_size_small">Pequeño</string>
734735
<string name="settings_fab_size_medium">Mediano</string>
735736
<string name="settings_fab_size_large">Grande</string>

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@
640640
<string name="settings_fab_positions_explain">重置悬浮操作按钮(FAB)位置为默认值</string>
641641
<string name="settings_fab_size">FAB大小</string>
642642
<string name="settings_fab_size_explain">更改所有FAB的大小</string>
643+
<string name="settings_fab_size_tiny">极小</string>
643644
<string name="settings_fab_size_small">小</string>
644645
<string name="settings_fab_size_medium">中</string>
645646
<string name="settings_fab_size_large">大</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@
645645
<string name="settings_fab_positions_explain">Reset floating action button positions to defaults</string>
646646
<string name="settings_fab_size">FAB Size</string>
647647
<string name="settings_fab_size_explain">Change the size of all floating action buttons</string>
648+
<string name="settings_fab_size_tiny">Tiny</string>
648649
<string name="settings_fab_size_small">Small</string>
649650
<string name="settings_fab_size_medium">Medium</string>
650651
<string name="settings_fab_size_large">Large</string>

0 commit comments

Comments
 (0)