Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/flipcash/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ dependencies {
implementation(project(":apps:flipcash:shared:router"))
implementation(project(":apps:flipcash:shared:session"))
implementation(project(":apps:flipcash:shared:google-play-billing"))
implementation(project(":apps:flipcash:shared:currency-selection:core"))
implementation(project(":apps:flipcash:shared:currency-selection:ui"))
implementation(project(":apps:flipcash:shared:region-selection:core"))
implementation(project(":apps:flipcash:shared:region-selection:ui"))
implementation(project(":apps:flipcash:shared:contacts"))
implementation(project(":apps:flipcash:shared:notifications"))
implementation(project(":apps:flipcash:shared:onramp:coinbase"))
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion apps/flipcash/shared/google-play-billing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ dependencies {
api(libs.google.play.billing.ktx)

implementation(project(":apps:flipcash:shared:analytics"))
implementation(project(":apps:flipcash:shared:currency-selection:core"))
implementation(project(":apps:flipcash:shared:region-selection:core"))
implementation(project(":libs:datetime"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ android {
dependencies {
implementation(libs.androidx.datastore)

implementation(project(":apps:flipcash:shared:currency-selection:core"))
implementation(project(":apps:flipcash:shared:region-selection:core"))
implementation(project(":libs:datetime"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel
import com.flipcash.app.currency.internal.CurrencyViewModel
import com.flipcash.app.currency.internal.RegionSelectionModalContent
import com.flipcash.app.currency.internal.RegionSelectionViewModel
import com.flipcash.app.currency.internal.RegionSelectionScreen
import com.flipcash.core.R
import com.getcode.navigation.core.LocalCodeNavigator
import com.getcode.ui.components.AppBarWithTitle
Expand All @@ -30,7 +30,7 @@ fun RegionSelectionScreen() {
}
)

val viewModel = hiltViewModel<CurrencyViewModel>()
RegionSelectionModalContent(viewModel)
val viewModel = hiltViewModel<RegionSelectionViewModel>()
RegionSelectionScreen(viewModel)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.flipcash.app.currency.internal

import com.getcode.opencode.model.financial.Currency

sealed interface CurrencyListItem {
data class TitleItem(val text: String) : CurrencyListItem
data class RegionCurrencyItem(val currency: Currency, val isRecent: Boolean) : CurrencyListItem
sealed interface RegionListItem {
data class TitleItem(val text: String) : RegionListItem
data class RegionCurrencyItem(val currency: Currency, val isRecent: Boolean) : RegionListItem
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

@Composable
internal fun RegionSelectionModalContent(viewModel: CurrencyViewModel) {
internal fun RegionSelectionScreen(viewModel: RegionSelectionViewModel) {
val navigator = LocalCodeNavigator.current
val state by viewModel.stateFlow.collectAsStateWithLifecycle()
val keyboard = rememberKeyboardController()
Expand All @@ -35,7 +35,7 @@ internal fun RegionSelectionModalContent(viewModel: CurrencyViewModel) {

LaunchedEffect(viewModel) {
viewModel.eventFlow
.filterIsInstance<CurrencyViewModel.Event.OnSelectedCurrencyChanged>()
.filterIsInstance<RegionSelectionViewModel.Event.OnSelectedCurrencyChanged>()
.onEach {
if (keyboard.visible) {
keyboard.hide()
Expand Down Expand Up @@ -65,13 +65,12 @@ internal fun RegionSelectionModalContent(viewModel: CurrencyViewModel) {
RegionList(
modifier = Modifier.weight(1f),
items = state.listItems,
isLoading = state.loading,
selected = state.selectedCurrency,
onRemoved = { currency ->
viewModel.dispatchEvent(CurrencyViewModel.Event.OnRecentCurrencyRemoved(currency))
viewModel.dispatchEvent(RegionSelectionViewModel.Event.OnRecentCurrencyRemoved(currency))
},
onSelected = { currency ->
viewModel.dispatchEvent(CurrencyViewModel.Event.OnCurrencySelected(currency))
viewModel.dispatchEvent(RegionSelectionViewModel.Event.OnCurrencySelected(currency))
}
)
}
Expand Down
Loading
Loading