Merge pull request #18 from feliperce/development

Development
feliperce · Jul 6, 2024 · 1f566b8 · 1f566b8
2 parents c3112d8 + fe676bd
commit 1f566b8
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 11 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -57,6 +57,7 @@ kotlin {
             //implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
             implementation(libs.bundletool)
+            implementation(libs.kotlin.multiplatform.appdirs)
 
         }
         desktopMain.dependencies {
@@ -66,19 +67,19 @@ kotlin {
 }
 
 android {
-    namespace = "br.com.mobileti.aabtoapk"
+    namespace = "io.github.feliperce.aabtoapk"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
-        applicationId = "br.com.mobileti.aabtoapk"
+        applicationId = "io.github.feliperce.aabtoapk"
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
-        versionCode = 1
-        versionName = "0.5"
+        versionCode = 2
+        versionName = "0.5.1"
     }
     packaging {
         resources {
@@ -112,7 +113,7 @@ compose.desktop {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb, TargetFormat.AppImage, TargetFormat.Exe)
             packageName = "AabToApk"
             description = "Extract .apk from .aab"
-            packageVersion = "1.0.0"
+            packageVersion = "1.0.1"
             macOS {
                 iconFile.set(project.file("icons/ic_aabtoapk.icns"))
             }

diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
         <provider
                 android:name="androidx.core.content.FileProvider"
-                android:authorities="br.com.mobileti.aabtoapk.fileprovider"
+                android:authorities="io.github.feliperce.aabtoapk.fileprovider"
                 android:exported="false"
                 android:grantUriPermissions="true">
             <meta-data

diff --git a/...m/mobileti/aabtoapk/DefaultApplication.kt → .../feliperce/aabtoapk/DefaultApplication.kt b/...m/mobileti/aabtoapk/DefaultApplication.kt → .../feliperce/aabtoapk/DefaultApplication.kt
@@ -1,4 +1,4 @@
-package br.com.mobileti.aabtoapk
+package io.github.feliperce.aabtoapk
 
 import android.app.Application
 import di.initKoin

diff --git a/.../br/com/mobileti/aabtoapk/MainActivity.kt → ...github/feliperce/aabtoapk/MainActivity.kt b/.../br/com/mobileti/aabtoapk/MainActivity.kt → ...github/feliperce/aabtoapk/MainActivity.kt
@@ -1,4 +1,4 @@
-package br.com.mobileti.aabtoapk
+package io.github.feliperce.aabtoapk
 
 import android.os.Bundle
 import android.util.Log

diff --git a/...n/br/com/mobileti/aabtoapk/Permissions.kt → .../github/feliperce/aabtoapk/Permissions.kt b/...n/br/com/mobileti/aabtoapk/Permissions.kt → .../github/feliperce/aabtoapk/Permissions.kt
@@ -1,4 +1,4 @@
-package br.com.mobileti.aabtoapk
+package io.github.feliperce.aabtoapk
 
 import android.app.Activity
 import android.content.Context

diff --git a/composeApp/src/commonMain/kotlin/utils/FileExtensions.kt b/composeApp/src/commonMain/kotlin/utils/FileExtensions.kt
@@ -0,0 +1,8 @@
+package utils
+
+import ca.gosyer.appdirs.AppDirs
+
+fun getUserDataDirPath(): String {
+    val appDirs = AppDirs("AabToApk", "feliperce")
+    return appDirs.getUserDataDir()
+}
diff --git a/composeApp/src/desktopMain/kotlin/shared/data/DataActual.kt b/composeApp/src/desktopMain/kotlin/shared/data/DataActual.kt
@@ -4,18 +4,20 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import ca.gosyer.appdirs.AppDirs
 import data.local.db.ExtractorDatabase
 import shared.settings.AppSettings
 import shared.settings.createDataStore
+import utils.getUserDataDirPath
 import java.io.File
 
 fun dataStore(): DataStore<Preferences> =
     createDataStore(
-        producePath = { System.getProperty("java.io.tmpdir")+"/"+AppSettings.DATA_STORE_FILE }
+        producePath = { getUserDataDirPath()+"/"+AppSettings.DATA_STORE_FILE }
     )
 
 fun getDatabaseBuilder(): RoomDatabase.Builder<ExtractorDatabase> {
-    val dbFile = File(System.getProperty("java.io.tmpdir"), ExtractorDatabase.DATABASE_NAME)
+    val dbFile = File(getUserDataDirPath(), ExtractorDatabase.DATABASE_NAME)
     return Room.databaseBuilder<ExtractorDatabase>(
         name = dbFile.absolutePath,
     )

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 agp = "8.2.0"
 bundletool = "1.16.0"
+kotlinMultiplatformAppdirs = "1.1.1"
 ksp = "2.0.0-1.0.21"
 android-compileSdk = "34"
 android-minSdk = "26"
@@ -35,6 +36,7 @@ koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinCompose" }
 koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koinCompose" }
+kotlin-multiplatform-appdirs = { module = "ca.gosyer:kotlin-multiplatform-appdirs", version.ref = "kotlinMultiplatformAppdirs" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }