diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/build.gradle b/platforms/android/samples/CheckoutKitAndroidDemo/app/build.gradle index 28b73c29b..92dd1f367 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/build.gradle +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/build.gradle @@ -61,7 +61,7 @@ if (!storefrontDomain || !accessToken) { } android { - namespace = 'com.shopify.checkout_kit_android_demo' + namespace = 'com.shopify.checkoutkit.androiddemo' compileSdk = 37 defaultConfig { @@ -198,7 +198,7 @@ dependencies { apollo { service("storefront") { - packageName.set("com.shopify.checkout_kit_android_demo.graphql") + packageName.set("com.shopify.checkoutkit.androiddemo.graphql") srcDir("src/main/graphql") plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:${libs.versions.apolloCache.get()}") pluginArgument("com.apollographql.cache.packageName", packageName.get()) diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ModelMappingExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ModelMappingExt.kt deleted file mode 100644 index 4f0e85069..000000000 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ModelMappingExt.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.shopify.checkout_kit_android_demo.common - -data class ID(val id: String) diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/CheckoutKitAndroidDemo.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/CheckoutKitAndroidDemo.kt similarity index 83% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/CheckoutKitAndroidDemo.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/CheckoutKitAndroidDemo.kt index 87292f975..c93d1ee18 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/CheckoutKitAndroidDemo.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/CheckoutKitAndroidDemo.kt @@ -1,13 +1,13 @@ -package com.shopify.checkout_kit_android_demo +package com.shopify.checkoutkit.androiddemo import android.app.Application -import com.shopify.checkout_kit_android_demo.common.di.setupDI -import com.shopify.checkout_kit_android_demo.common.withCustomCloseIcon -import com.shopify.checkout_kit_android_demo.settings.PreferencesManager -import com.shopify.checkout_kit_android_demo.settings.data.toCheckoutSheetOptions import com.shopify.checkoutkit.LogLevel import com.shopify.checkoutkit.Preloading import com.shopify.checkoutkit.ShopifyCheckoutKit +import com.shopify.checkoutkit.androiddemo.common.di.setupDI +import com.shopify.checkoutkit.androiddemo.common.withCustomCloseIcon +import com.shopify.checkoutkit.androiddemo.settings.PreferencesManager +import com.shopify.checkoutkit.androiddemo.settings.data.toCheckoutSheetOptions import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.cancel diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/CheckoutKitApp.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/CheckoutKitApp.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/CheckoutKitApp.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/CheckoutKitApp.kt index 22780da49..f17a4b733 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/CheckoutKitApp.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/CheckoutKitApp.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo +package com.shopify.checkoutkit.androiddemo import androidx.activity.ComponentActivity import androidx.activity.compose.LocalActivity @@ -42,21 +42,21 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController -import com.shopify.checkout_kit_android_demo.cart.AppOwnedCheckoutSheet -import com.shopify.checkout_kit_android_demo.cart.CartViewModel -import com.shopify.checkout_kit_android_demo.cart.data.totalQuantity -import com.shopify.checkout_kit_android_demo.common.ObserveAsEvents -import com.shopify.checkout_kit_android_demo.common.SnackbarController -import com.shopify.checkout_kit_android_demo.common.navigation.BottomAppBarWithNavigation -import com.shopify.checkout_kit_android_demo.common.navigation.CheckoutKitNavHost -import com.shopify.checkout_kit_android_demo.common.navigation.Screen -import com.shopify.checkout_kit_android_demo.common.ui.theme.CheckoutKitSampleTheme -import com.shopify.checkout_kit_android_demo.e2e.E2ETestIds -import com.shopify.checkout_kit_android_demo.logs.LogsViewModel -import com.shopify.checkout_kit_android_demo.settings.SettingsUiState -import com.shopify.checkout_kit_android_demo.settings.SettingsViewModel import com.shopify.checkoutkit.CheckoutAppearance import com.shopify.checkoutkit.ColorScheme +import com.shopify.checkoutkit.androiddemo.cart.AppOwnedCheckoutSheet +import com.shopify.checkoutkit.androiddemo.cart.CartViewModel +import com.shopify.checkoutkit.androiddemo.cart.data.totalQuantity +import com.shopify.checkoutkit.androiddemo.common.ObserveAsEvents +import com.shopify.checkoutkit.androiddemo.common.SnackbarController +import com.shopify.checkoutkit.androiddemo.common.navigation.BottomAppBarWithNavigation +import com.shopify.checkoutkit.androiddemo.common.navigation.CheckoutKitNavHost +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.common.ui.theme.CheckoutKitSampleTheme +import com.shopify.checkoutkit.androiddemo.e2e.E2ETestIds +import com.shopify.checkoutkit.androiddemo.logs.LogsViewModel +import com.shopify.checkoutkit.androiddemo.settings.SettingsUiState +import com.shopify.checkoutkit.androiddemo.settings.SettingsViewModel import org.koin.androidx.compose.koinViewModel @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/FileChooserResultContract.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/FileChooserResultContract.kt similarity index 98% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/FileChooserResultContract.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/FileChooserResultContract.kt index d7b74668a..c6d09a665 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/FileChooserResultContract.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/FileChooserResultContract.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo +package com.shopify.checkoutkit.androiddemo import android.app.Activity.RESULT_OK import android.content.Context diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/MainActivity.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/MainActivity.kt similarity index 98% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/MainActivity.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/MainActivity.kt index 06635f974..c46885e0b 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/MainActivity.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/MainActivity.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo +package com.shopify.checkoutkit.androiddemo import android.Manifest import android.content.pm.PackageManager diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/AppOwnedCheckoutSheet.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/AppOwnedCheckoutSheet.kt similarity index 96% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/AppOwnedCheckoutSheet.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/AppOwnedCheckoutSheet.kt index 0563493e9..b94a51624 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/AppOwnedCheckoutSheet.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/AppOwnedCheckoutSheet.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.cart +package com.shopify.checkoutkit.androiddemo.cart import androidx.activity.ComponentActivity import androidx.compose.foundation.layout.Box @@ -23,9 +23,9 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.MainActivity -import com.shopify.checkout_kit_android_demo.R import com.shopify.checkoutkit.ShopifyCheckout +import com.shopify.checkoutkit.androiddemo.MainActivity +import com.shopify.checkoutkit.androiddemo.R @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartItem.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartItem.kt similarity index 85% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartItem.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartItem.kt index e9247f065..cd67d072f 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartItem.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartItem.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.cart +package com.shopify.checkoutkit.androiddemo.cart import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.BoxWithConstraints @@ -21,14 +21,14 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.cart.data.CartLine -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.components.BodySmall -import com.shopify.checkout_kit_android_demo.common.components.MoneyText -import com.shopify.checkout_kit_android_demo.common.components.QuantitySelector -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.ui.theme.largeScreenBreakpoint +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.cart.data.CartLine +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.components.BodySmall +import com.shopify.checkoutkit.androiddemo.common.components.MoneyText +import com.shopify.checkoutkit.androiddemo.common.components.QuantitySelector +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.ui.theme.largeScreenBreakpoint @Composable fun CartItem( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartView.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartView.kt index 2a1d9bba6..162c61bd8 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.cart +package com.shopify.checkoutkit.androiddemo.cart import androidx.activity.ComponentActivity import androidx.activity.compose.LocalActivity @@ -37,19 +37,19 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.cart.data.CartAmount -import com.shopify.checkout_kit_android_demo.cart.data.CartLine -import com.shopify.checkout_kit_android_demo.cart.data.CartState -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.BodySmall -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.MoneyText -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutPresentationMode +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.cart.data.CartAmount +import com.shopify.checkoutkit.androiddemo.cart.data.CartLine +import com.shopify.checkoutkit.androiddemo.cart.data.CartState +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.BodySmall +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.MoneyText +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutPresentationMode @Composable fun CartView( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartViewModel.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartViewModel.kt index c3d800571..5c2a2e396 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/CartViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/CartViewModel.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.cart +package com.shopify.checkoutkit.androiddemo.cart import android.content.ActivityNotFoundException import androidx.activity.ComponentActivity @@ -7,26 +7,26 @@ import androidx.core.net.toUri import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.MainActivity -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.cart.data.CartRepository -import com.shopify.checkout_kit_android_demo.cart.data.CartState -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.SnackbarController -import com.shopify.checkout_kit_android_demo.common.SnackbarEvent -import com.shopify.checkout_kit_android_demo.common.logs.LogLevel -import com.shopify.checkout_kit_android_demo.common.logs.Logger -import com.shopify.checkout_kit_android_demo.common.navigation.Screen -import com.shopify.checkout_kit_android_demo.settings.PreferencesManager -import com.shopify.checkout_kit_android_demo.settings.authentication.data.CustomerRepository -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutPresentationMode -import com.shopify.checkout_kit_android_demo.settings.data.WindowOpenHandler import com.shopify.checkoutkit.CheckoutErrorCode import com.shopify.checkoutkit.CheckoutException import com.shopify.checkoutkit.CheckoutPreload import com.shopify.checkoutkit.CheckoutPresentation import com.shopify.checkoutkit.CheckoutProtocol import com.shopify.checkoutkit.ShopifyCheckoutKit +import com.shopify.checkoutkit.androiddemo.MainActivity +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.cart.data.CartRepository +import com.shopify.checkoutkit.androiddemo.cart.data.CartState +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.SnackbarController +import com.shopify.checkoutkit.androiddemo.common.SnackbarEvent +import com.shopify.checkoutkit.androiddemo.common.logs.LogLevel +import com.shopify.checkoutkit.androiddemo.common.logs.Logger +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.settings.PreferencesManager +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.CustomerRepository +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutPresentationMode +import com.shopify.checkoutkit.androiddemo.settings.data.WindowOpenHandler import com.shopify.ucp.embedded.checkout.WindowOpenResult import com.shopify.ucp.embedded.checkout.windowOpenRejected import com.shopify.ucp.embedded.checkout.windowOpenSuccess diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/CartRepository.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/CartRepository.kt similarity index 84% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/CartRepository.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/CartRepository.kt index a948e1c9e..add07b5e4 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/CartRepository.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/CartRepository.kt @@ -1,13 +1,13 @@ -package com.shopify.checkout_kit_android_demo.cart.data +package com.shopify.checkoutkit.androiddemo.cart.data import com.apollographql.apollo.api.Optional -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.client.StorefrontApiClient -import com.shopify.checkout_kit_android_demo.graphql.type.CartBuyerIdentityInput -import com.shopify.checkout_kit_android_demo.graphql.type.CartInput -import com.shopify.checkout_kit_android_demo.graphql.type.CartLineInput -import com.shopify.checkout_kit_android_demo.graphql.type.CartLineUpdateInput -import com.shopify.checkout_kit_android_demo.graphql.type.CountryCode +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.client.StorefrontApiClient +import com.shopify.checkoutkit.androiddemo.graphql.type.CartBuyerIdentityInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CartInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CartLineInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CartLineUpdateInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CountryCode import timber.log.Timber class CartRepository( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/CartState.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/CartState.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/CartState.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/CartState.kt index 642666db5..e2e30896b 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/CartState.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/CartState.kt @@ -1,7 +1,7 @@ -package com.shopify.checkout_kit_android_demo.cart.data +package com.shopify.checkoutkit.androiddemo.cart.data import androidx.compose.runtime.Stable -import com.shopify.checkout_kit_android_demo.common.ID +import com.shopify.checkoutkit.androiddemo.common.ID sealed class CartState { data object Empty : CartState() diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/DemoBuyerIdentity.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/DemoBuyerIdentity.kt similarity index 53% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/DemoBuyerIdentity.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/DemoBuyerIdentity.kt index 65e70bb30..07c9b5f01 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/DemoBuyerIdentity.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/DemoBuyerIdentity.kt @@ -1,9 +1,9 @@ -package com.shopify.checkout_kit_android_demo.cart.data +package com.shopify.checkoutkit.androiddemo.cart.data import com.apollographql.apollo.api.Optional -import com.shopify.checkout_kit_android_demo.BuildConfig -import com.shopify.checkout_kit_android_demo.graphql.type.CartBuyerIdentityInput -import com.shopify.checkout_kit_android_demo.graphql.type.CountryCode +import com.shopify.checkoutkit.androiddemo.BuildConfig +import com.shopify.checkoutkit.androiddemo.graphql.type.CartBuyerIdentityInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CountryCode object DemoBuyerIdentity { internal val value = CartBuyerIdentityInput( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/ModelMappingExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/ModelMappingExt.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/ModelMappingExt.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/ModelMappingExt.kt index f4d7da862..b5f5f13d7 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/cart/data/ModelMappingExt.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/cart/data/ModelMappingExt.kt @@ -1,7 +1,7 @@ -package com.shopify.checkout_kit_android_demo.cart.data +package com.shopify.checkoutkit.androiddemo.cart.data -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.graphql.fragment.CartFragment +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.graphql.fragment.CartFragment internal fun CartFragment.toLocal(): CartState.Cart { return CartState.Cart( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ColorSchemeExtensions.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ColorSchemeExtensions.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ColorSchemeExtensions.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ColorSchemeExtensions.kt index 6d9ff9b83..a0d30736c 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ColorSchemeExtensions.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ColorSchemeExtensions.kt @@ -1,9 +1,9 @@ -package com.shopify.checkout_kit_android_demo.common +package com.shopify.checkoutkit.androiddemo.common -import com.shopify.checkout_kit_android_demo.R import com.shopify.checkoutkit.CheckoutAppearance import com.shopify.checkoutkit.Color import com.shopify.checkoutkit.ColorScheme +import com.shopify.checkoutkit.androiddemo.R fun sampleStorefrontAppearance(): CheckoutAppearance.Storefront { return CheckoutAppearance.Storefront().customize { diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ModelMappingExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ModelMappingExt.kt new file mode 100644 index 000000000..acf2caf87 --- /dev/null +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ModelMappingExt.kt @@ -0,0 +1,3 @@ +package com.shopify.checkoutkit.androiddemo.common + +data class ID(val id: String) diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/SnackbarController.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/SnackbarController.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/SnackbarController.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/SnackbarController.kt index efd499656..5494d435e 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/SnackbarController.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/SnackbarController.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common +package com.shopify.checkoutkit.androiddemo.common import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/client/StorefrontApiClient.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/client/StorefrontApiClient.kt similarity index 82% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/client/StorefrontApiClient.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/client/StorefrontApiClient.kt index 49c3a5f38..7c8ac8cec 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/client/StorefrontApiClient.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/client/StorefrontApiClient.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.client +package com.shopify.checkoutkit.androiddemo.common.client import com.apollographql.apollo.ApolloClient import com.apollographql.apollo.api.ApolloResponse @@ -6,17 +6,17 @@ import com.apollographql.apollo.api.Operation import com.apollographql.apollo.api.Optional import com.apollographql.cache.normalized.FetchPolicy import com.apollographql.cache.normalized.fetchPolicy -import com.shopify.checkout_kit_android_demo.graphql.CartCreateMutation -import com.shopify.checkout_kit_android_demo.graphql.CartLinesAddMutation -import com.shopify.checkout_kit_android_demo.graphql.CartLinesRemoveMutation -import com.shopify.checkout_kit_android_demo.graphql.CartLinesUpdateMutation -import com.shopify.checkout_kit_android_demo.graphql.FetchCollectionQuery -import com.shopify.checkout_kit_android_demo.graphql.FetchCollectionsQuery -import com.shopify.checkout_kit_android_demo.graphql.FetchProductQuery -import com.shopify.checkout_kit_android_demo.graphql.FetchProductsQuery -import com.shopify.checkout_kit_android_demo.graphql.type.CartInput -import com.shopify.checkout_kit_android_demo.graphql.type.CartLineInput -import com.shopify.checkout_kit_android_demo.graphql.type.CartLineUpdateInput +import com.shopify.checkoutkit.androiddemo.graphql.CartCreateMutation +import com.shopify.checkoutkit.androiddemo.graphql.CartLinesAddMutation +import com.shopify.checkoutkit.androiddemo.graphql.CartLinesRemoveMutation +import com.shopify.checkoutkit.androiddemo.graphql.CartLinesUpdateMutation +import com.shopify.checkoutkit.androiddemo.graphql.FetchCollectionQuery +import com.shopify.checkoutkit.androiddemo.graphql.FetchCollectionsQuery +import com.shopify.checkoutkit.androiddemo.graphql.FetchProductQuery +import com.shopify.checkoutkit.androiddemo.graphql.FetchProductsQuery +import com.shopify.checkoutkit.androiddemo.graphql.type.CartInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CartLineInput +import com.shopify.checkoutkit.androiddemo.graphql.type.CartLineUpdateInput import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.transform diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/MoneyText.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/MoneyText.kt similarity index 97% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/MoneyText.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/MoneyText.kt index 5a6cb847b..ba73863cc 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/MoneyText.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/MoneyText.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.components +package com.shopify.checkoutkit.androiddemo.common.components import android.content.Context import androidx.compose.material3.MaterialTheme @@ -10,7 +10,7 @@ import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign -import com.shopify.checkout_kit_android_demo.R +import com.shopify.checkoutkit.androiddemo.R import java.util.Locale @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/ProgressIndicator.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/ProgressIndicator.kt similarity index 88% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/ProgressIndicator.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/ProgressIndicator.kt index 43978a9d3..ed09a8f8f 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/ProgressIndicator.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/ProgressIndicator.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.components +package com.shopify.checkoutkit.androiddemo.common.components import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/QuantitySelector.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/QuantitySelector.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/QuantitySelector.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/QuantitySelector.kt index c8b79b626..1ad67c86e 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/QuantitySelector.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/QuantitySelector.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.components +package com.shopify.checkoutkit.androiddemo.common.components import androidx.compose.foundation.border import androidx.compose.foundation.layout.Row diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/RemoteImage.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/RemoteImage.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/RemoteImage.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/RemoteImage.kt index 58eb722f0..186b4a90d 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/RemoteImage.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/RemoteImage.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.components +package com.shopify.checkoutkit.androiddemo.common.components import androidx.compose.foundation.Image import androidx.compose.runtime.Composable @@ -10,7 +10,7 @@ import androidx.compose.ui.res.painterResource import coil.compose.AsyncImage import coil.request.ImageRequest import coil.size.Scale -import com.shopify.checkout_kit_android_demo.R +import com.shopify.checkoutkit.androiddemo.R @Composable fun RemoteImage( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/TextComponents.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/TextComponents.kt similarity index 98% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/TextComponents.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/TextComponents.kt index f43790d40..6efbad4eb 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/components/TextComponents.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/components/TextComponents.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.components +package com.shopify.checkoutkit.androiddemo.common.components import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/di/AppModule.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/di/AppModule.kt similarity index 58% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/di/AppModule.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/di/AppModule.kt index ee8529dfb..11a851126 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/di/AppModule.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/di/AppModule.kt @@ -1,40 +1,40 @@ -package com.shopify.checkout_kit_android_demo.common.di +package com.shopify.checkoutkit.androiddemo.common.di import android.app.Application import androidx.room.Room import com.apollographql.apollo.ApolloClient import com.apollographql.cache.normalized.api.CacheKey import com.apollographql.cache.normalized.memory.MemoryCacheFactory -import com.shopify.checkout_kit_android_demo.BuildConfig -import com.shopify.checkout_kit_android_demo.cart.CartViewModel -import com.shopify.checkout_kit_android_demo.cart.data.CartRepository -import com.shopify.checkout_kit_android_demo.common.client.StorefrontApiClient -import com.shopify.checkout_kit_android_demo.common.logs.LogDatabase -import com.shopify.checkout_kit_android_demo.common.logs.Logger -import com.shopify.checkout_kit_android_demo.common.logs.MIGRATION_1_2 -import com.shopify.checkout_kit_android_demo.common.logs.MIGRATION_2_3 -import com.shopify.checkout_kit_android_demo.common.logs.MIGRATION_3_4 -import com.shopify.checkout_kit_android_demo.graphql.cache.Cache.cache -import com.shopify.checkout_kit_android_demo.home.HomeViewModel -import com.shopify.checkout_kit_android_demo.logs.LogsViewModel -import com.shopify.checkout_kit_android_demo.products.ProductsViewModel -import com.shopify.checkout_kit_android_demo.products.collection.ProductCollectionViewModel -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollectionRepository -import com.shopify.checkout_kit_android_demo.products.product.ProductViewModel -import com.shopify.checkout_kit_android_demo.products.product.data.ProductRepository -import com.shopify.checkout_kit_android_demo.settings.PreferencesManager -import com.shopify.checkout_kit_android_demo.settings.SettingsViewModel -import com.shopify.checkout_kit_android_demo.settings.account.AccountViewModel -import com.shopify.checkout_kit_android_demo.settings.authentication.LoginViewModel -import com.shopify.checkout_kit_android_demo.settings.authentication.data.CustomerRepository -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local.CustomerAccessTokenStore -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local.TokenAeadProvider -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local.TokenCodecProvider -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local.customerAccessTokenDataStore -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network.CustomerAccountsApiGraphQLClient -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network.CustomerAccountsApiRestClient -import com.shopify.checkout_kit_android_demo.settings.authentication.utils.AuthenticationHelper -import com.shopify.checkout_kit_android_demo.settings.data.SettingsRepository +import com.shopify.checkoutkit.androiddemo.BuildConfig +import com.shopify.checkoutkit.androiddemo.cart.CartViewModel +import com.shopify.checkoutkit.androiddemo.cart.data.CartRepository +import com.shopify.checkoutkit.androiddemo.common.client.StorefrontApiClient +import com.shopify.checkoutkit.androiddemo.common.logs.LogDatabase +import com.shopify.checkoutkit.androiddemo.common.logs.Logger +import com.shopify.checkoutkit.androiddemo.common.logs.MIGRATION_1_2 +import com.shopify.checkoutkit.androiddemo.common.logs.MIGRATION_2_3 +import com.shopify.checkoutkit.androiddemo.common.logs.MIGRATION_3_4 +import com.shopify.checkoutkit.androiddemo.graphql.cache.Cache.cache +import com.shopify.checkoutkit.androiddemo.home.HomeViewModel +import com.shopify.checkoutkit.androiddemo.logs.LogsViewModel +import com.shopify.checkoutkit.androiddemo.products.ProductsViewModel +import com.shopify.checkoutkit.androiddemo.products.collection.ProductCollectionViewModel +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollectionRepository +import com.shopify.checkoutkit.androiddemo.products.product.ProductViewModel +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductRepository +import com.shopify.checkoutkit.androiddemo.settings.PreferencesManager +import com.shopify.checkoutkit.androiddemo.settings.SettingsViewModel +import com.shopify.checkoutkit.androiddemo.settings.account.AccountViewModel +import com.shopify.checkoutkit.androiddemo.settings.authentication.LoginViewModel +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.CustomerRepository +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local.CustomerAccessTokenStore +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local.TokenAeadProvider +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local.TokenCodecProvider +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local.customerAccessTokenDataStore +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network.CustomerAccountsApiGraphQLClient +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network.CustomerAccountsApiRestClient +import com.shopify.checkoutkit.androiddemo.settings.authentication.utils.AuthenticationHelper +import com.shopify.checkoutkit.androiddemo.settings.data.SettingsRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.serialization.json.Json diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogDao.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogDao.kt similarity index 84% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogDao.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogDao.kt index 9e7ab9b8c..486df5c31 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogDao.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogDao.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.logs +package com.shopify.checkoutkit.androiddemo.common.logs import androidx.room.Dao import androidx.room.Insert diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogDatabase.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogDatabase.kt similarity index 98% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogDatabase.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogDatabase.kt index 1ba7ad516..88e919259 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogDatabase.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogDatabase.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.logs +package com.shopify.checkoutkit.androiddemo.common.logs import androidx.room.Database import androidx.room.RoomDatabase diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogLine.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogLine.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogLine.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogLine.kt index e31f73a34..abc6f57ae 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/LogLine.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/LogLine.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.logs +package com.shopify.checkoutkit.androiddemo.common.logs import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/Logger.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/Logger.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/Logger.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/Logger.kt index 97f2390ca..a6b579f64 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/logs/Logger.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/logs/Logger.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.logs +package com.shopify.checkoutkit.androiddemo.common.logs import com.shopify.checkoutkit.CheckoutException import kotlinx.coroutines.CoroutineScope diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/navigation/BottomAppBarWithNavigation.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/BottomAppBarWithNavigation.kt similarity index 94% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/navigation/BottomAppBarWithNavigation.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/BottomAppBarWithNavigation.kt index f1b3d2f6f..b0f185ac9 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/navigation/BottomAppBarWithNavigation.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/BottomAppBarWithNavigation.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.navigation +package com.shopify.checkoutkit.androiddemo.common.navigation import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,8 +19,8 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodySmall +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodySmall @Composable fun BottomAppBarWithNavigation( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/navigation/CheckoutKitNavHost.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt similarity index 81% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/navigation/CheckoutKitNavHost.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt index 25d91e818..25c915be8 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/navigation/CheckoutKitNavHost.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/navigation/CheckoutKitNavHost.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.navigation +package com.shopify.checkoutkit.androiddemo.common.navigation import androidx.compose.runtime.Composable import androidx.navigation.NavBackStackEntry @@ -6,18 +6,18 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.shopify.checkout_kit_android_demo.cart.CartView -import com.shopify.checkout_kit_android_demo.cart.CartViewModel -import com.shopify.checkout_kit_android_demo.home.HomeView -import com.shopify.checkout_kit_android_demo.logs.LogsView -import com.shopify.checkout_kit_android_demo.logs.LogsViewModel -import com.shopify.checkout_kit_android_demo.products.ProductsView -import com.shopify.checkout_kit_android_demo.products.collection.ProductCollectionView -import com.shopify.checkout_kit_android_demo.products.product.ProductView -import com.shopify.checkout_kit_android_demo.settings.SettingsView -import com.shopify.checkout_kit_android_demo.settings.SettingsViewModel -import com.shopify.checkout_kit_android_demo.settings.account.AccountView -import com.shopify.checkout_kit_android_demo.settings.authentication.LoginView +import com.shopify.checkoutkit.androiddemo.cart.CartView +import com.shopify.checkoutkit.androiddemo.cart.CartViewModel +import com.shopify.checkoutkit.androiddemo.home.HomeView +import com.shopify.checkoutkit.androiddemo.logs.LogsView +import com.shopify.checkoutkit.androiddemo.logs.LogsViewModel +import com.shopify.checkoutkit.androiddemo.products.ProductsView +import com.shopify.checkoutkit.androiddemo.products.collection.ProductCollectionView +import com.shopify.checkoutkit.androiddemo.products.product.ProductView +import com.shopify.checkoutkit.androiddemo.settings.SettingsView +import com.shopify.checkoutkit.androiddemo.settings.SettingsViewModel +import com.shopify.checkoutkit.androiddemo.settings.account.AccountView +import com.shopify.checkoutkit.androiddemo.settings.authentication.LoginView import java.net.URLEncoder import java.nio.charset.StandardCharsets diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Shape.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Shape.kt similarity index 81% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Shape.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Shape.kt index 947b80162..f0c35db7f 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Shape.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Shape.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.ui.theme +package com.shopify.checkoutkit.androiddemo.common.ui.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Shapes diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Theme.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Theme.kt similarity index 97% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Theme.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Theme.kt index ed578e956..c1b45ccec 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Theme.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.ui.theme +package com.shopify.checkoutkit.androiddemo.common.ui.theme import androidx.activity.ComponentActivity import androidx.activity.compose.LocalActivity diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Type.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Type.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Type.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Type.kt index c39097ede..b75cfcb5a 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/common/ui/theme/Type.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/common/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.common.ui.theme +package com.shopify.checkoutkit.androiddemo.common.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle @@ -8,7 +8,7 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.sp -import com.shopify.checkout_kit_android_demo.R +import com.shopify.checkoutkit.androiddemo.R val cooperBTFontFamily = FontFamily( Font(R.font.cooper_bt_normal_200, FontWeight.Light), diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/e2e/E2ETestIds.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/e2e/E2ETestIds.kt similarity index 60% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/e2e/E2ETestIds.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/e2e/E2ETestIds.kt index 4dfad84f2..9adcefc03 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/e2e/E2ETestIds.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/e2e/E2ETestIds.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.e2e +package com.shopify.checkoutkit.androiddemo.e2e object E2ETestIds { const val APP_READY = "checkout-kit-sample-ready" diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/Featured.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/Featured.kt similarity index 79% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/Featured.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/Featured.kt index 87c275706..030ae4663 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/Featured.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/Featured.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.home +package com.shopify.checkoutkit.androiddemo.home import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -13,13 +13,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.components.Header3 -import com.shopify.checkout_kit_android_demo.common.ui.theme.defaultProductImageHeight -import com.shopify.checkout_kit_android_demo.common.ui.theme.defaultProductImageHeightLg -import com.shopify.checkout_kit_android_demo.products.collection.ProductCollectionProduct -import com.shopify.checkout_kit_android_demo.products.product.data.Product +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.ui.theme.defaultProductImageHeight +import com.shopify.checkoutkit.androiddemo.common.ui.theme.defaultProductImageHeightLg +import com.shopify.checkoutkit.androiddemo.products.collection.ProductCollectionProduct +import com.shopify.checkoutkit.androiddemo.products.product.data.Product @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/Hero.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/Hero.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/Hero.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/Hero.kt index dc315ffd3..f77b29eb2 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/Hero.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/Hero.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.home +package com.shopify.checkoutkit.androiddemo.home import HeroImage import androidx.compose.foundation.background @@ -19,10 +19,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.Header1 -import com.shopify.checkout_kit_android_demo.common.ui.theme.cooperBTFontFamily -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.Header1 +import com.shopify.checkoutkit.androiddemo.common.ui.theme.cooperBTFontFamily +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding @Composable fun Hero( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HeroImage.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HeroImage.kt similarity index 96% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HeroImage.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HeroImage.kt index d9068f112..f5e257e43 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HeroImage.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HeroImage.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.ColorMatrix import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import com.shopify.checkout_kit_android_demo.R +import com.shopify.checkoutkit.androiddemo.R @Composable fun HeroImage() { diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HomeView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HomeView.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HomeView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HomeView.kt index aa4f7dc23..23d4c24a9 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HomeView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HomeView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.home +package com.shopify.checkoutkit.androiddemo.home import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -10,9 +10,9 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.products.collection.ProductCollections +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.products.collection.ProductCollections import org.koin.androidx.compose.koinViewModel @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HomeViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HomeViewModel.kt similarity index 82% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HomeViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HomeViewModel.kt index 499c2e029..ff92af710 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/home/HomeViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/home/HomeViewModel.kt @@ -1,15 +1,15 @@ -package com.shopify.checkout_kit_android_demo.home +package com.shopify.checkoutkit.androiddemo.home import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.SnackbarController -import com.shopify.checkout_kit_android_demo.common.SnackbarEvent -import com.shopify.checkout_kit_android_demo.common.navigation.Screen -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollection -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollectionRepository +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.SnackbarController +import com.shopify.checkoutkit.androiddemo.common.SnackbarEvent +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollection +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollectionRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/CheckoutLogContext.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/CheckoutLogContext.kt similarity index 94% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/CheckoutLogContext.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/CheckoutLogContext.kt index c080eb271..c31073d76 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/CheckoutLogContext.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/CheckoutLogContext.kt @@ -1,8 +1,8 @@ -package com.shopify.checkout_kit_android_demo.logs +package com.shopify.checkoutkit.androiddemo.logs -import com.shopify.checkout_kit_android_demo.common.logs.LogLine -import com.shopify.checkout_kit_android_demo.common.logs.LogSource import com.shopify.checkoutkit.CheckoutProtocol +import com.shopify.checkoutkit.androiddemo.common.logs.LogLine +import com.shopify.checkoutkit.androiddemo.common.logs.LogSource import kotlinx.serialization.json.Json import kotlinx.serialization.json.contentOrNull import kotlinx.serialization.json.jsonArray diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/CheckoutLogGroupHeader.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/CheckoutLogGroupHeader.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/CheckoutLogGroupHeader.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/CheckoutLogGroupHeader.kt index 70e6f58ea..db1f8eaf2 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/CheckoutLogGroupHeader.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/CheckoutLogGroupHeader.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.logs +package com.shopify.checkoutkit.androiddemo.logs import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogOverview.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogOverview.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogOverview.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogOverview.kt index 2a488ef13..69bce31b0 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogOverview.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogOverview.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.logs +package com.shopify.checkoutkit.androiddemo.logs import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row @@ -12,7 +12,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.common.components.BodySmall +import com.shopify.checkoutkit.androiddemo.common.components.BodySmall @Composable fun LogOverview(log: PrettyLog, onClick: () -> Unit, modifier: Modifier) { diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogOverviewHeader.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogOverviewHeader.kt similarity index 83% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogOverviewHeader.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogOverviewHeader.kt index 2a5b844e3..ad7d25203 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogOverviewHeader.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogOverviewHeader.kt @@ -1,10 +1,10 @@ -package com.shopify.checkout_kit_android_demo.logs +package com.shopify.checkoutkit.androiddemo.logs import androidx.compose.foundation.layout.Row import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.shopify.checkout_kit_android_demo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.components.Header3 @Composable fun LogOverviewHeader(modifier: Modifier) { diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogsView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogsView.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogsView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogsView.kt index 42ea3d165..ab3e6d63c 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogsView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogsView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.logs +package com.shopify.checkoutkit.androiddemo.logs import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -20,11 +20,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.logs.details.LogDetailModal +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.logs.details.LogDetailModal @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogsViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogsViewModel.kt similarity index 92% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogsViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogsViewModel.kt index 23d07e8a8..fbf4eb764 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/LogsViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/LogsViewModel.kt @@ -1,10 +1,10 @@ -package com.shopify.checkout_kit_android_demo.logs +package com.shopify.checkoutkit.androiddemo.logs import android.text.format.DateFormat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.shopify.checkout_kit_android_demo.common.logs.LogDatabase -import com.shopify.checkout_kit_android_demo.common.logs.LogLine +import com.shopify.checkoutkit.androiddemo.common.logs.LogDatabase +import com.shopify.checkoutkit.androiddemo.common.logs.LogLine import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/JsonPayloadDiff.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/JsonPayloadDiff.kt similarity index 99% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/JsonPayloadDiff.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/JsonPayloadDiff.kt index 036b3342b..b17e62800 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/JsonPayloadDiff.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/JsonPayloadDiff.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.logs.details +package com.shopify.checkoutkit.androiddemo.logs.details import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString.Builder diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/LogDetailModal.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/LogDetailModal.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/LogDetailModal.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/LogDetailModal.kt index c9e96f59b..2f53d3e43 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/LogDetailModal.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/LogDetailModal.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.logs.details +package com.shopify.checkoutkit.androiddemo.logs.details import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.window.Dialog -import com.shopify.checkout_kit_android_demo.common.logs.LogLine +import com.shopify.checkoutkit.androiddemo.common.logs.LogLine import kotlinx.serialization.json.Json @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/LogDetails.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/LogDetails.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/LogDetails.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/LogDetails.kt index cf734f361..82168469d 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/logs/details/LogDetails.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/logs/details/LogDetails.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.logs.details +package com.shopify.checkoutkit.androiddemo.logs.details import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -10,7 +10,7 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium @Composable fun LogDetails(header: String, message: String, modifier: Modifier) { diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/ProductsView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/ProductsView.kt similarity index 84% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/ProductsView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/ProductsView.kt index 45fd05d7e..cd4571d0a 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/ProductsView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/ProductsView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products +package com.shopify.checkoutkit.androiddemo.products import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -27,18 +27,18 @@ import androidx.paging.PagingConfig import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.itemContentType import androidx.paging.compose.itemKey -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.MoneyRangeText -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.ui.theme.defaultProductImageHeight -import com.shopify.checkout_kit_android_demo.common.ui.theme.defaultProductImageHeightLg -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.largeScreenBreakpoint -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.products.product.data.Product +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.MoneyRangeText +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.ui.theme.defaultProductImageHeight +import com.shopify.checkoutkit.androiddemo.common.ui.theme.defaultProductImageHeightLg +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.largeScreenBreakpoint +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.products.product.data.Product import org.koin.androidx.compose.koinViewModel @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/ProductsViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/ProductsViewModel.kt similarity index 57% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/ProductsViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/ProductsViewModel.kt index d4eabd82d..25089a35d 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/ProductsViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/ProductsViewModel.kt @@ -1,11 +1,11 @@ -package com.shopify.checkout_kit_android_demo.products +package com.shopify.checkoutkit.androiddemo.products import androidx.lifecycle.ViewModel import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.navigation.Screen -import com.shopify.checkout_kit_android_demo.products.product.data.ProductPagingSource -import com.shopify.checkout_kit_android_demo.products.product.data.ProductRepository +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductPagingSource +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductRepository import timber.log.Timber class ProductsViewModel( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionProduct.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionProduct.kt similarity index 78% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionProduct.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionProduct.kt index 225edfad8..da9710f4a 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionProduct.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionProduct.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products.collection +package com.shopify.checkoutkit.androiddemo.products.collection import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -16,14 +16,14 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.components.MoneyRangeText -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.ui.theme.defaultProductImageHeight -import com.shopify.checkout_kit_android_demo.common.ui.theme.defaultProductImageHeightLg -import com.shopify.checkout_kit_android_demo.common.ui.theme.largeScreenBreakpoint -import com.shopify.checkout_kit_android_demo.products.product.data.Product +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.components.MoneyRangeText +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.ui.theme.defaultProductImageHeight +import com.shopify.checkoutkit.androiddemo.common.ui.theme.defaultProductImageHeightLg +import com.shopify.checkoutkit.androiddemo.common.ui.theme.largeScreenBreakpoint +import com.shopify.checkoutkit.androiddemo.products.product.data.Product @Composable fun ProductCollectionProduct( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionView.kt similarity index 86% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionView.kt index ddfd56cca..b91b99d40 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products.collection +package com.shopify.checkoutkit.androiddemo.products.collection import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,13 +19,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalLayoutApi::class) diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionViewModel.kt similarity index 78% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionViewModel.kt index 2d77bc4cf..d6b54afc4 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollectionViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollectionViewModel.kt @@ -1,15 +1,15 @@ -package com.shopify.checkout_kit_android_demo.products.collection +package com.shopify.checkoutkit.androiddemo.products.collection import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.common.SnackbarController -import com.shopify.checkout_kit_android_demo.common.SnackbarEvent -import com.shopify.checkout_kit_android_demo.common.navigation.Screen -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollection -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollectionRepository +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.common.SnackbarController +import com.shopify.checkoutkit.androiddemo.common.SnackbarEvent +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollection +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollectionRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollections.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollections.kt similarity index 80% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollections.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollections.kt index 2d396ec18..554b48db3 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/ProductCollections.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/ProductCollections.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products.collection +package com.shopify.checkoutkit.androiddemo.products.collection import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -16,14 +16,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.Header3 -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollection -import com.shopify.checkout_kit_android_demo.products.collection.data.ProductCollectionImage +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollection +import com.shopify.checkoutkit.androiddemo.products.collection.data.ProductCollectionImage @Composable fun ProductCollections( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ModelMappingExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ModelMappingExt.kt similarity index 70% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ModelMappingExt.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ModelMappingExt.kt index c512adb1d..341b4f5fc 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ModelMappingExt.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ModelMappingExt.kt @@ -1,9 +1,9 @@ -package com.shopify.checkout_kit_android_demo.products.collection.data +package com.shopify.checkoutkit.androiddemo.products.collection.data -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.graphql.FetchCollectionQuery -import com.shopify.checkout_kit_android_demo.graphql.FetchCollectionsQuery -import com.shopify.checkout_kit_android_demo.products.product.data.toLocal +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.graphql.FetchCollectionQuery +import com.shopify.checkoutkit.androiddemo.graphql.FetchCollectionsQuery +import com.shopify.checkoutkit.androiddemo.products.product.data.toLocal internal fun FetchCollectionsQuery.Node.toLocal(): ProductCollection { return ProductCollection( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ProductCollection.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ProductCollection.kt similarity index 60% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ProductCollection.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ProductCollection.kt index 9b739f13a..4674af89c 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ProductCollection.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ProductCollection.kt @@ -1,7 +1,7 @@ -package com.shopify.checkout_kit_android_demo.products.collection.data +package com.shopify.checkoutkit.androiddemo.products.collection.data -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.products.product.data.Product +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.products.product.data.Product data class ProductCollection( val id: ID, diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ProductCollectionRepository.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ProductCollectionRepository.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ProductCollectionRepository.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ProductCollectionRepository.kt index eb491007b..02064d5b9 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/collection/data/ProductCollectionRepository.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/collection/data/ProductCollectionRepository.kt @@ -1,6 +1,6 @@ -package com.shopify.checkout_kit_android_demo.products.collection.data +package com.shopify.checkoutkit.androiddemo.products.collection.data -import com.shopify.checkout_kit_android_demo.common.client.StorefrontApiClient +import com.shopify.checkoutkit.androiddemo.common.client.StorefrontApiClient import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.last import kotlinx.coroutines.flow.map diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/AddToCartButton.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/AddToCartButton.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/AddToCartButton.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/AddToCartButton.kt index a8cf783c0..f242f9435 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/AddToCartButton.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/AddToCartButton.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products.product +package com.shopify.checkoutkit.androiddemo.products.product import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Box @@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.Header3 @Composable fun AddToCartButton( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/OptionSelector.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/OptionSelector.kt similarity index 86% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/OptionSelector.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/OptionSelector.kt index 50216a5d2..95b3496c0 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/OptionSelector.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/OptionSelector.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products.product +package com.shopify.checkoutkit.androiddemo.products.product import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.BodySmall -import com.shopify.checkout_kit_android_demo.products.product.data.ProductVariantOptionDetails +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.BodySmall +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductVariantOptionDetails @Composable fun OptionSelector( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/ProductView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/ProductView.kt similarity index 85% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/ProductView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/ProductView.kt index 7a70d808f..9ab7c68b5 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/ProductView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/ProductView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.products.product +package com.shopify.checkoutkit.androiddemo.products.product import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.BoxWithConstraints @@ -18,16 +18,16 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.MoneyText -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.components.QuantitySelector -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.largeScreenBreakpoint -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.MoneyText +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.components.QuantitySelector +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.largeScreenBreakpoint +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding import org.koin.androidx.compose.koinViewModel import timber.log.Timber diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/ProductViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/ProductViewModel.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/ProductViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/ProductViewModel.kt index 17798a96f..214e0028b 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/ProductViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/ProductViewModel.kt @@ -1,13 +1,13 @@ -package com.shopify.checkout_kit_android_demo.products.product +package com.shopify.checkoutkit.androiddemo.products.product import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.shopify.checkout_kit_android_demo.cart.CartViewModel -import com.shopify.checkout_kit_android_demo.products.product.data.Product -import com.shopify.checkout_kit_android_demo.products.product.data.ProductRepository -import com.shopify.checkout_kit_android_demo.products.product.data.ProductVariant -import com.shopify.checkout_kit_android_demo.products.product.data.ProductVariantOptionDetails -import com.shopify.checkout_kit_android_demo.products.product.data.ProductVariantSelectedOption +import com.shopify.checkoutkit.androiddemo.cart.CartViewModel +import com.shopify.checkoutkit.androiddemo.products.product.data.Product +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductRepository +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductVariant +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductVariantOptionDetails +import com.shopify.checkoutkit.androiddemo.products.product.data.ProductVariantSelectedOption import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ModelMappingExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ModelMappingExt.kt similarity index 83% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ModelMappingExt.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ModelMappingExt.kt index a55bf2ea6..7a9b688fb 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ModelMappingExt.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ModelMappingExt.kt @@ -1,8 +1,8 @@ -package com.shopify.checkout_kit_android_demo.products.product.data +package com.shopify.checkoutkit.androiddemo.products.product.data -import com.shopify.checkout_kit_android_demo.common.ID -import com.shopify.checkout_kit_android_demo.graphql.fragment.ProductFragment -import com.shopify.checkout_kit_android_demo.graphql.fragment.ProductVariantFragment +import com.shopify.checkoutkit.androiddemo.common.ID +import com.shopify.checkoutkit.androiddemo.graphql.fragment.ProductFragment +import com.shopify.checkoutkit.androiddemo.graphql.fragment.ProductVariantFragment fun ProductFragment.toLocal(variants: List = emptyList()): Product { return Product( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/Product.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/Product.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/Product.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/Product.kt index a96278e68..334daaab6 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/Product.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/Product.kt @@ -1,6 +1,6 @@ -package com.shopify.checkout_kit_android_demo.products.product.data +package com.shopify.checkoutkit.androiddemo.products.product.data -import com.shopify.checkout_kit_android_demo.common.ID +import com.shopify.checkoutkit.androiddemo.common.ID data class Products( val products: List = mutableListOf(), diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ProductPagingSource.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ProductPagingSource.kt similarity index 82% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ProductPagingSource.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ProductPagingSource.kt index c497f275a..59c25df49 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ProductPagingSource.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ProductPagingSource.kt @@ -1,10 +1,10 @@ -package com.shopify.checkout_kit_android_demo.products.product.data +package com.shopify.checkoutkit.androiddemo.products.product.data import androidx.paging.PagingSource import androidx.paging.PagingState -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.SnackbarController -import com.shopify.checkout_kit_android_demo.common.SnackbarEvent +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.SnackbarController +import com.shopify.checkoutkit.androiddemo.common.SnackbarEvent import timber.log.Timber class ProductPagingSource( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ProductRepository.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ProductRepository.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ProductRepository.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ProductRepository.kt index 7234ea33c..919ab3aa1 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/products/product/data/ProductRepository.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/products/product/data/ProductRepository.kt @@ -1,6 +1,6 @@ -package com.shopify.checkout_kit_android_demo.products.product.data +package com.shopify.checkoutkit.androiddemo.products.product.data -import com.shopify.checkout_kit_android_demo.common.client.StorefrontApiClient +import com.shopify.checkoutkit.androiddemo.common.client.StorefrontApiClient import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.last import kotlinx.coroutines.flow.map diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/AppearanceSection.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/AppearanceSection.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/AppearanceSection.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/AppearanceSection.kt index bdbc677e0..816acda3d 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/AppearanceSection.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/AppearanceSection.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -11,12 +11,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.Header3 -import com.shopify.checkout_kit_android_demo.common.sampleStorefrontAppearance -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding import com.shopify.checkoutkit.CheckoutAppearance import com.shopify.checkoutkit.ColorScheme +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.sampleStorefrontAppearance +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding @Composable fun AppearanceSection( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/BuyerIdentityDemoSwitch.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/BuyerIdentityDemoSwitch.kt similarity index 88% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/BuyerIdentityDemoSwitch.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/BuyerIdentityDemoSwitch.kt index f136a4987..64961c7a2 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/BuyerIdentityDemoSwitch.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/BuyerIdentityDemoSwitch.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row @@ -6,7 +6,7 @@ import androidx.compose.material3.Switch import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium @Composable fun BuyerIdentityDemoSwitch( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/CheckoutPresentationModeSection.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/CheckoutPresentationModeSection.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/CheckoutPresentationModeSection.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/CheckoutPresentationModeSection.kt index 3644d5449..e3c269d66 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/CheckoutPresentationModeSection.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/CheckoutPresentationModeSection.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -11,12 +11,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodySmall -import com.shopify.checkout_kit_android_demo.common.components.Header3 -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutPresentationMode -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutSheetPreset +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodySmall +import com.shopify.checkoutkit.androiddemo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutPresentationMode +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutSheetPreset @Composable fun CheckoutPresentationModeSection( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/CheckoutSheetPresetSection.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/CheckoutSheetPresetSection.kt similarity index 88% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/CheckoutSheetPresetSection.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/CheckoutSheetPresetSection.kt index 6b73c6b73..6ade0a0ee 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/CheckoutSheetPresetSection.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/CheckoutSheetPresetSection.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -11,10 +11,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutSheetPreset +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutSheetPreset @Composable fun CheckoutSheetPresetSection( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/PreferencesManager.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/PreferencesManager.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/PreferencesManager.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/PreferencesManager.kt index 70cc7d6db..55062d022 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/PreferencesManager.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/PreferencesManager.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import android.content.Context import androidx.datastore.core.DataStore @@ -7,12 +7,12 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import com.shopify.checkout_kit_android_demo.common.sampleStorefrontAppearance -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutPresentationMode -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutSheetPreset -import com.shopify.checkout_kit_android_demo.settings.data.WindowOpenHandler import com.shopify.checkoutkit.CheckoutAppearance import com.shopify.checkoutkit.ColorScheme +import com.shopify.checkoutkit.androiddemo.common.sampleStorefrontAppearance +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutPresentationMode +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutSheetPreset +import com.shopify.checkoutkit.androiddemo.settings.data.WindowOpenHandler import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.serialization.json.Json diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsRadioOption.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsRadioOption.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsRadioOption.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsRadioOption.kt index 4806301bc..7c4edf6b3 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsRadioOption.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsRadioOption.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth @@ -12,7 +12,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium @Composable internal fun SettingsRadioOption( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsView.kt similarity index 92% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsView.kt index 161023f9f..7713a9677 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -23,13 +23,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.navigation.Screen -import com.shopify.checkout_kit_android_demo.common.ui.theme.horizontalPadding -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.common.ui.theme.horizontalPadding +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding @Composable fun SettingsView( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsViewModel.kt similarity index 88% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsViewModel.kt index eea3acea3..886b807e4 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/SettingsViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/SettingsViewModel.kt @@ -1,19 +1,19 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.shopify.checkout_kit_android_demo.BuildConfig -import com.shopify.checkout_kit_android_demo.common.withCustomCloseIcon -import com.shopify.checkout_kit_android_demo.settings.authentication.data.CustomerRepository -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutPresentationMode -import com.shopify.checkout_kit_android_demo.settings.data.CheckoutSheetPreset -import com.shopify.checkout_kit_android_demo.settings.data.Settings -import com.shopify.checkout_kit_android_demo.settings.data.SettingsRepository -import com.shopify.checkout_kit_android_demo.settings.data.WindowOpenHandler -import com.shopify.checkout_kit_android_demo.settings.data.toCheckoutSheetOptions import com.shopify.checkoutkit.CheckoutAppearance import com.shopify.checkoutkit.Preloading import com.shopify.checkoutkit.ShopifyCheckoutKit +import com.shopify.checkoutkit.androiddemo.BuildConfig +import com.shopify.checkoutkit.androiddemo.common.withCustomCloseIcon +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.CustomerRepository +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutPresentationMode +import com.shopify.checkoutkit.androiddemo.settings.data.CheckoutSheetPreset +import com.shopify.checkoutkit.androiddemo.settings.data.Settings +import com.shopify.checkoutkit.androiddemo.settings.data.SettingsRepository +import com.shopify.checkoutkit.androiddemo.settings.data.WindowOpenHandler +import com.shopify.checkoutkit.androiddemo.settings.data.toCheckoutSheetOptions import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/Version.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/Version.kt similarity index 81% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/Version.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/Version.kt index 4f4afaabd..586a52ca5 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/Version.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/Version.kt @@ -1,11 +1,11 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium @Composable fun Version( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/WindowOpenHandlerSection.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/WindowOpenHandlerSection.kt similarity index 88% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/WindowOpenHandlerSection.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/WindowOpenHandlerSection.kt index b3e03c4d1..4b55d2d47 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/WindowOpenHandlerSection.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/WindowOpenHandlerSection.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings +package com.shopify.checkoutkit.androiddemo.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -11,10 +11,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.Header3 -import com.shopify.checkout_kit_android_demo.common.ui.theme.verticalPadding -import com.shopify.checkout_kit_android_demo.settings.data.WindowOpenHandler +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.ui.theme.verticalPadding +import com.shopify.checkoutkit.androiddemo.settings.data.WindowOpenHandler @Composable fun WindowOpenHandlerSection( diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/account/AccountView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/account/AccountView.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/account/AccountView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/account/AccountView.kt index 61d29e5cd..5676c05ea 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/account/AccountView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/account/AccountView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.account +package com.shopify.checkoutkit.androiddemo.settings.account import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,13 +15,13 @@ import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.Header2 -import com.shopify.checkout_kit_android_demo.common.components.Header3 -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.components.RemoteImage -import com.shopify.checkout_kit_android_demo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.Header2 +import com.shopify.checkoutkit.androiddemo.common.components.Header3 +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.components.RemoteImage +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen import org.koin.androidx.compose.koinViewModel @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/account/AccountViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/account/AccountViewModel.kt similarity index 80% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/account/AccountViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/account/AccountViewModel.kt index dee3c6e86..1ad769926 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/account/AccountViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/account/AccountViewModel.kt @@ -1,9 +1,9 @@ -package com.shopify.checkout_kit_android_demo.settings.account +package com.shopify.checkoutkit.androiddemo.settings.account import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.shopify.checkout_kit_android_demo.settings.authentication.data.Customer -import com.shopify.checkout_kit_android_demo.settings.authentication.data.CustomerRepository +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.Customer +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.CustomerRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginView.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginView.kt index 0a695dbd6..48028d42a 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication +package com.shopify.checkoutkit.androiddemo.settings.authentication import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,10 +13,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.shopify.checkout_kit_android_demo.R -import com.shopify.checkout_kit_android_demo.common.components.BodyMedium -import com.shopify.checkout_kit_android_demo.common.components.ProgressIndicator -import com.shopify.checkout_kit_android_demo.common.navigation.Screen +import com.shopify.checkoutkit.androiddemo.R +import com.shopify.checkoutkit.androiddemo.common.components.BodyMedium +import com.shopify.checkoutkit.androiddemo.common.components.ProgressIndicator +import com.shopify.checkoutkit.androiddemo.common.navigation.Screen import org.koin.androidx.compose.koinViewModel @Composable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginViewModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginViewModel.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginViewModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginViewModel.kt index 23548a754..a49d39f18 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginViewModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginViewModel.kt @@ -1,10 +1,10 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication +package com.shopify.checkoutkit.androiddemo.settings.authentication import androidx.compose.ui.text.intl.Locale import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.shopify.checkout_kit_android_demo.settings.authentication.data.CustomerRepository -import com.shopify.checkout_kit_android_demo.settings.authentication.utils.AuthenticationHelper +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.CustomerRepository +import com.shopify.checkoutkit.androiddemo.settings.authentication.utils.AuthenticationHelper import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginWebView.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginWebView.kt similarity index 96% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginWebView.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginWebView.kt index 687082818..7530ca601 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/LoginWebView.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/LoginWebView.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication +package com.shopify.checkoutkit.androiddemo.settings.authentication import android.annotation.SuppressLint import android.view.ViewGroup diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerModel.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerModel.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerModel.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerModel.kt index 11a800086..4b5c14a1b 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerModel.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerModel.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data +package com.shopify.checkoutkit.androiddemo.settings.authentication.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerRepository.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerRepository.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerRepository.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerRepository.kt index 014f79da9..3fa11d6d7 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerRepository.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerRepository.kt @@ -1,10 +1,10 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data +package com.shopify.checkoutkit.androiddemo.settings.authentication.data -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local.CustomerAccessTokenStore -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network.CustomerAccountsApiGraphQLClient -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network.CustomerAccountsApiRestClient -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network.CustomerResponse -import com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network.OAuthTokenResult +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local.CustomerAccessTokenStore +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network.CustomerAccountsApiGraphQLClient +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network.CustomerAccountsApiRestClient +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network.CustomerResponse +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network.OAuthTokenResult import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/CustomerAccessTokenStore.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/CustomerAccessTokenStore.kt similarity index 97% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/CustomerAccessTokenStore.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/CustomerAccessTokenStore.kt index 136301780..48a1f0754 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/CustomerAccessTokenStore.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/CustomerAccessTokenStore.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import android.content.Context import androidx.datastore.core.DataStore @@ -8,7 +8,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.emptyPreferences import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import com.shopify.checkout_kit_android_demo.settings.authentication.data.AccessToken +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.AccessToken import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.serialization.encodeToString diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/EncryptedTokenCodec.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/EncryptedTokenCodec.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/EncryptedTokenCodec.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/EncryptedTokenCodec.kt index a16999abc..adafe9ff1 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/EncryptedTokenCodec.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/EncryptedTokenCodec.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import com.google.crypto.tink.Aead import java.nio.charset.StandardCharsets.UTF_8 diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/KeysetAeadFactory.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/KeysetAeadFactory.kt similarity index 90% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/KeysetAeadFactory.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/KeysetAeadFactory.kt index d52b73bf7..c1f15c096 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/KeysetAeadFactory.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/KeysetAeadFactory.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import com.google.crypto.tink.Aead import java.security.GeneralSecurityException diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenAeadProvider.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenAeadProvider.kt similarity index 97% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenAeadProvider.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenAeadProvider.kt index 07351fd0b..dee62c58c 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenAeadProvider.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenAeadProvider.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import android.content.Context import com.google.crypto.tink.Aead diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenCodecProvider.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenCodecProvider.kt similarity index 87% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenCodecProvider.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenCodecProvider.kt index 554eeb1e3..713f80532 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenCodecProvider.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenCodecProvider.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local /** * Supplies the codec used to encrypt customer access tokens. diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/CustomerAccountsApiGraphQLClient.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/CustomerAccountsApiGraphQLClient.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/CustomerAccountsApiGraphQLClient.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/CustomerAccountsApiGraphQLClient.kt index fe3d698a0..386bb8d3e 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/CustomerAccountsApiGraphQLClient.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/CustomerAccountsApiGraphQLClient.kt @@ -1,7 +1,7 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network -import com.shopify.checkout_kit_android_demo.settings.authentication.data.AccessToken -import com.shopify.checkout_kit_android_demo.settings.authentication.data.Customer +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.AccessToken +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.Customer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.Serializable diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/CustomerAccountsApiRestClient.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/CustomerAccountsApiRestClient.kt similarity index 93% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/CustomerAccountsApiRestClient.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/CustomerAccountsApiRestClient.kt index af3495aef..361283167 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/CustomerAccountsApiRestClient.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/CustomerAccountsApiRestClient.kt @@ -1,7 +1,7 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network -import com.shopify.checkout_kit_android_demo.settings.authentication.data.AccessToken -import com.shopify.checkout_kit_android_demo.settings.authentication.utils.AuthenticationHelper +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.AccessToken +import com.shopify.checkoutkit.androiddemo.settings.authentication.utils.AuthenticationHelper import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/ResponseExt.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/ResponseExt.kt similarity index 69% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/ResponseExt.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/ResponseExt.kt index 2771d162a..4af29beaa 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/network/ResponseExt.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/network/ResponseExt.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.network +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.network import okhttp3.Response import java.io.IOException diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/utils/AuthenticationHelper.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/utils/AuthenticationHelper.kt similarity index 98% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/utils/AuthenticationHelper.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/utils/AuthenticationHelper.kt index 4e6da4338..2d8681ced 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/authentication/utils/AuthenticationHelper.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/authentication/utils/AuthenticationHelper.kt @@ -1,8 +1,8 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.utils +package com.shopify.checkoutkit.androiddemo.settings.authentication.utils import android.util.Base64 -import androidx.core.net.toUri import androidx.compose.ui.text.intl.Locale +import androidx.core.net.toUri import java.security.MessageDigest import java.security.SecureRandom diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/CheckoutPresentationMode.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/CheckoutPresentationMode.kt similarity index 91% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/CheckoutPresentationMode.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/CheckoutPresentationMode.kt index 8d4c607a3..c07163288 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/CheckoutPresentationMode.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/CheckoutPresentationMode.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.data +package com.shopify.checkoutkit.androiddemo.settings.data import com.shopify.checkoutkit.CheckoutSheetOptions diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/CheckoutSheetPreset.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/CheckoutSheetPreset.kt similarity index 94% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/CheckoutSheetPreset.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/CheckoutSheetPreset.kt index 3f110d8ac..f101bfb77 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/CheckoutSheetPreset.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/CheckoutSheetPreset.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.data +package com.shopify.checkoutkit.androiddemo.settings.data import com.shopify.checkoutkit.CheckoutSheetDismissal import com.shopify.checkoutkit.CheckoutSheetOptions diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/Settings.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/Settings.kt similarity index 92% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/Settings.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/Settings.kt index c1cfd5585..8842428be 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/Settings.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/Settings.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.data +package com.shopify.checkoutkit.androiddemo.settings.data import com.shopify.checkoutkit.CheckoutAppearance import com.shopify.checkoutkit.ColorScheme diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/SettingsRepository.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/SettingsRepository.kt similarity index 94% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/SettingsRepository.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/SettingsRepository.kt index 3960f7d6b..c57e6ec83 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/SettingsRepository.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/SettingsRepository.kt @@ -1,7 +1,7 @@ -package com.shopify.checkout_kit_android_demo.settings.data +package com.shopify.checkoutkit.androiddemo.settings.data -import com.shopify.checkout_kit_android_demo.settings.PreferencesManager import com.shopify.checkoutkit.CheckoutAppearance +import com.shopify.checkoutkit.androiddemo.settings.PreferencesManager import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/WindowOpenHandler.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/WindowOpenHandler.kt similarity index 51% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/WindowOpenHandler.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/WindowOpenHandler.kt index a47d5d9ad..6d6b32a8c 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkout_kit_android_demo/settings/data/WindowOpenHandler.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/main/java/com/shopify/checkoutkit/androiddemo/settings/data/WindowOpenHandler.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.data +package com.shopify.checkoutkit.androiddemo.settings.data enum class WindowOpenHandler { Default, diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerModelTest.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerModelTest.kt similarity index 89% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerModelTest.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerModelTest.kt index d8d0226d3..da5a672bc 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/CustomerModelTest.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/CustomerModelTest.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data +package com.shopify.checkoutkit.androiddemo.settings.authentication.data import org.assertj.core.api.Assertions.assertThat import org.junit.Test diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/CustomerAccessTokenStoreTest.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/CustomerAccessTokenStoreTest.kt similarity index 98% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/CustomerAccessTokenStoreTest.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/CustomerAccessTokenStoreTest.kt index dcf32e891..2740aabde 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/CustomerAccessTokenStoreTest.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/CustomerAccessTokenStoreTest.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.PreferenceDataStoreFactory @@ -7,7 +7,7 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.emptyPreferences import androidx.datastore.preferences.core.stringPreferencesKey import com.google.crypto.tink.Aead -import com.shopify.checkout_kit_android_demo.settings.authentication.data.AccessToken +import com.shopify.checkoutkit.androiddemo.settings.authentication.data.AccessToken import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/EncryptedTokenCodecTest.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/EncryptedTokenCodecTest.kt similarity index 95% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/EncryptedTokenCodecTest.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/EncryptedTokenCodecTest.kt index 7e39d0c17..51fb2d117 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/EncryptedTokenCodecTest.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/EncryptedTokenCodecTest.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import com.google.crypto.tink.Aead import org.assertj.core.api.Assertions.assertThat diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/KeysetAeadFactoryTest.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/KeysetAeadFactoryTest.kt similarity index 96% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/KeysetAeadFactoryTest.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/KeysetAeadFactoryTest.kt index f79d609c2..a6170506a 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/KeysetAeadFactoryTest.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/KeysetAeadFactoryTest.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import com.google.crypto.tink.Aead import org.assertj.core.api.Assertions.assertThat diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenAeadProviderTest.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenAeadProviderTest.kt similarity index 96% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenAeadProviderTest.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenAeadProviderTest.kt index 169005001..bb604de83 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenAeadProviderTest.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenAeadProviderTest.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import com.google.crypto.tink.Aead import kotlinx.coroutines.Dispatchers diff --git a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenBackupRulesTest.kt b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenBackupRulesTest.kt similarity index 96% rename from platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenBackupRulesTest.kt rename to platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenBackupRulesTest.kt index f7eed0580..9fb293f49 100644 --- a/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkout_kit_android_demo/settings/authentication/data/source/local/TokenBackupRulesTest.kt +++ b/platforms/android/samples/CheckoutKitAndroidDemo/app/src/test/java/com/shopify/checkoutkit/androiddemo/settings/authentication/data/source/local/TokenBackupRulesTest.kt @@ -1,4 +1,4 @@ -package com.shopify.checkout_kit_android_demo.settings.authentication.data.source.local +package com.shopify.checkoutkit.androiddemo.settings.authentication.data.source.local import org.assertj.core.api.Assertions.assertThat import org.junit.Test