milan jurkulák 2 anos atrás
pai
commit
88f04dbcdb

+ 3 - 1
build.gradle.kts

@@ -18,8 +18,8 @@ allprojects {
         maven("https://androidx.dev/storage/compose-compiler/repository")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
         maven("https://gitlab.com/api/v4/projects/38224197/packages/maven")
-        maven("https://jogamp.org/deployment/maven")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://jogamp.org/deployment/maven")
         maven("https://jitpack.io")
         google()
         gradlePluginPortal()
@@ -32,6 +32,8 @@ allprojects {
         runtimeOnly(libs.kotlinx.coroutines.swing)
         // compose desktop
         implementation(compose.desktop.currentOs)
+        // preview
+        implementation(compose.runtime)
         // material 3
         implementation(compose.material3)
         // icons

+ 3 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 4 - 1
src/main/kotlin/eu/mjdev/desktop/Main.kt

@@ -17,7 +17,10 @@ import eu.mjdev.desktop.provider.DesktopProvider.Companion.LocalDesktop
 import eu.mjdev.desktop.provider.DesktopProvider.Companion.rememberDesktopProvider
 import eu.mjdev.desktop.windows.MainWindow
 
-fun main() = application(
+@Suppress("unused")
+fun main(
+    args: Array<String>
+) = application(
     exitProcessOnExit = true
 ) {
     val api = rememberDesktopProvider()

+ 2 - 1
src/main/kotlin/eu/mjdev/desktop/extensions/Locale.kt

@@ -4,11 +4,12 @@ import java.util.Locale
 
 object Locale {
 
+    @Suppress("DEPRECATION")
     fun String.toLocale(): Locale = this.split("_").let { lc ->
         when (lc.size) {
             2 -> Locale(lc[0], lc[1])
             1 -> Locale(lc[0])
-            else -> java.util.Locale.ENGLISH
+            else -> Locale.ENGLISH
         }
     }
 

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

@@ -50,9 +50,11 @@ class GnomeManager {
 
     companion object {
         const val COLOR_SCHEME_PREFER_DARK = "prefer-dark"
+
         const val COLOR_SCHEME_MJDEV = "mjdev"
 
         const val THEME_YARU = "Yaru"
+        const val THEME_ADWAITA_DARK = "Adwaita-dark"
         const val THEME_MJDEV = "mjdev"
 
     }

+ 2 - 0
src/main/kotlin/eu/mjdev/desktop/provider/AppsProvider.kt

@@ -7,6 +7,7 @@ import eu.mjdev.desktop.data.DesktopFile
 import eu.mjdev.desktop.extensions.Custom.invalidate
 import eu.mjdev.desktop.extensions.Locale.toLocale
 import eu.mjdev.desktop.helpers.exception.EmptyException.Companion.EmptyException
+import eu.mjdev.desktop.helpers.managers.GnomeManager
 import eu.mjdev.desktop.helpers.system.Command
 import eu.mjdev.desktop.helpers.system.Command.Companion.toList
 import kotlinx.coroutines.Dispatchers
@@ -144,6 +145,7 @@ class AppsProvider(
     fun startApp(app: App) {
         scope.launch(Dispatchers.IO) {
             api.gnome.setDarkColorScheme()
+            api.gnome.setGTKTheme(GnomeManager.THEME_ADWAITA_DARK)
             if (app.isRunning) {
                 // todo menu to switch
                 if (app.isWindowFocus(api)) {