Изменение структуры проекта

app/src/main/java/com/example/shawarma/MainActivity.kt

@@ -3,16 +3,9 @@ package com.example.shawarma
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
+import com.example.shawarma.ui.screens.MainNavBar
-import androidx.compose.material.Surface
-import androidx.compose.ui.Modifier
-import com.example.shawarma.screens.MainNavBar
-import com.example.shawarma.screens.authorization.AuthorizationScreen
-import com.example.shawarma.screens.registration.RegistrationScreen
-import com.example.shawarma.ui.theme.MyLightYellow
-import com.example.shawarma.ui.theme.ShawarmaTheme
 import dagger.hilt.android.AndroidEntryPoint
-import dagger.hilt.android.HiltAndroidApp
+
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/example/shawarma/data/api/mediators/OrderRemoteMediator.kt

@@ -9,8 +9,8 @@ import com.example.shawarma.data.api.MyServerService
 import com.example.shawarma.data.api.models.OrderListResponse
 import com.example.shawarma.data.api.models.toOrderModel
 import com.example.shawarma.data.db.AppDatabase
-import com.example.shawarma.data.models.OrderModel
+import com.example.shawarma.data.db.models.OrderModel
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import java.io.IOException
 
 @OptIn(ExperimentalPagingApi::class)

app/src/main/java/com/example/shawarma/data/api/mediators/ProductRemoteMediator.kt

@@ -9,7 +9,7 @@ import com.example.shawarma.data.api.MyServerService
 import com.example.shawarma.data.api.models.ProductListResponse
 import com.example.shawarma.data.api.models.toProductModel
 import com.example.shawarma.data.db.AppDatabase
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import kotlinx.coroutines.flow.first
 import java.io.IOException
 

app/src/main/java/com/example/shawarma/data/api/models/OrderModelRemote.kt

@@ -1,7 +1,7 @@
 package com.example.shawarma.data.api.models
 
-import com.example.shawarma.data.models.OrderModel
+import com.example.shawarma.data.db.models.OrderModel
-import com.example.shawarma.data.models.OrderProductModel
+import com.example.shawarma.data.db.models.OrderProductModel
 import kotlinx.serialization.Serializable
 
 @Serializable

app/src/main/java/com/example/shawarma/data/api/models/ProductModelRemote.kt

@@ -1,6 +1,6 @@
 package com.example.shawarma.data.api.models
 
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import kotlinx.serialization.Serializable
 
 @Serializable

app/src/main/java/com/example/shawarma/data/api/models/UserModelRemote.kt

@@ -1,6 +1,6 @@
 package com.example.shawarma.data.api.models
 
-import com.example.shawarma.data.models.UserModel
+import com.example.shawarma.data.db.models.UserModel
 import kotlinx.serialization.Serializable
 
 @Serializable

app/src/main/java/com/example/shawarma/data/api/repos/RestProductRepository.kt

