capacitor-sora-editor 1.0.1 → 1.0.3

package/android/build.gradle

@@ -62,8 +62,11 @@ dependencies {
     implementation "androidx.core:core-ktx:1.15.0"
     
     // Correct Maven coordinates for Sora Editor
-    implementation 'io.github.rosemoe:editor:0.24.4'
-    implementation 'io.github.rosemoe:language-textmate:0.24.4'
+    // Correct Maven coordinates for Sora Editor
+    // Use local Sora Editor project
+    implementation project(':sora-editor')
+    // Remove individual module dependencies if they are included in :sora-editor or if they also need to be local
+    // implementation 'io.github.abc15018045126:language-textmate:0.24.4' 
 
     // Compose
     def composeBom = platform('androidx.compose:compose-bom:2024.12.01')

package/android/src/main/java/com/abc15018045126/capacitor/soraeditor/SoraEditorPlugin.kt

@@ -9,8 +9,8 @@ import com.getcapacitor.Plugin
 import com.getcapacitor.PluginCall
 import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
-import io.github.rosemoe.sora.widget.CodeEditor
-import io.github.rosemoe.sora.widget.schemes.EditorColorScheme
+import io.github.abc15018045126.sora.widget.CodeEditor
+import io.github.abc15018045126.sora.widget.schemes.EditorColorScheme
 
 @CapacitorPlugin(name = "SoraEditor")
 class SoraEditorPlugin : Plugin() {
@@ -41,6 +41,17 @@ class SoraEditorPlugin : Plugin() {
                     isWordwrap = wordWrap
                     setEditable(editable)
                     
+                    // Initial setup for new features
+                    setLineSpacing(call.getFloat("lineSpacingExtra") ?: 0f, call.getFloat("lineSpacingMultiplier") ?: 1.0f)
+                    setWrapLineSpacing(call.getFloat("wrapLineSpacingExtra") ?: 0f, call.getFloat("wrapLineSpacingMultiplier") ?: 1.0f)
+                    setHighlightCurrentLine(call.getBoolean("highlightCurrentLine") ?: true)
+                    isDisplayLnPanel = call.getBoolean("showScrollLineInfo") ?: true
+                    
+                    val hPadding = call.getFloat("horizontalPadding") ?: 12f
+                    setDividerMargin(0f, hPadding * dpUnit)
+                    setExtraMarginRight(hPadding * dpUnit)
+                    setLineNumberMarginLeft(hPadding * dpUnit)
+
                     var startX = 0f
                     var startY = 0f
                     var startTime = 0L
@@ -62,7 +73,7 @@ class SoraEditorPlugin : Plugin() {
                         }
                         false // Allow editor to handle the event too
                     }
-                    subscribeEvent(io.github.rosemoe.sora.event.ContentChangeEvent::class.java) { event, _ ->
+                    subscribeEvent(io.github.abc15018045126.sora.event.ContentChangeEvent::class.java) { event, _ ->
                         notifyListeners("onContentChange", JSObject())
                     }
                 }
@@ -99,6 +110,14 @@ class SoraEditorPlugin : Plugin() {
                 } catch (e: Exception) {}
             }
 
+            val searchMatchBgStr = call.getString("searchMatchBackgroundColor")
+            if (searchMatchBgStr != null) {
+                try {
+                    val color = Color.parseColor(searchMatchBgStr)
+                    editor!!.colorScheme.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, color)
+                } catch (e: Exception) {}
+            }
+
             val density = context.resources.displayMetrics.density
             val params = editor!!.layoutParams as FrameLayout.LayoutParams
             params.topMargin = (topMargin * density).toInt()
@@ -118,6 +137,79 @@ class SoraEditorPlugin : Plugin() {
             }
             
             editor!!.setTextSize(fontSize)
