Skip to content

Commit 3b0f444

Browse files
committed
Update
1 parent ddaa672 commit 3b0f444

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

app/src/main/java/com/tool/tree/TextEditorActivity.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class TextEditorActivity : AppCompatActivity() {
111111
private var savedContent: String = ""
112112
private var isSaving = false
113113
private var noWrapContainer: HorizontalScrollView? = null
114-
private var mainListBaseBottomMargin = 0
114+
private var mainListTextBaseBottomMargin = 0
115115
private var syntaxHighlighter: SyntaxHighlighter? = null
116116
private var placeholderText: String = ""
117117
private var titleText: String = ""
@@ -271,7 +271,7 @@ class TextEditorActivity : AppCompatActivity() {
271271
}
272272

273273
private fun setupKeyboardInsets() {
274-
mainListBaseBottomMargin = (binding.mainList.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin
274+
mainListTextBaseBottomMargin = (binding.mainListText.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin
275275
val specialCharsBaseBottomMargin =
276276
(binding.editorSpecialCharsScroll.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin
277277

@@ -284,12 +284,12 @@ class TextEditorActivity : AppCompatActivity() {
284284
charsLp.bottomMargin = specialCharsBaseBottomMargin + targetBottomInset
285285
binding.editorSpecialCharsScroll.layoutParams = charsLp
286286

287-
val mlp = binding.mainList.layoutParams as ViewGroup.MarginLayoutParams
288-
mlp.bottomMargin = mainListBaseBottomMargin
289-
binding.mainList.layoutParams = mlp
287+
val mlp = binding.mainListText.layoutParams as ViewGroup.MarginLayoutParams
288+
mlp.bottomMargin = mainListTextBaseBottomMargin
289+
binding.mainListText.layoutParams = mlp
290290

291291
if (imeInset > 0) {
292-
binding.mainList.post { scrollToCursor() }
292+
binding.mainListText.post { scrollToCursor() }
293293
}
294294
insets
295295
}
@@ -305,7 +305,7 @@ class TextEditorActivity : AppCompatActivity() {
305305
}
306306
}
307307

308-
binding.mainList.setOnClickListener { focusAndShowKeyboard() }
308+
binding.mainListText.setOnClickListener { focusAndShowKeyboard() }
309309
binding.editorLineNumbers.setOnClickListener { focusAndShowKeyboard() }
310310
binding.editorContentContainer.setOnClickListener { focusAndShowKeyboard() }
311311
}
@@ -353,7 +353,7 @@ class TextEditorActivity : AppCompatActivity() {
353353
private fun scrollToCursor() {
354354
val editText = binding.editorContent
355355
val layout = editText.layout ?: return
356-
val scrollView = binding.mainList
356+
val scrollView = binding.mainListText
357357
val selection = editText.selectionEnd.coerceIn(0, editText.text?.length ?: 0)
358358
val line = layout.getLineForOffset(selection)
359359

app/src/main/res/layout/activity_file_selector.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:clipToPadding="true"
8+
android:id="@+id/editor_root"
89
android:fitsSystemWindows="false"
910
tools:openDrawer="start">
1011

0 commit comments

Comments
 (0)