Skip to content

fix: Fix Currency picker state resetting in onboarding screen on screen rotation #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starry-shivam merged 1 commit into from
May 8, 2026
Merged

fix: Fix Currency picker state resetting in onboarding screen on screen rotation #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/com/starry/greenstash/ui/common/CurrencyPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand Down Expand Up @@ -108,10 +108,10 @@ fun CurrencyPicker(
val currencyValues = currencyPickerData.currencyValues

val defaultCurrencyEntry = currencyNames[currencyValues.indexOf(defaultCurrencyValue)]
val (selectedCurrencyOption, onCurrencyOptionSelected) = remember {
val (selectedCurrencyOption, onCurrencyOptionSelected) = rememberSaveable {
mutableStateOf(defaultCurrencyEntry)
}
val (searchText, onSearchTextChanged) = remember { mutableStateOf("") }
val (searchText, onSearchTextChanged) = rememberSaveable { mutableStateOf("") }
val filteredCurrencies = currencyNames.filter { it.contains(searchText, ignoreCase = true) }

val coroutineScope = rememberCoroutineScope()
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/starry/greenstash/ui/common/SlideInContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import androidx.compose.animation.slideOutVertically
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import kotlinx.coroutines.delay

Expand All @@ -44,7 +44,7 @@ fun SlideInAnimatedContainer(
initialDelay: Long, content:
@Composable () -> Unit
) {
val showContent = remember { mutableStateOf(false) }
val showContent = rememberSaveable { mutableStateOf(false) }
LaunchedEffect(key1 = true) {
delay(initialDelay)
showContent.value = true
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ import androidx.compose.runtime.MutableState
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand Down Expand Up @@ -337,20 +338,20 @@ private fun LocaleSettings(viewModel: SettingsViewModel) {
val context = LocalContext.current
// Date related values.
val dateValue = dateStyleToDisplayFormat(viewModel.dateStyle.observeAsState().value!!)
val dateDialog = remember { mutableStateOf(false) }
val dateDialog = rememberSaveable { mutableStateOf(false) }
val dateRadioOptions = DateStyle.entries.map { dateStyleToDisplayFormat(it) }
val (selectedDateOption, onDateOptionSelected) = remember {
val (selectedDateOption, onDateOptionSelected) = rememberSaveable {
mutableStateOf(dateValue)
}

// Currency related values.
val currencyDialog = remember { mutableStateOf(false) }
val currencyDialog = rememberSaveable { mutableStateOf(false) }
val currencyNames =
context.applicationContext.resources.getStringArray(R.array.currency_names)
val currencyValues =
context.applicationContext.resources.getStringArray(R.array.currency_values)

val selectedCurrencyName = remember {
val selectedCurrencyName = rememberSaveable {
mutableStateOf(currencyNames[currencyValues.indexOf(viewModel.getDefaultCurrencyValue())])
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
Expand Down Expand Up @@ -81,14 +81,14 @@ fun WelcomeScreen(navController: NavController) {
val context = LocalContext.current
val viewModel: WelcomeViewModel = hiltViewModel()

val currencyDialog = remember { mutableStateOf(false) }
val currencyDialog = rememberSaveable { mutableStateOf(false) }
val currencyNames =
context.applicationContext.resources.getStringArray(R.array.currency_names)
val currencyValues =
context.applicationContext.resources.getStringArray(R.array.currency_values)


val selectedCurrencyName = remember {
val selectedCurrencyName = rememberSaveable {
mutableStateOf(currencyNames[currencyValues.indexOf(viewModel.getDefaultCurrencyValue())])
}

Expand Down
Loading