Merge branch 'Writeopia:main' into main

kdroidFilter · web-flow · commit 451ceaba41f4 · 2025-03-17T15:03:48.000+02:00
diff --git a/README.md b/README.md
@@ -25,11 +25,10 @@
 This is the source code for Writopia, a text editing App and SDK.
 
 # Application
-Writeopia is a project developed with Kotlin Multiplatform, most of the code is shared between all the apps.
+Writeopia is a modern text editor that integrates AI while prioritizing offline functionality and user privacy. Unlike cloud-based AI assistants, Writeopia allows you to choose your own AI model and interact with it locally, ensuring that your data stays on your device.
 
-This is a project to save all your documents in one place providing you the freedom to choose where to store it. You can save your whole workspace with a button click and save it in your git repository (like Github) or a storage system like Dropbox or Google Drive.
-
-A backend is also under development so you can self host it and have full controll how you share your documentations with work teams and friends.
+## Why Writeopia?
+Writeopia is built for writers, developers, and researchers who want the power of AI without sacrificing privacy. Whether you're drafting a novel, taking notes, or coding, Writeopia provides an intelligent and distraction-free environment.
 
 ## Documentation
 You can check the documentation of the project in the [application documentation](https://docs.writeopia.io/docs/application/overview).
diff --git a/application/composeApp/proguard-rules-desktop.pro b/application/composeApp/proguard-rules-desktop.pro
@@ -14,6 +14,7 @@
 -keepclassmembers public class **$$serializer {
     private ** descriptor;
 }
+-keep class coil3.network.ktor3.** { *; }
 
 -dontwarn org.slf4j.**
 -dontwarn android.**
diff --git a/application/core/connection/src/commonMain/kotlin/io/writeopia/di/AppConnectionInjection.kt b/application/core/connection/src/commonMain/kotlin/io/writeopia/di/AppConnectionInjection.kt
@@ -39,8 +39,8 @@ object ApiInjectorDefaults {
         apiLogger: Logger,
     ) = HttpClient {
         install(HttpTimeout) {
-//            requestTimeoutMillis = 30000
-//            socketTimeoutMillis = 30000
+            requestTimeoutMillis = 300000
+            socketTimeoutMillis = 300000
         }
 
         install(ContentNegotiation) {
diff --git a/application/core/resources/config/ktlint/baseline.xml b/application/core/resources/config/ktlint/baseline.xml
diff --git a/application/core/resources/src/commonMain/composeResources/values-en/strings.xml b/application/core/resources/src/commonMain/composeResources/values-en/strings.xml
@@ -51,7 +51,7 @@
   <string name="download_models">Download Model</string>
   <string name="suggestions">Suggestions:</string>
   <string name="error_model_download">Error when downloading model.</string>
-  <string name="version">"Version: alpha32 - Amado, Jorge"</string>
+  <string name="version">"Version: alpha33 - Amado, Jorge"</string>
   <string name="light_theme">Light</string>
   <string name="dark_theme">Dark</string>
   <string name="system_theme">System</string>
diff --git a/application/core/resources/src/commonMain/composeResources/values-pt/strings.xml b/application/core/resources/src/commonMain/composeResources/values-pt/strings.xml
@@ -51,7 +51,7 @@
   <string name="download_models">Baixar modelos</string>
   <string name="suggestions">Sugestões:</string>
   <string name="error_model_download">Error ao baixar modelo.</string>
-  <string name="version">"Versão: alpha32 - Amado, Jorge"</string>
+  <string name="version">"Versão: alpha33 - Amado, Jorge"</string>
   <string name="light_theme">Claro</string>
   <string name="dark_theme">Escuro</string>
   <string name="system_theme">Sistema</string>
diff --git a/application/core/resources/src/commonMain/composeResources/values/strings.xml b/application/core/resources/src/commonMain/composeResources/values/strings.xml
@@ -53,7 +53,7 @@
   <string name="download_models">Download Model</string>
   <string name="suggestions">Suggestions:</string>
   <string name="error_model_download">Error when downloading model.</string>
-  <string name="version">Version: alpha32 - Amado, Jorge</string>
+  <string name="version">Version: alpha33 - Amado, Jorge</string>
   <string name="light_theme">Light</string>
   <string name="dark_theme">Dark</string>
   <string name="system_theme">System</string>
@@ -75,6 +75,7 @@
   <string name="page">Page</string>
   <string name="ask_ai">Ask AI</string>
   <string name="json">JSON</string>
+  <string name="markdown">Markdown</string>
   <string name="tap_to_start">Tap here to <font fgcolor='#FFFF3B30'>write</font> the next big thing</string>
   <string name="font">Font</string>
   <string name="actions">Actions</string>
diff --git a/application/core/resources/src/commonMain/kotlin/io/writeopia/resources/WrStrings.kt b/application/core/resources/src/commonMain/kotlin/io/writeopia/resources/WrStrings.kt
@@ -187,6 +187,9 @@ object WrStrings {
     @Composable
     fun json() = stringResource(Res.string.json)
 
+    @Composable
+    fun markdown() = stringResource(Res.string.json)
+
     @Composable
     fun tapToStart() = stringResource(Res.string.tap_to_start)
 
diff --git a/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/modifier/ModifierExtensions.kt b/application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/modifier/ModifierExtensions.kt
@@ -0,0 +1,19 @@
+package io.writeopia.common.utils.modifier
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.changedToUp
+import androidx.compose.ui.input.pointer.pointerInput
+
+fun Modifier.clickableWithoutGettingFocus(block: () -> Unit): Modifier =
+    this.pointerInput(Unit) {
+        awaitPointerEventScope {
+            while (true) {
+                val event = awaitPointerEvent()
+                event.changes.forEach { pointerInputChange ->
+                    if (pointerInputChange.changedToUp()) {
+                        block()
+                    }
+                }
+            }
+        }
+    }
diff --git a/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/desktop/edit/menu/SideEditorOptions.kt b/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/desktop/edit/menu/SideEditorOptions.kt
@@ -47,6 +47,7 @@ import io.writeopia.common.utils.collections.inBatches
 import io.writeopia.common.utils.file.fileChooserLoad
 import io.writeopia.common.utils.file.fileChooserSave
 import io.writeopia.common.utils.icons.WrIcons
+import io.writeopia.common.utils.modifier.clickableWithoutGettingFocus
 import io.writeopia.model.Font
 import io.writeopia.resources.WrStrings
 import io.writeopia.sdk.models.span.Span
@@ -305,7 +306,9 @@ private fun TextChanges(spanClick: (Span) -> Unit) {
             modifier = Modifier.weight(1F)
                 .clip(RoundedCornerShape(topStart = 6.dp, bottomStart = 6.dp))
                 .size(32.dp)
-                .clickable { spanClick(Span.BOLD) }
+                .clickableWithoutGettingFocus {
+                    spanClick(Span.BOLD)
+                }
                 .padding(horizontal = 8.dp, vertical = 8.dp),
             tint = MaterialTheme.colorScheme.onBackground
         )
@@ -315,7 +318,7 @@ private fun TextChanges(spanClick: (Span) -> Unit) {
             contentDescription = "Italic",
             modifier = Modifier.weight(1F)
                 .size(32.dp)
-                .clickable { spanClick(Span.ITALIC) }
+                .clickableWithoutGettingFocus { spanClick(Span.ITALIC) }
                 .padding(horizontal = 8.dp, vertical = 8.dp),
             tint = MaterialTheme.colorScheme.onBackground
         )
@@ -326,7 +329,7 @@ private fun TextChanges(spanClick: (Span) -> Unit) {
             modifier = Modifier.weight(1F)
                 .clip(RoundedCornerShape(topEnd = 6.dp, bottomEnd = 6.dp))
                 .size(32.dp)
-                .clickable { spanClick(Span.UNDERLINE) }
+                .clickableWithoutGettingFocus { spanClick(Span.UNDERLINE) }
                 .padding(horizontal = 8.dp, vertical = 8.dp),
             tint = MaterialTheme.colorScheme.onBackground
         )
@@ -601,32 +604,32 @@ private fun Actions(
 
         Row {
             TextButton(
-                modifier = Modifier.weight(1F),
                 text = WrStrings.json(),
+                modifier = Modifier.weight(1F),
                 paddingValues = smallButtonPadding()
             ) {
                 fileChooserSave()?.let {
                     exportJson(it)
                 }
             }
 
-//            Text(
-//                "Markdown",
-//                textAlign = TextAlign.Center,
-//                modifier = Modifier
-//                    .padding(2.dp)
-//                    .background(
-//                        MaterialTheme.colorScheme.surfaceVariant,
-//                        MaterialTheme.shapes.medium
-//                    ).weight(1F)
-//                    .clip(MaterialTheme.shapes.medium)
-//                    .clickable {
-//                        fileChooserSave()?.let(exportMarkdown)
-//                    }
-//                    .padding(4.dp),
-//                color = MaterialTheme.colorScheme.onBackground,
-//                style = buttonsTextStyle()
-//            )
+            Text(
+                WrStrings.markdown(),
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .padding(2.dp)
+                    .background(
+                        MaterialTheme.colorScheme.surfaceVariant,
+                        MaterialTheme.shapes.medium
+                    ).weight(1F)
+                    .clip(MaterialTheme.shapes.medium)
+                    .clickable {
+                        fileChooserSave()?.let(exportMarkdown)
+                    }
+                    .padding(4.dp),
+                color = MaterialTheme.colorScheme.onBackground,
+                style = buttonsTextStyle()
+            )
         }
 
         Spacer(modifier = Modifier.height(12.dp))
diff --git a/plugins/writeopia_export/src/commonMain/kotlin/io/writeopia/sdk/export/DocumentToMarkdown.kt b/plugins/writeopia_export/src/commonMain/kotlin/io/writeopia/sdk/export/DocumentToMarkdown.kt
@@ -15,16 +15,20 @@ import io.writeopia.sdk.utils.files.useKmp
  */
 object DocumentToMarkdown : DocumentWriter {
 
-    // In the future it may be necessary to add a parse to an OutputStream
-
     override fun writeDocuments(
         documents: List<Document>,
         path: String,
         addHashTable: Boolean,
-        usePath: Boolean
+        usePath: Boolean,
     ) {
         documents.forEach { document ->
-            KmpFileWriter(name(document, path, ".md")).useKmp { writer ->
+            KmpFileWriter(
+                if (usePath) {
+                    name(document, path, ".md")
+                } else {
+                    path.takeIf { it.contains(".md") } ?: "$path.md"
+                }
+            ).useKmp { writer ->
                 writeToWriter(
                     content = document.content,
                     kmpFileWriter = writer
diff --git a/plugins/writeopia_export/src/commonMain/kotlin/io/writeopia/sdk/export/files/KmpFileWritter.kt b/plugins/writeopia_export/src/commonMain/kotlin/io/writeopia/sdk/export/files/KmpFileWritter.kt
@@ -21,5 +21,13 @@ expect class KmpFileWriter(fileName: String) : KmpClosable {
  * @param path String The path of the file
  * @param extension String The extensions, containing dot.
  */
-fun name(document: Document, path: String, extension: String) =
-    "$path/${document.title.trim().replace(" ", "_")}_${document.id}$extension"
+fun name(document: Document, path: String, extension: String): String {
+    val documentPath =
+        "$path/${document.title.trim().replace(" ", "_")}_${document.id}"
+
+    return if (documentPath.endsWith(extension)) {
+        documentPath
+    } else {
+        "$documentPath$extension"
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`-keepclassmembers public class **$$serializer {`
`15`	`15`	`private ** descriptor;`
`16`	`16`	`}`
	`17`	`+-keep class coil3.network.ktor3.** { *; }`
`17`	`18`
`18`	`19`	`-dontwarn org.slf4j.**`
`19`	`20`	`-dontwarn android.**`