+            editor!!.isLineNumberEnabled = showLineNumbers
+            editor!!.isWordwrap = wordWrap
+            editor!!.setEditable(editable)
+            
+            // Re-apply spacing/padding in update
+            editor!!.setLineSpacing(call.getFloat("lineSpacingExtra") ?: 0f, call.getFloat("lineSpacingMultiplier") ?: 1.0f)
+            editor!!.setWrapLineSpacing(call.getFloat("wrapLineSpacingExtra") ?: 0f, call.getFloat("wrapLineSpacingMultiplier") ?: 1.0f)
+            editor!!.setHighlightCurrentLine(call.getBoolean("highlightCurrentLine") ?: true)
+            editor!!.isDisplayLnPanel = call.getBoolean("showScrollLineInfo") ?: true
+            
+            val hPadding = call.getFloat("horizontalPadding") ?: 12f
+            editor!!.setDividerMargin(0f, hPadding * editor!!.dpUnit)
+            editor!!.setExtraMarginRight(hPadding * editor!!.dpUnit)
+            editor!!.setLineNumberMarginLeft(hPadding * editor!!.dpUnit)
+
+            // Handle Font Family
+            val fontFamily = call.getString("fontFamily") ?: "Monospace"
+            when (fontFamily) {
+                "JetBrains Mono" -> editor!!.typefaceText = Typeface.createFromAsset(context.assets, "JetBrainsMono-Regular.ttf")
+                "Ubuntu" -> editor!!.typefaceText = Typeface.createFromAsset(context.assets, "Ubuntu-Regular.ttf")
+                "Roboto" -> editor!!.typefaceText = Typeface.createFromAsset(context.assets, "Roboto-Regular.ttf")
+                else -> editor!!.setTypefaceText(Typeface.MONOSPACE)
+            }
+
+            // Handle Colors
+            val currentLineBg = call.getString("currentLineBackgroundColor")
+            if (currentLineBg != null) {
+                try { editor!!.colorScheme.setColor(EditorColorScheme.CURRENT_LINE, Color.parseColor(currentLineBg)) } catch(e: Exception) {}
+            }
+            
+            val cursorColor = call.getString("cursorColor")
+            if (cursorColor != null) {
+                try { editor!!.colorScheme.setColor(EditorColorScheme.SELECTION_INSERT, Color.parseColor(cursorColor)) } catch(e: Exception) {}
+            }
+            
+            val handleColor = call.getString("handleColor")
+            if (handleColor != null) {
+                try { editor!!.colorScheme.setColor(EditorColorScheme.SELECTION_HANDLE, Color.parseColor(handleColor)) } catch(e: Exception) {}
+            }
+            
+            val scrollbarColor = call.getString("scrollbarColor")
+            if (scrollbarColor != null) {
+                try { 
+                    val sColor = Color.parseColor(scrollbarColor)
+                    editor!!.colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB, sColor)
+                    editor!!.colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, sColor)
+                } catch(e: Exception) {}
+            }
+
+            val scrollbarStyle = call.getString("scrollbarStyle") ?: "default"
+            if (scrollbarStyle == "rounded") {
+                val sColor = try { Color.parseColor(scrollbarColor ?: "#A0888888") } catch(e: Exception) { 0xFFA0888888.toInt() }
+                val drawable = android.graphics.drawable.GradientDrawable().apply {
+                    shape = android.graphics.drawable.GradientDrawable.RECTANGLE
+                    cornerRadius = 100f
+                    setColor(sColor)
+                }
+                editor!!.renderer.setVerticalScrollbarThumbDrawable(drawable)
+                editor!!.renderer.setHorizontalScrollbarThumbDrawable(drawable)
+            } else {
+                editor!!.renderer.setVerticalScrollbarThumbDrawable(null)
+                editor!!.renderer.setHorizontalScrollbarThumbDrawable(null)
+            }
+
+            editor!!.setCursorWidth((call.getFloat("cursorWidth") ?: 2f) * editor!!.dpUnit / 2f)
+
+            val handleStyle = call.getString("handleStyle") ?: "side_drop"
+            editor!!.setSelectionHandleStyle(when (handleStyle) {
+                "drop" -> io.github.abc15018045126.sora.widget.style.HandleStyleDrop(context)
+                "none" -> io.github.abc15018045126.sora.widget.style.HandleStyleNone()
+                else -> io.github.abc15018045126.sora.widget.style.HandleStyleSideDrop(context)
+            })
+
             editor!!.visibility = View.VISIBLE
             editor!!.bringToFront()
             

