Single item screen

app/build.gradle.kts

@@ -75,6 +75,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
     implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.compose.ui:ui-text-google-fonts:1.5.3")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
 
     <application
         android:name=".MyApplication"
+        android:screenOrientation="portrait"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/com/example/mycloset/ApiWorkingSet/ImgDisplay.kt

@@ -4,14 +4,19 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.util.Log
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.InputStream
@@ -29,7 +34,8 @@ class ImgDisplay {
                 bitmap= showImg(url)?.asImageBitmap()
             }
             bitmap?.let { bitmap ->
-                Image(bitmap = bitmap, contentDescription = "downloaded picture")
+                Image(modifier = Modifier.size(300.dp)
+                    .clip(RoundedCornerShape(16.dp)), bitmap = bitmap, contentDescription = "downloaded picture" )
             }
         }
 

app/src/main/java/com/example/mycloset/App/LoginPreviewApp.kt

@@ -1,22 +1,37 @@
 package com.example.mycloset.App
 
+import androidx.camera.view.LifecycleCameraController
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.example.mycloset.AppViewModelProvider
+import com.example.mycloset.BarcodeWorkingSet.CameraScanViewModel
+import com.example.mycloset.DatabaseWorkingset.ProductViewModel
+import com.example.mycloset.Views.HomeScreen
 import com.example.mycloset.Views.LoginScreen
+import com.example.mycloset.Views.MainScreen
+import com.example.mycloset.Views.ProductScanView
 import com.example.mycloset.Views.SignUpScreen
+import com.example.mycloset.Views.SingleItemScreen
+import com.example.mycloset.Views.UpdateSingleItem
 import com.example.mycloset.navigation.LoginAppRouter
 import com.example.mycloset.navigation.Screen
 
+
 @Composable
