From 55e7d35a8e8f614516d8f7622813f9ab3408d855 Mon Sep 17 00:00:00 2001 From: Patrick Goldinger Date: Thu, 30 Apr 2020 19:33:27 +0200 Subject: [PATCH] Fix minor issues & bugs --- .../dev/patrickgold/florisboard/ime/core/FlorisBoard.kt | 7 +++++++ .../java/dev/patrickgold/florisboard/ime/key/KeyView.kt | 4 ++++ .../patrickgold/florisboard/ime/keyboard/KeyboardView.kt | 1 + .../dev/patrickgold/florisboard/ime/layout/LayoutType.kt | 1 - .../patrickgold/florisboard/ime/popup/KeyPopupManager.kt | 2 +- .../florisboard/ime/smartbar/SmartbarManager.kt | 6 +++--- .../dev/patrickgold/florisboard/settings/AboutActivity.kt | 6 +++--- app/src/main/res/layout/keyboard_preview.xml | 3 +-- app/src/main/res/values/dimens.xml | 1 - 9 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt index 292c8817..644b3daa 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt @@ -84,6 +84,13 @@ class FlorisBoard : InputMethodService() { super.onStartInputView(info, restarting) } + override fun onComputeInsets(outInsets: Insets?) { + super.onComputeInsets(outInsets) + if (!isFullscreenMode && outInsets != null) { + outInsets.contentTopInsets = outInsets.visibleTopInsets + } + } + fun sendKeyPress(keyData: KeyData) { val ic = currentInputConnection if (keyData.type == KeyType.CHARACTER) { diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt index faf9abb5..23ed07f2 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt @@ -135,6 +135,7 @@ class KeyView( } } + @SuppressLint("ClickableViewAccessibility") @Suppress("NAME_SHADOWING") override fun onTouchEvent(event: MotionEvent?): Boolean { val event = event ?: return false @@ -194,6 +195,9 @@ class KeyView( } else { shouldBlockNextKeyCode = false } + if (event.action == MotionEvent.ACTION_UP) { + performClick() + } } else -> return false } diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt index f71616e2..c2fed657 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt @@ -56,6 +56,7 @@ class KeyboardView( return shouldStealMotionEvents } + @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent?): Boolean { shouldStealMotionEvents = false if (event != null && event.action == MotionEvent.ACTION_MOVE) { diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutType.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutType.kt index ba9d5c30..8837dc9a 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutType.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutType.kt @@ -2,7 +2,6 @@ package dev.patrickgold.florisboard.ime.layout import android.annotation.SuppressLint import com.squareup.moshi.FromJson -import java.lang.Error /** * Defines the type of the layout. diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/popup/KeyPopupManager.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/popup/KeyPopupManager.kt index 012d4d38..3e615161 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/ime/popup/KeyPopupManager.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/ime/popup/KeyPopupManager.kt @@ -5,7 +5,6 @@ import android.util.TypedValue import android.view.Gravity import android.view.MotionEvent import android.view.View -import android.view.ViewGroup import android.widget.ImageView import android.widget.LinearLayout import android.widget.PopupWindow @@ -76,6 +75,7 @@ class KeyPopupManager( } fun show() { + // TODO: improve performance of popup creation val code = keyView.data.code if (code <= 32 || isShowingPopup) { return diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/smartbar/SmartbarManager.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/smartbar/SmartbarManager.kt index 2cf43de8..57778ca8 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/ime/smartbar/SmartbarManager.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/ime/smartbar/SmartbarManager.kt @@ -21,10 +21,10 @@ class SmartbarManager( var isQuickActionsViewVisible: Boolean = false set(value) { field = value; updateQuickActionVisibility() } - private val candidateViewOnClickListener = View.OnClickListener { _ -> + private val candidateViewOnClickListener = View.OnClickListener { v -> // } - private val candidateViewOnLongClickListener = View.OnLongClickListener { _ -> + private val candidateViewOnLongClickListener = View.OnLongClickListener { v -> true } private val quickActionOnClickListener = View.OnClickListener { v -> @@ -37,7 +37,7 @@ class SmartbarManager( else -> return@OnClickListener } } - private val quickActionToggleOnClickListener = View.OnClickListener { _ -> + private val quickActionToggleOnClickListener = View.OnClickListener { isQuickActionsViewVisible = !isQuickActionsViewVisible } diff --git a/app/src/main/java/dev/patrickgold/florisboard/settings/AboutActivity.kt b/app/src/main/java/dev/patrickgold/florisboard/settings/AboutActivity.kt index 6750f15f..24509946 100644 --- a/app/src/main/java/dev/patrickgold/florisboard/settings/AboutActivity.kt +++ b/app/src/main/java/dev/patrickgold/florisboard/settings/AboutActivity.kt @@ -32,14 +32,14 @@ class AboutActivity : AppCompatActivity() { } // Set onClickListeners for buttons - privacyPolicyButton.setOnClickListener { _ -> + privacyPolicyButton.setOnClickListener { val browserIntent = Intent( Intent.ACTION_VIEW, Uri.parse(resources.getString(R.string.florisboard__privacy_policy_url)) ) startActivity(browserIntent) } - licenseButton.setOnClickListener { _ -> + licenseButton.setOnClickListener { val webView = WebView(this) webView.loadUrl("file:///android_asset/license/open_source_licenses.html") licensesAlertDialog = AlertDialog.Builder(this, R.style.SettingsTheme_Light) @@ -48,7 +48,7 @@ class AboutActivity : AppCompatActivity() { .setPositiveButton(android.R.string.ok, null) .show() } - sourceCodeButton.setOnClickListener { _ -> + sourceCodeButton.setOnClickListener { val browserIntent = Intent( Intent.ACTION_VIEW, Uri.parse(resources.getString(R.string.florisboard__repo_url)) diff --git a/app/src/main/res/layout/keyboard_preview.xml b/app/src/main/res/layout/keyboard_preview.xml index 1a5ee072..e7c7b1d5 100644 --- a/app/src/main/res/layout/keyboard_preview.xml +++ b/app/src/main/res/layout/keyboard_preview.xml @@ -3,8 +3,7 @@ android:id="@+id/keyboard_preview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:background="#f00"> + android:orientation="vertical"> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a66957c3..46ccbf00 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -15,7 +15,6 @@ 200dp - 48dp 2dp 5dp