Skip to content

Commit 929e1d7

Browse files
committed
Improve naming of state class and vals
1 parent 11fac8f commit 929e1d7

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosCatalogSyncOverdueBanner.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTyp
3535

3636
@Composable
3737
fun WooPosCatalogSyncOverdueBanner(
38-
bannerState: WooPosItemsViewModel.CatalogSyncBannerState,
38+
state: WooPosItemsViewModel.CatalogSyncOverdueBannerState,
3939
modifier: Modifier = Modifier,
4040
onDismiss: () -> Unit
4141
) {
4242
AnimatedVisibility(
43-
visible = bannerState is WooPosItemsViewModel.CatalogSyncBannerState.OverdueSyncWarning,
43+
visible = state is WooPosItemsViewModel.CatalogSyncOverdueBannerState.Visible,
4444
enter = fadeIn(
4545
animationSpec = tween(durationMillis = 180)
4646
) + scaleIn(
@@ -106,7 +106,7 @@ fun WooPosCatalogSyncOverdueBanner(
106106
fun WooPosRefreshCatalogBannerPreview() {
107107
WooPosTheme {
108108
WooPosCatalogSyncOverdueBanner(
109-
bannerState = WooPosItemsViewModel.CatalogSyncBannerState.OverdueSyncWarning,
109+
state = WooPosItemsViewModel.CatalogSyncOverdueBannerState.Visible,
110110
onDismiss = {}
111111
)
112112
}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsScreen.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fun WooPosItemsScreen(
6565
WooPosItemsScreen(
6666
modifier = modifier,
6767
itemsStateFlow = productsViewModel.viewState,
68-
catalogSyncBannerStateFlow = productsViewModel.catalogSyncBannerState,
68+
catalogSyncOverdueBannerStateFlow = productsViewModel.catalogSyncOverdueBannerState,
6969
productsViewState = productsViewState,
7070
couponsListState = couponsListState,
7171
catalogSyncState = catalogSyncState,
@@ -79,15 +79,15 @@ fun WooPosItemsScreen(
7979
private fun WooPosItemsScreen(
8080
modifier: Modifier = Modifier,
8181
itemsStateFlow: StateFlow<WooPosItemsToolbarViewState>,
82-
catalogSyncBannerStateFlow: StateFlow<WooPosItemsViewModel.CatalogSyncBannerState>,
82+
catalogSyncOverdueBannerStateFlow: StateFlow<WooPosItemsViewModel.CatalogSyncOverdueBannerState>,
8383
productsViewState: LazyListState,
8484
couponsListState: LazyListState,
8585
catalogSyncState: CatalogSyncState,
8686
onRetryCatalogSync: () -> Unit,
8787
onUIEvent: (WooPosItemsUIEvent) -> Unit,
8888
) {
8989
val state = itemsStateFlow.collectAsState()
90-
val catalogSyncOverdueBannerState = catalogSyncBannerStateFlow.collectAsState()
90+
val catalogSyncOverdueBannerState = catalogSyncOverdueBannerStateFlow.collectAsState()
9191

9292
MainItemsList(
9393
modifier = modifier,
@@ -125,7 +125,7 @@ private fun WooPosItemsScreen(
125125
private fun MainItemsList(
126126
modifier: Modifier,
127127
state: State<WooPosItemsToolbarViewState>,
128-
bannerState: State<WooPosItemsViewModel.CatalogSyncBannerState>,
128+
bannerState: State<WooPosItemsViewModel.CatalogSyncOverdueBannerState>,
129129
productsViewState: LazyListState,
130130
couponsListState: LazyListState,
131131
catalogSyncState: CatalogSyncState,
@@ -159,7 +159,7 @@ private fun MainItemsList(
159159
)
160160

161161
WooPosCatalogSyncOverdueBanner(
162-
bannerState = bannerState.value,
162+
state = bannerState.value,
163163
onDismiss = onSyncWarningBannerDismissed
164164
)
165165

@@ -324,12 +324,12 @@ fun WooPosItemsScreenSearchVisiblePreview(modifier: Modifier = Modifier) {
324324
tabs = tabs()
325325
)
326326
)
327-
val bannerState = MutableStateFlow(WooPosItemsViewModel.CatalogSyncBannerState.OverdueSyncWarning)
327+
val bannerState = MutableStateFlow(WooPosItemsViewModel.CatalogSyncOverdueBannerState.Visible)
328328
WooPosTheme {
329329
WooPosItemsScreen(
330330
modifier = modifier,
331331
itemsStateFlow = productState,
332-
catalogSyncBannerStateFlow = bannerState,
332+
catalogSyncOverdueBannerStateFlow = bannerState,
333333
productsViewState = rememberLazyListState(),
334334
couponsListState = rememberLazyListState(),
335335
catalogSyncState = CatalogSyncState.Idle,
@@ -354,12 +354,12 @@ fun WooPosItemsScreenSearchHiddenPreview(modifier: Modifier = Modifier) {
354354
tabs = tabs()
355355
)
356356
)
357-
val bannerState = MutableStateFlow(WooPosItemsViewModel.CatalogSyncBannerState.OverdueSyncWarning)
357+
val bannerState = MutableStateFlow(WooPosItemsViewModel.CatalogSyncOverdueBannerState.Visible)
358358
WooPosTheme {
359359
WooPosItemsScreen(
360360
modifier = modifier,
361361
itemsStateFlow = productState,
362-
catalogSyncBannerStateFlow = bannerState,
362+
catalogSyncOverdueBannerStateFlow = bannerState,
363363
productsViewState = rememberLazyListState(),
364364
couponsListState = rememberLazyListState(),
365365
catalogSyncState = CatalogSyncState.Idle,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsViewModel.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class WooPosItemsViewModel @Inject constructor(
4848
initialValue = _viewState.value,
4949
)
5050

51-
private val _catalogSyncBannerState = MutableStateFlow<CatalogSyncBannerState>(CatalogSyncBannerState.Hidden)
52-
val catalogSyncBannerState: StateFlow<CatalogSyncBannerState> = _catalogSyncBannerState
51+
private val _catalogSyncOverdueBannerState = MutableStateFlow<CatalogSyncOverdueBannerState>(CatalogSyncOverdueBannerState.Hidden)
52+
val catalogSyncOverdueBannerState: StateFlow<CatalogSyncOverdueBannerState> = _catalogSyncOverdueBannerState
5353

5454
init {
5555
listenUpEvents()
@@ -68,9 +68,9 @@ class WooPosItemsViewModel @Inject constructor(
6868
private fun checkSyncStatusAndUpdateBanner() {
6969
viewModelScope.launch {
7070
val requirement = syncStatusChecker.checkSyncRequirement()
71-
_catalogSyncBannerState.value = when (requirement) {
72-
is WooPosFullSyncRequirement.Overdue -> CatalogSyncBannerState.OverdueSyncWarning
73-
else -> CatalogSyncBannerState.Hidden
71+
_catalogSyncOverdueBannerState.value = when (requirement) {
72+
is WooPosFullSyncRequirement.Overdue -> CatalogSyncOverdueBannerState.Visible
73+
else -> CatalogSyncOverdueBannerState.Hidden
7474
}
7575
}
7676
}
@@ -96,7 +96,7 @@ class WooPosItemsViewModel @Inject constructor(
9696

9797
is WooPosItemsUIEvent.AddCouponIconClicked -> createAndAddCoupon()
9898
WooPosItemsUIEvent.SyncOverdueBannerDismissed -> {
99-
_catalogSyncBannerState.value = CatalogSyncBannerState.Hidden
99+
_catalogSyncOverdueBannerState.value = CatalogSyncOverdueBannerState.Hidden
100100
}
101101
}
102102
}
@@ -263,8 +263,8 @@ class WooPosItemsViewModel @Inject constructor(
263263
data class Coupon(override val id: Long, val couponCode: String) : ItemClickedData(id), Parcelable
264264
}
265265

266-
sealed class CatalogSyncBannerState {
267-
data object Hidden : CatalogSyncBannerState()
268-
data object OverdueSyncWarning : CatalogSyncBannerState()
266+
sealed class CatalogSyncOverdueBannerState {
267+
data object Hidden : CatalogSyncOverdueBannerState()
268+
data object Visible : CatalogSyncOverdueBannerState()
269269
}
270270
}

0 commit comments

Comments
 (0)