Imrpove AlertWindow handling 3.0.0 (33004)

anod · Sep 9, 2023 · 63f71c8 · 63f71c8
1 parent 0594bbc
commit 63f71c8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -58,8 +58,8 @@ android {
         targetSdk = 33 // 29 wifi switch not working
         applicationId = "com.anod.car.home.free"
 
-        versionCode = 33003
-        versionName = "3.0.0-rc1"
+        versionCode = 33004
+        versionName = "3.0.0"
         vectorDrawables.generatedDensities("hdpi", "xxhdpi")
     }
 

diff --git a/app/src/main/java/com/anod/car/home/CarWidgetApplication.kt b/app/src/main/java/com/anod/car/home/CarWidgetApplication.kt
@@ -46,6 +46,7 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koin.core.context.startKoin
 import org.koin.core.module.dsl.factoryOf
+import org.koin.core.module.dsl.singleOf
 import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -146,17 +147,11 @@ class CarWidgetApplication : Application(), ApplicationInstance, KoinComponent {
                         factory { (skinName: String) -> get<SkinPropertiesFactory>().create(skinName) }
                         factoryOf(::ScreenOrientation)
                         factoryOf(::AlertWindow)
-                        factoryOf(::ScreenOnAlert)
+                        singleOf(::ScreenOnAlert)
                         factory {
                             BroadcastService.Manager(applicationContext = get(), inCarSettings = get())
                         } bind BroadcastServiceManager::class
-                        factory {
-                            ModeHandler(
-                                context = get(),
-                                screenOrientation = get(),
-                                koin = getKoin()
-                            )
-                        }
+                        singleOf(::ModeHandler)
                         factoryOf(::ModePhoneStateListener)
                         factoryOf(::PermissionChecker)
                         factory(named("permissionDescriptions")) { permissionDescriptions }

diff --git a/app/src/main/java/com/anod/car/home/incar/ModeHandler.kt b/app/src/main/java/com/anod/car/home/incar/ModeHandler.kt
@@ -12,14 +12,12 @@ import info.anodsplace.applog.AppLog
 import info.anodsplace.carwidget.incar.ScreenOnAlert
 import info.anodsplace.carwidget.incar.ScreenOrientation
 import info.anodsplace.framework.content.startActivitySafely
-import org.koin.core.Koin
 
 class ModeHandler(
     private val context: Context,
     private val screenOrientation: ScreenOrientation,
-    private val koin: Koin
+    private val alertWindow: ScreenOnAlert
 ) {
-    private val alertWindow: ScreenOnAlert by lazy { koin.get() }
 
     fun enable(prefs: info.anodsplace.carwidget.content.preferences.InCarInterface) {
         if (prefs.isDisableScreenTimeout) {

diff --git a/compose/src/main/java/info/anodsplace/carwidget/incar/ScreenOnAlert.kt b/compose/src/main/java/info/anodsplace/carwidget/incar/ScreenOnAlert.kt
@@ -40,7 +40,9 @@ class ScreenOnAlert(private val context: Context, private val prefs: InCarInterf
 
     fun hide() {
         alertWindow.hide()
-        prefs.screenOnAlert = prefs.screenOnAlert.withLocation(lastX, lastY)
+        if (lastX > 0 && lastY > 0) {
+            prefs.screenOnAlert = prefs.screenOnAlert.withLocation(lastX, lastY)
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")

diff --git a/lib b/lib