move CountrySettings UI to settings/country package

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: frett

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

@@ -68,8 +68,8 @@ 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.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

…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.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api

…nguages/country/CountrySettingsLayout.kt …ettings/country/CountrySettingsLayout.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsLayout.kt app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsLayout.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
@@ -45,8 +45,8 @@ 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.common.LocalizedName
-import org.cru.godtools.ui.languages.country.CountrySettingsPresenter.UiEvent
-import org.cru.godtools.ui.languages.country.CountrySettingsPresenter.UiState
+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"

…ages/country/CountrySettingsPresenter.kt …ings/country/CountrySettingsPresenter.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsPresenter.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsPresenter.kt app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsPresenter.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsPresenter.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages.country
+package org.cru.godtools.ui.settings.country
 
 import android.content.Context
 import android.icu.text.LocaleDisplayNames
@@ -23,15 +23,13 @@ import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import java.util.Locale
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.cru.godtools.base.Settings
 import org.cru.godtools.base.util.getPrimaryCollator
-import org.cru.godtools.ui.languages.country.CountrySettingsPresenter.UiState
+import org.cru.godtools.ui.settings.country.CountrySettingsPresenter.UiState
 
 class CountrySettingsPresenter @AssistedInject constructor(
     @param:ApplicationContext private val context: Context,
@@ -40,7 +38,7 @@ class CountrySettingsPresenter @AssistedInject constructor(
 ) : Presenter<UiState> {
     // what the screen needs to know
     data class UiState(
-        val countries: List<CountryItem> = persistentListOf(),
+        val countries: List<CountryItem> = emptyList(),
         val query: MutableState<String> = mutableStateOf(""),
         val countryCode: String? = null,
         val eventSink: (UiEvent) -> Unit = {},

…nguages/country/CountrySettingsScreen.kt …ettings/country/CountrySettingsScreen.ktapp/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsScreen.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsScreen.kt app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsScreen.kt renamed to app/src/main/kotlin/org/cru/godtools/ui/settings/country/CountrySettingsScreen.kt

@@ -1,4 +1,4 @@
-package org.cru.godtools.ui.languages.country
+package org.cru.godtools.ui.settings.country
 
 import com.slack.circuit.runtime.screen.Screen
 import kotlinx.parcelize.Parcelize