capacitor-sora-editor 1.2.1 → 1.8.2

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

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.automirrored.filled.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -35,6 +36,10 @@ 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
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import androidx.compose.ui.platform.LocalLifecycleOwner as ComposeLifecycleOwner
 
 class EditorControl {
     private var editor: CodeEditor? = null
@@ -46,7 +51,7 @@ class EditorControl {
     fun jumpTo(pos: Int) {
         if (editor == null) return 
         editor?.let {
-            if (androidx.core.view.ViewCompat.isLaidOut(it)) {
+            if (it.isLaidOut) {
                 performJump(it, pos)
             } else {
                 it.addOnLayoutChangeListener(object : View.OnLayoutChangeListener {
@@ -62,9 +67,10 @@ class EditorControl {
     fun getCurrentCursorPosition(): Int {
         val editor = this.editor ?: return 0
         try {
-            val cursor = editor.cursor
+            val cursor = editor.cursor!!
             val targetLine = cursor.leftLine
             val targetCol = cursor.leftColumn
+
             val text = editor.text.toString()
             
             var idx = 0
@@ -117,7 +123,13 @@ class EditorControl {
             } else {
                 io.github.abc15018045126.sora.widget.EditorSearcher.SearchOptions.TYPE_NORMAL
             }
-            editor?.searcher?.search(text, io.github.abc15018045126.sora.widget.EditorSearcher.SearchOptions(type, !matchCase))
+            // 清理输入文本：移除换行符和其他控制字符
+            val cleanedText = text.replace("\\r", "").replace("\\n", "").trim()
+            if (cleanedText.isEmpty()) {
+                stopSearch()
+                return
+            }
+            editor?.searcher?.search(cleanedText, io.github.abc15018045126.sora.widget.EditorSearcher.SearchOptions(type, !matchCase))
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -141,7 +153,7 @@ class EditorControl {
 
     fun replace(text: String) {
         try {
-            editor?.searcher?.replaceThis(text)
+            editor?.searcher?.replaceCurrentMatch(text)
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -210,17 +222,67 @@ fun SoraEditorView(
     fontFamily: String = "Monospace",
     scrollbarColor: String = "#A0888888",
     showScrollLineInfo: Boolean = true,
-    scrollbarStyle: String = "default"
+    scrollbarStyle: String = "default",
+    isFastMode: Boolean = false,
+    initialPreviewLines: Int = 20,
+    lineNumberAlign: String = "left",
+    isLineNumberRightOfDivider: Boolean = false,
+    isLineNumberPinned: Boolean = false,
+    lineNumberColor: String = "#FF000000",
+    lineDividerColor: String = "#A0888888",
+    editorTextColor: String = "auto",
+    textActionMenuItems: List<String> = listOf("select_all", "copy", "paste", "long_select", "cut"),
+    textActionMenuHidden: List<String> = emptyList(),
+    textActionMenuBgColor: String = "auto"
 ) {
     var editorInstance by remember { mutableStateOf<CodeEditor?>(null) }
     
     // Flag to prevent update loop when setting text programmatically
     val isSettingTextProgrammatically = remember { mutableStateOf(false) }
-    
+    var lastAppliedFontFamily by remember { mutableStateOf("") }
+    var lastAppliedHandleStyle by remember { mutableStateOf("") }
+    var lastAppliedTextActionMenuItems by remember { mutableStateOf<List<String>>(emptyList()) }
+    var lastAppliedTextActionMenuHidden by remember { mutableStateOf<List<String>>(emptyList()) }
+    var lastAppliedTextActionMenuBgColor by remember { mutableStateOf("") }
+    var lastAppliedTextSize by remember { mutableStateOf(-1f) }
+    var lastAppliedCursorWidth by remember { mutableStateOf(-1f) }
+    var lastAppliedLineNumbers by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedWordWrap by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedEditable by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedHighlightCurrentLine by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedShowScrollLineInfo by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedFastMode by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedInitialPreviewLines by remember { mutableStateOf<Int?>(null) }
+    var lastAppliedLineNumberAlign by remember { mutableStateOf("") }
+    var lastAppliedIsLineNumberRightOfDivider by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedIsLineNumberPinned by remember { mutableStateOf<Boolean?>(null) }
+    var lastAppliedLineNumberColor by remember { mutableStateOf("") }
+    var lastAppliedLineDividerColor by remember { mutableStateOf("") }
+
     // Ensure we always have the latest callbacks even if factory is not re-run
     val currentOnTap by rememberUpdatedState(onTap)
     val currentOnContentChange by rememberUpdatedState(onContentChange)
     val currentOnSelectionChange by rememberUpdatedState(onSelectionChange)
+
+    // Use LifecycleEffect to sync text back to ViewModel when app is paused
+    // This fixed auto-save on exit while keeping ContentChangeEvent disabled (avoiding flicker)
+    val lifecycleOwner = LocalLifecycleOwner.current
+    var editorInstanceForSync by remember { mutableStateOf<CodeEditor?>(null) }
+    
+    DisposableEffect(lifecycleOwner) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                editorInstanceForSync?.let { view ->
+                    val currentText = view.text.toString()
+                    currentOnContentChange(currentText)
+                }
+            }
+        }
+        lifecycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
     
     LaunchedEffect(editorInstance, control) {
         editorInstance?.let { control?.attach(it) }
@@ -232,16 +294,17 @@ fun SoraEditorView(
                 setTextSize(fontSize)
                 isLineNumberEnabled = showLineNumbers
                 isWordwrap = wordWrap
-                setEditable(editable)
-                setHighlightCurrentLine(highlightCurrentLine)
+                isEditable = editable
+                isHighlightCurrentLine = highlightCurrentLine
                 setCursorWidth(cursorWidth * dpUnit / 2f)
                 isDisplayLnPanel = showScrollLineInfo
+
                 
                 // Set font family
                 when (fontFamily) {
-                    "JetBrains Mono" -> typefaceText = Typeface.createFromAsset(context.assets, "JetBrainsMono-Regular.ttf")
-                    "Ubuntu" -> typefaceText = Typeface.createFromAsset(context.assets, "Ubuntu-Regular.ttf")
-                    "Roboto" -> typefaceText = Typeface.createFromAsset(context.assets, "Roboto-Regular.ttf")
+                    "JetBrains Mono" -> setTypefaceText(Typeface.createFromAsset(context.assets, "JetBrainsMono-Regular.ttf"))
+                    "Ubuntu" -> setTypefaceText(Typeface.createFromAsset(context.assets, "Ubuntu-Regular.ttf"))
+                    "Roboto" -> setTypefaceText(Typeface.createFromAsset(context.assets, "Roboto-Regular.ttf"))
                     else -> setTypefaceText(Typeface.MONOSPACE)
                 }
                 
@@ -262,7 +325,7 @@ fun SoraEditorView(
                 }
                 
                 subscribeEvent(io.github.abc15018045126.sora.event.SelectionChangeEvent::class.java) { _, _ ->
-                     val cursor = this.cursor
+                     val cursor = this.cursor!!
                      val line = cursor.leftLine
                      val col = cursor.leftColumn
                      
@@ -311,8 +374,8 @@ fun SoraEditorView(
                 setLineSpacing(lineSpacingExtra, lineSpacingMultiplier)
                 setWrapLineSpacing(wrapLineSpacingExtra, wrapLineSpacingMultiplier)
                 val dp = dpUnit
-                setDividerMargin(0f, horizontalPadding * dp)
-                setExtraMarginRight(horizontalPadding * dp)
+                dividerMarginRight = horizontalPadding * dp
+                extraMarginRight = horizontalPadding * dp
                 setLineNumberMarginLeft(horizontalPadding * dp)
 
                 try {
@@ -322,43 +385,49 @@ fun SoraEditorView(
                     val b = android.graphics.Color.blue(color)
                     val luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255.0
                     
-                    colorScheme.setColor(EditorColorScheme.WHOLE_BACKGROUND, color)
-                    colorScheme.setColor(EditorColorScheme.LINE_NUMBER_BACKGROUND, color)
+                    colorScheme?.setColor(EditorColorScheme.WHOLE_BACKGROUND, color)
+                    colorScheme?.setColor(EditorColorScheme.LINE_NUMBER_BACKGROUND, color)
                     
                     if (luminance < 0.5) {
-                        colorScheme.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.WHITE)
-                        colorScheme.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.GRAY)
+                        colorScheme?.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.WHITE)
+                        colorScheme?.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.GRAY)
                     } else {
-                        colorScheme.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.BLACK)
-                        colorScheme.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.DKGRAY)
+                        colorScheme?.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.BLACK)
+                        colorScheme?.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.DKGRAY)
+                    }
+                    
+                    if (editorTextColor != "auto" && editorTextColor.isNotEmpty()) {
+                        try {
+                            colorScheme?.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.parseColor(editorTextColor))
+                        } catch (e: Exception) {}
                     }
 
                     try {
                         val searchMatchColor = android.graphics.Color.parseColor(searchMatchBackgroundColor)
-                        colorScheme.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, searchMatchColor)
+                        colorScheme?.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, searchMatchColor)
                     } catch (e: Exception) {
-                        colorScheme.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, 0xffffff00.toInt())
+                        colorScheme?.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, 0xffffff00.toInt())
                     }
 
                     try {
                         val currentLineColor = android.graphics.Color.parseColor(currentLineBackgroundColor)
-                        colorScheme.setColor(EditorColorScheme.CURRENT_LINE, currentLineColor)
+                        colorScheme?.setColor(EditorColorScheme.CURRENT_LINE, currentLineColor)
                     } catch (e: Exception) {
-                        colorScheme.setColor(EditorColorScheme.CURRENT_LINE, 0x10000000)
+                        colorScheme?.setColor(EditorColorScheme.CURRENT_LINE, 0x10000000)
                     }
 
                     try {
                         val cColor = android.graphics.Color.parseColor(cursorColor)
-                        colorScheme.setColor(EditorColorScheme.SELECTION_INSERT, cColor)
+                        colorScheme?.setColor(EditorColorScheme.SELECTION_INSERT, cColor)
                     } catch (e: Exception) {
-                        colorScheme.setColor(EditorColorScheme.SELECTION_INSERT, 0xFF000000.toInt())
+                        colorScheme?.setColor(EditorColorScheme.SELECTION_INSERT, 0xFF000000.toInt())
                     }
 
                     try {
                         val hColor = android.graphics.Color.parseColor(handleColor)
-                        colorScheme.setColor(EditorColorScheme.SELECTION_HANDLE, hColor)
+                        colorScheme?.setColor(EditorColorScheme.SELECTION_HANDLE, hColor)
                     } catch (e: Exception) {
-                        colorScheme.setColor(EditorColorScheme.SELECTION_HANDLE, 0xFF000000.toInt())
+                        colorScheme?.setColor(EditorColorScheme.SELECTION_HANDLE, 0xFF000000.toInt())
                     }
 
                     setSelectionHandleStyle(when (handleStyle) {
@@ -369,11 +438,11 @@ fun SoraEditorView(
 
                     try {
                         val sColor = android.graphics.Color.parseColor(scrollbarColor)
-                        colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB, sColor)
-                        colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, sColor)
+                        colorScheme?.setColor(EditorColorScheme.SCROLL_BAR_THUMB, sColor)
+                        colorScheme?.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, sColor)
                     } catch (e: Exception) {
-                        colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB, 0xFFA0888888.toInt())
-                        colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, 0xFFA0888888.toInt())
+                        colorScheme?.setColor(EditorColorScheme.SCROLL_BAR_THUMB, 0xFFA0888888.toInt())
+                        colorScheme?.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, 0xFFA0888888.toInt())
                     }
 
                     if (scrollbarStyle == "rounded") {
@@ -383,51 +452,135 @@ fun SoraEditorView(
                             cornerRadius = 100f // Large radius for fully rounded ends
                             setColor(sColor)
                         }
-                        renderer.setVerticalScrollbarThumbDrawable(drawable)
-                        renderer.setHorizontalScrollbarThumbDrawable(drawable)
+                        renderer?.setVerticalScrollbarThumbDrawable(drawable)
+                        renderer?.setHorizontalScrollbarThumbDrawable(drawable)
                     } else {
-                        renderer.setVerticalScrollbarThumbDrawable(null)
-                        renderer.setHorizontalScrollbarThumbDrawable(null)
+                        renderer?.setVerticalScrollbarThumbDrawable(null)
+                        renderer?.setHorizontalScrollbarThumbDrawable(null)
                     }
+                    isCursorAnimationEnabled = !isFastMode
+                    setInitialPreviewLines(initialPreviewLines)
+                    setLineNumberPaintAlign(if (lineNumberAlign == "right") android.graphics.Paint.Align.RIGHT else if (lineNumberAlign == "center") android.graphics.Paint.Align.CENTER else android.graphics.Paint.Align.LEFT)
+                    setLineNumberRightOfDivider(isLineNumberRightOfDivider)
+                    setPinLineNumber(isLineNumberPinned)
+                    colorScheme.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.parseColor(lineNumberColor))
+                    colorScheme.setColor(EditorColorScheme.LINE_DIVIDER, android.graphics.Color.parseColor(lineDividerColor))
                 } catch (e: Exception) {}
                 
                 editorInstance = this
+                editorInstanceForSync = this
                 control?.attach(this)
                 
                 // Auto-focus if requested (for new notes)
                 if (autoFocus) {
                     postDelayed({
                         requestFocus()
-                        // Show keyboard with SHOW_FORCED to ensure it appears
+                        // Show keyboard using input method manager
                         val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager
-                        imm?.showSoftInput(this, android.view.inputmethod.InputMethodManager.SHOW_FORCED)
+                        imm?.showSoftInput(this, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT)
                     }, 200) // Delay to ensure view is fully laid out
                 }
             }
         },
         update = { view ->
-            view.setTextSize(fontSize)
-            view.isLineNumberEnabled = showLineNumbers
-            // Only update wordwrap if it actually changed to avoid layout recalculation flicker
-            if (view.isWordwrap != wordWrap) {
+            if (lastAppliedTextSize != fontSize) {
+                view.setTextSize(fontSize)
+                lastAppliedTextSize = fontSize
+            }
+            if (lastAppliedLineNumbers != showLineNumbers) {
+                view.isLineNumberEnabled = showLineNumbers
+                lastAppliedLineNumbers = showLineNumbers
+            }
+            if (lastAppliedWordWrap != wordWrap) {
                 view.isWordwrap = wordWrap
+                lastAppliedWordWrap = wordWrap
+            }
+            if (lastAppliedEditable != editable) {
+                view.isEditable = editable
+                lastAppliedEditable = editable
+            }
+            if (lastAppliedHighlightCurrentLine != highlightCurrentLine) {
+                view.isHighlightCurrentLine = highlightCurrentLine
+                lastAppliedHighlightCurrentLine = highlightCurrentLine
+            }
+            val targetCursorWidth = cursorWidth * view.dpUnit / 2f
+            if (lastAppliedCursorWidth != targetCursorWidth) {
+                view.setCursorWidth(targetCursorWidth)
+                lastAppliedCursorWidth = targetCursorWidth
+            }
+            if (lastAppliedShowScrollLineInfo != showScrollLineInfo) {
+                view.isDisplayLnPanel = showScrollLineInfo
+                lastAppliedShowScrollLineInfo = showScrollLineInfo
+            }
+            if (lastAppliedFastMode != isFastMode) {
+                view.isCursorAnimationEnabled = !isFastMode
+                lastAppliedFastMode = isFastMode
+            }
+            if (lastAppliedInitialPreviewLines != initialPreviewLines) {
+                view.setInitialPreviewLines(initialPreviewLines)
+                lastAppliedInitialPreviewLines = initialPreviewLines
+            }
+            if (lastAppliedLineNumberAlign != lineNumberAlign) {
+                view.setLineNumberPaintAlign(if (lineNumberAlign == "right") android.graphics.Paint.Align.RIGHT else if (lineNumberAlign == "center") android.graphics.Paint.Align.CENTER else android.graphics.Paint.Align.LEFT)
+                lastAppliedLineNumberAlign = lineNumberAlign
+            }
+            if (lastAppliedIsLineNumberRightOfDivider != isLineNumberRightOfDivider) {
+                view.setLineNumberRightOfDivider(isLineNumberRightOfDivider)
+                lastAppliedIsLineNumberRightOfDivider = isLineNumberRightOfDivider
+            }
+            if (lastAppliedIsLineNumberPinned != isLineNumberPinned) {
+                view.setPinLineNumber(isLineNumberPinned)
+                lastAppliedIsLineNumberPinned = isLineNumberPinned
+            }
+            if (lastAppliedLineNumberColor != lineNumberColor) {
+                try { view.colorScheme.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.parseColor(lineNumberColor)) } catch(e: Exception) {}
+                lastAppliedLineNumberColor = lineNumberColor
+            }
+            if (lastAppliedLineDividerColor != lineDividerColor) {
+                try { view.colorScheme.setColor(EditorColorScheme.LINE_DIVIDER, android.graphics.Color.parseColor(lineDividerColor)) } catch(e: Exception) {}
+                lastAppliedLineDividerColor = lineDividerColor
+            }
+            
+            try {
+                if (editorTextColor != "auto" && editorTextColor.isNotEmpty()) {
+                    view.colorScheme.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.parseColor(editorTextColor))
+                }
+            } catch (e: Exception) {}
+
+            if (lastAppliedTextActionMenuItems != textActionMenuItems) {
+                view.textActionMenuOrder = textActionMenuItems
+                lastAppliedTextActionMenuItems = textActionMenuItems
+            }
+            if (lastAppliedTextActionMenuHidden != textActionMenuHidden) {
+                view.textActionMenuHidden = textActionMenuHidden
+                lastAppliedTextActionMenuHidden = textActionMenuHidden
+            }
+            if (lastAppliedTextActionMenuBgColor != textActionMenuBgColor) {
+                if (textActionMenuBgColor != "auto") {
+                    try {
+                        view.colorScheme.setColor(EditorColorScheme.TEXT_ACTION_WINDOW_BACKGROUND, android.graphics.Color.parseColor(textActionMenuBgColor))
+                    } catch (e: Exception) {}
+                }
+                lastAppliedTextActionMenuBgColor = textActionMenuBgColor
             }
