Revert "Merge pull request #54 from maxrave-dev/dev"

This reverts commit 8e181d8, reversing changes made to 7dd8c57.
maxrave-dev · Sep 11, 2023 · e09f829 · e09f829
1 parent bd9e552
commit e09f829
Show file tree

Hide file tree

Showing 55 changed files with 100 additions and 2,192 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,6 @@
 *.iml
 .gradle
 /local.properties
-/.idea
-/.idea/codeStyles
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,4 +1,3 @@
 /build
 /release
 /release/
-!/build/outputs/apk/full/debug/*
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,14 +15,10 @@ android {
         applicationId = "com.maxrave.simpmusic"
         minSdk = 26
         targetSdk = 34
-        versionCode = 8
-        versionName = "0.1.2-beta"
+        versionCode = 7
+        versionName = "0.1.1-beta"
 
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
-
-        resourceConfigurations += listOf("en", "vi", "it")
+        resourceConfigurations += listOf("en", "vi")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
     }
@@ -94,8 +90,8 @@ dependencies {
     //Coroutines
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
     //Navigation
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.0")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.0")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
+    implementation("androidx.navigation:navigation-ui-ktx:2.6.0")
 
     implementation("com.google.code.gson:gson:2.10.1")
 
@@ -109,14 +105,16 @@ dependencies {
     implementation("androidx.palette:palette-ktx:1.0.0")
 
     //Preference
-    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation("androidx.preference:preference-ktx:1.2.0")
 
     //fragment ktx
     implementation("androidx.fragment:fragment-ktx:1.6.1")
     //Hilt
     implementation("com.google.dagger:hilt-android:2.47")
     kapt("com.google.dagger:hilt-compiler:2.47")
     ksp("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
+    //Preference ktx
+    implementation("androidx.preference:preference-ktx:1.2.0")
     //DataStore
     implementation("androidx.datastore:datastore-preferences:1.0.0")
     //Swipe To Refresh

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 8,
-      "versionName": "0.1.2-beta",
+      "versionCode": 7,
+      "versionName": "0.1.1-beta",
       "outputFile": "app-release.apk"
     }
   ],