Develop (#2644)

* WIP: Get rid of `Gson` and restructure `:ivy-core`

* Fix build errors caused by the `:ivy-core` restructure

* Move `Constants` from `:ivy-core` to `temp-legacy-code`

* Fix the KotlinxSerialization gradle setup

* WIP: Configure KotlinxSerialization

* WIP: Configure KotlinxSerialization

* KotlinxSerialization seems working

* Remove the Gson dependency

* Get rid of DangerJS

* Fix Detekt errors

* Re-structure `:ivy-core`

* Add a simple `IvyFeatures` API to turn on/off user settings

* Add empty `:ivy-core-ui` module

* WIP: Features screen

* Fix Detekt errors

.github/workflows/apk.yml

@@ -54,11 +54,3 @@ jobs:
                -F "reply_to_message_id=16118" \
                -F "caption=$CAPTION" \
                https://api.telegram.org/bot${{ secrets.BOTFATHER_TELEGRAM_BOT_TOKEN }}/sendDocument
-
-      - name: Comment APK on the PR with Danger
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-        uses: danger/danger-js@11.2.8
-        with:
-          args: "--dangerfile .danger/danger_apk.ts"
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.IVYWALLET_BOT_GITHUB_PAT }}

.github/workflows/detekt.yml

@@ -50,13 +50,4 @@ jobs:
         with:
           name: detekt-report.html
           path: build/reports/detekt/detekt.html
-      #------------------------------------------------------------------
-
-      - name: Comment Detekt results on the PR with Danger
-        if: (success() || failure()) && (github.event.pull_request.head.repo.full_name == github.repository)
-        uses: danger/danger-js@11.2.8
-        with:
-          args: "--dangerfile .danger/danger_detekt.ts"
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.IVYWALLET_BOT_GITHUB_PAT }}
-
+      #------------------------------------------------------------------

app/build.gradle.kts

