Update BaseActivity.kt (#198)

app/src/main/java/com/github/kr328/clash/BaseActivity.kt

@@ -29,22 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-abstract class BaseActivity<D : Design<*>> :
+abstract class BaseActivity<D : Design<*>> : AppCompatActivity(),
-    AppCompatActivity(),
     CoroutineScope by MainScope(),
     Broadcasts.Observer {
-    enum class Event {
-        ServiceRecreated,
-        ActivityStart,
-        ActivityStop,
-        ClashStop,
-        ClashStart,
-        ProfileLoaded,
-        ProfileChanged,
-        ProfileUpdateCompleted,
-        ProfileUpdateFailed
-    }
-
     
     protected val uiStore by lazy { UiStore(this) }
     protected val events = Channel<Event>(Channel.UNLIMITED)
@@ -52,9 +39,8 @@ abstract class BaseActivity<D : Design<*>> :
     protected val clashRunning: Boolean
         get() = Remote.broadcasts.clashRunning
     protected var design: D? = null
-        private set(value) {
+        set(value) {
             field = value
-
             if (value != null) {
                 setContentView(value.root)
             } else {
@@ -75,14 +61,14 @@ abstract class BaseActivity<D : Design<*>> :
 
     suspend fun <I, O> startActivityForResult(
         contracts: ActivityResultContract<I, O>,
-        input: I
+        input: I,
     ): O = withContext(Dispatchers.Main) {
         val requestKey = nextRequestKey.getAndIncrement().toString()
 
         ActivityResultLifecycle().use { lifecycle, start ->
             suspendCoroutine { c ->
                 activityResultRegistry.register(requestKey, lifecycle, contracts) {
-                    c.resumeWith(Result.success(it))
+                    c.resume(it)
                 }.apply { start() }.launch(input)
             }
         }
@@ -92,7 +78,6 @@ abstract class BaseActivity<D : Design<*>> :
         suspendCoroutine<Unit> {
             window.decorView.post {
                 this.design = design
-
                 it.resume(Unit)
             }
         }
@@ -100,49 +85,35 @@ abstract class BaseActivity<D : Design<*>> :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         applyDayNight()
 
         launch {
             main()
-
-            finish()
         }
     }
 
     override fun onStart() {
         super.onStart()
-
         activityStarted = true
-
         Remote.broadcasts.addObserver(this)
-
         events.trySend(Event.ActivityStart)
     }
 
     override fun onStop() {
         super.onStop()
-
         activityStarted = false
-
         Remote.broadcasts.removeObserver(this)
-
         events.trySend(Event.ActivityStop)
     }
 
     override fun onDestroy() {
         design?.cancel()
-
         cancel()
-
         super.onDestroy()
     }
 
     override fun finish() {
-        if (deferRunning) {
+        if (deferRunning) return
-            return
-        }
-
         deferRunning = true
 
         launch {
@@ -172,7 +143,6 @@ abstract class BaseActivity<D : Design<*>> :
 
     override fun onSupportNavigateUp(): Boolean {
         this.onBackPressed()
-
         return true
     }
 
@@ -212,31 +182,17 @@ abstract class BaseActivity<D : Design<*>> :
 
     private fun queryDayNight(config: Configuration = resources.configuration): DayNight {
         return when (uiStore.darkMode) {
-            DarkMode.Auto -> {
+            DarkMode.Auto -> if (config.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) DayNight.Night else DayNight.Day
-                if (config.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES)
+            DarkMode.ForceLight -> DayNight.Day
-                    DayNight.Night
+            DarkMode.ForceDark -> DayNight.Night
-                else
-                    DayNight.Day
-            }
-            DarkMode.ForceLight -> {
-                DayNight.Day
-            }
-            DarkMode.ForceDark -> {
-                DayNight.Night
-            }
         }
     }
 
     private fun applyDayNight(config: Configuration = resources.configuration) {
         val dayNight = queryDayNight(config)
-
         when (dayNight) {
-            DayNight.Night -> {
+            DayNight.Night -> theme.applyStyle(R.style.AppThemeDark, true)
-                theme.applyStyle(R.style.AppThemeDark, true)
+            DayNight.Day -> theme.applyStyle(R.style.AppThemeLight, true)
-            }
-            DayNight.Day -> {
-                theme.applyStyle(R.style.AppThemeLight, true)
-            }
         }
 
         window.isAllowForceDarkCompat = false
@@ -246,15 +202,25 @@ abstract class BaseActivity<D : Design<*>> :
         window.navigationBarColor = resolveThemedColor(android.R.attr.navigationBarColor)
 
         if (Build.VERSION.SDK_INT >= 23) {
-            window.isLightStatusBarsCompat =
+            window.isLightStatusBarsCompat = resolveThemedBoolean(android.R.attr.windowLightStatusBar)
-                resolveThemedBoolean(android.R.attr.windowLightStatusBar)
         }
 
         if (Build.VERSION.SDK_INT >= 27) {
-            window.isLightNavigationBarCompat =
+            window.isLightNavigationBarCompat = resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
-                resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
         }
 
         this.dayNight = dayNight
     }
+
+    enum class Event {
+        ServiceRecreated,
+        ActivityStart,
+        ActivityStop,
+        ClashStop,
+        ClashStart,
+        ProfileLoaded,
+        ProfileChanged,
+        ProfileUpdateCompleted,
+        ProfileUpdateFailed,
+    }
 }