Merge branch 'main' into enhancement-108-creator-view-page-1

app/build.gradle

@@ -56,6 +56,7 @@ dependencies {
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     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/java/com/example/belindas_closet/Routes.kt

@@ -13,4 +13,6 @@ sealed class Routes (val route: String) {
     object IndividualProductUpdatePage: Routes("Individual_Product_Update")
     object AdminView: Routes("Admin_View")
     object CreatorView: Routes("Creator_View")
+    object EditUserRole: Routes("Edit User Role")
+    object DonationInfo: Routes("Donation_Info")
 }

app/src/main/java/com/example/belindas_closet/data/Datasource.kt

@@ -8,9 +8,13 @@ import com.example.belindas_closet.model.ProductSizePantsWaist
 import com.example.belindas_closet.model.ProductSizeShoes
 import com.example.belindas_closet.model.ProductSizes
 import com.example.belindas_closet.model.ProductType
+import com.example.belindas_closet.model.User
+import com.example.belindas_closet.model.UserRole
 
 class Datasource {
     private val productList = mutableListOf<Product>()
+    private val userList = mutableListOf<User>()
+
 
     init {
         productList.add(
@@ -195,9 +199,72 @@ class Datasource {
                 "9"
             )
         )
+
+    }
+    init {
+
+        // Adding Users to UserList
+        userList.add(
+            User(
+                userFirstName = "John",
+                userLastName = "Smith",
+                userEmail = "[email protected]",
+                UserRole.ADMIN,
+                userId = "1"
+            )
+        )
+        userList.add(
+            User(
+                userFirstName = "Alex",
+                userLastName = "Brown",
+                userEmail = "[email protected]",
+                UserRole.STANDARD,
+                userId = "2"
+            )
+        )
+        userList.add(
+            User(
+                userFirstName = "Jason",
+                userLastName = "Ni",
+                userEmail = "[email protected]",
+                UserRole.ADMIN,
+                userId = "3"
+            )
+        )
+        userList.add(
+            User(
+                userFirstName = "Kim",
+                userLastName = "Johnson",
+                userEmail = "[email protected]",
+                UserRole.ADMIN,
+                userId = "4"
+            )
+        )
+        userList.add(
+            User(
+                userFirstName = "Ellen",
+                userLastName = "Jones",
+                userEmail = "[email protected]",
+                UserRole.STANDARD,
+                userId = "5"
+            )
+        )
+        userList.add(
+            User(
+                userFirstName = "Taylor",
+                userLastName = "Wright",
+                userEmail = "[email protected]",
+                UserRole.STANDARD,
+                userId = "6"
+            )
+        )
     }
 
     fun loadProducts(): List<Product> {
         return productList
     }
+
+    fun loadUsers(): List<User> {
+        return userList
+    }
 }

app/src/main/java/com/example/belindas_closet/model/User.kt

@@ -0,0 +1,42 @@
+package com.example.belindas_closet.model
+
+import android.view.View
+import com.example.belindas_closet.R
+
+// saving template of product variables in case of editing user variables similarly
+enum class UserRole(val userType: String) {
+    ADMIN("Admin"), STANDARD("Standard")
+}
+//
+//// Shoes sizes
+//enum class UserLastName(val size: Int?) {
+//    SELECT_SIZE(null), XS(5), S(6), M(7), L(8), XL(9), XXL(10), XXXL(11), XXXXL(12)
+//}
+//
+//// General product sizes
+//enum class UserEmail {
+//    SELECT_SIZE, XXS, XS, S, M, L, XL, XXL, XXXL, XXXXL
+//}
+//
+//// productSizePantsWaist is nullable because not all products have a waist size
+//enum class UserRole(val size: Int?) {
+//    SELECT_SIZE(null), XS(28), S(30), M(32), L(34), XL(36), XXL(38), XXXL(40), XXXXL(42)
+//}
+
+
+data class User(
+    val userFirstName: String,
+    val userLastName: String,
+    val userEmail: String,
+    val userRole: UserRole,
+    val userId: String = "0"
+) {
+    companion object {
+        const val userFirstName: String = "User First Name"
+        const val userLastName: String = "User Last Name"
+        const val userEmail: String = "[email protected]"
+        val userRole: UserRole = UserRole.STANDARD
+        val userId: String ="00"
+    }
+}
+