1. update ui

ekibun · Aug 11, 2022 · 0a93b48 · 0a93b48
1 parent d1f2d35
commit 0a93b48
Show file tree

Hide file tree

Showing 36 changed files with 703 additions and 442 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,6 +30,7 @@ android {
     defaultConfig {
         applicationId "soko.ekibun.stitch"
         minSdkVersion 21
+        //noinspection OldTargetApi
         targetSdkVersion 31
         versionCode gitVersionCode()
         versionName gitVersionTag()

diff --git a/app/src/main/java/soko/ekibun/stitch/App.kt b/app/src/main/java/soko/ekibun/stitch/App.kt
@@ -1,14 +1,14 @@
 package soko.ekibun.stitch
 
 import android.app.Application
-import android.preference.PreferenceManager
+import android.content.Context
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.runBlocking
 import java.io.File
 import java.util.concurrent.Executors
 
 class App : Application() {
-  val sp by lazy { PreferenceManager.getDefaultSharedPreferences(this) }
+  val sp by lazy { getSharedPreferences(packageName + "_preferences", Context.MODE_PRIVATE)!! }
   private val bitmapCache by lazy { BitmapCache(this) }
   private val projects by lazy { HashMap<String, Stitch.StitchProject>() }
 
@@ -18,7 +18,7 @@ class App : Application() {
   }
 
   val dataDirPath: String by lazy {
-    dataDir.path + File.separator + "Project"
+    applicationInfo.dataDir + File.separator + "Project"
   }
 
   companion object {
@@ -43,10 +43,7 @@ class App : Application() {
       return File(app.dataDirPath + File.separator + projectKey + File.separator + ".project")
     }
 
-    fun newProject(): String {
-      val projectKey = System.currentTimeMillis().toString(16)
-      return projectKey
-    }
+    fun newProject(): String = System.currentTimeMillis().toString(16)
 
     fun clearProjects() {
       val file = File(app.dataDirPath)

diff --git a/app/src/main/java/soko/ekibun/stitch/BitmapCache.kt b/app/src/main/java/soko/ekibun/stitch/BitmapCache.kt
@@ -6,7 +6,7 @@ import android.graphics.BitmapFactory
 import android.util.LruCache
 import androidx.core.content.FileProvider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileOutputStream
@@ -65,7 +65,7 @@ class BitmapCache(var app: App) {
       return saveBitmap(project, bmp, saveToMemory)
     }
     lastKey = key
-    GlobalScope.launch(Dispatchers.IO) {
+    MainScope().launch(Dispatchers.IO) {
       try {
         if (saveToMemory) addBitmapToMemoryCache(key, bmp)
         val file = File(app.dataDirPath, key)

diff --git a/app/src/main/java/soko/ekibun/stitch/CaptureService.kt b/app/src/main/java/soko/ekibun/stitch/CaptureService.kt
@@ -3,6 +3,7 @@ package soko.ekibun.stitch
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.IBinder
 import android.widget.Toast
 
@@ -36,7 +37,9 @@ class CaptureService : Service() {
   }
 
   override fun onCreate() {
-    startService(Intent(this, QuickTileService::class.java))
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      startService(Intent(this, QuickTileService::class.java))
+    }
     floatButton.run { }
     notification.run { }
   }
@@ -58,7 +61,9 @@ class CaptureService : Service() {
     stopForeground(true)
     screenCapture?.destroy()
     floatButton.destroy()
-    startService(Intent(this, QuickTileService::class.java))
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      startService(Intent(this, QuickTileService::class.java))
+    }
   }
 
   override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {