Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (!storefrontDomain || !accessToken) {
}

android {
namespace = 'com.shopify.checkout_kit_android_demo'
namespace = 'com.shopify.checkoutkit.androiddemo'
compileSdk = 37

defaultConfig {
Expand Down Expand Up @@ -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())
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.shopify.checkout_kit_android_demo
package com.shopify.checkoutkit.androiddemo

import android.Manifest
import android.content.pm.PackageManager
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.shopify.checkoutkit.androiddemo.common

data class ID(val id: String)
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
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
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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading