瀏覽代碼

theme auto-create

milan jurkulák 2 年之前
父節點
當前提交
3d27ccbb7f

+ 9 - 2
src/main/kotlin/eu/mjdev/desktop/helpers/internal/Palette.kt

@@ -11,6 +11,7 @@ import eu.mjdev.desktop.extensions.ColorUtils.nonAlphaValue
 import eu.mjdev.desktop.extensions.Compose.SuperDarkGray
 import eu.mjdev.desktop.extensions.Image.loadPicture
 import eu.mjdev.desktop.helpers.managers.GnomeManager.Companion.THEME_MJDEV
+import eu.mjdev.desktop.helpers.managers.GnomeManager.Companion.THEME_YARU
 import eu.mjdev.desktop.provider.DesktopProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -80,10 +81,16 @@ class Palette(
             backgroundColorState.value = background
             textColorState.value = text
         }
-        api.gtkTheme.createFromPalette()
-        api.gnome.setGTKTheme(THEME_MJDEV)
+        createFromPalette()
+        setGtkTheme(THEME_MJDEV)
     }
 
+    fun createFromPalette() =
+        api.gtkTheme.createFromPalette()
+
+    fun setGtkTheme(themeName: String = THEME_YARU) =
+        api.gnome.setGTKTheme(themeName)
+
     companion object {
         @Composable
         inline fun <T> rememberPalette(

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/helpers/managers/GnomeManager.kt

@@ -70,8 +70,8 @@ class GnomeManager {
         themeName
     )
 
-    fun setDarkColorScheme() =
-        setColorScheme(COLOR_SCHEME_PREFER_DARK)
+//    fun setDarkColorScheme() =
+//        setColorScheme(COLOR_SCHEME_PREFER_DARK)
 
 //    fun recursiveVariantValue(variant: Variant<*>): Any {
 //        val value = variant.value

+ 2 - 1
src/main/kotlin/eu/mjdev/desktop/provider/DesktopProvider.kt

@@ -17,6 +17,7 @@ import eu.mjdev.desktop.helpers.adb.AdbDiscover.Companion.adbDevicesHandler
 import eu.mjdev.desktop.helpers.bitmap.Bitmap
 import eu.mjdev.desktop.helpers.internal.Palette
 import eu.mjdev.desktop.helpers.managers.*
+import eu.mjdev.desktop.helpers.managers.GnomeManager.Companion.THEME_MJDEV
 import eu.mjdev.desktop.helpers.system.DBus
 import eu.mjdev.desktop.helpers.system.OsRelease
 import eu.mjdev.desktop.helpers.system.Shell
@@ -128,7 +129,7 @@ class DesktopProvider(
             lastTheme = gnome.getGTKTheme()
         }
         runCatching {
-            gnome.setGTKTheme(GnomeManager.THEME_MJDEV)
+            gnome.setGTKTheme(THEME_MJDEV)
         }
     }