From 9f9fd6c615fda17e2e82ac9a3c2237db81753859 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Kuppan Date: Mon, 28 Oct 2024 19:23:19 +0100 Subject: [PATCH] Updating the libs.versions.toml and fixing the transaction type change not changing the category type --- .idea/compiler.xml | 2 +- .../create/TransactionCreateViewModel.kt | 10 +++--- gradle/libs.versions.toml | 32 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index e58d3e42..b86273d9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/feature/transaction/src/main/kotlin/com/naveenapps/expensemanager/feature/transaction/create/TransactionCreateViewModel.kt b/feature/transaction/src/main/kotlin/com/naveenapps/expensemanager/feature/transaction/create/TransactionCreateViewModel.kt index 09e512e7..c665db2f 100644 --- a/feature/transaction/src/main/kotlin/com/naveenapps/expensemanager/feature/transaction/create/TransactionCreateViewModel.kt +++ b/feature/transaction/src/main/kotlin/com/naveenapps/expensemanager/feature/transaction/create/TransactionCreateViewModel.kt @@ -154,7 +154,9 @@ class TransactionCreateViewModel @Inject constructor( combine( transactionType, getAllCategoryUseCase.invoke(), - ) { transactionType, categories -> + settingsRepository.getDefaultIncomeCategory(), + settingsRepository.getDefaultExpenseCategory() + ) { transactionType, categories, defaultIncomeCategory, defaultExpenseCategory -> val filteredCategories = categories.filter { category -> if (transactionType.isIncome()) { category.type.isIncome() @@ -165,11 +167,11 @@ class TransactionCreateViewModel @Inject constructor( val categoryId = when (transactionType) { TransactionType.INCOME -> { - settingsRepository.getDefaultIncomeCategory().firstOrNull() + defaultIncomeCategory } TransactionType.EXPENSE -> { - settingsRepository.getDefaultExpenseCategory().firstOrNull() + defaultExpenseCategory } else -> { @@ -185,7 +187,7 @@ class TransactionCreateViewModel @Inject constructor( selectedCategory = if (transaction != null) { expenseCategory ?: filteredCategories.firstOrNull() ?: defaultCategory } else { - defaultCategory + filteredCategories.firstOrNull() ?: defaultCategory }, categories = filteredCategories ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0cbb193f..617e25f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] accompanist = "0.34.0" androidDesugarJdkLibs = "2.0.4" -androidGradlePlugin = "8.5.2" -androidxActivity = "1.9.2" +androidGradlePlugin = "8.7.1" +androidxActivity = "1.9.3" androidxAppCompat = "1.7.0" androidxMaterial = "1.12.0" androidxBrowser = "1.7.0" -androidxComposeBom = "2024.09.03" +androidxComposeBom = "2024.10.00" androidxComposeCompiler = "1.5.14" -androidxComposeRuntimeTracing = "1.7.3" +androidxComposeRuntimeTracing = "1.7.4" lottieCompose = "6.4.0" material3 = "1.3.0" androidxCore = "1.13.1" @@ -17,10 +17,10 @@ androidxDataStore = "1.1.1" androidxEspresso = "3.6.1" androidxHiltNavigationCompose = "1.2.0" androidxLifecycle = "2.8.6" -androidxMacroBenchmark = "1.3.2" -benchmark = "1.3.2" +androidxMacroBenchmark = "1.3.3" +benchmark = "1.3.3" androidxMetrics = "1.0.0-beta01" -androidxNavigation = "2.8.2" +androidxNavigation = "2.8.3" androidxProfileinstaller = "1.4.1" androidxSplashScreen = "1.0.1" androidxStartup = "1.2.0" @@ -33,13 +33,13 @@ androidxTracing = "1.2.0" androidxUiAutomator = "2.3.0" androidxWindowManager = "1.3.0" androidxWork = "2.9.1" -firebaseBom = "33.4.0" +firebaseBom = "33.5.1" firebaseCrashlyticsPlugin = "3.0.2" firebasePerfPlugin = "1.4.2" firebaseDistribution = "5.0.0" googleOss = "17.1.0" opencsv = "4.6" -review = "2.0.1" +review = "2.0.2" googleOssPlugin = "0.10.6" spotless = "6.23.0" hilt = "2.51.1" @@ -47,21 +47,21 @@ hiltExt = "1.2.0" jacoco = "0.8.12" junit4 = "4.13.2" kotlin = "2.0.0" -kotlinxCoroutines = "1.8.0" +kotlinxCoroutines = "1.8.1" kotlinxDatetime = "0.5.0" kotlinxSerializationJson = "1.6.3" ksp = "2.0.0-1.0.21" -lint = "31.7.0" +lint = "31.7.1" okhttp = "4.12.0" -retrofit = "2.9.0" +retrofit = "2.11.0" retrofitKotlinxSerializationJson = "1.0.0" -robolectric = "4.12.2" +robolectric = "4.13" room = "2.6.1" secrets = "2.0.1" turbine = "1.1.0" ossLicense = "0.10.5" mpcharts = "v3.1.0" -mockito = "4.0.0" +mockito = "5.4.0" jxl = "2.6.12" truth = "1.4.2" vico = "1.11.1" @@ -69,9 +69,9 @@ play-publish = "3.9.1" google-services = "4.4.2" backup-restore = "1.0.0-beta13" baselineprofile = "1.2.2" -gson = "2.10.1" +gson = "2.11.0" dependency-analysis = "1.27.0" -coil = "2.6.0" +coil = "2.7.0" [libraries] accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f644d8a..fcab7c87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Jul 20 22:34:12 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists