capacitor-sora-editor 1.0.3 → 1.0.5

package/android/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
             android:name="com.abc15018045126.capacitor.soraeditor.compose.ComposeEditorActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
+            android:windowSoftInputMode="adjustResize"
             android:exported="false" />
     </application>
 </manifest>

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

@@ -11,6 +11,9 @@ import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
 import io.github.abc15018045126.sora.widget.CodeEditor
 import io.github.abc15018045126.sora.widget.schemes.EditorColorScheme
+import io.github.abc15018045126.sora.widget.style.builtin.HandleStyleDrop
+import io.github.abc15018045126.sora.widget.style.builtin.HandleStyleSideDrop
+import io.github.abc15018045126.sora.widget.style.builtin.HandleStyleNone
 
 @CapacitorPlugin(name = "SoraEditor")
 class SoraEditorPlugin : Plugin() {
@@ -205,11 +208,26 @@ class SoraEditorPlugin : Plugin() {
 
             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)
+                "drop" -> HandleStyleDrop(context)
+                "none" -> HandleStyleNone()
+                else -> HandleStyleSideDrop(context)
             })
 
+            if (call.hasOption("keyboardAdjust")) {
+                val adjust = call.getBoolean("keyboardAdjust") ?: true
+                activity.runOnUiThread {
+                    if (adjust) {
+                        activity.window.setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+                    } else {
+                        activity.window.setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
+                    }
+                }
+            }
+
+            val symbolBarColor = call.getString("symbolBarColor") ?: "#F5F5F5"
+            val symbolTextColor = call.getString("symbolTextColor") ?: "#FF000000"
+            val symbolBarStyle = call.getString("symbolBarStyle") ?: "rounded"
+
             editor!!.visibility = View.VISIBLE
             editor!!.bringToFront()
             

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

@@ -32,6 +32,14 @@ class ComposeEditorActivity : ComponentActivity() {
         setContent {
             val uiState by viewModel.uiState.collectAsState()
             
+            LaunchedEffect(uiState.keyboardAdjust) {
+                if (uiState.keyboardAdjust) {
+                    window.setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+                } else {
+                    window.setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
+                }
+            }
+
             NotesTheme(darkTheme = uiState.isDarkTheme) {
                 Surface(
                     modifier = Modifier.fillMaxSize(),

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

@@ -64,7 +64,11 @@ data class EditorUiState(
     val fontFamily: String = "Monospace",
     val scrollbarColor: String = "#A0888888",
     val showScrollLineInfo: Boolean = true,
-    val scrollbarStyle: String = "default" // "default" or "rounded"
+    val scrollbarStyle: String = "default", // "default" or "rounded"
+    val keyboardAdjust: Boolean = true,
+    val symbolBarColor: String = "#F5F5F5",
+    val symbolTextColor: String = "#FF000000",
+    val symbolBarStyle: String = "rounded" // "rounded", "flat"
 )
 
 class EditorViewModel : ViewModel() {
@@ -438,6 +442,26 @@ class EditorViewModel : ViewModel() {
         saveSettings(context)
     }
 
+    fun setKeyboardAdjust(context: Context, enabled: Boolean) {
+        _uiState.update { it.copy(keyboardAdjust = enabled) }
+        saveSettings(context)
+    }
+
+    fun setSymbolBarColor(context: Context, color: String) {
+        _uiState.update { it.copy(symbolBarColor = color) }
+        saveSettings(context)
+    }
+
+    fun setSymbolTextColor(context: Context, color: String) {
+        _uiState.update { it.copy(symbolTextColor = color) }
+        saveSettings(context)
+    }
+
+    fun setSymbolBarStyle(context: Context, style: String) {
+        _uiState.update { it.copy(symbolBarStyle = style) }
+        saveSettings(context)
+    }
+
     fun renameFile(newName: String): Boolean {
         val currentFile = File(_uiState.value.filePath)
         val parent = currentFile.parentFile
@@ -514,7 +538,11 @@ class EditorViewModel : ViewModel() {
             fontFamily = "Monospace",
             scrollbarColor = "#A0888888",
             showScrollLineInfo = true,
-            scrollbarStyle = "default"
+            scrollbarStyle = "default",
+            keyboardAdjust = true,
+            symbolBarColor = "#F5F5F5",
+            symbolTextColor = "#FF000000",
+            symbolBarStyle = "rounded"
         ) }
         saveSettings(context)
     }
@@ -562,6 +590,10 @@ class EditorViewModel : ViewModel() {
             put("scrollbarColor", _uiState.value.scrollbarColor)
             put("showScrollLineInfo", _uiState.value.showScrollLineInfo)
             put("scrollbarStyle", _uiState.value.scrollbarStyle)
+            put("keyboardAdjust", _uiState.value.keyboardAdjust)
+            put("symbolBarColor", _uiState.value.symbolBarColor)
+            put("symbolTextColor", _uiState.value.symbolTextColor)
+            put("symbolBarStyle", _uiState.value.symbolBarStyle)
         }
         prefs.edit().putString("settings_json", json.toString()).apply()
     }
@@ -601,7 +633,11 @@ class EditorViewModel : ViewModel() {
             fontFamily = json.optString("fontFamily", "Monospace"),
             scrollbarColor = json.optString("scrollbarColor", "#A0888888"),
             showScrollLineInfo = json.optBoolean("showScrollLineInfo", true),
-            scrollbarStyle = json.optString("scrollbarStyle", "default")
+            scrollbarStyle = json.optString("scrollbarStyle", "default"),
+            keyboardAdjust = json.optBoolean("keyboardAdjust", true),
+            symbolBarColor = json.optString("symbolBarColor", "#F5F5F5"),
+            symbolTextColor = json.optString("symbolTextColor", "#FF000000"),
+            symbolBarStyle = json.optString("symbolBarStyle", "rounded")
             )
         } catch (e: Exception) {
             e.printStackTrace()
@@ -641,7 +677,11 @@ class EditorViewModel : ViewModel() {
                 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)
+                scrollbarStyle = json.optString("scrollbarStyle", _uiState.value.scrollbarStyle),
+                keyboardAdjust = json.optBoolean("keyboardAdjust", _uiState.value.keyboardAdjust),
+                symbolBarColor = json.optString("symbolBarColor", _uiState.value.symbolBarColor),
+                symbolTextColor = json.optString("symbolTextColor", _uiState.value.symbolTextColor),
+                symbolBarStyle = json.optString("symbolBarStyle", _uiState.value.symbolBarStyle)
             )
             saveSettings(context)
             true
@@ -683,6 +723,10 @@ class EditorViewModel : ViewModel() {
             put("scrollbarColor", _uiState.value.scrollbarColor)
             put("showScrollLineInfo", _uiState.value.showScrollLineInfo)
             put("scrollbarStyle", _uiState.value.scrollbarStyle)
+            put("keyboardAdjust", _uiState.value.keyboardAdjust)
+            put("symbolBarColor", _uiState.value.symbolBarColor)
+            put("symbolTextColor", _uiState.value.symbolTextColor)
+            put("symbolBarStyle", _uiState.value.symbolBarStyle)
         } .toString(4)
     }
 }

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

@@ -715,7 +715,9 @@ fun EditorScreen(
                 Column {
                     if (uiState.showSymbolBar && !uiState.isReadOnly) {
                         SymbolBar(
-                            uiColor = uiState.uiColor,
+                            uiColor = uiState.symbolBarColor,
+                            textColor = uiState.symbolTextColor,
+                            style = uiState.symbolBarStyle,
                             onSymbolClick = { editorControl.insertText(it) }
                         )
                     }
@@ -773,29 +775,46 @@ fun EditorScreen(
 }
 
 @Composable
-fun SymbolBar(uiColor: String, onSymbolClick: (String) -> Unit) {
+fun SymbolBar(uiColor: String, textColor: String, style: String, onSymbolClick: (String) -> Unit) {
     val symbols = listOf(",", ".", ";", "(", ")", "{", "}", "[", "]", "\"", "'", ":", "/", "<", ">", "=", "+", "-", "*", "&", "|", "!", "?", "#", "@", "$", "%", "^", "~", "`")
+    val bgColor = try { Color(android.graphics.Color.parseColor(uiColor)) } catch(e:Exception) { Color(0xFFF0F0F0) }
+    val tColor = try { Color(android.graphics.Color.parseColor(textColor)) } catch(e:Exception) { Color.Black }
+    
     androidx.compose.foundation.lazy.LazyRow(
         modifier = Modifier
             .fillMaxWidth()
             .height(44.dp)
-            .background(try { Color(android.graphics.Color.parseColor(uiColor)) } catch(e:Exception) { Color(0xFFF0F0F0) })
+            .background(bgColor)
             .border(androidx.compose.foundation.BorderStroke(0.5.dp, Color.LightGray.copy(alpha = 0.5f))),
         contentPadding = PaddingValues(horizontal = 8.dp),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(4.dp)
+        horizontalArrangement = Arrangement.spacedBy(if (style == "flat") 0.dp else 4.dp)
     ) {
         items(symbols.size) { index ->
-            Surface(
-                onClick = { onSymbolClick(symbols[index]) },
-                modifier = Modifier
-                    .size(width = 36.dp, height = 36.dp),
-                shape = RoundedCornerShape(4.dp),
-                color = Color.White,
-                border = androidx.compose.foundation.BorderStroke(0.5.dp, Color.LightGray)
-            ) {
-                Box(contentAlignment = Alignment.Center) {
-                    Text(symbols[index], fontSize = 18.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Medium)
+            val content = @Composable {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    Text(symbols[index], fontSize = 18.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Medium, color = tColor)
+                }
+            }
+            
+            if (style == "flat") {
+                Box(
+                    modifier = Modifier
+                        .size(width = 36.dp, height = 36.dp)
+                        .clickable { onSymbolClick(symbols[index]) }
+                ) {
+                    content()
+                }
+            } else {
+                Surface(
+                    onClick = { onSymbolClick(symbols[index]) },
+                    modifier = Modifier
+                        .size(width = 36.dp, height = 36.dp),
+                    shape = if (style == "rounded") RoundedCornerShape(4.dp) else androidx.compose.ui.graphics.RectangleShape,
+                    color = Color.White.copy(alpha = 0.8f),
+                    border = androidx.compose.foundation.BorderStroke(0.5.dp, Color.LightGray.copy(alpha = 0.5f))
+                ) {
+                    content()
                 }
             }
         }
@@ -1110,6 +1129,7 @@ fun EditorSettingsScreen(
                 SettingsSwitchItem("显示状态栏", "显示底部的行、列、字符数信息", uiState.showStatusBar) { viewModel.toggleStatusBar(localContext) }
                 SettingsSwitchItem("符号快捷键", "在底部显示常用符号栏", uiState.showSymbolBar) { viewModel.toggleSymbolBar(localContext) }
                 SettingsSwitchItem("显示滚动详情 (行号)", "拖动滚动条时显示当前行号", uiState.showScrollLineInfo) { viewModel.setShowScrollLineInfo(localContext, it) }
+                SettingsSwitchItem("键盘开启时调整窗口大小", "启用 adjustResize，避免输入法遮挡光标", uiState.keyboardAdjust) { viewModel.setKeyboardAdjust(localContext, it) }
 
                 Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                     Text("搜索首选项", style = MaterialTheme.typography.titleMedium)
@@ -1274,6 +1294,40 @@ fun EditorSettingsScreen(
                             }
                         }
                     }
+
+                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                        Text("符号快捷键颜色 (Symbol Bar)", fontSize = 12.sp, color = Color.Gray)
+                        val barColors = listOf("#F5F5F5" to "灰", "#FFFFFF" to "白", "#EEEEEE" to "深灰", "#000000" to "黑", "#EFEBE9" to "米", "#E8EAF6" to "蓝灰")
+                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            barColors.forEach { (c, l) -> 
+                                ColorOption(c, l, uiState.symbolBarColor == c) { viewModel.setSymbolBarColor(localContext, c) }
+                            }
+                        }
+                    }
+
+                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                        Text("符号文本颜色 (Symbol Text)", fontSize = 12.sp, color = Color.Gray)
+                        val textColors = listOf("#FF000000" to "黑", "#FF888888" to "灰", "#FFFFFFFF" to "白", "#FF0000FF" to "蓝", "#FFFF0000" to "红")
+                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            textColors.forEach { (c, l) -> 
+                                ColorOption(c, l, uiState.symbolTextColor == c) { viewModel.setSymbolTextColor(localContext, c) }
+                            }
+                        }
+                    }
+
+                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                        Text("符号快捷键样式", fontSize = 12.sp, color = Color.Gray)
+                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            mapOf("rounded" to "圆角框", "flat" to "无框 (全屏)", "classic" to "直角框").forEach { (id, label) ->
+                                Button(
+                                    onClick = { viewModel.setSymbolBarStyle(localContext, id) },
+                                    colors = ButtonDefaults.buttonColors(containerColor = if (uiState.symbolBarStyle == id) MaterialTheme.colorScheme.primary else Color.LightGray)
+                                ) {
+                                    Text(label, fontSize = 10.sp)
+                                }
+                            }
+                        }
+                    }
                 }
 
                 Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "capacitor-sora-editor",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "description": "SoraEditor plugin for Capacitor",
     "main": "dist/plugin.js",
     "module": "dist/esm/index.js",
@@ -24,4 +24,4 @@
             "src": "android"
         }
     }
-}
+}

package/src/definitions.ts

@@ -48,4 +48,8 @@ export interface SoraStartOptions {
     scrollbarColor?: string;
     showScrollLineInfo?: boolean;
     scrollbarStyle?: 'default' | 'rounded';
+    keyboardAdjust?: boolean;
+    symbolBarColor?: string;
+    symbolTextColor?: string;
+    symbolBarStyle?: 'rounded' | 'flat' | 'classic';
 }