@@ -153,6 +153,7 @@ dependencies {
     implementation(projects.screenSearch)
     implementation(projects.screenTest)
     implementation(projects.screenBalance)
+    implementation(projects.screenFeatures)
 
     implementation(libs.bundles.kotlin)
     implementation(libs.bundles.ktor)
@@ -165,8 +166,6 @@ dependencies {
     implementation(libs.androidx.security)
     implementation(libs.androidx.biometrics)
 
-    implementation(libs.gson)
-
     implementation(libs.bundles.hilt)
     kapt(libs.hilt.compiler)
 

app/proguard-rules.pro

@@ -9,12 +9,6 @@
 -dontwarn com.google.errorprone.**
 -dontwarn org.slf4j.impl.**
 
-# Json serialization (GSON fixes)
--keepattributes Signature
--keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
--keep class com.google.gson.** { *; }
-
 # Keep inherited services.
 -if interface * { @retrofit2.http.* <methods>; }
 -keep,allowobfuscation interface * extends <1>
@@ -26,14 +20,4 @@
 
 # R8 full mode strips generic signatures from return types if not kept.
 -if interface * { @retrofit2.http.* public *** *(...); }
--keep,allowoptimization,allowshrinking,allowobfuscation class <3>
-
-# If a class is used in some way by the application, and has fields annotated with @SerializedName
-# and a no-args constructor, keep those fields and the constructor
-# Based on https://issuetracker.google.com/issues/150189783#comment11
-# See also https://github.com/google/gson/pull/2420#discussion_r1241813541 for a more detailed explanation
--if class *
--keepclasseswithmembers,allowobfuscation,allowoptimization class <1> {
-  <init>();
-  @com.google.gson.annotations.SerializedName <fields>;
-}
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>

app/src/main/java/com/ivy/IvyNavGraph.kt

@@ -8,6 +8,7 @@ import com.ivy.balance.BalanceScreen
 import com.ivy.budgets.BudgetScreen
 import com.ivy.categories.CategoriesScreen
 import com.ivy.exchangerates.ExchangeRatesScreen
+import com.ivy.features.FeaturesScreenImpl
 import com.ivy.importdata.csv.CSVScreen
 import com.ivy.importdata.csvimport.ImportCSVScreen
 import com.ivy.loans.loan.LoansScreen
@@ -19,6 +20,7 @@ import com.ivy.navigation.CategoriesScreen
 import com.ivy.navigation.EditPlannedScreen
 import com.ivy.navigation.EditTransactionScreen
 import com.ivy.navigation.ExchangeRatesScreen
+import com.ivy.navigation.FeaturesScreen
 import com.ivy.navigation.ImportScreen
 import com.ivy.navigation.ItemStatisticScreen
 import com.ivy.navigation.LoanDetailsScreen
@@ -49,6 +51,9 @@ import com.ivy.wallet.ui.main.MainScreen
 @Composable
 fun BoxWithConstraintsScope.IvyNavGraph(screen: Screen?) {
     when (screen) {
+        null -> {
+            // show nothing
+        }
         is MainScreen -> MainScreen(screen = screen)
         is OnboardingScreen -> OnboardingScreen(screen = screen)
         is ExchangeRatesScreen -> ExchangeRatesScreen()
@@ -68,7 +73,6 @@ fun BoxWithConstraintsScope.IvyNavGraph(screen: Screen?) {
         is LoanDetailsScreen -> LoanDetailsScreen(screen = screen)
         is SearchScreen -> SearchScreen(screen = screen)
         is CSVScreen -> CSVScreen(screen = screen)
-        null -> {
-        }
+        FeaturesScreen -> FeaturesScreenImpl()
     }
 }

app/src/main/java/com/ivy/wallet/IvyAppStarter.kt

@@ -3,7 +3,7 @@ package com.ivy.wallet
 import android.content.Context
 import android.content.Intent
 import com.ivy.core.AppStarter
-import com.ivy.core.data.db.entity.TransactionType
+import com.ivy.core.db.entity.TransactionType
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 

app/src/main/java/com/ivy/wallet/RootActivity.kt

@@ -39,7 +39,7 @@ import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
 import com.google.android.play.core.review.ReviewManagerFactory
 import com.ivy.IvyNavGraph
-import com.ivy.core.Constants
+import com.ivy.legacy.Constants
 import com.ivy.core.RootScreen
 import com.ivy.core.util.toEpochMilli
 import com.ivy.design.api.IvyUI

app/src/main/java/com/ivy/wallet/RootViewModel.kt

@@ -4,8 +4,8 @@ import android.content.Intent
 import androidx.biometric.BiometricPrompt
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.ivy.core.data.db.entity.TransactionType
-import com.ivy.core.data.db.read.SettingsDao
+import com.ivy.core.db.entity.TransactionType
+import com.ivy.core.db.read.SettingsDao
 import com.ivy.core.util.stringRes
 import com.ivy.design.l0_system.Theme
 import com.ivy.frp.test.TestIdlingResource

app/src/main/java/com/ivy/wallet/di/AppModuleBindings.kt → app/src/main/java/com/ivy/wallet/di/AppBindingsModule.kt

@@ -9,7 +9,7 @@ import dagger.hilt.components.SingletonComponent
 
 @Module
 @InstallIn(SingletonComponent::class)
-abstract class AppModuleBindings {
+abstract class AppBindingsModule {
     @Binds
     abstract fun appStarter(appStarter: IvyAppStarter): AppStarter
 }

app/src/main/java/com/ivy/wallet/migrations/MigrationsManager.kt

@@ -3,7 +3,7 @@ package com.ivy.wallet.migrations
 import android.content.Context
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
-import com.ivy.core.data.dataStore
+import com.ivy.core.datastore.dataStore
 import com.ivy.wallet.migrations.impl.DisableGitHubAutoBackupMigration
 import dagger.Lazy
 import dagger.hilt.android.qualifiers.ApplicationContext

app/src/main/java/com/ivy/wallet/migrations/impl/DisableGitHubAutoBackupMigration.kt

@@ -3,8 +3,8 @@ package com.ivy.wallet.migrations.impl
 import android.content.Context
 import androidx.datastore.preferences.core.edit
 import androidx.work.WorkManager
-import com.ivy.core.data.DatastoreKeys
-import com.ivy.core.data.dataStore
+import com.ivy.core.datastore.DatastoreKeys
+import com.ivy.core.datastore.dataStore
 import com.ivy.wallet.migrations.Migration
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject

app/src/main/java/com/ivy/wallet/ui/main/MainScreen.kt

@@ -20,7 +20,7 @@ import com.ivy.home.HomeTab
 import com.ivy.navigation.EditPlannedScreen
 import com.ivy.navigation.EditTransactionScreen
 import com.ivy.navigation.MainScreen
-import com.ivy.core.data.db.entity.TransactionType
+import com.ivy.core.db.entity.TransactionType
 import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData
 import com.ivy.wallet.ui.theme.modal.edit.AccountModal
 import com.ivy.wallet.ui.theme.modal.edit.AccountModalData

app/src/main/java/com/ivy/wallet/ui/main/MainViewModel.kt

@@ -3,7 +3,7 @@ package com.ivy.wallet.ui.main
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.ivy.core.data.db.read.SettingsDao
+import com.ivy.core.db.read.SettingsDao
 import com.ivy.core.event.AccountUpdatedEvent
 import com.ivy.core.event.EventBus
 import com.ivy.frp.test.TestIdlingResource

buildSrc/src/main/kotlin/ivy.module.gradle.kts

@@ -1,10 +1,11 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("kotlin-kapt") // TODO: Remove
+    id("kotlin-kapt") // TODO: Remove when we migrate to KSP
     id("org.jetbrains.kotlin.android")
     id("dagger.hilt.android.plugin")
     id("com.google.devtools.ksp")
+    id("org.jetbrains.kotlin.plugin.serialization")
 }
 
 kotlin {
@@ -53,6 +54,8 @@ dependencies {
     // TODO: Migrate to KSP when supported
     kapt(catalog.library("hilt-compiler"))
 
+    implementation(catalog.library("kotlinx-serialization-json"))
+
     testImplementation(libs.bundles.kotest)
     testImplementation(catalog.bundle("kotlin-test"))
     testImplementation(catalog.library("hilt-testing"))