浏览代码

theme auto-create temporary disabled

milan jurkulák 2 年之前
父节点
当前提交
7aa0dc0187

+ 6 - 8
src/main/kotlin/eu/mjdev/desktop/helpers/internal/Palette.kt

@@ -10,8 +10,6 @@ import eu.mjdev.desktop.extensions.ColorUtils.lighter
 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
@@ -81,15 +79,15 @@ class Palette(
             backgroundColorState.value = background
             textColorState.value = text
         }
-        createFromPalette()
-        setGtkTheme(THEME_MJDEV)
+//        createFromPalette()
+//        setGtkTheme(THEME_MJDEV)
     }
 
-    fun createFromPalette() =
-        api.gtkTheme.createFromPalette()
+//    fun createFromPalette() =
+//        api.gtkTheme.createFromPalette()
 
-    fun setGtkTheme(themeName: String = THEME_YARU) =
-        api.gnome.setGTKTheme(themeName)
+//    fun setGtkTheme(themeName: String = THEME_YARU) =
+//        api.gnome.setGTKTheme(themeName)
 
     companion object {
         @Composable

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

@@ -33,15 +33,15 @@ class GnomeManager {
         schemeName
     )
 
-    fun setGTKTheme(
-        themeName: String = THEME_YARU
-    ) = Shell.executeAndRead(
-        "gsettings",
-        "set",
-        "org.gnome.desktop.interface",
-        "gtk-theme",
-        themeName
-    )
+//    fun setGTKTheme(
+//        themeName: String = THEME_YARU
+//    ) = Shell.executeAndRead(
+//        "gsettings",
+//        "set",
+//        "org.gnome.desktop.interface",
+//        "gtk-theme",
+//        themeName
+//    )
 
     fun getGTKTheme(): String = Shell.executeAndRead(
         "gsettings",
@@ -92,7 +92,7 @@ class GnomeManager {
         const val THEME_YARU = "Yaru"
         const val THEME_ADWAITA = "Adwaita"
         const val THEME_ADWAITA_DARK = "Adwaita-dark"
-        const val THEME_MJDEV = "mjdev"
+        const val THEME_MJDEV = "Mjdev"
     }
 
 }

+ 6 - 7
src/main/kotlin/eu/mjdev/desktop/provider/DesktopProvider.kt

@@ -17,7 +17,6 @@ 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,15 +127,15 @@ class DesktopProvider(
         runCatching {
             lastTheme = gnome.getGTKTheme()
         }
-        runCatching {
-            gnome.setGTKTheme(THEME_MJDEV)
-        }
+//        runCatching {
+//            gnome.setGTKTheme(THEME_MJDEV)
+//        }
     }
 
     override fun close() {
-        runCatching {
-            gnome.setGTKTheme(lastTheme)
-        }
+//        runCatching {
+//            gnome.setGTKTheme(lastTheme)
+//        }
         runCatching {
             mounts.dispose()
         }