-            view.setEditable(editable)
-            view.setHighlightCurrentLine(highlightCurrentLine)
-            view.setCursorWidth(cursorWidth * view.dpUnit / 2f)
-            view.isDisplayLnPanel = showScrollLineInfo
             
             // Update font family
-            when (fontFamily) {
-                "JetBrains Mono" -> view.typefaceText = Typeface.createFromAsset(view.context.assets, "JetBrainsMono-Regular.ttf")
-                "Ubuntu" -> view.typefaceText = Typeface.createFromAsset(view.context.assets, "Ubuntu-Regular.ttf")
-                "Roboto" -> view.typefaceText = Typeface.createFromAsset(view.context.assets, "Roboto-Regular.ttf")
-                else -> view.setTypefaceText(Typeface.MONOSPACE)
+            if (lastAppliedFontFamily != fontFamily) {
+                val assets = view.context.assets
+                when (fontFamily) {
+                    "JetBrains Mono" -> view.setTypefaceText(Typeface.createFromAsset(assets, "JetBrainsMono-Regular.ttf"))
+                    "Ubuntu" -> view.setTypefaceText(Typeface.createFromAsset(assets, "Ubuntu-Regular.ttf"))
+                    "Roboto" -> view.setTypefaceText(Typeface.createFromAsset(assets, "Roboto-Regular.ttf"))
+                    else -> view.setTypefaceText(Typeface.MONOSPACE)
+                }
+                lastAppliedFontFamily = fontFamily
             }
 
             // Only update text if it strictly differs.
             if (view.text.toString() != content) {
+                isSettingTextProgrammatically.value = true
                 view.setText(content)
+                isSettingTextProgrammatically.value = false
             }
             
             // REMOVED: These methods trigger expensive layout recalculation on every update
@@ -440,61 +593,69 @@ fun SoraEditorView(
 
             try {
                 val sColor = android.graphics.Color.parseColor(scrollbarColor)
-                view.colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB, sColor)
-                view.colorScheme.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, sColor)
+                if (view.colorScheme.getColor(EditorColorScheme.SCROLL_BAR_THUMB) != sColor) {
+                    view.colorScheme?.setColor(EditorColorScheme.SCROLL_BAR_THUMB, sColor)
+                    view.colorScheme?.setColor(EditorColorScheme.SCROLL_BAR_THUMB_PRESSED, sColor)
+                }
             } catch (e: Exception) {}
             
             try {
                 val color = android.graphics.Color.parseColor(backgroundColor)
-                val r = android.graphics.Color.red(color)
-                val g = android.graphics.Color.green(color)
-                val b = android.graphics.Color.blue(color)
-                val luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255.0
-                
-                view.colorScheme.setColor(EditorColorScheme.WHOLE_BACKGROUND, color)
-                view.colorScheme.setColor(EditorColorScheme.LINE_NUMBER_BACKGROUND, color)
-                
-                if (luminance < 0.5) {
-                    view.colorScheme.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.WHITE)
-                    view.colorScheme.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.GRAY)
-                } else {
-                    view.colorScheme.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.BLACK)
-                    view.colorScheme.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.DKGRAY)
+                if (view.colorScheme?.getColor(EditorColorScheme.WHOLE_BACKGROUND) != color) {
+                    val r = android.graphics.Color.red(color)
+                    val g = android.graphics.Color.green(color)
+                    val b = android.graphics.Color.blue(color)
+                    val luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255.0
+                    
+                    view.colorScheme?.setColor(EditorColorScheme.WHOLE_BACKGROUND, color)
+                    view.colorScheme?.setColor(EditorColorScheme.LINE_NUMBER_BACKGROUND, color)
+                    
+                    if (luminance < 0.5) {
+                        view.colorScheme?.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.WHITE)
+                        view.colorScheme?.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.GRAY)
+                    } else {
+                        view.colorScheme?.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.BLACK)
+                        view.colorScheme?.setColor(EditorColorScheme.LINE_NUMBER, android.graphics.Color.DKGRAY)
+                    }
                 }
 
