Merge pull request #4403 from CruGlobal/settingsRestructure

Restructure settings UI package hierarchy

Author: frett

.claude/skills/record-screenshots/SKILL.md

@@ -97,16 +97,26 @@ If there are multiple candidates at any step, show them and ask the user which c
 
 ### 7. Apply the snapshot changes locally
 
-Stage the snapshot files from the remote commit:
+The CI commit may add new snapshots, delete old ones (e.g. when a package was renamed), or both. Handle all cases:
 
 ```bash
-# Get the list of files changed by the screenshot commit
+# Get the full diff between local HEAD and the remote screenshot commit
 git diff --name-only HEAD origin/<branch>
+git diff --name-status HEAD origin/<branch>
+```
+
+For files marked **A** (added) or **M** (modified) — stage them at the remote version:
+```bash
+git checkout origin/<branch> -- <file> [<file> ...]
+```
 
-# Stage those files at the remote version
-git checkout origin/<branch> -- $(git diff --name-only HEAD origin/<branch>)
+For files marked **D** (deleted) — remove them:
+```bash
+git rm <file> [<file> ...]
 ```
 
+Do not use a single `git checkout origin/<branch> -- $(git diff --name-only ...)` shortcut, as it cannot handle deletions (checking out a deleted file would re-create it instead of removing it).
+
 ### 8. Create a fixup commit
 
 ```bash

…ls/ui/languages/LanguageName+Previews.kt …tools/ui/common/LanguageName+Previews.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/LanguageName+Previews.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/common/LanguageName+Previews.kt app/src/main/kotlin/org/cru/godtools/ui/languages/LanguageName+Previews.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/common/LanguageName+Previews.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages
+package org.cru.godtools.ui.common
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.HorizontalDivider

…ru/godtools/ui/languages/LanguageName.kt …g/cru/godtools/ui/common/LanguageName.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/LanguageName.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/common/LanguageName.kt app/src/main/kotlin/org/cru/godtools/ui/languages/LanguageName.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/common/LanguageName.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages
+package org.cru.godtools.ui.common
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember

…u/godtools/ui/languages/LocalizedName.kt …/cru/godtools/ui/common/LocalizedName.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/LocalizedName.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/common/LocalizedName.kt app/src/main/kotlin/org/cru/godtools/ui/languages/LocalizedName.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/common/LocalizedName.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages
+package org.cru.godtools.ui.common
 
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
@@ -17,7 +17,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.sp
 
-private const val LANGUAGE_NAME_GAP = "[gap]"
+private const val NAME_GAP = "[gap]"
 
 @Composable
 internal fun LocalizedName(name: String, secondName: String, modifier: Modifier = Modifier) {
@@ -28,15 +28,15 @@ internal fun LocalizedName(name: String, secondName: String, modifier: Modifier
         remember(name, secondName, color, secondNameColor) {
             buildAnnotatedString {
                 withStyle(SpanStyle(color = color)) { append(name) }
-                appendInlineContent(LANGUAGE_NAME_GAP, " ")
+                appendInlineContent(NAME_GAP, " ")
                 withStyle(SpanStyle(color = secondNameColor)) { append(secondName) }
             }
         },
         maxLines = 1,
         overflow = TextOverflow.Ellipsis,
         inlineContent = remember {
             mapOf(
-                LANGUAGE_NAME_GAP to InlineTextContent(
+                NAME_GAP to InlineTextContent(
                     Placeholder(
                         width = 8.sp,
                         height = 1.sp,

app/src/main/kotlin/org/cru/godtools/ui/dashboard/lessons/LessonFilters.kt

@@ -13,8 +13,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.cru.godtools.R
 import org.cru.godtools.base.LocalAppLanguage
+import org.cru.godtools.ui.common.LanguageName
 import org.cru.godtools.ui.dashboard.filters.LazyFilterMenu
-import org.cru.godtools.ui.languages.LanguageName
 
 @Composable
 @OptIn(ExperimentalLayoutApi::class)

app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolFilters.kt

@@ -32,11 +32,11 @@ import org.cru.godtools.R
 import org.cru.godtools.base.LocalAppLanguage
 import org.cru.godtools.base.ui.util.getToolCategoryName
 import org.cru.godtools.model.Language
+import org.cru.godtools.ui.common.LanguageName
 import org.cru.godtools.ui.dashboard.filters.FilterMenu
 import org.cru.godtools.ui.dashboard.filters.FilterMenuItem
 import org.cru.godtools.ui.dashboard.filters.LazyFilterMenu
 import org.cru.godtools.ui.dashboard.tools.ToolFiltersStateProducer.Filters
-import org.cru.godtools.ui.languages.LanguageName
 import org.jetbrains.annotations.VisibleForTesting
 
 private val DROPDOWN_MAX_HEIGHT = 700.dp

app/src/main/kotlin/org/cru/godtools/ui/drawer/DrawerMenuLayout.kt

@@ -68,9 +68,9 @@ import org.cru.godtools.ui.account.delete.DeleteAccountScreen
 import org.cru.godtools.ui.account.startAccountActivity
 import org.cru.godtools.ui.drawer.DrawerMenuScreen.Event
 import org.cru.godtools.ui.drawer.DrawerMenuScreen.State
-import org.cru.godtools.ui.languages.LanguageSettingsScreen
-import org.cru.godtools.ui.languages.country.CountrySettingsScreen
 import org.cru.godtools.ui.login.startLoginActivity
+import org.cru.godtools.ui.settings.country.CountrySettingsScreen
+import org.cru.godtools.ui.settings.language.LanguageSettingsScreen
 
 @Composable
 fun DrawerMenuLayout(

app/src/main/kotlin/org/cru/godtools/ui/languages/LanguageSettingsViewModel.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages.country
+package org.cru.godtools.ui.settings.country
 
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api

…ry/CountrySettingsConfirmationOverlay.kt …ry/CountrySettingsConfirmationOverlay.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsConfirmationOverlay.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsConfirmationOverlay.kt app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsConfirmationOverlay.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsConfirmationOverlay.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages.country
+package org.cru.godtools.ui.settings.country
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -44,9 +44,9 @@ import kotlinx.coroutines.launch
 import org.ccci.gto.android.common.compose.foundation.layout.padding
 import org.cru.godtools.R
 import org.cru.godtools.base.ui.theme.GodToolsTheme
-import org.cru.godtools.ui.languages.LocalizedName
-import org.cru.godtools.ui.languages.country.CountrySettingsPresenter.UiEvent
-import org.cru.godtools.ui.languages.country.CountrySettingsPresenter.UiState
+import org.cru.godtools.ui.common.LocalizedName
+import org.cru.godtools.ui.settings.country.CountrySettingsPresenter.UiEvent
+import org.cru.godtools.ui.settings.country.CountrySettingsPresenter.UiState
 
 internal const val TEST_TAG_ACTION_BACK = "action_navigate_back"
 internal const val TEST_TAG_CANCEL_SEARCH = "action_cancel_search"