Explorar o código

removal non yet important things

milan jurkulák %!s(int64=2) %!d(string=hai) anos
pai
achega
67776d7a72

+ 1 - 1
build.gradle.kts

@@ -52,7 +52,7 @@ allprojects {
         // javascript
         // implementation(libs.mozilla.rhino)
         // gemini ai
-        implementation(libs.google.generativeai)
+        // implementation(libs.google.generativeai)
         // no log
         implementation("org.slf4j:slf4j-nop:2.0.7")
         implementation("me.xdrop:fuzzywuzzy:1.4.0")

+ 4 - 4
gradle/libs.versions.toml

@@ -15,7 +15,7 @@ kotlin = "1.9.22"
 compose = "1.7.0-alpha03"
 okhttp3 = "5.0.0-alpha.12"
 materialKolor = "1.7.0"
-generativeai = "0.5.0-1.0.0-wasm"
+#generativeai = "0.5.0-1.0.0-wasm"
 #compose-webview = "1.9.20"
 #decompose = "3.0.0-alpha07"
 
@@ -23,8 +23,8 @@ generativeai = "0.5.0-1.0.0-wasm"
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 gradle-api = { module = "com.android.tools.build:gradle-api", version.ref = "gradle" }
 #gradle-kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-dbus-java-core = { module = "com.github.hypfvieh:dbus-java-core", version = "5.0.0" }
-dbus-java-transport-native-unixsocket = { module = "com.github.hypfvieh:dbus-java-transport-native-unixsocket", version = "5.0.0" }
+#dbus-java-core = { module = "com.github.hypfvieh:dbus-java-core", version = "5.0.0" }
+#dbus-java-transport-native-unixsocket = { module = "com.github.hypfvieh:dbus-java-transport-native-unixsocket", version = "5.0.0" }
 mozilla-rhino = { module = "org.mozilla:rhino", version = "1.7.13" }
 okhttp-client = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
 material-kolor = { module = "com.materialkolor:material-kolor", version.ref = "materialKolor" }
@@ -34,7 +34,7 @@ font-icons-awesome = { module = "br.com.devsrsouza.compose.icons:font-awesome-de
 #decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" }
 #decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" }
 ini4j = { module = "org.ini4j:ini4j", version = "0.5.4" }
-google-generativeai = { module = "dev.shreyaspatil.generativeai:generativeai-google-jvm", version.ref = "generativeai" }
+#google-generativeai = { module = "dev.shreyaspatil.generativeai:generativeai-google-jvm", version.ref = "generativeai" }
 
 #// open ai
 #//        implementation("com.aallam.openai:openai-client:3.8.2")

+ 14 - 15
src/main/kotlin/eu/mjdev/desktop/provider/DesktopProvider.kt

@@ -1,19 +1,18 @@
 package eu.mjdev.desktop.provider
 
+//import dev.shreyaspatil.ai.client.generativeai.GenerativeModel
+//import dev.shreyaspatil.ai.client.generativeai.type.content
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import dev.shreyaspatil.ai.client.generativeai.GenerativeModel
-import dev.shreyaspatil.ai.client.generativeai.type.content
 import eu.mjdev.desktop.components.controlcenter.ControlCenterPage
 import eu.mjdev.desktop.components.controlcenter.pages.*
 import eu.mjdev.desktop.helpers.ResourceStream
 import eu.mjdev.desktop.provider.data.User
 import eu.mjdev.desktop.provider.providers.AppsProvider
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
 import java.awt.GraphicsDevice
 import java.awt.GraphicsEnvironment
 import java.awt.Toolkit
@@ -22,7 +21,7 @@ import java.io.FileReader
 import javax.script.ScriptEngine
 import javax.script.ScriptEngineManager
 
-@Suppress("unused", "MemberVisibilityCanBePrivate", "CanBeParameter", "PrivatePropertyName", "SameParameterValue")
+@Suppress("unused", "MemberVisibilityCanBePrivate", "PrivatePropertyName", "SameParameterValue")
 class DesktopProvider(
     private val scope: CoroutineScope? = null,
 ) {
@@ -65,12 +64,12 @@ class DesktopProvider(
     val isTransparencySupported
         get() = graphicsDevice.isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency.TRANSLUCENT)
 
-    val generativeModel: GenerativeModel by lazy {
-        GenerativeModel(
-            modelName = "gemini-1.5-pro-latest",
-            apiKey = loadKey("gemini")
-        )
-    }
+//    val generativeModel: GenerativeModel by lazy {
+//        GenerativeModel(
+//            modelName = "gemini-1.5-pro-latest",
+//            apiKey = loadKey("gemini")
+//        )
+//    }
 
     init {
         currentUser.theme.controlCenterExpandedWidth = containerSize.width.div(4)
@@ -80,11 +79,11 @@ class DesktopProvider(
         ResourceStream("keys/$key.key").string
     }.getOrNull().orEmpty()
 
-    fun askGemini(question: String): String = runBlocking {
-        generativeModel.generateContent(content {
-            text(question)
-        }).text
-    }.orEmpty()
+//    fun askGemini(question: String): String = runBlocking {
+//        generativeModel.generateContent(content {
+//            text(question)
+//        }).text
+//    }.orEmpty()
 
     fun runScript(script: String): Any =
         engine.eval(script)

+ 14 - 11
src/main/kotlin/eu/mjdev/desktop/windows/TopWindow.kt

@@ -2,6 +2,7 @@ package eu.mjdev.desktop.windows
 
 import androidx.compose.animation.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.input.key.KeyEvent
@@ -125,17 +126,19 @@ class TopWindowState(
                     else -> WindowBounds(0.dp, 0.dp, 0.dp, 0.dp)
                 }
             }
-        ) = TopWindowState(
-            containerSize = containerSize,
-            placement = placement,
-            position = position,
-            size = size,
-            minSize = minSize,
-            computeBounds = computeBounds,
-            enter = enter,
-            exit = exit,
-            visible = visible
-        )
+        ) = remember(visible) {
+            TopWindowState(
+                containerSize = containerSize,
+                placement = placement,
+                position = position,
+                size = size,
+                minSize = minSize,
+                computeBounds = computeBounds,
+                enter = enter,
+                exit = exit,
+                visible = visible
+            )
+        }
 
         @Composable
         fun rememberTopWindowState(