-                try {
-                    val searchMatchColor = android.graphics.Color.parseColor(searchMatchBackgroundColor)
-                    view.colorScheme.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, searchMatchColor)
-                } catch (e: Exception) {
-                    view.colorScheme.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, 0xffffff00.toInt())
+                val searchMatchColor = try { android.graphics.Color.parseColor(searchMatchBackgroundColor) } catch (e: Exception) { 0xffffff00.toInt() }
+                if (view.colorScheme?.getColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND) != searchMatchColor) {
+                    view.colorScheme?.setColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND, searchMatchColor)
                 }
 
-                try {
-                    val currentLineColor = android.graphics.Color.parseColor(currentLineBackgroundColor)
-                    view.colorScheme.setColor(EditorColorScheme.CURRENT_LINE, currentLineColor)
-                } catch (e: Exception) {
-                    view.colorScheme.setColor(EditorColorScheme.CURRENT_LINE, 0x10000000)
+                val currentLineColor = try { android.graphics.Color.parseColor(currentLineBackgroundColor) } catch (e: Exception) { 0x10000000 }
+                if (view.colorScheme?.getColor(EditorColorScheme.CURRENT_LINE) != currentLineColor) {
+                    view.colorScheme?.setColor(EditorColorScheme.CURRENT_LINE, currentLineColor)
+                }
+                
+                // Re-apply text color if needed after background update (as background update might reset scheme parts or we want to ensure precedence)
+                // Actually the background update block above re-runs the luminance logic which might reset TEXT_NORMAL.
+                // So we need to re-apply editorTextColor if it's not auto.
+                if (editorTextColor != "auto" && editorTextColor.isNotEmpty()) {
+                    try {
+                        view.colorScheme?.setColor(EditorColorScheme.TEXT_NORMAL, android.graphics.Color.parseColor(editorTextColor))
+                    } catch (e: Exception) {}
                 }
 
-                try {
-                    val cColor = android.graphics.Color.parseColor(cursorColor)
-                    view.colorScheme.setColor(EditorColorScheme.SELECTION_INSERT, cColor)
-                } catch (e: Exception) {
-                    view.colorScheme.setColor(EditorColorScheme.SELECTION_INSERT, 0xFF000000.toInt())
+                val cColor = try { android.graphics.Color.parseColor(cursorColor) } catch (e: Exception) { 0xFF000000.toInt() }
+                if (view.colorScheme?.getColor(EditorColorScheme.SELECTION_INSERT) != cColor) {
+                    view.colorScheme?.setColor(EditorColorScheme.SELECTION_INSERT, cColor)
                 }
 
-                try {
-                    val hColor = android.graphics.Color.parseColor(handleColor)
-                    view.colorScheme.setColor(EditorColorScheme.SELECTION_HANDLE, hColor)
-                } catch (e: Exception) {
-                    view.colorScheme.setColor(EditorColorScheme.SELECTION_HANDLE, 0xFF000000.toInt())
+                val hColor = try { android.graphics.Color.parseColor(handleColor) } catch (e: Exception) { 0xFF000000.toInt() }
+                if (view.colorScheme?.getColor(EditorColorScheme.SELECTION_HANDLE) != hColor) {
+                    view.colorScheme?.setColor(EditorColorScheme.SELECTION_HANDLE, hColor)
                 }
 
-                view.setSelectionHandleStyle(when (handleStyle) {
-                    "drop" -> HandleStyleDrop(view.context)
-                    "none" -> HandleStyleNone()
-                    else -> HandleStyleSideDrop(view.context)
-                })
+                if (lastAppliedHandleStyle != handleStyle) {
+                    view.setSelectionHandleStyle(when (handleStyle) {
+                        "drop" -> HandleStyleDrop(view.context)
+                        "none" -> HandleStyleNone()
+                        else -> HandleStyleSideDrop(view.context)
+                    })
+                    lastAppliedHandleStyle = handleStyle
+                }
 
                 if (scrollbarStyle == "rounded") {
                     val sColor = try { android.graphics.Color.parseColor(scrollbarColor) } catch(e: Exception) { 0xFFA0888888.toInt() }
@@ -503,11 +664,11 @@ fun SoraEditorView(
                         cornerRadius = 100f
                         setColor(sColor)
                     }
-                    view.renderer.setVerticalScrollbarThumbDrawable(drawable)
-                    view.renderer.setHorizontalScrollbarThumbDrawable(drawable)
+                    view.renderer?.setVerticalScrollbarThumbDrawable(drawable)
+                    view.renderer?.setHorizontalScrollbarThumbDrawable(drawable)
                 } else {
-                    view.renderer.setVerticalScrollbarThumbDrawable(null)
-                    view.renderer.setHorizontalScrollbarThumbDrawable(null)
+                    view.renderer?.setVerticalScrollbarThumbDrawable(null)
+                    view.renderer?.setHorizontalScrollbarThumbDrawable(null)
                 }
             } catch (e: Exception) {}
         },
@@ -586,10 +747,10 @@ fun EditorScreen(
                             Icon(Icons.Default.Save, "保存")
                         }
                         IconButton(onClick = { editorControl.undo() }, enabled = editorControl.canUndo()) {
-                            Icon(Icons.Default.Undo, "撤销")
+                            Icon(Icons.AutoMirrored.Filled.Undo, "撤销")
                         }
                         IconButton(onClick = { editorControl.redo() }, enabled = editorControl.canRedo()) {
-                            Icon(Icons.Default.Redo, "反撤销")
+                            Icon(Icons.AutoMirrored.Filled.Redo, "反撤销")
                         }
                         IconButton(onClick = { showMoreMenu = true }) {
                             Icon(Icons.Default.MoreVert, "More")
@@ -603,7 +764,7 @@ fun EditorScreen(
                             DropdownMenuItem(
                                 text = { Text("返回") },
                                 onClick = { showMoreMenu = false; handleBack() },
-                                leadingIcon = { Icon(Icons.Default.ArrowBack, null) }
+                                leadingIcon = { Icon(Icons.AutoMirrored.Filled.ArrowBack, null) }
                             )
                             DropdownMenuItem(
                                 text = { Text("搜索") },
@@ -699,6 +860,7 @@ fun EditorScreen(
                         fontSize = uiState.fontSize,
                         showLineNumbers = uiState.showLineNumbers,
                         wordWrap = uiState.wordWrap,
+                        isLineNumberPinned = uiState.isLineNumberPinned,
                         editable = !uiState.isReadOnly,
                         backgroundColor = uiState.backgroundColor,
                         searchMatchBackgroundColor = uiState.searchMatchBackgroundColor,
@@ -721,7 +883,17 @@ fun EditorScreen(
                         fontFamily = uiState.fontFamily,
                         scrollbarColor = uiState.scrollbarColor,
                         showScrollLineInfo = uiState.showScrollLineInfo,
-                        scrollbarStyle = uiState.scrollbarStyle
+                        scrollbarStyle = uiState.scrollbarStyle,
+                        isFastMode = uiState.isFastMode,
+                        initialPreviewLines = uiState.initialPreviewLines,
+                        lineNumberAlign = uiState.lineNumberAlign,
+                        isLineNumberRightOfDivider = uiState.isLineNumberRightOfDivider,
+                        lineNumberColor = uiState.lineNumberColor,
+                        lineDividerColor = uiState.lineDividerColor,
+                        editorTextColor = uiState.editorTextColor,
+                        textActionMenuItems = uiState.textActionMenuItems,
+                        textActionMenuHidden = uiState.textActionMenuHidden,
+                        textActionMenuBgColor = uiState.textActionMenuBgColor
                     )
                 }
                 
@@ -1069,7 +1241,7 @@ fun EditorSettingsScreen(
         topBar = {
             TopAppBar(
                 title = { Text("编辑器设置") },
-                navigationIcon = { IconButton(onClick = onBack) { Icon(Icons.Default.ArrowBack, null) } }
+                navigationIcon = { IconButton(onClick = onBack) { Icon(Icons.AutoMirrored.Filled.ArrowBack, null) } }
             )
         }
     ) { padding ->
@@ -1115,9 +1287,36 @@ fun EditorSettingsScreen(
                 }
 
                 SettingsSwitchItem("显示行号", "在左侧显示行号", uiState.showLineNumbers) { viewModel.toggleLineNumbers(localContext) }
+                SettingsSwitchItem("固定行号", "行号固定不随行移动 (Sticky)", uiState.isLineNumberPinned) { viewModel.toggleLineNumberPinned(localContext) }
                 SettingsSwitchItem("自动换行", "自动折行显示", uiState.wordWrap) { viewModel.toggleWordWrap(localContext) }
                 SettingsSwitchItem("高亮当前行", "突出显示光标所在的行", uiState.highlightCurrentLine) { viewModel.setHighlightCurrentLine(localContext, it) }
+                SettingsSwitchItem("行号位于竖线右侧", "将行号显示在分隔线右侧（靠近代码）", uiState.isLineNumberRightOfDivider) { viewModel.setLineNumberRightOfDivider(localContext, it) }
+                
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("行号文本对齐", fontSize = 12.sp, color = Color.Gray)
+                    Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        mapOf("left" to "左对齐", "center" to "居中", "right" to "右对齐").forEach { (id, label) ->
+                            Button(
+                                onClick = { viewModel.setLineNumberAlign(localContext, id) },
+                                colors = ButtonDefaults.buttonColors(containerColor = if (uiState.lineNumberAlign == id) MaterialTheme.colorScheme.primary else Color.LightGray)
+                            ) {
+                                Text(label, fontSize = 10.sp)
+                            }
+                        }
+                    }
+                }
+                
                 SettingsSwitchItem("自动保存", "编辑时自动保存", uiState.autoSave) { viewModel.setAutoSave(localContext, it) }
+                SettingsSwitchItem("极速模式", "禁用动画（如光标移动）以获得更快的响应", uiState.isFastMode) { viewModel.setFastMode(localContext, it) }
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text("初始加载行数 (同步): ${uiState.initialPreviewLines}", modifier = Modifier.weight(1f))
+                        Text("越多加载越慢", color = Color.Red, fontSize = 10.sp)
+                    }
+                    Slider(
+                        value = uiState.initialPreviewLines.toFloat(),
+                        onValueChange = { viewModel.setInitialPreviewLines(localContext, it.toInt()) },
+                        valueRange = 0f..200f,
+                    )
 
                 Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                     Text("字体样式", style = MaterialTheme.typography.titleMedium)
@@ -1151,131 +1350,8 @@ fun EditorSettingsScreen(
                     SettingsSwitchItem("区分大小写", "默认区分大小写", uiState.searchMatchCase) { viewModel.setSearchMatchCase(localContext, it) }
                 }
 
-                Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
-                    Text("主题颜色自定义 (也可在下面 JSON 自由配置)", style = MaterialTheme.typography.titleMedium)
-                    val colors = listOf("#FFFFFF" to "白", "#F5F5F5" to "灰", "#E0E0E0" to "深灰", "#FFF8DC" to "米", "#E8F5E9" to "绿", "#E3F2FD" to "蓝", "#000000" to "黑")
-                    
-                    Column {
-                        Text("编辑器背景 (Editor)", fontSize = 12.sp, color = Color.Gray)
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            colors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.backgroundColor == c) { viewModel.setBackgroundColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
-                            Text("应用 UI 颜色 (Toolbar/Bottom)", fontSize = 12.sp, color = Color.Gray, modifier = Modifier.weight(1f))
-                            TextButton(onClick = { 
-                                viewModel.setTocColor(localContext, uiState.uiColor)
-                                viewModel.setSearchColor(localContext, uiState.uiColor)
-                                viewModel.setMenuColor(localContext, uiState.uiColor)
-                            }) {
-                                Text("同步到所有面板", fontSize = 10.sp)
-                            }
-                        }
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            colors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.uiColor == c) { viewModel.setUiColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column {
-                        Text("更多菜单颜色 (More Menu)", fontSize = 12.sp, color = Color.Gray)
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            colors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.menuColor == c) { viewModel.setMenuColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column {
-                        Text("目录面板颜色 (TOC)", fontSize = 12.sp, color = Color.Gray)
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            colors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.tocColor == c) { viewModel.setTocColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column {
-                        Text("搜索面板颜色 (Search)", fontSize = 12.sp, color = Color.Gray)
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            colors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.searchColor == c) { viewModel.setSearchColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column {
-                        Text("搜索匹配高亮颜色 (Search Match highlight)", fontSize = 12.sp, color = Color.Gray)
-                        val matchColors = listOf(
-                            "#FFF59D" to "淡黄", 
-                            "#C8E6C9" to "淡绿", 
-                            "#FFCDD2" to "淡红", 
-                            "#B2EBF2" to "淡蓝", 
-                            "#E1BEE7" to "淡紫", 
-                            "#FFE0B2" to "淡橙", 
-                            "#BBDEFB" to "灰蓝"
-                        )
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            matchColors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.searchMatchBackgroundColor == c) { viewModel.setSearchMatchBackgroundColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column {
-                        Text("当前行高亮颜色 (Current Line)", fontSize = 12.sp, color = Color.Gray)
-                        val highlightColors = listOf(
-                            "#00000000" to "无",
-                            "#10000000" to "淡黑",
-                            "#10888888" to "淡灰",
-                            "#100000FF" to "淡蓝",
-                            "#10FF0000" to "淡红",
-                            "#1000FF00" to "淡绿",
-                            "#20FFEB3B" to "浅黄"
-                        )
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            highlightColors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.currentLineBackgroundColor == c) { viewModel.setCurrentLineBackgroundColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                        Text("光标颜色 (Cursor Color)", fontSize = 12.sp, color = Color.Gray)
-                        val cursorColors = listOf("#FF000000" to "黑", "#FF888888" to "灰", "#FF0000FF" to "蓝", "#FFFF0000" to "红", "#FF00FF00" to "绿", "#FFFB8C00" to "橙", "#FF1976D2" to "深蓝")
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            cursorColors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.cursorColor == c) { viewModel.setCursorColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                        Text("光标提手颜色 (Handle Color)", fontSize = 12.sp, color = Color.Gray)
-                        val handleColors = listOf("#FF000000" to "黑", "#FF888888" to "灰", "#FF0000FF" to "蓝", "#FFFF0000" to "红", "#FF00FF00" to "绿", "#FFFB8C00" to "橙", "#FF1976D2" to "深蓝")
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            handleColors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.handleColor == c) { viewModel.setHandleColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                        Text("滚动条颜色 (Scrollbar Color)", fontSize = 12.sp, color = Color.Gray)
-                        val scrollbarColors = listOf("#A0888888" to "默认灰", "#A0000000" to "黑", "#A0FF0000" to "红", "#A000FF00" to "绿", "#A00000FF" to "蓝", "#A0FB8C00" to "橙", "#A01976D2" to "深蓝")
-                        FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            scrollbarColors.forEach { (c, l) -> 
-                                ColorOption(c, l, uiState.scrollbarColor == c) { viewModel.setScrollbarColor(localContext, c) }
-                            }
-                        }
-                    }
-
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                EditorColorSettings(uiState, viewModel, localContext)
+     Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                         Text("滚动条样式", fontSize = 12.sp, color = Color.Gray)
                         Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                             mapOf("default" to "Sora (直角)", "rounded" to "Chrome (圆角)").forEach { (id, label) ->
@@ -1341,6 +1417,94 @@ fun EditorSettingsScreen(
                             }
                         }
                     }
+
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("编辑浮动菜单 (长按/双击弹出)", style = MaterialTheme.typography.titleMedium)
+                    
+                    val allItemLabels = mapOf(
+                        "select_all" to "全选",
+                        "copy" to "复制",
+                        "paste" to "粘贴",
+                        "cut" to "剪切",
+                        "long_select" to "自由选择"
+                    )
+                    
+                    Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                        uiState.textActionMenuItems.forEachIndexed { index, id ->
+                            val label = allItemLabels[id] ?: id
+                            val isHidden = id in uiState.textActionMenuHidden
+                            
+                            Surface(
+                                modifier = Modifier.fillMaxWidth(),
+                                shape = RoundedCornerShape(8.dp),
+                                color = if (isHidden) Color.LightGray.copy(alpha = 0.3f) else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
+                                border = BorderStroke(1.dp, Color.LightGray.copy(alpha = 0.2f))
+                            ) {
+                                Row(
+                                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp),
+                                    verticalAlignment = Alignment.CenterVertically
+                                ) {
+                                    IconButton(
+                                        onClick = { viewModel.toggleTextActionMenuItemVisibility(localContext, id) },
+                                        modifier = Modifier.size(36.dp)
+                                    ) {
+                                        Icon(
+                                            if (isHidden) Icons.Default.VisibilityOff else Icons.Default.Visibility,
+                                            contentDescription = null,
+                                            modifier = Modifier.size(18.dp),
+                                            tint = if (isHidden) Color.Gray else MaterialTheme.colorScheme.primary
+                                        )
+                                    }
+                                    
+                                    Text(
+                                        text = label,
+                                        modifier = Modifier.weight(1f),
+                                        fontSize = 14.sp,
+                                        color = if (isHidden) Color.Gray else Color.Unspecified
+                                    )
+                                    
+                                    IconButton(
+                                        onClick = { 
+                                            if (index > 0) {
+                                                val newList = uiState.textActionMenuItems.toMutableList()
+                                                val item = newList.removeAt(index)
+                                                newList.add(index - 1, item)
+                                                viewModel.setTextActionMenuOrder(localContext, newList)
+                                            }
+                                        },
+                                        enabled = index > 0,
+                                        modifier = Modifier.size(36.dp)
+                                    ) {
+                                        Icon(Icons.Default.ArrowUpward, null, modifier = Modifier.size(18.dp), tint = if (index > 0) Color.Gray else Color.Transparent)
+                                    }
+                                    
+                                    IconButton(
+                                        onClick = { 
+                                            if (index < uiState.textActionMenuItems.size - 1) {
+                                                val newList = uiState.textActionMenuItems.toMutableList()
+                                                val item = newList.removeAt(index)
+                                                newList.add(index + 1, item)
+                                                viewModel.setTextActionMenuOrder(localContext, newList)
+                                            }
+                                        },
+                                        enabled = index < uiState.textActionMenuItems.size - 1,
+                                        modifier = Modifier.size(36.dp)
+                                    ) {
+                                        Icon(Icons.Default.ArrowDownward, null, modifier = Modifier.size(18.dp), tint = if (index < uiState.textActionMenuItems.size - 1) Color.Gray else Color.Transparent)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    
+                    Spacer(Modifier.height(4.dp))
+                    Text("浮动菜单背景颜色", fontSize = 12.sp, color = Color.Gray)
+                    val bgColors = listOf("auto" to "默认", "#FFFFFF" to "白", "#F5F5F5" to "灰", "#000000" to "黑", "#EFEBE9" to "米", "#E8EAF6" to "蓝灰")
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        bgColors.forEach { (c, l) -> 
+                            ColorOption(c, l, uiState.textActionMenuBgColor == c) { viewModel.setTextActionMenuBgColor(localContext, c) }
+                        }
+                    }
                 }
 
                 Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
@@ -1394,14 +1558,6 @@ fun SettingsSwitchItem(title: String, desc: String, checked: Boolean, onCheckedC
     }
 }
 
-@Composable
-fun ColorOption(color: String, label: String, isSelected: Boolean, onClick: () -> Unit) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.width(60.dp).clickable { onClick() }) {
-        Box(Modifier.size(40.dp).background(try { Color(android.graphics.Color.parseColor(color)) } catch(e:Exception) { Color.Gray }, RoundedCornerShape(20.dp)).border(if (isSelected) 2.dp else 1.dp, if (isSelected) MaterialTheme.colorScheme.primary else Color.LightGray, RoundedCornerShape(20.dp)))
-        Text(label, fontSize = 10.sp)
-    }
-}
-
 @Composable
 fun RenameDialog(currentName: String, backgroundColor: String, onRename: (String) -> Unit, onDismiss: () -> Unit) {
     var name by remember { mutableStateOf(currentName) }