WIP Version catalog + Devex fixes

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ILIYANGERMANOV

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,7 +4,6 @@ Please check if your pull request fulfills the following requirements:
 - [ ] I've read the **[Contribution Guidelines](https://github.com/Ivy-Apps/ivy-wallet/blob/main/CONTRIBUTING.md)**.
 - [ ] The code builds and is tested on a real Android device.
 - [ ] I confirm that I've run the code locally and everything works as expected.
-- [ ] Request a review from **@ILIYANGERMANOV**.
 
 _Put an `x` in the boxes that apply._
 - [x] Demo: Checking checkbox using `[x]`

.github/workflows/apk.yml

@@ -4,6 +4,8 @@ on:
   # Triggers the workflow on push or pull request events
   push:
 
+  pull_request:
+
 jobs:
   assemble_demo_apk:
     runs-on: ubuntu-latest

.github/workflows/lint.yml

@@ -5,6 +5,8 @@ on:
   # Triggers the workflow on push or pull request events
   push:
 
+  pull_request:
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   lint:

.github/workflows/test.yml

@@ -5,6 +5,8 @@ on:
   # Triggers the workflow on push or pull request events
   push:
 
+  pull_request:
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   test:

app/build.gradle.kts

@@ -150,6 +150,8 @@ dependencies {
     implementation(libs.bundles.compose)
     implementation(libs.bundles.glance)
     implementation(libs.bundles.activity)
+    implementation(libs.bundles.google)
+    implementation(libs.bundles.firebase)
     implementation(libs.datastore)
     implementation(libs.androidx.security)
     implementation(libs.androidx.biometrics)

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

@@ -85,13 +85,6 @@ object AppModuleDI {
         return RestClient.initialize(appContext, ivySession, gson)
     }
 
-    @Provides
-    fun provideFCMClient(
-        sharedPrefs: SharedPrefs
-    ): FCMClient {
-        return FCMClient(sharedPrefs)
-    }
-
     @Provides
     @Singleton
     fun provideIvyRoomDatabase(

app/src/main/java/com/ivy/wallet/ui/onboarding/viewmodel/OnboardingViewModel.kt

@@ -13,13 +13,16 @@ import com.ivy.wallet.domain.data.IvyCurrency
 import com.ivy.wallet.domain.data.core.Account
 import com.ivy.wallet.domain.data.core.Category
 import com.ivy.wallet.domain.data.core.Settings
-import com.ivy.wallet.domain.deprecated.logic.*
+import com.ivy.wallet.domain.deprecated.logic.AccountCreator
+import com.ivy.wallet.domain.deprecated.logic.CategoryCreator
+import com.ivy.wallet.domain.deprecated.logic.LogoutLogic
+import com.ivy.wallet.domain.deprecated.logic.PreloadDataLogic
+import com.ivy.wallet.domain.deprecated.logic.WalletAccountLogic
 import com.ivy.wallet.domain.deprecated.logic.currency.ExchangeRatesLogic
 import com.ivy.wallet.domain.deprecated.logic.model.CreateAccountData
 import com.ivy.wallet.domain.deprecated.logic.model.CreateCategoryData
 import com.ivy.wallet.domain.deprecated.logic.notification.TransactionReminderLogic
 import com.ivy.wallet.domain.deprecated.sync.IvySync
-import com.ivy.wallet.io.network.FCMClient
 import com.ivy.wallet.io.network.IvyAnalytics
 import com.ivy.wallet.io.network.IvySession
 import com.ivy.wallet.io.network.RestClient
@@ -48,7 +51,6 @@ class OnboardingViewModel @Inject constructor(
     private val accountDao: AccountDao,
     private val settingsDao: SettingsDao,
     private val restClient: RestClient,
-    private val fcmClient: FCMClient,
     private val session: IvySession,
     private val accountLogic: WalletAccountLogic,
     private val categoryCreator: CategoryCreator,
@@ -188,10 +190,11 @@ class OnboardingViewModel @Inject constructor(
     private suspend fun loginWithGoogleOnServer(idToken: String) {
         TestIdlingResource.increment()
 
+        // TODO: Delete this legacy code
         val authResponse = restClient.authService.googleSignIn(
             GoogleSignInRequest(
                 googleIdToken = idToken,
-                fcmToken = fcmClient.fcmToken()
+                fcmToken = ""
             )
         )
 

app/src/main/java/com/ivy/wallet/ui/settings/SettingsViewModel.kt

@@ -18,7 +18,6 @@ import com.ivy.wallet.domain.deprecated.logic.csv.ExportCSVLogic
 import com.ivy.wallet.domain.deprecated.logic.currency.ExchangeRatesLogic
 import com.ivy.wallet.domain.deprecated.logic.zip.BackupLogic
 import com.ivy.wallet.domain.deprecated.sync.IvySync
-import com.ivy.wallet.io.network.FCMClient
 import com.ivy.wallet.io.network.IvyAnalytics
 import com.ivy.wallet.io.network.IvySession
 import com.ivy.wallet.io.network.RestClient
@@ -55,7 +54,6 @@ class SettingsViewModel @Inject constructor(
     private val ivySync: IvySync,
     private val exportCSVLogic: ExportCSVLogic,
     private val restClient: RestClient,
-    private val fcmClient: FCMClient,
     private val ivyAnalytics: IvyAnalytics,
     private val exchangeRatesLogic: ExchangeRatesLogic,
     private val logoutLogic: LogoutLogic,
@@ -285,7 +283,7 @@ class SettingsViewModel @Inject constructor(
                         val authResponse = restClient.authService.googleSignIn(
                             GoogleSignInRequest(
                                 googleIdToken = idToken,
-                                fcmToken = fcmClient.fcmToken()
+                                fcmToken = ""
                             )
                         )
 

buildSrc/src/main/java/com/ivy/wallet/buildsrc/dependencies.kt

@@ -58,8 +58,6 @@ fun DependencyHandler.appModuleDependencies(
 
 //    Compose(version = GlobalVersions.compose)
 
-    Google()
-    Firebase()
 
     Hilt(
         hiltVersion = "2.47",
@@ -92,27 +90,6 @@ fun DependencyHandler.ivyDesignModuleDependencies(
 }
 //---------------------------------------------------------------------------------
 
-fun DependencyHandler.DataStore() {
-    implementation("androidx.datastore:datastore-preferences:1.0.0")
-}
-
-fun DependencyHandler.Google() {
-    //URL: https://mvnrepository.com/artifact/com.google.android.gms/play-services-auth
-    implementation("com.google.android.gms:play-services-auth:19.2.0")
-
-    //URL: https://developer.android.com/google/play/billing/getting-ready
-    implementation("com.android.billingclient:billing-ktx:6.0.1")
-
-    //In-App Reviews SDK
-    implementation("com.google.android.play:core:1.10.0")
-    implementation("com.google.android.play:core-ktx:1.8.1")
-}
-
-fun DependencyHandler.Firebase() {
-    implementation("com.google.firebase:firebase-crashlytics:17.3.0")
-    implementation("com.google.firebase:firebase-analytics:18.0.0")
-    implementation("com.google.firebase:firebase-messaging:21.0.0")
-}
 
 /**
  * Hilt DI

gradle/libs.versions.toml

@@ -17,6 +17,11 @@ androidx-security = "1.0.0"
 androidx-activity = "1.8.0-alpha07"
 appcompat-activity = "1.7.0-alpha03"
 androidx-biometrics = "1.2.0-alpha05"
+google-playservices-auth = "20.7.0"
+google-billing = "6.0.1"
+google-play-core = "1.10.0"
+google-play-core-ktx = "1.8.1"
+firebase-crashlytics = "17.3.0"
 
 [libraries]
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
@@ -58,6 +63,11 @@ androidx-security = { module = "androidx.security:security-crypto", version.ref
 androidx-biometrics = { module = "androidx.biometric:biometric", version.ref = "androidx-biometrics" }
 androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 appcompat-activity = { module = "androidx.appcompat:appcompat", version.ref = "appcompat-activity" }
+google-playservices-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "google-playservices-auth" }
+google-billing = { module = "com.android.billingclient:billing-ktx", version.ref = "google-billing" }
+google-play-core = { module = "com.google.android.play:core", version.ref = "google-play-core" }
+google-play-core-ktx = { module = "com.google.android.play:core-ktx", version.ref = "google-play-core-ktx" }
+firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "firebase-crashlytics" }
 
 [bundles]
 kotlin = [
@@ -110,6 +120,15 @@ glance = [
     "glance-appwidget",
     "glance-material3"
 ]
+google = [
+    "google-playservices-auth",
+    "google-billing",
+    "google-play-core",
+    "google-play-core-ktx"
+]
+firebase = [
+    "firebase-crashlytics"
+]
 
 [plugins]
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }