HellBus1 · HellBus1 · Feb 8, 2026 · Sep 19, 2025 · Sep 19, 2025 · Sep 19, 2025
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,27 +1,34 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'com.google.dagger.hilt.android'
     id 'kotlin-kapt'
     id 'kotlin-parcelize'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.10'
     id 'org.jetbrains.kotlin.plugin.compose' version '2.2.10'
+}
 
-    // disabled for internal purpose (if you want to enable, you must create firebase project first)
-//    id 'com.google.gms.google-services'
-//    id 'com.google.firebase.crashlytics'
-//    id 'com.google.firebase.firebase-perf'
+// Apply Google Services and Crashlytics only if google-services.json exists
+if (file('google-services.json').exists()) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
+    println 'Google Services and Crashlytics plugins applied'
+} else {
+    println 'google-services.json not found. Skipping Google Services and Crashlytics plugins'
 }
 
 android {
     namespace 'com.digiventure.ventnote'
-    compileSdk 36
+    compileSdk = 36
 
     defaultConfig {
         applicationId "com.digiventure.ventnote"
         minSdk 23
-        targetSdk 36
-        versionCode 42
-        versionName "1.1.0"
+        targetSdk = 36
+        versionCode 46
+        versionName "1.2.0"
 
         testInstrumentationRunner "com.digiventure.utils.CustomTestRunner"
         vectorDrawables {
@@ -38,23 +45,31 @@ android {
     buildTypes {
         release {
             minifyEnabled true
+            shrinkResources true
             debuggable false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField "boolean", "ENABLE_CRASHLYTICS", "true"
         }
         debug {
             minifyEnabled false
+            shrinkResources false
+            debuggable true
             signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField "boolean", "ENABLE_CRASHLYTICS", "false"
         }
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled true
     }
 
-    kotlinOptions {
-        jvmTarget = '17'
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -66,124 +81,127 @@ android {
         kotlinCompilerExtensionVersion '1.5.15'
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
 
     packaging {
         resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-            excludes += 'META-INF/*'
+            excludes.add('/META-INF/{AL2.0,LGPL2.1}')
+            excludes.add('META-INF/DEPENDENCIES')
+            excludes.add('META-INF/LICENSE')
+            excludes.add('META-INF/LICENSE.txt')
+            excludes.add('META-INF/license.txt')
+            excludes.add('META-INF/NOTICE')
+            excludes.add('META-INF/NOTICE.txt')
+            excludes.add('META-INF/notice.txt')
+            excludes.add('META-INF/ASL2.0')
+            excludes.add('META-INF/*.kotlin_module')
+            excludes.add('META-INF/services/org.jetbrains.kotlin.*')
         }
     }
 
     lint {
         abortOnError false
     }
+
+    sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+    }
 }
 
 
 dependencies {
-    implementation "androidx.core:core-ktx:1.17.0"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.9.2"
+    implementation "androidx.core:core-ktx:$core_ktx_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_ktx_version"
 
-    implementation "androidx.activity:activity-compose:1.10.1"
+    implementation "androidx.activity:activity-compose:$activity_compose_version"
 
     // Jetpack Compose
-    implementation "androidx.compose.runtime:runtime-livedata:1.9.0"
-    implementation "androidx.compose.ui:ui:1.9.0"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.9.0"
+    implementation "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version"
+    implementation "androidx.compose.ui:ui:$jetpack_compose_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"
 
-    implementation "androidx.compose.material3:material3:1.3.2"
+    implementation "androidx.compose.material3:material3:$material3_version"
 
     // Lifecycle Livedata
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_ktx_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_ktx_version"
 
-    implementation "androidx.compose.compiler:compiler:1.5.15"
-    implementation 'androidx.test.ext:junit-ktx:1.3.0'
+    implementation "androidx.compose.compiler:compiler:$compose_compiler_version"
 
     // Room
-    def room_version = "2.7.0"
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     androidTestImplementation "androidx.room:room-testing:$room_version"
 
     // Datastore
-    implementation("androidx.datastore:datastore-preferences:1.1.7")
+    implementation "androidx.datastore:datastore-preferences:$datastore_preference_version"
 
     // Compose Navigation
-    implementation "androidx.navigation:navigation-compose:2.9.3"
+    implementation "androidx.navigation:navigation-compose:$navigation_compose_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0"
 
     // Coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
-
-    // Unit test
-    testImplementation "junit:junit:4.13.2"
-    androidTestImplementation "androidx.test.ext:junit:1.3.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     // Hilt
-    def dagger_version = "2.56.2"
     implementation "com.google.dagger:hilt-android:$dagger_version"
     kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
-    implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
-
-    // Material Icon Extension
-    implementation "androidx.compose.material:material-icons-extended:1.7.8"
+    implementation "androidx.hilt:hilt-navigation-compose:$hilt_navigation_compose_version"
 
     // So, make sure you also include that repository in your project's build.gradle file.
-    implementation("com.google.android.play:app-update:2.1.0")
+    implementation "com.google.android.play:app-update:$play_app_update_version"
     // For Kotlin users also import the Kotlin extensions library for Play In-App Update:
-    implementation("com.google.android.play:app-update-ktx:2.1.0")
+    implementation "com.google.android.play:app-update-ktx:$play_app_update_version"
 
     // Google Play API
-    implementation "com.google.android.gms:play-services-auth:21.4.0"
+    implementation "com.google.android.gms:play-services-auth:$play_services_auth_version"
 
     // Accompanist - Status Bar
-    implementation "com.google.accompanist:accompanist-systemuicontroller:0.36.0"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:$systemuicontroller_version"
+
+    // Unit test
+    testImplementation "junit:junit:$junit_version"
 
     // Instrumented test
     /// Espresso (for ui interaction purpose)
-    androidTestImplementation "androidx.test:runner:1.7.0"
-    androidTestImplementation "androidx.test:rules:1.7.0"
-    androidTestImplementation "androidx.test.espresso:espresso-intents:3.7.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
+    androidTestImplementation "androidx.test:runner:$test_version"
+    androidTestImplementation "androidx.test:rules:$test_version"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$test_espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$test_espresso_version"
 
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.9.0"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.9.0"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.9.0"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_test_version"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_test_version"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_test_version"
 
     /// Hilt test (for handling service locator when test)
     androidTestImplementation "com.google.dagger:hilt-android-testing:$dagger_version"
     kaptAndroidTest "com.google.dagger:hilt-android-compiler:$dagger_version"
 
     // For mocking purposes & make it visible in instrumented test
-    testImplementation "org.mockito.kotlin:mockito-kotlin:6.0.0"
-    testImplementation "org.mockito:mockito-inline:5.2.0"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockito_version"
+    testImplementation "org.mockito:mockito-inline:$mockito_inline_version"
 
-    androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
+    androidTestImplementation "androidx.test.ext:junit-ktx:$junit_ktx_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0"
 
-    testImplementation "androidx.arch.core:core-testing:2.2.0"
+    testImplementation "androidx.arch.core:core-testing:$core_testing_version"
 
     // For unit testing coroutines
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
 
     // Import the Firebase BoM
-    implementation platform("com.google.firebase:firebase-bom:34.1.0")
+    implementation platform("com.google.firebase:firebase-bom:$firebase_bom_version")
     // When using the BoM, you don't specify versions in Firebase library dependencies
     // Add the dependency for the Firebase SDK for Google Analytics
-    implementation "com.google.firebase:firebase-analytics"
-    implementation "com.google.firebase:firebase-crashlytics:20.0.0"
-    implementation "com.google.firebase:firebase-perf-ktx:21.0.5"
-
-    //Google sign in
-    implementation "com.google.android.gms:play-services-auth:21.4.0"
+    implementation "com.google.firebase:firebase-crashlytics"
 
     //Google Drive API
-    implementation "com.google.http-client:google-http-client-gson:2.0.0"
-    implementation "com.google.apis:google-api-services-drive:v3-rev136-1.25.0"
-    implementation "com.google.api-client:google-api-client-android:2.8.1"
+    implementation "com.google.http-client:google-http-client-gson:$http_client_gson_version"
+    implementation "com.google.apis:google-api-services-drive:$google_drive_service_version"
+    implementation "com.google.api-client:google-api-client-android:$google_api_client_version"
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 }
 
 kapt {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -54,30 +54,13 @@
    void traceEventEnd();
 }
 
-# Google Play Services Auth
--keep class com.google.android.gms.auth.** { *; }
--keep class com.google.android.gms.common.** { *; }
--keep class com.google.api.client.** { *; }
--keep class com.google.oauth.client.** { *; }
--keep class com.google.http.client.** { *; }
--keep class com.google.api.client.json.** { *; }
--keep class com.google.api.client.http.** { *; }
--keep class com.google.api.client.googleapis.** { *; }
-
-# Google Drive API
--keep class com.google.api.services.drive.** { *; }
--keep class com.google.api.client.googleapis.services.** { *; }
-
-# Google API Client for Android
--keep class com.google.api.client.googleapis.extensions.android.** { *; }
--keep class com.google.api.client.extensions.android.** { *; }
-
-# Keep all classes related to Google Auth API
--keep class com.google.api.services.** { *; }
--keep class com.google.auth.** { *; }
--keep class com.google.api.client.auth.** { *; }
--keep class com.google.http.client.auth.** { *; }
--keep class com.google.oauth.client.auth.** { *; }
+# Google API Client & Auth (Targeted)
+-keep class * extends com.google.api.client.json.GenericJson { *; }
+-keep class com.google.api.client.util.** { *; }
+
+# Google Drive API Models
+-keep class com.google.api.services.drive.model.** { *; }
+-keep class com.google.api.services.drive.Drive$Files$** { *; }
 
 -keep class com.google.android.gms.auth.api.signin.GoogleSignInClient {
     *;
@@ -98,8 +81,8 @@
   @com.google.api.client.util.Value *;
 }
 
-# Room database
--keep class androidx.room.** { *; }
+# Room database (Targeted)
+# -keep class androidx.room.** { *; } # Broad rule removed
 -keep class * extends androidx.room.RoomDatabase {
     <init>(...);
 }
@@ -125,13 +108,7 @@
 # If NoteModel has inner classes, keep them too
 -keep class com.digiventure.ventnote.data.persistence.NoteModel$* { *; }
 
-# Keep the GoogleDriveService class and all its methods
--keep class com.digiventure.ventnote.data.google_drive.GoogleDriveService { *; }
-
-# Prevent obfuscation of the DatabaseProxy class as it is used within GoogleDriveService
--keep class com.digiventure.ventnote.module.proxy.DatabaseProxy { *; }
 
--keep class com.digiventure.ventnote.feature.backup.viewmodel.AuthVM
 
 # Keep any classes that are used in Gson serialization
 -keep class * implements com.google.gson.TypeAdapterFactory