Skip to content

Commit c65787e

Browse files
authored
Merge pull request #15505 from woocommerce/woomob-2454-woo-pos-syncing-can-take-5-minutes-on-large-store
[WOOMOB-2454] Improve POS catalog syncing loading UX
2 parents f4e8c92 + cda1dad commit c65787e

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/splash/WooPosSplashScreen.kt

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,24 @@ private fun SyncingCatalog(
120120
)
121121
}
122122

123-
Text(
124-
text = stringResource(R.string.woopos_home_syncing_catalog_subtitle),
125-
style = MaterialTheme.typography.bodySmall,
126-
textAlign = TextAlign.Center,
127-
color = WooPosTheme.colors.onSurfaceVariantLowest
128-
)
123+
Column(
124+
horizontalAlignment = Alignment.CenterHorizontally,
125+
modifier = Modifier.padding(horizontal = WooPosSpacing.XLarge.value),
126+
) {
127+
Text(
128+
text = stringResource(R.string.woopos_home_syncing_catalog_hint),
129+
style = MaterialTheme.typography.bodyMedium,
130+
textAlign = TextAlign.Center,
131+
color = WooPosTheme.colors.onSurfaceVariantLowest,
132+
)
133+
Text(
134+
text = stringResource(R.string.woopos_home_syncing_catalog_subtitle),
135+
style = MaterialTheme.typography.bodyMedium,
136+
textAlign = TextAlign.Center,
137+
color = WooPosTheme.colors.onSurfaceVariantLowest,
138+
modifier = Modifier.padding(top = 4.dp),
139+
)
140+
}
129141
}
130142
}
131143
}

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ enum class FeatureFlag {
4545
POS_PRODUCTS_FTS,
4646
POS_REFUNDS,
4747
WOO_POS_CLIENT_SIDE_BANNER,
48+
WOO_POS_LOCAL_CATALOG_FILE_APPROACH,
4849
AGE_ELIGIBILITY_CHECKS -> PackageUtils.isDebugBuild()
4950

5051
WOO_PUSH_NOTIFICATIONS_SYSTEM,
51-
WOO_PUSH_NOTIFICATIONS_SYSTEM_M2,
52-
WOO_POS_LOCAL_CATALOG_FILE_APPROACH -> false
52+
WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 -> false
5353
}
5454
}
5555
}

WooCommerce/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3630,7 +3630,8 @@
36303630
Woo POS
36313631
-->
36323632
<string name="woopos_home_syncing_catalog_title">Syncing catalog</string>
3633-
<string name="woopos_home_syncing_catalog_subtitle">Syncing will continue in the background.</string>
3633+
<string name="woopos_home_syncing_catalog_hint">Catalog syncing may take a few minutes.</string>
3634+
<string name="woopos_home_syncing_catalog_subtitle">You can leave and syncing will continue in the background.</string>
36343635
<string name="woopos_home_syncing_catalog_exit_button">Exit POS</string>
36353636
<string name="woopos_home_sync_failed_title">Unable to sync</string>
36363637
<string name="woopos_home_sync_failed_message">We are unable to sync your product catalog. Please check your internet connection and retry.</string>

0 commit comments

Comments
 (0)