Fix small behaviors

Ryosuke839 · Sep 15, 2024 · a0cccce · a0cccce
1 parent 164ec84
commit a0cccce
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "jp.ddo.hotmist.unicodepad"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 62
-        versionName "2.14.0"
+        versionCode 63
+        versionName "2.14.1"
     }
 
     compileOptions {

diff --git a/app/src/main/java/jp/ddo/hotmist/unicodepad/FindAdapter.kt b/app/src/main/java/jp/ddo/hotmist/unicodepad/FindAdapter.kt
@@ -47,6 +47,7 @@ internal class FindAdapter(activity: Activity, private val pref: SharedPreferenc
             activity.theme.resolveAttribute(R.attr.search, it, true)
         }.resourceId, null))
         val text = AutoCompleteTextView(activity)
+        text.id = R.id.searchText
         text.setSingleLine()
         text.setText(saved)
         text.setHint(R.string.fhint)

diff --git a/app/src/main/java/jp/ddo/hotmist/unicodepad/UnicodeActivity.kt b/app/src/main/java/jp/ddo/hotmist/unicodepad/UnicodeActivity.kt
@@ -153,6 +153,7 @@ class UnicodeActivity : BaseActivity() {
                         AndroidView(
                             factory = { context ->
                                 if (useEmoji != "null") { AppCompatEditText(context) } else { EditText(context) }.apply {
+                                    id = R.id.editText
                                     setOnTouchListener { view: View, motionEvent: MotionEvent ->
                                         view.onTouchEvent(motionEvent)
                                         if (disableime) (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(
@@ -165,7 +166,7 @@ class UnicodeActivity : BaseActivity() {
                                     maxLines = if (multiline) 3 else 1
                                     inputType = InputType.TYPE_CLASS_TEXT or if (multiline) InputType.TYPE_TEXT_FLAG_MULTI_LINE else 0
                                     setOnEditorActionListener { _, actionId, keyEvent ->
-                                        if (keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN || actionId == EditorInfo.IME_ACTION_DONE) {
+                                        if (keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN && !multiline || actionId == EditorInfo.IME_ACTION_DONE) {
                                             btnFinish.performClick()
                                             true
                                         } else
@@ -530,6 +531,7 @@ class UnicodeActivity : BaseActivity() {
                                         }
                                     }
                                 }
+                                bottomSheetBackCallback.isEnabled = false
                                 behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
                                     override fun onStateChanged(bottomSheet: View, newState: Int) {
                                         bottomSheetBackCallback.isEnabled = newState != BottomSheetBehavior.STATE_HIDDEN
@@ -940,13 +942,22 @@ class UnicodeActivity : BaseActivity() {
         disableime = pref.getBoolean("ime", true)
         showBtnClear = pref.getBoolean("clear", false)
         showBtnRow = pref.getBoolean("buttons", true)
+        scrollUi = (pref.getString("scroll", null)?.toIntOrNull() ?: 1) + (if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) 1 else 0) > 1
         if (created) {
             editText.textSize = fontsize
             adpPage.notifyDataSetChanged()
-            scrollUi = (pref.getString("scroll", null)?.toIntOrNull() ?: 1) + (if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) 1 else 0) > 1
-            val multiline = pref.getBoolean("multiline", false)
-            editText.maxLines = if (multiline) 3 else 1
-            editText.inputType = InputType.TYPE_CLASS_TEXT or if (multiline) InputType.TYPE_TEXT_FLAG_MULTI_LINE else 0
+            editText.apply {
+                val multiline = pref.getBoolean("multiline", false)
+                editText.maxLines = if (multiline) 3 else 1
+                editText.inputType = InputType.TYPE_CLASS_TEXT or if (multiline) InputType.TYPE_TEXT_FLAG_MULTI_LINE else 0
+                setOnEditorActionListener { _, actionId, keyEvent ->
+                    if (keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN && !multiline || actionId == EditorInfo.IME_ACTION_DONE) {
+                        btnFinish.performClick()
+                        true
+                    } else
+                        false
+                }
+            }
         }
         if (requestCode != -1) {
             adCompat.renderAdToContainer(this, pref)

diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
@@ -22,4 +22,6 @@
 	<item name="fontBar" type="id"/>
 	<item name="finish" type="id"/>
 	<item name="adContainer" type="id"/>
+	<item name="editText" type="id"/>
+	<item name="searchText" type="id"/>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -502,7 +502,7 @@
 Copyright © 1991-2023 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in
 http://www.unicode.org/copyright.html.</string>
-	<string name="legal_app" translatable="false">UnicodePad 2.14.0</string>
+	<string name="legal_app" translatable="false">UnicodePad 2.14.1</string>
 	<string name="legal_app2" translatable="false">UnicodePad is licensed under the Apache License, Version2.0
 https://github.com/Ryosuke839/UnicodePad</string>
 </resources>