clientapp: Android: Use hilt and room

Royna2544 · Jul 1, 2024 · 0a516e4 · 0a516e4
1 parent e2db4ba
commit 0a516e4
Show file tree

Hide file tree

Showing 26 changed files with 549 additions and 296 deletions.
diff --git a/clientapp/android/.idea/kotlinc.xml b/clientapp/android/.idea/kotlinc.xml
diff --git a/clientapp/android/.idea/other.xml b/clientapp/android/.idea/other.xml
diff --git a/clientapp/android/app/build.gradle.kts b/clientapp/android/app/build.gradle.kts
@@ -1,8 +1,9 @@
-import java.util.Properties
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.androidx.room)
+    alias(libs.plugins.com.google.devtools.ksp)
+    alias(libs.plugins.com.google.dagger.hilt.android)
 }
 
 android {
@@ -59,6 +60,13 @@ android {
             excludes += "META-INF/LICENSE-notice.md"
         }
     }
+    room {
+        schemaDirectory("$projectDir/schemas")
+    }
+}
+
+ksp {
+    arg("room.generateKotlin", "true")
 }
 
 dependencies {
@@ -73,9 +81,14 @@ dependencies {
     implementation(libs.androidx.preference.ktx)
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.window)
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.hilt)
 
-    testImplementation(libs.junit)
+    ksp(libs.androidx.room.compiler)
+    ksp(libs.hilt.compiler)
 
+    testImplementation(libs.junit)
     androidTestImplementation(libs.junit)
     androidTestImplementation(libs.junit.jupiter)
     androidTestImplementation(libs.androidx.espresso.core)

diff --git a/clientapp/android/app/schemas/com.royna.tgbotclient.datastore.ChatIDDatabase/1.json b/clientapp/android/app/schemas/com.royna.tgbotclient.datastore.ChatIDDatabase/1.json
@@ -0,0 +1,50 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "6780e511c5a2371a71169f6bd0de9e12",
+    "entities": [
+      {
+        "tableName": "ChatIDEntry",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`chat_id` INTEGER NOT NULL, `chat_name` TEXT NOT NULL, PRIMARY KEY(`chat_id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "chat_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "chat_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "chat_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ChatIDEntry_chat_name",
+            "unique": true,
+            "columnNames": [
+              "chat_name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ChatIDEntry_chat_name` ON `${TABLE_NAME}` (`chat_name`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6780e511c5a2371a71169f6bd0de9e12')"
+    ]
+  }
+}
diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/ClientApplication.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/ClientApplication.kt
@@ -2,9 +2,10 @@ package com.royna.tgbotclient
 
 import android.app.Application
 import com.royna.tgbotclient.ui.settings.TgClientSettings
-import com.royna.tgbotclient.util.DeviceUtils
 import com.royna.tgbotclient.util.Logging
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class ClientApplication : Application() {
     override fun onCreate() {
         super.onCreate()

diff --git a/clientapp/android/app/src/main/java/com/royna/tgbotclient/MainActivity.kt b/clientapp/android/app/src/main/java/com/royna/tgbotclient/MainActivity.kt
@@ -21,7 +21,9 @@ import com.royna.tgbotclient.pm.IStoragePermission
 import com.royna.tgbotclient.pm.StoragePermissionPreR
 import com.royna.tgbotclient.pm.StoragePermissionR
 import com.royna.tgbotclient.ui.settings.SettingsActivity
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityMainBinding