dox4/fcitx5-android
1
0
Fork 0
mirror of https://github.com/fcitx5-android/fcitx5-android.git synced 2026-08-02 04:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化PopupComponent中的弹出窗口逻辑，移除冗余代码，简化预览显示和清空文本的处理，提升代码可读性和维护性。

Browse Source
This commit is contained in:
BetterAndBetterII 2025-09-22 11:26:10 +00:00
parent 4b3f535d6e
commit bb89b5410b
1 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt
View File

@ -91,29 +91,13 @@ class PopupComponent :
dismissJobs.remove(viewId)?.cancel()
}
lastShowTime = System.currentTimeMillis()
// Always clear danger hint state when (re)showing a preview
setDangerHint(false)
when (style) {
PopupAction.PreviewStyle.WideAbove -> showIcon(R.drawable.ic_baseline_delete_sweep_24)
else -> {
showTextMode()
setText(content)
}
}
setText(content)
return
}
val popup = (freeEntryUi.poll()
?: PopupEntryUi(context, theme, popupKeyHeight, popupRadius)).apply {
lastShowTime = System.currentTimeMillis()
// Always clear danger hint state when (re)showing a preview
setDangerHint(false)
when (style) {
PopupAction.PreviewStyle.WideAbove -> showIcon(R.drawable.ic_baseline_delete_sweep_24)
else -> {
showTextMode()
setText(content)
}
}
setText(content)
}
// translate absolute bounds into root-local coordinates
val left = bounds.left - rootBounds.left
@ -148,11 +132,6 @@ class PopupComponent :
LayoutSpec(w, h, lm, tm)
}
}
// Defensive: in case a reused popup view still has a parent for any reason,
// detach it before adding to our root to avoid IllegalStateException.
(popup.root.parent as? ViewGroup)?.removeView(popup.root)
root.apply {
add(popup.root, lParams(w, h) {
leftMargin = lm
@ -170,12 +149,8 @@ class PopupComponent :
val keys = PopupPreset[keyboard.label]
?: EmojiModifier.produceSkinTones(keyboard.label)
?: return
// clear popup preview text OR create empty popup preview
showingEntryUi[viewId]?.apply {
setDangerHint(false)
showTextMode()
setText("")
} ?: showPopup(viewId, "", bounds, PopupAction.PreviewStyle.Default)
// clear popup preview text OR create empty popup preview
showingEntryUi[viewId]?.setText("") ?: showPopup(viewId, "", bounds, PopupAction.PreviewStyle.Default)
reallyShowKeyboard(viewId, keys, bounds)
}