Merge branch 'release/1.1.5'

mshdabiola · Apr 15, 2023 · 16fbe60 · 16fbe60
2 parents a863055 + 76b634a
commit 16fbe60
Show file tree

Hide file tree

Showing 27 changed files with 555 additions and 94 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -79,5 +79,8 @@ dependencies {
     //testImplementation (libs.junit4)
     //androidTestImplementation (libs.bundles.android.test.bundle)
     //debugImplementation (libs.bundles.compose.debug.bundle)
+    implementation(libs.timber)
+    implementation(libs.play.update)
+    implementation(libs.play.update.kts)
 
 }
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/MainActivity.kt b/app/src/main/java/com/mshdabiola/playnotepad/MainActivity.kt
@@ -7,6 +7,9 @@ import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSiz
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
 import com.mshdabiola.designsystem.theme.NotePadAppTheme
 import com.mshdabiola.playnotepad.ui.NotePadApp
 import dagger.hilt.android.AndroidEntryPoint
@@ -25,4 +28,26 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    override fun onStart() {
+        super.onStart()
+        val appUpdateInfoManager = AppUpdateManagerFactory.create(this)
+        val appUpdateInfoTask = appUpdateInfoManager.appUpdateInfo
+
+        appUpdateInfoTask.addOnSuccessListener { appUpdateInfo ->
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)
+            ) {
+                appUpdateInfoManager.startUpdateFlowForResult(
+                    appUpdateInfo,
+                    AppUpdateType.IMMEDIATE,
+                    this,
+                    343
+                )
+            }
+            //  log("update ${appUpdateInfo.packageName()} ${appUpdateInfo.availableVersionCode()}",)
+        }.addOnFailureListener {
+            it.printStackTrace()
+        }
+    }
 }
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/NotePadApplication.kt b/app/src/main/java/com/mshdabiola/playnotepad/NotePadApplication.kt
@@ -3,11 +3,18 @@ package com.mshdabiola.playnotepad
 import android.app.Application
 import com.mshdabiola.worker.Saver
 import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
 
 @HiltAndroidApp
 class NotePadApplication : Application(){
     override fun onCreate() {
         super.onCreate()
         Saver.initialize(applicationContext)
+
+        if (packageName.contains("debug")) {
+            Timber.plant(Timber.DebugTree())
+            Timber.e("log on app create")
+        }
     }
+
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -34,8 +34,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 defaultConfig.targetSdk = 33
                // compileSdkPreview = "UpsideDownCake"
                 defaultConfig.minSdk = 24
-                defaultConfig.versionName = "1.1.4"
-                defaultConfig.versionCode = 12
+                defaultConfig.versionName = "1.1.5"
+                defaultConfig.versionCode = 13
 
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 defaultConfig.vectorDrawables {

diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -18,8 +18,10 @@ import com.android.build.gradle.LibraryExtension
 import com.mshdabiola.app.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.kotlin
 
 class AndroidLibraryConventionPlugin : Plugin<Project> {
@@ -49,9 +51,11 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 //                    force("org.objenesis:objenesis:2.6")
 //                }
 //            }
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
                 add("androidTestImplementation", kotlin("test"))
                 add("testImplementation", kotlin("test"))
+                add("implementation", libs.findLibrary("timber").get())
             }
         }
     }

diff --git a/core/common/src/main/java/com/mshdabiola/common/ContentManager.kt b/core/common/src/main/java/com/mshdabiola/common/ContentManager.kt
@@ -75,12 +75,12 @@ class ContentManager
         }
     }
 
-    fun dataFile(): File {
+    fun dataFile(drawingId:Long): File {
         val dir = File(context.filesDir.absolutePath + "/drawingfile")
         if (dir.exists().not()) {
             dir.mkdir()
         }
 
-        return File(dir, "data.json")
+        return File(dir, "data_$drawingId.json")
     }
 }