-fun LoginApp(){
+fun LoginApp(cameraController: LifecycleCameraController){
+    val productViewModel: ProductViewModel = viewModel(factory = AppViewModelProvider.Factory)
+    // ViewModel for handling camera and barcode scanning logic
+    val viewModel: CameraScanViewModel = viewModel(factory = AppViewModelProvider.Factory)
+
     Surface(modifier = Modifier.fillMaxSize(),
         color = Color.White
     ) {
-        Crossfade(targetState = LoginAppRouter.currentScreen) { currentState ->
+        Crossfade(targetState = LoginAppRouter.currentScreen, label = "") { currentState ->
             when(currentState.value){
                 is Screen.SignupScreen ->{
                     SignUpScreen()
@@ -25,10 +40,35 @@ fun LoginApp(){
                     LoginScreen()
                 }
                 is Screen.HomeScreen ->{
-                   //HomeScreen()
+                    HomeScreen(productViewModel)
+                }
+                is Screen.ProductScanView ->{
+                    ProductScanView(
+                        productViewModel,
+                        barcodesFlow = viewModel.barcodesFlow,
+                        cameraController,
+                        torchEnabledFlow = viewModel.torchFlow,
+                        onTorchButtonClicked = {
+                            // Toggle torch status when the button is clicked
+                            cameraController.enableTorch(!viewModel.torchFlow.value)
+                            viewModel.updateTorchEnabled()
+                        }
+                    )
+                }
+                is Screen.MainScreen -> {
+                    MainScreen()
+                }
+
+
+                is Screen.SingleItemScreen ->{
+                    SingleItemScreen(productViewModel)
+                }
+                is Screen.UpdateSingleScreen->{
+                    UpdateSingleItem(productViewModel)
                 }
             }
 
         }
     }
-}
+}
+

app/src/main/java/com/example/mycloset/AppContainer.kt

@@ -1,14 +1,17 @@
 package com.example.mycloset
 
 import android.content.Context
+import com.example.mycloset.DatabaseWorkingset.OfflineProductRepository
 import com.example.mycloset.DatabaseWorkingset.ProductDatabase
+import com.example.mycloset.DatabaseWorkingset.ProductRepository
 
 
 /**
  * App container for Dependency injection.
  */
 interface AppContainer {
     val appDatabase: ProductDatabase
+    val productRepository: ProductRepository
 }
 
 class AppDataContainer(private val context: Context) :
@@ -17,4 +20,7 @@ class AppDataContainer(private val context: Context) :
     override val appDatabase: ProductDatabase by lazy {
         ProductDatabase.getInstance(context)
     }
+        override val productRepository: ProductRepository by lazy {
+            OfflineProductRepository(ProductDatabase.getInstance(context).productDao())
+        }
 }

app/src/main/java/com/example/mycloset/AppViewModelProvider.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory
 import androidx.lifecycle.viewmodel.CreationExtras
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
+import com.example.mycloset.BarcodeWorkingSet.CameraScanViewModel
 import com.example.mycloset.DatabaseWorkingset.ProductViewModel
 
 /**
@@ -14,9 +15,13 @@ object AppViewModelProvider {
     val Factory = viewModelFactory {
         initializer {
             ProductViewModel(
-                productDao = MyApplication().container.appDatabase.productDao()
+                productDao = MyApplication().container.appDatabase.productDao(),
+                productRepository = MyApplication().container.productRepository
             )
         }
+        addInitializer(CameraScanViewModel::class) {
+            CameraScanViewModel()
+        }
     }
 }
 

app/src/main/java/com/example/mycloset/BarcodeModel.kt

@@ -0,0 +1,2 @@
+
+data class BarcodeModel(var barcode: String)

app/src/main/java/com/example/mycloset/BarcodeWorkingSet/BarcodeRepository.kt

@@ -3,7 +3,7 @@ package com.example.mycloset.BarcodeWorkingSet
 import com.example.mycloset.ApiWorkingSet.RetrofitObject
 
 //
-var APY_KEY:String="3nupb3et7t5lbqlhhhspyrh3si1wu0"
+var APY_KEY:String="i4fwimwj7nx49wkp564w68s0xaf04q"
 
 //class for using the barcode-lookup API
 class BarcodeRepository{

app/src/main/java/com/example/mycloset/DatabaseWorkingset/OfflineProductRepository.kt

@@ -0,0 +1,16 @@
+package com.example.mycloset.DatabaseWorkingset
+
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+class OfflineProductRepository(private val productDao: ProductDao) : ProductRepository {
+    override fun getAllProductsWithEmailStream(userEmail: String) = productDao.getProductsWithEmail(userEmail)
+
+    override fun getAllProductWithBarcodeStream(barcodeNumber: String) = productDao.getProductWithBarcode(barcodeNumber)
+
+    override suspend fun updateProductDetailsStream(product: ProductEntity) = productDao.updateProductDetails(product)
+
+    override suspend fun deleteProductStream(barcodeNumber: String) = productDao.deleteProduct(barcodeNumber)
+
+    //override fun getSingleProductStream(barcode:String,userEmail: String)=productDao.getSingleProduct(barcode,userEmail)
+}

app/src/main/java/com/example/mycloset/DatabaseWorkingset/ProductDao.kt

@@ -4,13 +4,29 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.example.mycloset.DatabaseWorkingset.ProductEntity
+import androidx.room.Update
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ProductDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertProduct(product: ProductEntity)
 
+    // Get all products
     @Query("SELECT * FROM products")
-    suspend fun getAllProducts(): List<ProductEntity>
+    fun getAllProducts(): Flow<List<ProductEntity>>
+
+    // Get products of logged in user
+    @Query("SELECT * from products WHERE userEmail = :userEmail")
+    fun getProductsWithEmail(userEmail: String): Flow<List<ProductEntity>>
+
+    @Query("SELECT * from products WHERE barcodeNumber=:barcodeNumber")
+    fun getProductWithBarcode(barcodeNumber: String): Flow<List<ProductEntity>>
+
+    @Update
+    suspend fun updateProductDetails(product: ProductEntity)
+
+    //@Query("DELETE FROM products WHERE barcodeNumber = :barcodeNumber")
+    @Query("DELETE FROM products WHERE barcodeNumber = :barcodeNumber")
+    suspend fun deleteProduct(barcodeNumber: String)
 }

app/src/main/java/com/example/mycloset/DatabaseWorkingset/ProductDatabase.kt

@@ -6,7 +6,7 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 
 
-@Database(entities = [ProductEntity::class], version = 1, exportSchema = false)
+@Database(entities = [ProductEntity::class], version = 3, exportSchema = false)
 abstract class ProductDatabase : RoomDatabase() {
     abstract fun productDao(): ProductDao
 
@@ -26,12 +26,4 @@ abstract class ProductDatabase : RoomDatabase() {
                 .build()
         }
     }
-}
-
-class DatabaseManager(context: Context) {
-    private val database = ProductDatabase.getInstance(context)
-
-    suspend fun insertProduct(product: ProductEntity) {
-        database.productDao().insertProduct(product)
-    }
 }

app/src/main/java/com/example/mycloset/DatabaseWorkingset/ProductEntity.kt

@@ -1,18 +1,17 @@
 package com.example.mycloset.DatabaseWorkingset
 
 import androidx.room.Entity
-import androidx.room.PrimaryKey
 
-@Entity(tableName = "products")
+@Entity(tableName = "products",primaryKeys = ["barcodeNumber", "userEmail"])
 data class ProductEntity(
-    @PrimaryKey val barcodeNumber: String,
+    val barcodeNumber: String,
     val userEmail: String,
-    val model: String,
-    val title: String,
-    val category: String,
-    val brand: String,
-    val color: String,
-    val material: String,
-    val size: String,
+    var model: String,
+    var title: String,
+    var category: String,
+    var brand: String,
+    var color: String,
+    var material: String,
+    var size: String,
     val images: String
 )

app/src/main/java/com/example/mycloset/DatabaseWorkingset/ProductRepository.kt

@@ -0,0 +1,11 @@
+package com.example.mycloset.DatabaseWorkingset
+
+import kotlinx.coroutines.flow.Flow
+
+// Repository that provides insert, update, delete, and retrieve of [Product] from a given data source.
+interface ProductRepository {
+    fun getAllProductsWithEmailStream(userEmail: String): Flow<List<ProductEntity>>
+    fun getAllProductWithBarcodeStream(barcodeNumber: String): Flow<List<ProductEntity>>
+    suspend fun updateProductDetailsStream(product: ProductEntity)
+    suspend fun deleteProductStream(barcodeNumber: String)
+}