Merge pull request #5 from mutukuian/presentation-layer

customized the addincome sources
mutukuian · Sep 22, 2023 · a4709e5 · a4709e5
2 parents 6260366 + 7842d9e
commit a4709e5
Show file tree

Hide file tree

Showing 22 changed files with 690 additions and 10 deletions.
diff --git a/app/src/main/java/budgetTracker/app/presentation/home_screen/HomeScreen.kt b/app/src/main/java/budgetTracker/app/presentation/home_screen/HomeScreen.kt
@@ -99,17 +99,20 @@ fun HomeScreen(
                             transaction = dailyTransaction,
                             onItemClick = {
                                 val trxType = dailyTransaction.transactionType
-                                if (trxType == TransactionType.INCOME.title)
+                                if (trxType == TransactionType.EXPENSE.title)
                                     navController.navigate(
                                         "${Screen.TransactionScreen.route}/0?trxPos=${pos}&trxStatus=${0}"
                                     )
-                                else
+                                else{
                                     navController.navigate(
-                                        "${Screen.TransactionScreen.route}/1?trxPos=${pos}&trxStatus=${0}"
+                                        "${Screen.TransactionIncomeScreen.route}/1?trxPos=${pos}&trxStatus=${1}"
                                     )
+                                }
+
                             }
                         )
                     }
+
                 }
             }
 
@@ -154,17 +157,20 @@ fun HomeScreen(
                                 transaction = transaction,
                                 onItemClick = {
                                     val trxType = transaction.transactionType
-                                    if (trxType == TransactionType.INCOME.title)
+                                    if (trxType == TransactionType.EXPENSE.title)
                                         navController.navigate(
-                                            "${Screen.TransactionScreen.route}/0?trxKey=${date}&trxPos=${pos}&trxStatus=${1}"
+                                            "${Screen.TransactionScreen.route}/0?trxKey=${date}&trxPos=${pos}&trxStatus=${0}"
                                         )
-                                    else
+                                    else{
                                         navController.navigate(
-                                            "${Screen.TransactionScreen.route}/1?trxKey=${date}&trxPos=${pos}&trxStatus=${1}"
+                                            "${Screen.TransactionIncomeScreen.route}/1?trxPos=${pos}&trxStatus=${1}"
                                         )
+                                    }
+
                                 }
                             )
                         }
+
                     }
                 }
             }

diff --git a/app/src/main/java/budgetTracker/app/presentation/home_screen/HomeViewModel.kt b/app/src/main/java/budgetTracker/app/presentation/home_screen/HomeViewModel.kt
@@ -24,6 +24,7 @@ import budgetTracker.app.domain.use_case.write_database.InsertAccountsUseCase
 import budgetTracker.app.domain.use_case.write_database.InsertNewTransactionUseCase
 import budgetTracker.app.presentation.ui.theme.businessBg
 import budgetTracker.app.presentation.ui.theme.clothBg
+import budgetTracker.app.presentation.ui.theme.corporationBg
 import budgetTracker.app.presentation.ui.theme.electricBg
 import budgetTracker.app.presentation.ui.theme.food_drink
 import budgetTracker.app.presentation.ui.theme.gadgetBg
@@ -34,6 +35,7 @@ import budgetTracker.app.presentation.ui.theme.homeBg
 import budgetTracker.app.presentation.ui.theme.leisureBg
 import budgetTracker.app.presentation.ui.theme.miscBg
 import budgetTracker.app.presentation.ui.theme.petBg
+import budgetTracker.app.presentation.ui.theme.salary
 import budgetTracker.app.presentation.ui.theme.schBg
 import budgetTracker.app.presentation.ui.theme.snackBg
 import budgetTracker.app.presentation.ui.theme.subBg
@@ -51,7 +53,8 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.text.DecimalFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
 import javax.inject.Inject
 
 
@@ -82,6 +85,7 @@ class HomeViewModel @Inject constructor(
         private set
 
     var category = MutableStateFlow(Category.FOOD_DRINK)
+    var incomeCategory = MutableStateFlow(IncomeCategory.SALARY)
         private set
 
     var account = MutableStateFlow(Account.CASH)
@@ -216,6 +220,9 @@ class HomeViewModel @Inject constructor(
     fun selectCategory(category: Category) {
         this.category.value = category
     }
+    fun selectIncomeCategory(incomeCategory: IncomeCategory) {
+        this.incomeCategory.value = incomeCategory
+    }
 
     fun selectAccount(account: Account) {
         this.account.value = account
@@ -480,6 +487,8 @@ enum class Category(
     val colorRes: Color = Color.White
 ) {
     FOOD_DRINK("Food & Drink", R.drawable.drink, food_drink, Color.Black),
+    TAXES("Taxes", R.drawable.baseline_money_off_24, miscBg),
+    HOUSE_HELP("House Help", R.drawable.baseline_help_24, miscBg),
     CLOTHING("Clothing", R.drawable.clothing, clothBg, Color.Black),
     HOME("Home", R.drawable.home, homeBg, Color.Black),
     HEALTH("Health", R.drawable.health, healthBg),
@@ -497,4 +506,21 @@ enum class Category(
     SNACK("Snack", R.drawable.snack, snackBg, Color.Black),
     GIFT("Gift", R.drawable.gift, giftBg, Color.Black),
     MISC("Miscellaneous", R.drawable.misc, miscBg)
+
+}
+
+
+enum class IncomeCategory(
+    val title: String,
+    val iconRes: Int,
+    val bgRes: Color,
+    val colorRes: Color = Color.White
+
+){
+    SALARY("Salary", R.drawable.baseline_attach_money_24, salary, Color.Black),
+    BUSINESS("Business", R.drawable.business, businessBg, Color.Black),
+    OVERTIME_PAY("OverTime Pay", R.drawable.baseline_more_time_24, homeBg, Color.Black),
+    CORPORATIONS("Corporations", R.drawable.baseline_organisation_24, corporationBg),
+    LIMITED_LIABILITY_COMPANIES("Limited Liability Companies", R.drawable.baseline_factory_24, healthBg),
+    OTHERS("Others", R.drawable.misc, healthBg),
 }