package/android/src/main/java/com/abc15018045126/capacitor/soraeditor/compose/EditorViewModel.kt

@@ -45,7 +45,26 @@ data class EditorUiState(
     val tocColor: String = "#FFFFFF",
     val searchColor: String = "#F5F5F5",
     val menuColor: String = "#FFFFFF",
-    val shouldAutoFocus: Boolean = false
+    val searchMatchBackgroundColor: String = "#FFF59D",
+    val shouldAutoFocus: Boolean = false,
+    val lineSpacingMultiplier: Float = 1.0f,
+    val lineSpacingExtra: Float = 0f,
+    val wrapLineSpacingMultiplier: Float = 1.0f,
+    val wrapLineSpacingExtra: Float = 0f,
+    val horizontalPadding: Float = 12f,
+    val highlightCurrentLine: Boolean = true,
+    val currentLineBackgroundColor: String = "#10000000",
+    val cursorColor: String = "#FF000000",
+    val handleColor: String = "#FF000000",
+    val cursorWidth: Float = 2.0f,
+    val handleStyle: String = "side_drop", // "drop", "side_drop", "none"
+    val searchAsRegExp: Boolean = false,
+    val searchWholeWord: Boolean = false,
+    val searchMatchCase: Boolean = false,
+    val fontFamily: String = "Monospace",
+    val scrollbarColor: String = "#A0888888",
+    val showScrollLineInfo: Boolean = true,
+    val scrollbarStyle: String = "default" // "default" or "rounded"
 )
 
 class EditorViewModel : ViewModel() {
@@ -63,6 +82,7 @@ class EditorViewModel : ViewModel() {
     }
 
     fun loadFile(context: Context, filePath: String, autoFocus: Boolean = false) {
+        loadSettings(context)
         viewModelScope.launch {
             try {
                 // Convert URI to actual path if needed
@@ -328,6 +348,96 @@ class EditorViewModel : ViewModel() {
         saveSettings(context)
     }
 
+    fun setSearchMatchBackgroundColor(context: Context, color: String) {
+        _uiState.update { it.copy(searchMatchBackgroundColor = color) }
+        saveSettings(context)
+    }
+
+    fun setLineSpacingMultiplier(context: Context, multiplier: Float) {
+        _uiState.update { it.copy(lineSpacingMultiplier = multiplier) }
+        saveSettings(context)
+    }
+
+    fun setLineSpacingExtra(context: Context, extra: Float) {
+        _uiState.update { it.copy(lineSpacingExtra = extra) }
+        saveSettings(context)
+    }
+
+    fun setHorizontalPadding(context: Context, padding: Float) {
+        _uiState.update { it.copy(horizontalPadding = padding) }
+        saveSettings(context)
+    }
+
+    fun setWrapLineSpacing(context: Context, extra: Float, multiplier: Float) {
+        _uiState.update { it.copy(wrapLineSpacingExtra = extra, wrapLineSpacingMultiplier = multiplier) }
+        saveSettings(context)
+    }
+
+    fun setHighlightCurrentLine(context: Context, enabled: Boolean) {
+        _uiState.update { it.copy(highlightCurrentLine = enabled) }
+        saveSettings(context)
+    }
+
+    fun setCurrentLineBackgroundColor(context: Context, color: String) {
+        _uiState.update { it.copy(currentLineBackgroundColor = color) }
+        saveSettings(context)
+    }
+
+    fun setCursorColor(context: Context, color: String) {
+        _uiState.update { it.copy(cursorColor = color) }
+        saveSettings(context)
+    }
+
+    fun setHandleColor(context: Context, color: String) {
+        _uiState.update { it.copy(handleColor = color) }
+        saveSettings(context)
+    }
+
+    fun setCursorWidth(context: Context, width: Float) {
+        _uiState.update { it.copy(cursorWidth = width) }
+        saveSettings(context)
+    }
+
+    fun setHandleStyle(context: Context, style: String) {
+        _uiState.update { it.copy(handleStyle = style) }
+        saveSettings(context)
+    }
+
+    fun setSearchAsRegExp(context: Context, enabled: Boolean) {
+        _uiState.update { it.copy(searchAsRegExp = enabled) }
+        saveSettings(context)
+    }
+
+    fun setSearchWholeWord(context: Context, enabled: Boolean) {
+        _uiState.update { it.copy(searchWholeWord = enabled) }
+        saveSettings(context)
+    }
+
+    fun setSearchMatchCase(context: Context, enabled: Boolean) {
+        _uiState.update { it.copy(searchMatchCase = enabled) }
+        saveSettings(context)
+    }
+
+    fun setFontFamily(context: Context, fontFamily: String) {
+        _uiState.update { it.copy(fontFamily = fontFamily) }
+        saveSettings(context)
+    }
+
+    fun setScrollbarColor(context: Context, color: String) {
+        _uiState.update { it.copy(scrollbarColor = color) }
+        saveSettings(context)
+    }
+
+    fun setShowScrollLineInfo(context: Context, show: Boolean) {
+        _uiState.update { it.copy(showScrollLineInfo = show) }
+        saveSettings(context)
+    }
+
+    fun setScrollbarStyle(context: Context, style: String) {
+        _uiState.update { it.copy(scrollbarStyle = style) }
+        saveSettings(context)
+    }
+
     fun renameFile(newName: String): Boolean {
         val currentFile = File(_uiState.value.filePath)
         val parent = currentFile.parentFile
@@ -385,7 +495,26 @@ class EditorViewModel : ViewModel() {
             uiColor = "#F5F5F5",
             tocColor = "#FFFFFF",
             searchColor = "#F5F5F5",
-            menuColor = "#FFFFFF"
+            menuColor = "#FFFFFF",
+            searchMatchBackgroundColor = "#FFF59D",
+            lineSpacingMultiplier = 1.0f,
+            lineSpacingExtra = 0f,
+            wrapLineSpacingMultiplier = 1.0f,
+            wrapLineSpacingExtra = 0f,
+            horizontalPadding = 12f,
+            highlightCurrentLine = true,
+            currentLineBackgroundColor = "#10000000",
+            cursorColor = "#FF000000",
+            handleColor = "#FF000000",
+            cursorWidth = 2.0f,
+            handleStyle = "side_drop",
+            searchAsRegExp = false,
+            searchWholeWord = false,
+            searchMatchCase = false,
+            fontFamily = "Monospace",
+            scrollbarColor = "#A0888888",
+            showScrollLineInfo = true,
+            scrollbarStyle = "default"
         ) }
         saveSettings(context)
     }
@@ -414,6 +543,25 @@ class EditorViewModel : ViewModel() {
             put("tocColor", _uiState.value.tocColor)
             put("searchColor", _uiState.value.searchColor)
             put("menuColor", _uiState.value.menuColor)
+            put("searchMatchBackgroundColor", _uiState.value.searchMatchBackgroundColor)
+            put("lineSpacingMultiplier", _uiState.value.lineSpacingMultiplier.toDouble())
+            put("lineSpacingExtra", _uiState.value.lineSpacingExtra.toDouble())
+            put("wrapLineSpacingMultiplier", _uiState.value.wrapLineSpacingMultiplier.toDouble())
+            put("wrapLineSpacingExtra", _uiState.value.wrapLineSpacingExtra.toDouble())
+            put("horizontalPadding", _uiState.value.horizontalPadding.toDouble())
+            put("highlightCurrentLine", _uiState.value.highlightCurrentLine)
+            put("currentLineBackgroundColor", _uiState.value.currentLineBackgroundColor)
+            put("cursorColor", _uiState.value.cursorColor)
+            put("handleColor", _uiState.value.handleColor)
+            put("cursorWidth", _uiState.value.cursorWidth.toDouble())
+            put("handleStyle", _uiState.value.handleStyle)
+            put("searchAsRegExp", _uiState.value.searchAsRegExp)
+            put("searchWholeWord", _uiState.value.searchWholeWord)
+            put("searchMatchCase", _uiState.value.searchMatchCase)
+            put("fontFamily", _uiState.value.fontFamily)
+            put("scrollbarColor", _uiState.value.scrollbarColor)
+            put("showScrollLineInfo", _uiState.value.showScrollLineInfo)
+            put("scrollbarStyle", _uiState.value.scrollbarStyle)
         }
         prefs.edit().putString("settings_json", json.toString()).apply()
     }
@@ -434,7 +582,26 @@ class EditorViewModel : ViewModel() {
                 uiColor = json.optString("uiColor", "#F5F5F5"),
                 tocColor = json.optString("tocColor", "#FFFFFF"),
                 searchColor = json.optString("searchColor", "#F5F5F5"),
-                menuColor = json.optString("menuColor", "#FFFFFF")
+                menuColor = json.optString("menuColor", "#FFFFFF"),
+                searchMatchBackgroundColor = json.optString("searchMatchBackgroundColor", "#FFF59D"),
+                lineSpacingMultiplier = json.optDouble("lineSpacingMultiplier", 1.0).toFloat(),
+                lineSpacingExtra = json.optDouble("lineSpacingExtra", 0.0).toFloat(),
+                wrapLineSpacingMultiplier = json.optDouble("wrapLineSpacingMultiplier", 1.0).toFloat(),
+                wrapLineSpacingExtra = json.optDouble("wrapLineSpacingExtra", 0.0).toFloat(),
+            horizontalPadding = json.optDouble("horizontalPadding", 12.0).toFloat(),
+            highlightCurrentLine = json.optBoolean("highlightCurrentLine", true),
+            currentLineBackgroundColor = json.optString("currentLineBackgroundColor", "#10000000"),
+            cursorColor = json.optString("cursorColor", "#FF000000"),
+            handleColor = json.optString("handleColor", "#FF000000"),
+            cursorWidth = json.optDouble("cursorWidth", 2.0).toFloat(),
+            handleStyle = json.optString("handleStyle", "side_drop"),
+            searchAsRegExp = json.optBoolean("searchAsRegExp", false),
+            searchWholeWord = json.optBoolean("searchWholeWord", false),
+            searchMatchCase = json.optBoolean("searchMatchCase", false),
+            fontFamily = json.optString("fontFamily", "Monospace"),
+            scrollbarColor = json.optString("scrollbarColor", "#A0888888"),
+            showScrollLineInfo = json.optBoolean("showScrollLineInfo", true),
+            scrollbarStyle = json.optString("scrollbarStyle", "default")
             )
         } catch (e: Exception) {
             e.printStackTrace()
@@ -455,7 +622,26 @@ class EditorViewModel : ViewModel() {
                 uiColor = json.optString("uiColor", _uiState.value.uiColor),
                 tocColor = json.optString("tocColor", _uiState.value.tocColor),
                 searchColor = json.optString("searchColor", _uiState.value.searchColor),
-                menuColor = json.optString("menuColor", _uiState.value.menuColor)
+                menuColor = json.optString("menuColor", _uiState.value.menuColor),
+                searchMatchBackgroundColor = json.optString("searchMatchBackgroundColor", _uiState.value.searchMatchBackgroundColor),
+                lineSpacingMultiplier = json.optDouble("lineSpacingMultiplier", _uiState.value.lineSpacingMultiplier.toDouble()).toFloat(),
+                lineSpacingExtra = json.optDouble("lineSpacingExtra", _uiState.value.lineSpacingExtra.toDouble()).toFloat(),
+                wrapLineSpacingMultiplier = json.optDouble("wrapLineSpacingMultiplier", _uiState.value.wrapLineSpacingMultiplier.toDouble()).toFloat(),
+                wrapLineSpacingExtra = json.optDouble("wrapLineSpacingExtra", _uiState.value.wrapLineSpacingExtra.toDouble()).toFloat(),
+                horizontalPadding = json.optDouble("horizontalPadding", _uiState.value.horizontalPadding.toDouble()).toFloat(),
+                highlightCurrentLine = json.optBoolean("highlightCurrentLine", _uiState.value.highlightCurrentLine),
+                currentLineBackgroundColor = json.optString("currentLineBackgroundColor", _uiState.value.currentLineBackgroundColor),
+                cursorColor = json.optString("cursorColor", _uiState.value.cursorColor),
+                handleColor = json.optString("handleColor", _uiState.value.handleColor),
+                cursorWidth = json.optDouble("cursorWidth", _uiState.value.cursorWidth.toDouble()).toFloat(),
+                handleStyle = json.optString("handleStyle", _uiState.value.handleStyle),
+                searchAsRegExp = json.optBoolean("searchAsRegExp", _uiState.value.searchAsRegExp),
+                searchWholeWord = json.optBoolean("searchWholeWord", _uiState.value.searchWholeWord),
+                searchMatchCase = json.optBoolean("searchMatchCase", _uiState.value.searchMatchCase),
+                fontFamily = json.optString("fontFamily", _uiState.value.fontFamily),
+                scrollbarColor = json.optString("scrollbarColor", _uiState.value.scrollbarColor),
+                showScrollLineInfo = json.optBoolean("showScrollLineInfo", _uiState.value.showScrollLineInfo),
+                scrollbarStyle = json.optString("scrollbarStyle", _uiState.value.scrollbarStyle)
             )
             saveSettings(context)
             true
@@ -477,6 +663,26 @@ class EditorViewModel : ViewModel() {
             put("uiColor", _uiState.value.uiColor)
             put("tocColor", _uiState.value.tocColor)
             put("searchColor", _uiState.value.searchColor)
+            put("menuColor", _uiState.value.menuColor)
+            put("searchMatchBackgroundColor", _uiState.value.searchMatchBackgroundColor)
+            put("lineSpacingMultiplier", _uiState.value.lineSpacingMultiplier.toDouble())
+            put("lineSpacingExtra", _uiState.value.lineSpacingExtra.toDouble())
+            put("wrapLineSpacingMultiplier", _uiState.value.wrapLineSpacingMultiplier.toDouble())
+            put("wrapLineSpacingExtra", _uiState.value.wrapLineSpacingExtra.toDouble())
+            put("horizontalPadding", _uiState.value.horizontalPadding.toDouble())
+            put("highlightCurrentLine", _uiState.value.highlightCurrentLine)
+            put("currentLineBackgroundColor", _uiState.value.currentLineBackgroundColor)
+            put("cursorColor", _uiState.value.cursorColor)
+            put("handleColor", _uiState.value.handleColor)
+            put("cursorWidth", _uiState.value.cursorWidth.toDouble())
+            put("handleStyle", _uiState.value.handleStyle)
+            put("searchAsRegExp", _uiState.value.searchAsRegExp)
+            put("searchWholeWord", _uiState.value.searchWholeWord)
+            put("searchMatchCase", _uiState.value.searchMatchCase)
+            put("fontFamily", _uiState.value.fontFamily)
+            put("scrollbarColor", _uiState.value.scrollbarColor)
+            put("showScrollLineInfo", _uiState.value.showScrollLineInfo)
+            put("scrollbarStyle", _uiState.value.scrollbarStyle)
         } .toString(4)
     }
 }