Prevent too frequent resizing

This reverts commit 1d3dc6d
and implements another solution

Keyboards push up the bottom of app.
- If skkPrefs.candidatesMinHeight is false,
  push up all the height of candidatesView too
  and this resizes the app too often (old behavior)
- If true, push up only the minimum height of it (fixed value)
  and place the rest of the candidates *over* the app

Author: tamo

app/src/main/java/jp/deadend/noname/skk/CandidatesViewContainer.kt

@@ -35,6 +35,7 @@ class CandidatesViewContainer(screen: Context, attrs: AttributeSet) : LinearLayo
                 setSize(-1)
             }
         }
+    internal val minHeight = resources.getDimensionPixelSize(R.dimen.candidates_scroll_button_width)
     private lateinit var mService: SKKService
 
     private val mActivePointers = mutableListOf<Pair<Int, Float>>()
@@ -169,9 +170,8 @@ class CandidatesViewContainer(screen: Context, attrs: AttributeSet) : LinearLayo
         if (px > 0) {
             binding.candidates.setTextSize(px)
         }
-        val buttonSize = resources.getDimensionPixelSize(R.dimen.candidates_scroll_button_width)
-        val width = mService.inputViewWidth - buttonSize * 2
-        val height = if (lines > 0) (px * lines * LINE_SCALE).toInt() else buttonSize
+        val width = mService.inputViewWidth - minHeight * 2 // minHeight == size of square button
+        val height = if (lines > 0) (px * lines * LINE_SCALE).toInt() else minHeight
         val newLayoutParams = LayoutParams(width, height)
         if (binding.frame.layoutParams.width != newLayoutParams.width ||
             binding.frame.layoutParams.height != newLayoutParams.height

app/src/main/java/jp/deadend/noname/skk/SKKPrefs.kt

@@ -29,10 +29,10 @@ class SKKPrefs(context: Context) {
             putInt(res.getString(R.string.pref_candidates_size), value)
         }
 
-    var candidatesReserveLines: Boolean
-        get() = prefs.getBoolean(res.getString(R.string.pref_candidates_reserve_lines), false)
+    var candidatesMinHeight: Boolean
+        get() = prefs.getBoolean(res.getString(R.string.pref_candidates_min_height), true)
         set(value) = prefs.edit {
-            putBoolean(res.getString(R.string.pref_candidates_reserve_lines), value)
+            putBoolean(res.getString(R.string.pref_candidates_min_height), value)
         }
 
     var candidatesNormalLines: Int

app/src/main/java/jp/deadend/noname/skk/SKKService.kt

@@ -841,17 +841,16 @@ class SKKService : InputMethodService() {
         //dLog("lifecycle: ${Thread.currentThread().stackTrace[2].methodName}")
         super.onComputeInsets(outInsets)
         if (outInsets == null || mInputView == null || mCandidatesViewContainer == null) return
+        val height = mInputView!!.height + mCandidatesViewContainer!!.height // paddingBottom は除外
         outInsets.apply {
-            if (isFloating()) {
-                val height = mInputView!!.height + mCandidatesViewContainer!!.height
-                contentTopInsets = height
-                touchableInsets = Insets.TOUCHABLE_INSETS_REGION
-                touchableRegion.set(leftOffset, 0, leftOffset + mInputView!!.keyboard.width, height)
-            } else {
-                contentTopInsets = visibleTopInsets
-                // CandidatesViewに対して強制的にActivityをリサイズさせるためのhack
-                touchableInsets = Insets.TOUCHABLE_INSETS_VISIBLE
+            contentTopInsets = when {
+                isFloating() -> height // 高さをすべて無効にして floating を実現
+                skkPrefs.candidatesMinHeight -> contentTopInsets -
+                        mCandidatesViewContainer!!.minHeight // 常時表示される分だけを確保し固定
+                else -> visibleTopInsets // 変動する CandidatesView の高さも確保
             }
+            touchableInsets = Insets.TOUCHABLE_INSETS_REGION
+            touchableRegion.set(leftOffset, 0, leftOffset + mInputView!!.keyboard.width, height)
         }
     }
 
@@ -1325,7 +1324,7 @@ class SKKService : InputMethodService() {
         mCandidatesViewContainer?.apply {
             if (list.isNullOrEmpty()) {
                 setAlpha(skkPrefs.inactiveAlpha)
-                lines = if (skkPrefs.candidatesReserveLines) viewLines else 0
+                lines = 0
             } else {
                 setAlpha(skkPrefs.activeAlpha)
                 lines = viewLines
@@ -1336,9 +1335,7 @@ class SKKService : InputMethodService() {
 
     fun requestChooseCandidate(index: Int) = mCandidatesView?.choose(index)
 
-    fun clearCandidatesView() = mCandidatesViewContainer?.let {
-        setCandidates(null, "", if (skkPrefs.candidatesReserveLines) it.lines else 0)
-    }
+    fun clearCandidatesView() = setCandidates(null, "", 0)
 
     // カーソル直前に引数と同じ文字列があるなら，それを消してtrue なければfalse
     fun prepareReConversion(candidate: String): Boolean {

app/src/main/res/values/strings.xml

@@ -80,7 +80,7 @@
     <string name="pref_abbrev_key" translatable="false">PrefKeyAbbrevKey</string>
     <string name="pref_hankaku_kana_key" translatable="false">PrefKeyHankakuKanaKey</string>
     <string name="pref_candidates_size" translatable="false">PrefKeyCandidatesSize</string>
-    <string name="pref_candidates_reserve_lines" translatable="false">PrefKeyCandidatesReserveLines</string>
+    <string name="pref_candidates_min_height" translatable="false">PrefKeyCandidatesMinHeight</string>
     <string name="pref_candidates_normal_lines" translatable="false">PrefKeyCandidatesNormalLines</string>
     <string name="pref_candidates_emoji_lines" translatable="false">PrefKeyCandidatesEmojiLines</string>
     <string name="pref_use_candidates_view" translatable="false">PrefKeyUseCandidatesView</string>

app/src/main/res/xml/prefs_main.xml

@@ -26,11 +26,11 @@
         app:showSeekBarValue="true"
         app:title="候補表示の文字サイズ" />
     <androidx.preference.CheckBoxPreference
-        app:defaultValue="false"
+        app:defaultValue="true"
         app:iconSpaceReserved="false"
-        app:key="@string/pref_candidates_reserve_lines"
-        app:summary="画面のちらつきを減らせる可能性があります"
-        app:title="候補表示を閉じない" />
+        app:key="@string/pref_candidates_min_height"
+        app:summary="変換中にリサイズで画面がちらつかず安定します"
+        app:title="候補表示をアプリ上に重ねて伸ばす" />
     <androidx.preference.SeekBarPreference
         android:max="10"
         app:defaultValue="2"