adjust: card color

Author: TanakaLun

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

@@ -98,7 +98,7 @@ abstract class BaseActivity<D : Design<*>> : AppCompatActivity(),
             DynamicColors.applyToActivityIfAvailable(this)
         }
         super.onCreate(savedInstanceState)
-        // updateSystemBars(dayNightValue)
+        updateSystemBars(dayNightValue)
         // Apply excludeFromRecents setting to all app tasks.
         checkNotNull(getSystemService<ActivityManager>()).appTasks.forEach { task ->
             task.setExcludeFromRecents(uiStore.hideFromRecents)
@@ -197,23 +197,23 @@ abstract class BaseActivity<D : Design<*>> : AppCompatActivity(),
         }
     }
 
-    // private fun updateSystemBars(currentDayNight: DayNight) {
-        // window.isAllowForceDarkCompat = false
-        // window.isSystemBarsTranslucentCompat = true
+    private fun updateSystemBars(currentDayNight: DayNight) {
+        window.isAllowForceDarkCompat = false
+        window.isSystemBarsTranslucentCompat = true
 
-        // window.statusBarColor = resolveThemedColor(android.R.attr.statusBarColor)
-        // window.navigationBarColor = resolveThemedColor(android.R.attr.navigationBarColor)
+        window.statusBarColor = resolveThemedColor(android.R.attr.statusBarColor)
+        window.navigationBarColor = resolveThemedColor(android.R.attr.navigationBarColor)
 
-        // if (Build.VERSION.SDK_INT >= 23) {
-            // window.isLightStatusBarsCompat = resolveThemedBoolean(android.R.attr.windowLightStatusBar)
-        // }
+        if (Build.VERSION.SDK_INT >= 23) {
+            window.isLightStatusBarsCompat = resolveThemedBoolean(android.R.attr.windowLightStatusBar)
+        }
 
-        // if (Build.VERSION.SDK_INT >= 27) {
-            // window.isLightNavigationBarCompat = resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
-        // }
+        if (Build.VERSION.SDK_INT >= 27) {
+            window.isLightNavigationBarCompat = resolveThemedBoolean(android.R.attr.windowLightNavigationBar)
+        }
 
-        // this.dayNight = currentDayNight
-    // }
+        this.dayNight = currentDayNight
+    }
 
     private fun queryDayNight(config: Configuration = resources.configuration): DayNight {
         return when (uiStore.darkMode) {

design/src/main/java/com/github/kr328/clash/design/MainDesign.kt

@@ -81,8 +81,8 @@ class MainDesign(context: Context) : Design<MainDesign.Request>(context) {
     init {
         binding.self = this
 
-        binding.colorClashStarted = context.resolveThemedColor(com.google.android.material.R.attr.colorPrimary)
-        binding.colorClashStopped = context.resolveThemedColor(com.google.android.material.R.attr.colorPrimaryContainer)
+        binding.colorClashStarted = context.resolveThemedColor(com.google.android.material.R.attr.colorPrimaryContainer)
+        binding.colorClashStopped = context.resolveThemedColor(com.google.android.material.R.attr.colorSurfaceContainerHighest)
     }
 
     fun request(request: Request) {