diff --git a/app/build.gradle b/app/build.gradle index c3c7941..89d639f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 32 + compileSdkVersion 33 defaultConfig { applicationId "jp.ddo.hotmist.unicodepad" minSdkVersion 16 - targetSdkVersion 32 - versionCode 53 - versionName "2.12.0" + targetSdkVersion 33 + versionCode 54 + versionName "2.12.1" } compileOptions { diff --git a/app/src/main/java/jp/ddo/hotmist/unicodepad/SettingActivity.kt b/app/src/main/java/jp/ddo/hotmist/unicodepad/SettingActivity.kt index 0a43e18..abf3524 100644 --- a/app/src/main/java/jp/ddo/hotmist/unicodepad/SettingActivity.kt +++ b/app/src/main/java/jp/ddo/hotmist/unicodepad/SettingActivity.kt @@ -213,6 +213,7 @@ class SettingActivity : PreferenceActivity(), OnPreferenceChangeListener { it.put("shrink", if (pref.contains("shrink")) pref.getBoolean("shrink", true) else null) it.put("ime", if (pref.contains("ime")) pref.getBoolean("ime", true) else null) it.put("clear", if (pref.contains("clear")) pref.getBoolean("clear", true) else null) + it.put("buttons", if (pref.contains("buttons")) pref.getBoolean("buttons", true) else null) it.put("scroll", pref.getString("scroll", null)) it.put("recentsize", pref.getString("recentsize", null)) }) @@ -334,6 +335,7 @@ class SettingActivity : PreferenceActivity(), OnPreferenceChangeListener { (it.opt("shrink") as? Boolean)?.let { bool -> edit.putBoolean("shrink", bool) } (it.opt("ime") as? Boolean)?.let { bool -> edit.putBoolean("ime", bool) } (it.opt("clear") as? Boolean)?.let { bool -> edit.putBoolean("clear", bool) } + (it.opt("buttons") as? Boolean)?.let { bool -> edit.putBoolean("buttons", bool) } (it.opt("scroll") as? String)?.let { str -> edit.putString("scroll", str) } (it.opt("recentsize") as? String)?.let { str -> edit.putString("recentsize", str) } } diff --git a/app/src/main/java/jp/ddo/hotmist/unicodepad/UnicodeActivity.kt b/app/src/main/java/jp/ddo/hotmist/unicodepad/UnicodeActivity.kt index 1507b54..a0b7541 100644 --- a/app/src/main/java/jp/ddo/hotmist/unicodepad/UnicodeActivity.kt +++ b/app/src/main/java/jp/ddo/hotmist/unicodepad/UnicodeActivity.kt @@ -53,7 +53,8 @@ import kotlin.math.min class UnicodeActivity : AppCompatActivity() { private lateinit var editText: EditText private lateinit var btnClear: ImageButton - private lateinit var btnFinish: MenuItem + private lateinit var btnRow: LinearLayout + private lateinit var btnFinish: Button private lateinit var chooser: FontChooser private lateinit var locale: LocaleChooser private lateinit var scroll: LockableScrollView @@ -107,7 +108,7 @@ class UnicodeActivity : AppCompatActivity() { it.textSize = fontsize it.setOnEditorActionListener { _, actionId, keyEvent -> if (keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN || actionId == EditorInfo.IME_ACTION_DONE) { - onOptionsItemSelected(btnFinish) + btnFinish.performClick() true } else false @@ -140,12 +141,62 @@ class UnicodeActivity : AppCompatActivity() { } }) } + findViewById