@@ -3,7 +3,7 @@ package com.example.shawarma.data.api.repos
 import com.example.shawarma.data.api.MyServerService
 import com.example.shawarma.data.api.models.ProductModelRemote
 import com.example.shawarma.data.api.models.toProductModelRemote
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import javax.inject.Inject
 
 class RestProductRepository @Inject constructor(

app/src/main/java/com/example/shawarma/data/api/repos/RestUserRepository.kt

@@ -4,7 +4,7 @@ import com.example.shawarma.data.api.MyServerService
 import com.example.shawarma.data.api.models.TokenModelRemote
 import com.example.shawarma.data.api.models.UserModelRemote
 import com.example.shawarma.data.api.models.toUserModelRemote
-import com.example.shawarma.data.models.UserModel
+import com.example.shawarma.data.db.models.UserModel
 import javax.inject.Inject
 
 class RestUserRepository @Inject constructor(

app/src/main/java/com/example/shawarma/data/db/AppDatabase.kt

@@ -7,14 +7,14 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.example.shawarma.data.interfaces.dao.OrderDao
+import com.example.shawarma.data.db.dao.OrderDao
-import com.example.shawarma.data.interfaces.dao.OrderProductDao
+import com.example.shawarma.data.db.dao.OrderProductDao
-import com.example.shawarma.data.interfaces.dao.ProductDao
+import com.example.shawarma.data.db.dao.ProductDao
-import com.example.shawarma.data.interfaces.dao.UserDao
+import com.example.shawarma.data.db.dao.UserDao
-import com.example.shawarma.data.models.OrderModel
+import com.example.shawarma.data.db.models.OrderModel
-import com.example.shawarma.data.models.OrderProductModel
+import com.example.shawarma.data.db.models.OrderProductModel
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
-import com.example.shawarma.data.models.UserModel
+import com.example.shawarma.data.db.models.UserModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/example/shawarma/data/db/dao/OrderDao.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.interfaces.dao
+package com.example.shawarma.data.db.dao
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
@@ -7,8 +7,8 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
 import androidx.room.Update
-import com.example.shawarma.data.models.OrderModel
+import com.example.shawarma.data.db.models.OrderModel
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import kotlinx.coroutines.flow.Flow
 @Dao
 interface OrderDao {

app/src/main/java/com/example/shawarma/data/db/dao/OrderProductDao.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.interfaces.dao
+package com.example.shawarma.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -6,7 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
 import androidx.room.Update
-import com.example.shawarma.data.models.OrderProductModel
+import com.example.shawarma.data.db.models.OrderProductModel
 @Dao
 interface OrderProductDao {
     @Insert(onConflict = REPLACE)

app/src/main/java/com/example/shawarma/data/db/dao/ProductDao.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.interfaces.dao
+package com.example.shawarma.data.db.dao
 
 import androidx.paging.PagingSource
 import androidx.room.Dao
@@ -7,7 +7,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
 import androidx.room.Update
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import kotlinx.coroutines.flow.Flow
 
 @Dao

app/src/main/java/com/example/shawarma/data/db/dao/UserDao.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.interfaces.dao
+package com.example.shawarma.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -6,7 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.ABORT
 import androidx.room.Query
 import androidx.room.Update
-import com.example.shawarma.data.models.UserModel
+import com.example.shawarma.data.db.models.UserModel
 import kotlinx.coroutines.flow.Flow
 
 @Dao

app/src/main/java/com/example/shawarma/data/db/models/OrderModel.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/example/shawarma/data/db/models/OrderProductModel.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/example/shawarma/data/db/models/OrderProductModelWithProduct.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 import androidx.room.Embedded
 import androidx.room.Relation
@@ -9,4 +9,4 @@ data class OrderProductModelWithProduct(
     @Relation(entity = ProductModel::class, parentColumn = "product_id", entityColumn = "id")
     val product: ProductModel?,
 
-)
+    )

app/src/main/java/com/example/shawarma/data/db/models/OrderWithProducts.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 import androidx.room.Embedded
 import androidx.room.Relation

app/src/main/java/com/example/shawarma/data/db/models/ProductModel.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/example/shawarma/data/db/models/Status.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 enum class OrderStatus {
     Неоплачено, Готовится, Готово, Выдано

app/src/main/java/com/example/shawarma/data/db/models/UserModel.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.data.models
+package com.example.shawarma.data.db.models
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/example/shawarma/data/repos/OrderProductRepository.kt

@@ -2,8 +2,8 @@ package com.example.shawarma.data.repos
 
 import com.example.shawarma.data.api.models.toOrderProductRemote
 import com.example.shawarma.data.api.repos.RestOrderProductRepository
-import com.example.shawarma.data.interfaces.dao.OrderProductDao
+import com.example.shawarma.data.db.dao.OrderProductDao
-import com.example.shawarma.data.models.OrderProductModel
+import com.example.shawarma.data.db.models.OrderProductModel
 import javax.inject.Inject
 
 class OrderProductRepository @Inject constructor(

app/src/main/java/com/example/shawarma/data/repos/OrderRepository.kt

@@ -11,11 +11,11 @@ import com.example.shawarma.data.api.models.toOrderModelRemote
 import com.example.shawarma.data.api.models.toOrderProductModel
 import com.example.shawarma.data.api.repos.RestOrderRepository
 import com.example.shawarma.data.db.AppDatabase
-import com.example.shawarma.data.interfaces.dao.OrderDao
+import com.example.shawarma.data.db.dao.OrderDao
-import com.example.shawarma.data.interfaces.dao.OrderProductDao
+import com.example.shawarma.data.db.dao.OrderProductDao
-import com.example.shawarma.data.interfaces.dao.ProductDao
+import com.example.shawarma.data.db.dao.ProductDao
-import com.example.shawarma.data.models.OrderModel
+import com.example.shawarma.data.db.models.OrderModel
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
@@ -35,7 +35,7 @@ class OrderRepository @Inject constructor(
         }
         return result.toOrderModel()
     }
-    suspend fun update(token: String, order:OrderModel) {
+    suspend fun update(token: String, order: OrderModel) {
         orderDao.update(order)
         restRepository.updateOrder(token, order.toOrderModelRemote())
     }

app/src/main/java/com/example/shawarma/data/repos/ProductRepository.kt

@@ -9,8 +9,8 @@ import com.example.shawarma.data.api.mediators.ProductRemoteMediator
 import com.example.shawarma.data.api.models.ProductModelRemote
 import com.example.shawarma.data.api.repos.RestProductRepository
 import com.example.shawarma.data.db.AppDatabase
-import com.example.shawarma.data.interfaces.dao.ProductDao
+import com.example.shawarma.data.db.dao.ProductDao
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 

app/src/main/java/com/example/shawarma/data/repos/UserRepository.kt

@@ -1,7 +1,7 @@
 package com.example.shawarma.data.repos
 
-import com.example.shawarma.data.interfaces.dao.UserDao
+import com.example.shawarma.data.db.dao.UserDao
-import com.example.shawarma.data.models.UserModel
+import com.example.shawarma.data.db.models.UserModel
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 

app/src/main/java/com/example/shawarma/ui/screens/MainNavBar.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens
+package com.example.shawarma.ui.screens
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,18 +12,18 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
-import com.example.shawarma.screens.authorization.AuthorizationScreen
+import com.example.shawarma.ui.screens.authorization.AuthorizationScreen
-import com.example.shawarma.screens.cart.CartScreen
+import com.example.shawarma.ui.screens.cart.CartScreen
-import com.example.shawarma.screens.discount.DiscountScreen
+import com.example.shawarma.ui.screens.discount.DiscountScreen
-import com.example.shawarma.screens.home.HomeScreen
+import com.example.shawarma.ui.screens.home.HomeScreen
-import com.example.shawarma.screens.orders.OrdersScreen
+import com.example.shawarma.ui.screens.orders.OrdersScreen
-import com.example.shawarma.screens.products.ProductScreen
+import com.example.shawarma.ui.screens.products.ProductScreen
-import com.example.shawarma.screens.products.ProductsAnalysis
+import com.example.shawarma.ui.screens.products.ProductsAnalysis
-import com.example.shawarma.screens.products.ProductsScreen
+import com.example.shawarma.ui.screens.products.ProductsScreen
-import com.example.shawarma.screens.registration.RegistrationScreen
+import com.example.shawarma.ui.screens.registration.RegistrationScreen
 import com.example.shawarma.ui.theme.MyLightYellow
-import com.example.shawarma.utils.ScreenPaths
+import com.example.shawarma.ui.utils.ScreenPaths
-import com.example.shawarma.widgets.BottomNavBar
+import com.example.shawarma.ui.widgets.BottomNavBar
 
 @SuppressLint("UnusedMaterialScaffoldPaddingParameter")
 @Composable

app/src/main/java/com/example/shawarma/ui/screens/authorization/AuthorizationScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.authorization
+package com.example.shawarma.ui.screens.authorization
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -37,10 +37,10 @@ import com.example.shawarma.data.sharedpref.PreferencesManager
 import com.example.shawarma.ui.theme.JejuFamily
 import com.example.shawarma.ui.theme.MyLightRed
 import com.example.shawarma.ui.theme.NunitoFamily
-import com.example.shawarma.utils.ScreenPaths
+import com.example.shawarma.ui.utils.ScreenPaths
 import com.example.shawarma.viewmodels.UserViewModel
-import com.example.shawarma.widgets.MyTextField
+import com.example.shawarma.ui.widgets.MyTextField
-import com.example.shawarma.widgets.ShawarmaLogo1
+import com.example.shawarma.ui.widgets.ShawarmaLogo1
 
 @Composable
 fun AuthorizationScreen(navHostController: NavHostController) {

app/src/main/java/com/example/shawarma/ui/screens/cart/CartScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.cart
+package com.example.shawarma.ui.screens.cart
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -38,7 +38,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.paging.compose.collectAsLazyPagingItems
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import com.example.shawarma.data.sharedpref.PreferencesManager
 import com.example.shawarma.ui.theme.MarckFamily
 import com.example.shawarma.ui.theme.MyLightYellow
@@ -46,7 +46,7 @@ import com.example.shawarma.ui.theme.MyMainBackground
 import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.NunitoFamily
 import com.example.shawarma.viewmodels.CartViewModel
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun CartScreen() {

app/src/main/java/com/example/shawarma/ui/screens/discount/DiscountScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.discount
+package com.example.shawarma.ui.screens.discount
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -35,7 +35,7 @@ import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.example.shawarma.R
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import com.example.shawarma.data.sharedpref.PreferencesManager
 import com.example.shawarma.ui.theme.MarckFamily
 import com.example.shawarma.ui.theme.MyLightYellow
@@ -44,7 +44,7 @@ import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.MyPriceBackground
 import com.example.shawarma.ui.theme.NunitoFamily
 import com.example.shawarma.viewmodels.HomeViewModel
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun DiscountScreen() {

app/src/main/java/com/example/shawarma/ui/screens/home/HomeScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.home
+package com.example.shawarma.ui.screens.home
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -35,7 +35,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.example.shawarma.R
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import com.example.shawarma.data.sharedpref.PreferencesManager
 import com.example.shawarma.ui.theme.MarckFamily
 import com.example.shawarma.ui.theme.MyLightYellow
@@ -44,7 +44,7 @@ import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.MyPriceBackground
 import com.example.shawarma.ui.theme.NunitoFamily
 import com.example.shawarma.viewmodels.HomeViewModel
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun HomeScreen() {

app/src/main/java/com/example/shawarma/ui/screens/orders/OrdersScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.orders
+package com.example.shawarma.ui.screens.orders
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -36,8 +36,8 @@ import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.example.shawarma.R
-import com.example.shawarma.data.models.OrderStatus
+import com.example.shawarma.data.db.models.OrderStatus
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import com.example.shawarma.data.sharedpref.PreferencesManager
 import com.example.shawarma.ui.theme.MarckFamily
 import com.example.shawarma.ui.theme.MyLightRed
@@ -46,7 +46,7 @@ import com.example.shawarma.ui.theme.MyMainBackground
 import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.NunitoFamily
 import com.example.shawarma.viewmodels.OrdersViewModel
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun OrdersScreen() {

app/src/main/java/com/example/shawarma/ui/screens/products/ProductScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.products
+package com.example.shawarma.ui.screens.products
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -34,10 +34,10 @@ import com.example.shawarma.ui.theme.MyLightYellow
 import com.example.shawarma.ui.theme.MyMainBackground
 import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.NunitoFamily
-import com.example.shawarma.utils.ScreenPaths
+import com.example.shawarma.ui.utils.ScreenPaths
 import com.example.shawarma.viewmodels.ProductViewModel
-import com.example.shawarma.widgets.MyTextField
+import com.example.shawarma.ui.widgets.MyTextField
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun ProductScreen(navHostController: NavHostController, productId: Int?) {

app/src/main/java/com/example/shawarma/ui/screens/products/ProductsAnalysis.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.products
+package com.example.shawarma.ui.screens.products
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -39,7 +39,7 @@ import com.example.shawarma.ui.theme.MyMainBackground
 import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.NunitoFamily
 import com.example.shawarma.viewmodels.ProductsViewModel
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun ProductsAnalysis() {

app/src/main/java/com/example/shawarma/ui/screens/products/ProductsScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.products
+package com.example.shawarma.ui.screens.products
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
@@ -36,7 +36,7 @@ import androidx.navigation.NavHostController
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.example.shawarma.R
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import com.example.shawarma.data.sharedpref.PreferencesManager
 import com.example.shawarma.ui.theme.MarckFamily
 import com.example.shawarma.ui.theme.MyLightRed
@@ -44,9 +44,9 @@ import com.example.shawarma.ui.theme.MyLightYellow
 import com.example.shawarma.ui.theme.MyMainBackground
 import com.example.shawarma.ui.theme.MyOrange
 import com.example.shawarma.ui.theme.NunitoFamily
-import com.example.shawarma.utils.ScreenPaths
+import com.example.shawarma.ui.utils.ScreenPaths
 import com.example.shawarma.viewmodels.ProductsViewModel
-import com.example.shawarma.widgets.ShawarmaLogo2
+import com.example.shawarma.ui.widgets.ShawarmaLogo2
 
 @Composable
 fun ProductsScreen(navHostController: NavHostController) {

app/src/main/java/com/example/shawarma/ui/screens/registration/RegistrationScreen.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.screens.registration
+package com.example.shawarma.ui.screens.registration
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -35,10 +35,10 @@ import androidx.navigation.NavHostController
 import com.example.shawarma.ui.theme.JejuFamily
 import com.example.shawarma.ui.theme.MyLightRed
 import com.example.shawarma.ui.theme.NunitoFamily
-import com.example.shawarma.utils.ScreenPaths
+import com.example.shawarma.ui.utils.ScreenPaths
 import com.example.shawarma.viewmodels.UserViewModel
-import com.example.shawarma.widgets.MyTextField
+import com.example.shawarma.ui.widgets.MyTextField
-import com.example.shawarma.widgets.ShawarmaLogo1
+import com.example.shawarma.ui.widgets.ShawarmaLogo1
 
 @Composable
 fun RegistrationScreen(navHostController: NavHostController) {

app/src/main/java/com/example/shawarma/ui/utils/BottomNavItem.kt

@@ -1,12 +1,12 @@
-package com.example.shawarma.utils
+package com.example.shawarma.ui.utils
 
 import com.example.shawarma.R
 
 sealed class BottomNavItem(var title:String, var icon:Int, var screen_route:String) {
-    object Home : BottomNavItem("Home", R.drawable.home_icon,ScreenPaths.home.name)
+    object Home : BottomNavItem("Home", R.drawable.home_icon, ScreenPaths.home.name)
-    object Discount : BottomNavItem("Discount", R.drawable.discount_icon,ScreenPaths.discount.name)
+    object Discount : BottomNavItem("Discount", R.drawable.discount_icon, ScreenPaths.discount.name)
-    object Cart : BottomNavItem("Cart", R.drawable.cart_icon,ScreenPaths.cart.name)
+    object Cart : BottomNavItem("Cart", R.drawable.cart_icon, ScreenPaths.cart.name)
-    object Orders: BottomNavItem("Orders", R.drawable.orders_icon,ScreenPaths.orders.name)
+    object Orders: BottomNavItem("Orders", R.drawable.orders_icon, ScreenPaths.orders.name)
     object Products: BottomNavItem("Products", R.drawable.pen_icon, ScreenPaths.products.name)
 
 }

app/src/main/java/com/example/shawarma/ui/utils/ScreenPaths.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.utils
+package com.example.shawarma.ui.utils
 
 enum class ScreenPaths {
     authorization, registration, home, discount, cart, orders, products, product, analysis

app/src/main/java/com/example/shawarma/ui/widgets/BottomNavBar.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.widgets
+package com.example.shawarma.ui.widgets
 
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import com.example.shawarma.data.sharedpref.PreferencesManager
-import com.example.shawarma.utils.BottomNavItem
+import com.example.shawarma.ui.utils.BottomNavItem
 
 @Composable
 fun BottomNavBar(navController: NavController) {

app/src/main/java/com/example/shawarma/ui/widgets/MyTextField.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.widgets
+package com.example.shawarma.ui.widgets
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text

app/src/main/java/com/example/shawarma/ui/widgets/ShawarmaLogo1.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.widgets
+package com.example.shawarma.ui.widgets
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

app/src/main/java/com/example/shawarma/ui/widgets/ShawarmaLogo2.kt

@@ -1,4 +1,4 @@
-package com.example.shawarma.widgets
+package com.example.shawarma.ui.widgets
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column

app/src/main/java/com/example/shawarma/viewmodels/CartViewModel.kt

@@ -5,8 +5,8 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
-import com.example.shawarma.data.models.OrderStatus
+import com.example.shawarma.data.db.models.OrderStatus
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import com.example.shawarma.data.repos.OrderProductRepository
 import com.example.shawarma.data.repos.OrderRepository
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/example/shawarma/viewmodels/HomeViewModel.kt

@@ -3,10 +3,10 @@ package com.example.shawarma.viewmodels
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
-import com.example.shawarma.data.models.OrderModel
+import com.example.shawarma.data.db.models.OrderModel
-import com.example.shawarma.data.models.OrderProductModel
+import com.example.shawarma.data.db.models.OrderProductModel
-import com.example.shawarma.data.models.OrderStatus
+import com.example.shawarma.data.db.models.OrderStatus
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import com.example.shawarma.data.repos.OrderProductRepository
 import com.example.shawarma.data.repos.OrderRepository
 import com.example.shawarma.data.repos.ProductRepository

app/src/main/java/com/example/shawarma/viewmodels/OrdersViewModel.kt

@@ -3,7 +3,7 @@ package com.example.shawarma.viewmodels
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
-import com.example.shawarma.data.models.OrderWithProducts
+import com.example.shawarma.data.db.models.OrderWithProducts
 import com.example.shawarma.data.repos.OrderRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow

app/src/main/java/com/example/shawarma/viewmodels/ProductViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import com.example.shawarma.data.repos.ProductRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch

app/src/main/java/com/example/shawarma/viewmodels/ProductsViewModel.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import com.example.shawarma.data.api.models.ProductModelRemote
-import com.example.shawarma.data.models.ProductModel
+import com.example.shawarma.data.db.models.ProductModel
 import com.example.shawarma.data.repos.ProductRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow

app/src/main/java/com/example/shawarma/viewmodels/UserViewModel.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.shawarma.data.api.repos.RestUserRepository
-import com.example.shawarma.data.models.UserModel
+import com.example.shawarma.data.db.models.UserModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch