Skip to content

Commit 2c804fa

Browse files
malinajirkamalinajirka
authored
Merge pull request #14543 from woocommerce/woomob-1043-woo-possettings-extract-states-of-the-dialogs-from-the-home
[WOOMOB-1043] Extract scanning setup dialog from home to POS root
2 parents a49e6cf + d67e0b2 commit 2c804fa

File tree

11 files changed

+29
-28
lines changed

11 files changed

+29
-28
lines changed

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ import com.woocommerce.android.ui.woopos.home.cart.WooPosCartScreen
3737
import com.woocommerce.android.ui.woopos.home.cart.WooPosCartScreenProductsPreview
3838
import com.woocommerce.android.ui.woopos.home.items.WooPosItemsScreen
3939
import com.woocommerce.android.ui.woopos.home.items.products.WooPosItemsScreenPreview
40-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupDialog
4140
import com.woocommerce.android.ui.woopos.home.toolbar.PreviewWooPosFloatingToolbarStatusConnectedWithMenu
4241
import com.woocommerce.android.ui.woopos.home.toolbar.WooPosFloatingToolbar
4342
import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsScreen
4443
import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsScreenPreview
44+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupDialog
4545
import org.wordpress.android.util.ToastUtils
4646

4747
@Composable

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScannerDetectionServiceForTracking.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScannerDetectionServiceForTracking.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

33
import com.woocommerce.android.ui.woopos.common.util.ScannerInfo
44
import com.woocommerce.android.ui.woopos.common.util.WooPosScannerDetectionUtil
5-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
5+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
66
import kotlinx.coroutines.CoroutineScope
77
import kotlinx.coroutines.Job
88
import kotlinx.coroutines.delay

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScannerSetupNavigator.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScannerSetupNavigator.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

3-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
4-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.ScannerConfigurations
5-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
3+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
4+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.ScannerConfigurations
5+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
66
import javax.inject.Inject
77

88
class WooPosScannerSetupNavigator @Inject constructor() {

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScanningSetupAnalyticsTracker.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupAnalyticsTracker.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

3-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
4-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
3+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
4+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
55
import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsEvent
66
import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsTracker
77
import javax.inject.Inject

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScanningSetupDialog.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupDialog.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

33
import android.content.ActivityNotFoundException
4+
import android.content.Context
45
import android.content.Intent
56
import android.provider.Settings
67
import androidx.annotation.DrawableRes
@@ -86,8 +87,8 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTyp
8687
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
8788
import com.woocommerce.android.ui.woopos.common.composeui.modifier.listenForBarcodes
8889
import com.woocommerce.android.ui.woopos.common.data.WOO_POS_BARCODE_DOC_URL
89-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
90-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
90+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
91+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
9192
import com.woocommerce.android.util.ChromeCustomTabUtils
9293
import com.woocommerce.android.util.WooLog
9394
import kotlinx.coroutines.delay
@@ -808,7 +809,7 @@ private fun ScannerSetupInfoContent(
808809
@Composable
809810
private fun EventListeners(
810811
viewModel: WooPosScanningSetupViewModel,
811-
context: android.content.Context,
812+
context: Context,
812813
onDismissRequestWrapper: () -> Unit
813814
) {
814815
LaunchedEffect(Unit) {

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScanningSetupState.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupState.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

33
import android.os.Parcelable
44
import androidx.annotation.DrawableRes

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScanningSetupUiEvent.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupUiEvent.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

33
import com.woocommerce.android.ui.woopos.common.composeui.modifier.BarcodeInputDetector
4-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
4+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
55

66
sealed class WooPosScanningSetupUiEvent {
77
data object OnDialogShown : WooPosScanningSetupUiEvent()

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScanningSetupViewModel.kt‎ renamed to ‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupViewModel.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

33
import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.viewModelScope
55
import com.woocommerce.android.ui.woopos.common.composeui.modifier.BarcodeInputDetector
6-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.Companion.TEST_BARCODE_EAN13
7-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
6+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.Companion.TEST_BARCODE_EAN13
7+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
88
import dagger.hilt.android.lifecycle.HiltViewModel
99
import kotlinx.coroutines.Job
1010
import kotlinx.coroutines.delay

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/WooPosSettingsScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.woocommerce.android.R
1717
import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
1818
import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosToolbar
1919
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
20-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupDialog
2120
import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
21+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupDialog
2222
import com.woocommerce.android.ui.woopos.settings.categories.WooPosSettingsCategoriesPaneScreen
2323
import com.woocommerce.android.ui.woopos.settings.categories.WooPosSettingsCategory
2424
import com.woocommerce.android.ui.woopos.settings.details.WooPosSettingsDetailPaneScreen

‎WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/scanningsetup/WooPosScannerSetupNavigatorTest.kt‎ renamed to ‎WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScannerSetupNavigatorTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.woocommerce.android.ui.woopos.home.scanningsetup
1+
package com.woocommerce.android.ui.woopos.scanningsetup
22

33
import com.woocommerce.android.R
4-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
5-
import com.woocommerce.android.ui.woopos.home.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
4+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
5+
import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.ScanningSetupStep
66
import org.assertj.core.api.Assertions.assertThat
77
import org.junit.Test
88

0 commit comments

Comments
 (0)