Merge pull request #5 from Fandroid745/dev

Add Material UI support and UI improvements

Author: Fandroid745

.idea/caches/deviceStreaming.xml

@@ -1,42 +1,37 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp' version '1.9.23-1.0.20'
     id 'dagger.hilt.android.plugin'
 }
 
 android {
     namespace 'com.opennotes'
     compileSdk 35
-    buildToolsVersion "34.0.0"
 
     defaultConfig {
         applicationId "com.opennotes"
         minSdk 24
         targetSdk 35
-        versionCode 4
-        versionName "1.3"
+        versionCode 5
+        versionName "1.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
 
-
     dependenciesInfo {
-
-        includeInApk = false
-
-        includeInBundle = false
+        includeInApk false
+        includeInBundle false
     }
 
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles(
-                    getDefaultProguardFile('proguard-android-optimize.txt'),
-                    'proguard-rules.pro'
-            )
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -67,44 +62,48 @@ android {
 
 dependencies {
     // Compose BOM
-    implementation platform("androidx.compose:compose-bom:2024.04.00")
-    implementation "androidx.compose.ui:ui"
-    implementation "androidx.compose.material:material"
-    implementation "androidx.compose.material:material-icons-extended"
-    implementation "androidx.compose.ui:ui-tooling-preview"
-    debugImplementation "androidx.compose.ui:ui-tooling"
-    androidTestImplementation platform("androidx.compose:compose-bom:2024.04.00")
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4"
-
-    implementation "androidx.activity:activity-compose:1.8.2"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
-    implementation "androidx.navigation:navigation-compose:2.7.7"
-    implementation "androidx.hilt:hilt-navigation-compose:1.1.0"
+    implementation platform('androidx.compose:compose-bom:2024.04.00')
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.material:material'
+    implementation 'androidx.compose.material:material-icons-extended'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.datastore:datastore-core-android:1.1.7'
+    implementation 'androidx.datastore:datastore-preferences:1.1.1'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.04.00')
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+
+    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
+    implementation 'androidx.navigation:navigation-compose:2.7.7'
+    implementation 'androidx.hilt:hilt-navigation-compose:1.1.0'
 
     // Material 3
-    implementation "androidx.compose.material3:material3:1.2.1"
+    implementation 'androidx.compose.material3:material3:1.2.1'
 
     // Core Android
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.11.0'
 
-    // Hilt
-    implementation "com.google.dagger:hilt-android:2.48"
-    kapt "com.google.dagger:hilt-android-compiler:2.48"
-    kapt "androidx.hilt:hilt-compiler:1.1.0"
+    // Hilt with KSP
+    implementation 'com.google.dagger:hilt-android:2.48'
+    ksp 'com.google.dagger:hilt-android-compiler:2.48'
+    ksp 'androidx.hilt:hilt-compiler:1.1.0'
 
-    // Room
-    implementation "androidx.room:room-runtime:2.6.1"
-    kapt "androidx.room:room-compiler:2.6.1"
-    implementation "androidx.room:room-ktx:2.6.1"
+    // Room with KSP - Compatible with Kotlin 1.9.23
+    implementation 'androidx.room:room-runtime:2.6.1'
+    implementation 'androidx.room:room-ktx:2.6.1'
+    ksp 'androidx.room:room-compiler:2.6.1'
 
     // Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation 'com.google.code.gson:gson:2.10.1'
+
+    implementation 'androidx.core:core-splashscreen:1.0.1'
 
     // Testing
     testImplementation 'junit:junit:4.13.2'

.idea/workspace.xml

@@ -1,7 +1,7 @@
 package com.opennotes.di
 
 import android.app.Application
-import androidx.room.Room
+
 import com.opennotes.feature_node.data.data_source.NoteDatabase
 import com.opennotes.feature_node.data.repository.AndroidFileHandler
 import com.opennotes.feature_node.data.repository.FileHandler
@@ -13,6 +13,7 @@ import com.opennotes.feature_node.domain.use_case.AddNote
 import com.opennotes.feature_node.domain.use_case.DeleteNote
 import com.opennotes.feature_node.domain.use_case.ExportUseCases
 import com.opennotes.feature_node.domain.use_case.GetNote
+import androidx.room.Room
 import com.opennotes.feature_node.domain.use_case.GetNotes
 import com.opennotes.feature_node.domain.use_case.ImportUseCases
 import com.opennotes.feature_node.domain.use_case.NoteUseCases
@@ -58,7 +59,7 @@ object AppModule {
         return GsonJsonHandler()
     }
 
-    // CORRECTED: Now takes all necessary dependencies as parameters
+
     @Provides
     @Singleton
     fun provideNoteUseCaseId(
@@ -67,12 +68,12 @@ object AppModule {
         fileHandler: FileHandler
     ): NoteUseCases {
         return NoteUseCases(
-            getNotes = GetNotes(repository),
+
             deleteNote = DeleteNote(repository),
             addNote = AddNote(repository),
             getNote = GetNote(repository),
+            getNotes = GetNotes(repository),
             searchNotes = SearchNotesUseCase(repository),
-
             importNotes = ImportUseCases(repository, fileHandler,jsonHandler),
             exportNotes = ExportUseCases(repository, fileHandler,jsonHandler)
         )