Add option to hide altText (#720)

eagleoflqj · rocka · web-flow · commit aa6c3a0c8203 · 2025-05-09T22:06:38.000+08:00
Co-authored-by: Rocka &lt;i@rocka.me&gt;
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt
@@ -87,6 +87,7 @@ class ThemePrefs(sharedPreferences: SharedPreferences) :
         int(R.string.clipboard_entry_radius, "clipboard_entry_radius", 2, 0, 48, "dp")
 
     enum class PunctuationPosition(override val stringRes: Int) : ManagedPreferenceEnum {
+        None(R.string.punctuation_pos_none),
         Bottom(R.string.punctuation_pos_bottom),
         TopRight(R.string.punctuation_pos_top_right);
     }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyView.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyView.kt
@@ -298,6 +298,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
             topToTop = parentId
             bottomToBottom = parentId
         }
+        altText.visibility = View.VISIBLE
         altText.updateLayoutParams<ConstraintLayout.LayoutParams> {
             // reset
             bottomToBottom = unset; bottomMargin = 0
@@ -316,6 +317,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
             topToTop = parentId; topMargin = vMargin
             bottomToTop = altText.existingOrNewId
         }
+        altText.visibility = View.VISIBLE
         altText.updateLayoutParams<ConstraintLayout.LayoutParams> {
             // reset
             topToTop = unset; topMargin = 0
@@ -327,13 +329,26 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
         }
     }
 
+    private fun applyNoAltTextPosition() {
+        mainText.updateLayoutParams<ConstraintLayout.LayoutParams> {
+            // reset
+            topMargin = 0
+            bottomToTop = unset
+            // set
+            topToTop = parentId
+            bottomToBottom = parentId
+        }
+        altText.visibility = View.GONE
+    }
+
     private fun applyLayout(orientation: Int) {
         when (ThemeManager.prefs.punctuationPosition.getValue()) {
             PunctuationPosition.Bottom -> when (orientation) {
                 Configuration.ORIENTATION_LANDSCAPE -> applyTopRightAltTextPosition()
                 else -> applyBottomAltTextPosition()
             }
             PunctuationPosition.TopRight -> applyTopRightAltTextPosition()
+            PunctuationPosition.None -> applyNoAltTextPosition()
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -122,6 +122,7 @@
     <string name="punctuation_position">Punctuation position</string>
     <string name="punctuation_pos_bottom">Bottom (Portrait only)</string>
     <string name="punctuation_pos_top_right">Top Right</string>
+    <string name="punctuation_pos_none">None</string>
     <string name="expand_toolbar_by_default">Expand toolbar by default</string>
     <string name="popup_on_key_press">Popup on key press</string>
     <string name="disable_animation">Disable animation</string>

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ class ThemePrefs(sharedPreferences: SharedPreferences) :`
`87`	`87`	`int(R.string.clipboard_entry_radius, "clipboard_entry_radius", 2, 0, 48, "dp")`
`88`	`88`
`89`	`89`	`enum class PunctuationPosition(override val stringRes: Int) : ManagedPreferenceEnum {`
	`90`	`+ None(R.string.punctuation_pos_none),`
`90`	`91`	`Bottom(R.string.punctuation_pos_bottom),`
`91`	`92`	`TopRight(R.string.punctuation_pos_top_right);`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)`
`298`	`298`	`topToTop = parentId`
`299`	`299`	`bottomToBottom = parentId`
`300`	`300`	`}`
	`301`	`+ altText.visibility = View.VISIBLE`
`301`	`302`	`altText.updateLayoutParams<ConstraintLayout.LayoutParams> {`
`302`	`303`	`// reset`
`303`	`304`	`bottomToBottom = unset; bottomMargin = 0`
`@@ -316,6 +317,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)`
`316`	`317`	`topToTop = parentId; topMargin = vMargin`
`317`	`318`	`bottomToTop = altText.existingOrNewId`
`318`	`319`	`}`
	`320`	`+ altText.visibility = View.VISIBLE`
`319`	`321`	`altText.updateLayoutParams<ConstraintLayout.LayoutParams> {`
`320`	`322`	`// reset`
`321`	`323`	`topToTop = unset; topMargin = 0`
`@@ -327,13 +329,26 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)`
`327`	`329`	`}`
`328`	`330`	`}`
`329`	`331`
	`332`	`+ private fun applyNoAltTextPosition() {`
	`333`	`+ mainText.updateLayoutParams<ConstraintLayout.LayoutParams> {`
	`334`	`+ // reset`
	`335`	`+ topMargin = 0`
	`336`	`+ bottomToTop = unset`
	`337`	`+ // set`
	`338`	`+ topToTop = parentId`
	`339`	`+ bottomToBottom = parentId`
	`340`	`+ }`
	`341`	`+ altText.visibility = View.GONE`
	`342`	`+ }`
	`343`	`+`
`330`	`344`	`private fun applyLayout(orientation: Int) {`
`331`	`345`	`when (ThemeManager.prefs.punctuationPosition.getValue()) {`
`332`	`346`	`PunctuationPosition.Bottom -> when (orientation) {`
`333`	`347`	`Configuration.ORIENTATION_LANDSCAPE -> applyTopRightAltTextPosition()`
`334`	`348`	`else -> applyBottomAltTextPosition()`
`335`	`349`	`}`
`336`	`350`	`PunctuationPosition.TopRight -> applyTopRightAltTextPosition()`
	`351`	`+ PunctuationPosition.None -> applyNoAltTextPosition()`
`337`	`352`	`}`
`338`	`353`	`}`
`339`	`354`