Prepping new feature: persisting data in database

Nnamodi · Jul 18, 2024 · 293da80 · 293da80
1 parent f3e03ba
commit 293da80
Show file tree

Hide file tree

Showing 85 changed files with 1,031 additions and 189 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -73,6 +73,8 @@ dependencies {
 	implementation(libs.koin.core)
 
 	// other modules
+	implementation(project(path = ":domain"))
+	implementation(project(path = ":localDataSource"))
 	implementation(project(path = ":remoteDataSource"))
 
 	// test

diff --git a/app/src/main/java/com/roland/android/destore/DeStoreApp.kt b/app/src/main/java/com/roland/android/destore/DeStoreApp.kt
@@ -5,6 +5,8 @@ import com.roland.android.destore.ui.screen.cart.CartViewModel
 import com.roland.android.destore.ui.screen.details.DetailsViewModel
 import com.roland.android.destore.ui.screen.home.HomeViewModel
 import com.roland.android.destore.ui.screen.list.ListViewModel
+import com.roland.android.domain.di.DomainModule.domainModule
+import com.roland.android.localdatasource.di.PersistenceModule.persistenceModule
 import com.roland.android.remotedatasource.di.NetworkModule.remoteDataModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
@@ -20,7 +22,12 @@ class DeStoreApp : Application() {
 		startKoin {
 			androidContext(this@DeStoreApp)
 			androidLogger(Level.INFO)
-			modules(appModule, remoteDataModule)
+			modules(
+				appModule,
+				domainModule,
+				persistenceModule,
+				remoteDataModule
+			)
 		}
 	}
 

diff --git a/app/src/main/java/com/roland/android/destore/data/GlobalData.kt b/app/src/main/java/com/roland/android/destore/data/GlobalData.kt
@@ -1,7 +1,7 @@
 package com.roland.android.destore.data
 
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Item
 import kotlinx.coroutines.flow.MutableStateFlow
 
 val cartItemsFlow: MutableStateFlow<List<CartItem>> = MutableStateFlow(emptyList())

diff --git a/app/src/main/java/com/roland/android/destore/ui/components/Items.kt b/app/src/main/java/com/roland/android/destore/ui/components/Items.kt
@@ -46,8 +46,8 @@ import com.roland.android.destore.R
 import com.roland.android.destore.utils.Extensions.getColor
 import com.roland.android.destore.utils.Extensions.round
 import com.roland.android.destore.utils.painterPlaceholder
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Item
 import com.roland.android.remotedatasource.utils.Constant.BASE_IMAGE_URL
 
 typealias ItemId = String

diff --git a/app/src/main/java/com/roland/android/destore/ui/components/Lists.kt b/app/src/main/java/com/roland/android/destore/ui/components/Lists.kt
@@ -44,12 +44,12 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.roland.android.destore.R
-import com.roland.android.destore.data.UserInfo
+import com.roland.android.domain.data.UserInfo
 import com.roland.android.destore.ui.theme.SkyBlue
 import com.roland.android.destore.utils.Extensions.round
 import com.roland.android.destore.utils.Extensions.transformList
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Item
 import kotlinx.coroutines.launch
 
 @Composable

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/CommonScreen.kt b/app/src/main/java/com/roland/android/destore/ui/screen/CommonScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.dp
 import com.roland.android.remotedatasource.utils.Constant.errorMessage
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.State
 
 @Composable
 fun <T: Any>CommonScreen(

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/ProductsViewModel.kt b/app/src/main/java/com/roland/android/destore/ui/screen/ProductsViewModel.kt
diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartActions.kt b/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartActions.kt
@@ -1,6 +1,6 @@
 package com.roland.android.destore.ui.screen.cart
 
-import com.roland.android.remotedatasource.usecase.data.CartItem
+import com.roland.android.domain.data.CartItem
 
 sealed class CartActions {
 

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartScreen.kt b/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartScreen.kt
@@ -15,7 +15,7 @@ import com.roland.android.destore.ui.navigation.Screens
 import com.roland.android.destore.ui.screen.EmptyScreen
 import com.roland.android.destore.ui.theme.DeStoreTheme
 import com.roland.android.destore.utils.Extensions.round
-import com.roland.android.remotedatasource.usecase.data.CartItem
+import com.roland.android.domain.data.CartItem
 
 @Composable
 fun CartScreen(
@@ -64,7 +64,12 @@ fun CartScreen(
 @Composable
 private fun CartScreenPreview() {
 	DeStoreTheme {
-		val uiState = CartUiState(listOf(CartItem(), CartItem(), CartItem(), CartItem()))
+		val uiState = CartUiState(listOf(
+			CartItem(),
+			CartItem(),
+			CartItem(),
+			CartItem()
+		))
 		CartScreen(uiState, {}) {}
 	}
 }
diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartUiState.kt b/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartUiState.kt
@@ -1,6 +1,6 @@
 package com.roland.android.destore.ui.screen.cart
 
-import com.roland.android.remotedatasource.usecase.data.CartItem
+import com.roland.android.domain.data.CartItem
 
 data class CartUiState(
 	val cartItems: List<CartItem> = emptyList()

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartViewModel.kt b/app/src/main/java/com/roland/android/destore/ui/screen/cart/CartViewModel.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.viewModelScope
 import com.roland.android.destore.data.cartItemsFlow
 import com.roland.android.destore.ui.screen.checkout.CheckoutUiState
 import com.roland.android.destore.utils.Extensions.filterCartItems
-import com.roland.android.remotedatasource.usecase.data.CartItem
+import com.roland.android.domain.data.CartItem
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/checkout/CheckoutScreen.kt b/app/src/main/java/com/roland/android/destore/ui/screen/checkout/CheckoutScreen.kt
@@ -14,7 +14,7 @@ import com.roland.android.destore.ui.navigation.AppRoute
 import com.roland.android.destore.ui.navigation.Screens
 import com.roland.android.destore.ui.screen.cart.CartActions
 import com.roland.android.destore.ui.theme.DeStoreTheme
-import com.roland.android.remotedatasource.usecase.data.CartItem
+import com.roland.android.domain.data.CartItem
 
 @Composable
 fun CheckoutScreen(
@@ -55,7 +55,12 @@ fun CheckoutScreen(
 @Composable
 private fun CheckoutScreenPreview() {
 	DeStoreTheme {
-		val uiState = CheckoutUiState(listOf(CartItem(), CartItem(), CartItem(), CartItem()))
+		val uiState = CheckoutUiState(listOf(
+			CartItem(),
+			CartItem(),
+			CartItem(),
+			CartItem()
+		))
 		CheckoutScreen(uiState, {}) {}
 	}
 }
diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/checkout/CheckoutUiState.kt b/app/src/main/java/com/roland/android/destore/ui/screen/checkout/CheckoutUiState.kt
@@ -1,7 +1,7 @@
 package com.roland.android.destore.ui.screen.checkout
 
-import com.roland.android.destore.data.UserInfo
-import com.roland.android.remotedatasource.usecase.data.CartItem
+import com.roland.android.domain.data.UserInfo
+import com.roland.android.domain.data.CartItem
 
 data class CheckoutUiState(
 	val cartItems: List<CartItem> = emptyList(),

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsActions.kt b/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsActions.kt
@@ -1,6 +1,6 @@
 package com.roland.android.destore.ui.screen.details
 
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.data.Item
 
 sealed class DetailsActions {
 

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsScreen.kt b/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsScreen.kt
@@ -69,8 +69,8 @@ import com.roland.android.destore.ui.theme.DeStoreTheme
 import com.roland.android.destore.ui.theme.Grey
 import com.roland.android.destore.ui.theme.SkyBlue
 import com.roland.android.destore.utils.Extensions.toItem
-import com.roland.android.remotedatasource.usecase.data.ItemDetails
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.ItemDetails
+import com.roland.android.domain.data.State
 import kotlinx.coroutines.launch
 import kotlin.math.min
 

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsUiState.kt b/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsUiState.kt
@@ -1,8 +1,8 @@
 package com.roland.android.destore.ui.screen.details
 
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.usecase.data.ItemDetails
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.ItemDetails
+import com.roland.android.domain.data.State
 
 data class DetailsUiState(
 	val details: State<ItemDetails>? = null,

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsViewModel.kt b/app/src/main/java/com/roland/android/destore/ui/screen/details/DetailsViewModel.kt
@@ -11,11 +11,11 @@ import com.roland.android.destore.utils.Extensions.filterCartItems
 import com.roland.android.destore.utils.Extensions.toCartItem
 import com.roland.android.destore.utils.ResponseConverter.convertToCategoryData
 import com.roland.android.destore.utils.ResponseConverter.convertToDetailsData
-import com.roland.android.remotedatasource.usecase.GetCategoryUseCase
-import com.roland.android.remotedatasource.usecase.GetProductUseCase
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.usecase.GetCategoryUseCase
+import com.roland.android.domain.usecase.GetProductUseCase
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.State
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeActions.kt b/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeActions.kt
@@ -1,6 +1,6 @@
 package com.roland.android.destore.ui.screen.home
 
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.data.Item
 
 sealed class HomeActions {
 

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeScreen.kt
@@ -72,13 +72,13 @@ import com.roland.android.destore.ui.theme.Red
 import com.roland.android.destore.ui.theme.SkyBlue
 import com.roland.android.destore.utils.Extensions.greetings
 import com.roland.android.destore.utils.Extensions.transformList
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.utils.Constant.ADDIDAS_CATEGORY
-import com.roland.android.remotedatasource.utils.Constant.FEATURED_CATEGORY
-import com.roland.android.remotedatasource.utils.Constant.NIKE_CATEGORY
-import com.roland.android.remotedatasource.utils.Constant.REEBOK_CATEGORY
-import com.roland.android.remotedatasource.utils.Constant.TIMBERLAND_CATEGORY
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.Constant.ADDIDAS_CATEGORY
+import com.roland.android.domain.Constant.FEATURED_CATEGORY
+import com.roland.android.domain.Constant.NIKE_CATEGORY
+import com.roland.android.domain.Constant.REEBOK_CATEGORY
+import com.roland.android.domain.Constant.TIMBERLAND_CATEGORY
+import com.roland.android.domain.data.State
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlin.math.absoluteValue

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeUiState.kt b/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeUiState.kt
@@ -1,7 +1,7 @@
 package com.roland.android.destore.ui.screen.home
 
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.State
 
 data class HomeUiState(
 	val data: State<HomeDataModel>? = null,

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeViewModel.kt b/app/src/main/java/com/roland/android/destore/ui/screen/home/HomeViewModel.kt
@@ -11,9 +11,9 @@ import com.roland.android.destore.ui.components.Colors
 import com.roland.android.destore.ui.screen.details.Sizes
 import com.roland.android.destore.utils.Extensions.toCartItem
 import com.roland.android.destore.utils.ResponseConverter.convertToHomeData
-import com.roland.android.remotedatasource.usecase.GetProductsUseCase
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.usecase.GetProductsUseCase
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Item
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/list/ListActions.kt b/app/src/main/java/com/roland/android/destore/ui/screen/list/ListActions.kt
@@ -1,6 +1,6 @@
 package com.roland.android.destore.ui.screen.list
 
-import com.roland.android.remotedatasource.usecase.data.Item
+import com.roland.android.domain.data.Item
 
 sealed class ListActions {
 

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/list/ListScreen.kt b/app/src/main/java/com/roland/android/destore/ui/screen/list/ListScreen.kt
@@ -18,7 +18,7 @@ import com.roland.android.destore.ui.screen.LoadingScreen
 import com.roland.android.destore.ui.screen.details.Sizes
 import com.roland.android.destore.ui.screen.list.ListActions.Favorite
 import com.roland.android.destore.ui.theme.DeStoreTheme
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.State
 
 @Composable
 fun ListScreen(

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/list/ListUiState.kt b/app/src/main/java/com/roland/android/destore/ui/screen/list/ListUiState.kt
@@ -1,7 +1,7 @@
 package com.roland.android.destore.ui.screen.list
 
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.State
 
 data class ListUiState(
 	val data: State<List<Item>>? = null,

diff --git a/app/src/main/java/com/roland/android/destore/ui/screen/list/ListViewModel.kt b/app/src/main/java/com/roland/android/destore/ui/screen/list/ListViewModel.kt
@@ -9,10 +9,10 @@ import com.roland.android.destore.data.cartItemsFlow
 import com.roland.android.destore.data.favoriteItemsFlow
 import com.roland.android.destore.utils.Extensions.toCartItem
 import com.roland.android.destore.utils.ResponseConverter.convertToCategoryData
-import com.roland.android.remotedatasource.usecase.GetCategoryUseCase
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.usecase.GetCategoryUseCase
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.State
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update

diff --git a/app/src/main/java/com/roland/android/destore/utils/Extensions.kt b/app/src/main/java/com/roland/android/destore/utils/Extensions.kt
@@ -3,10 +3,10 @@ package com.roland.android.destore.utils
 import android.content.Context
 import com.roland.android.destore.R
 import com.roland.android.destore.ui.components.Colors
-import com.roland.android.remotedatasource.usecase.data.CartItem
-import com.roland.android.remotedatasource.usecase.data.Category
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.usecase.data.ItemDetails
+import com.roland.android.domain.data.CartItem
+import com.roland.android.domain.data.Category
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.ItemDetails
 import java.math.BigDecimal
 import java.math.RoundingMode
 import java.util.Calendar
@@ -34,13 +34,15 @@ object Extensions {
 		return Colors.valueOf(color?.name ?: Colors.ColorBlue.name)
 	}
 
-	fun ItemDetails.toItem(price: String) = Item(
-		id = id,
-		name = name,
-		photos = photos,
-		currentPrice = price,
-		category = categories.firstOrNull() ?: Category(name = "Generic")
-	)
+	fun ItemDetails.toItem(price: String) =
+		Item(
+			id = id,
+			name = name,
+			photos = photos,
+			currentPrice = price,
+			category = categories.firstOrNull()
+				?: Category(name = "Generic")
+		)
 
 	fun Item.toCartItem(
 		color: Long,

diff --git a/app/src/main/java/com/roland/android/destore/utils/ResponseConverter.kt b/app/src/main/java/com/roland/android/destore/utils/ResponseConverter.kt
@@ -1,12 +1,12 @@
 package com.roland.android.destore.utils
 
 import com.roland.android.destore.ui.screen.home.HomeDataModel
-import com.roland.android.remotedatasource.usecase.GetCategoryUseCase
-import com.roland.android.remotedatasource.usecase.GetProductUseCase
-import com.roland.android.remotedatasource.usecase.GetProductsUseCase
-import com.roland.android.remotedatasource.usecase.data.Item
-import com.roland.android.remotedatasource.usecase.data.ItemDetails
-import com.roland.android.remotedatasource.utils.State
+import com.roland.android.domain.usecase.GetCategoryUseCase
+import com.roland.android.domain.usecase.GetProductUseCase
+import com.roland.android.domain.usecase.GetProductsUseCase
+import com.roland.android.domain.data.Item
+import com.roland.android.domain.data.ItemDetails
+import com.roland.android.domain.data.State
 
 object ResponseConverter {