diff --git a/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt b/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt index 9e87bb68e0..c14d71da38 100644 --- a/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt +++ b/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt @@ -102,8 +102,12 @@ class Composition(context: Context, attrs: AttributeSet?) : TextView(context, at private var onActionMove: ((Float, Float) -> Unit)? = null private val stickyLines: Int - get() = if (context.isLandscapeMode()) theme.generalStyle.layout.stickyLinesLand - else theme.generalStyle.layout.stickyLines + get() = + if (context.isLandscapeMode()) { + theme.generalStyle.layout.stickyLinesLand + } else { + theme.generalStyle.layout.stickyLines + } private enum class Movable { ALWAYS, @@ -418,9 +422,11 @@ class Composition(context: Context, attrs: AttributeSet?) : TextView(context, at for (component in windowComponents) { when { component.move.isNotBlank() -> buildSpannedMove(component) - component.composition.isNotBlank() -> buildSpannedComposition( - component, inputContext.composition - ) + component.composition.isNotBlank() -> + buildSpannedComposition( + component, + inputContext.composition, + ) component.click.isNotBlank() -> buildSpannedButton(component) component.candidate.isNotBlank() -> diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt index 2552a85bef..1e26bf100c 100644 --- a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt +++ b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt @@ -4,7 +4,6 @@ package com.osfans.trime.ime.keyboard -import android.content.res.Configuration import android.view.KeyEvent import com.osfans.trime.data.prefs.AppPrefs.Companion.defaultInstance import com.osfans.trime.data.theme.EventManager @@ -425,8 +424,11 @@ class Keyboard() { val keyboardHeight = theme.generalStyle.keyboardHeight val keyboardHeightLand = theme.generalStyle.keyboardHeightLand val value = - if (appContext.isLandscapeMode()) keyboardHeightLand.takeIf { it > 0 } ?: keyboardHeight - else keyboardHeight + if (appContext.isLandscapeMode()) { + keyboardHeightLand.takeIf { it > 0 } ?: keyboardHeight + } else { + keyboardHeight + } return appContext.dp(value) }