Merge pull request #95 from mhss1/dev

Dev

Author: mhss1

app/build.gradle

@@ -1,25 +1,26 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    id 'kotlin-kapt'
 }
 
 android {
     compileSdk 33
 
     defaultConfig {
         applicationId "com.mhss.app.mybrain"
+        namespace "com.mhss.app.mybrain"
         minSdk 24
         targetSdk 33
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resConfigs "en", "ar", "zh-rCN", "hi", "pl", "ru"
+        resConfigs "en", "ar", "zh-rCN", "hi", "pl", "ru", "ro", "pt-rBR", "de"
         kapt {
             arguments {
                 arg("room.schemaLocation", "$projectDir/schemas")
@@ -69,27 +70,28 @@ kotlin {
 }
 
 dependencies {
-    def nav_version = "2.5.1"
     def room_version = "2.4.3"
     def coroutines_version = "1.6.1"
 
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation platform('androidx.compose:compose-bom:2022.10.00')
+
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.ui:ui-tooling-preview"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation 'androidx.activity:activity-compose:1.6.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4"
+    debugImplementation "androidx.compose.ui:ui-tooling"
 
     // Compose navigation
-    implementation "androidx.navigation:navigation-compose:$nav_version"
+    implementation "androidx.navigation:navigation-compose:2.5.2"
     implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
 
-// Room
+    // Room
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
@@ -98,13 +100,14 @@ dependencies {
     implementation "com.google.dagger:hilt-android:2.43.2"
     kapt "com.google.dagger:hilt-android-compiler:2.43.2"
     kapt "androidx.hilt:hilt-compiler:1.0.0"
+    implementation 'androidx.hilt:hilt-work:1.0.0'
 
     // Coroutines
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
     // Gson
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
 
     // Preferences DataStore
     implementation "androidx.datastore:datastore-preferences:1.0.0"
@@ -118,8 +121,16 @@ dependencies {
     implementation 'com.github.jeziellago:compose-markdown:0.2.9'
 
     // Compose Glance (Widgets)
-    implementation "androidx.glance:glance-appwidget:1.0.0-alpha03"
+    implementation "androidx.glance:glance-appwidget:1.0.0-alpha05"
+
+    //Moshi
+    implementation "com.squareup.moshi:moshi-kotlin:1.14.0"
+
+    // WorkManager
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
 
+    // Compose live data
+    implementation "androidx.compose.runtime:runtime-livedata"
 }
 
 kapt {

app/proguard-rules.pro

@@ -18,4 +18,5 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontobfuscate