fix: prevent handwriting suggestions from hiding

Also hide the redundant top toolbar on the handwriting panel during normal use, keeping it only for active download progress.

Author: LeanBitLab

app/proguard-rules.pro

@@ -52,3 +52,7 @@
 -keep class com.google.android.gms.tasks.** { *; }
 -keep class com.google.firebase.components.** { *; }
 
+# Keep Kotlin standard library for dynamically loaded plugins
+# ponytail: keep kotlin stdlib classes to prevent NoSuchMethodError in plugin loading
+-keep class kotlin.** { *; }
+

app/src/main/java/helium314/keyboard/latin/LatinIME.java

@@ -295,6 +295,10 @@ public void handleMessage(@NonNull final Message msg) {
         }
 
         public void postUpdateSuggestionStrip(final int inputStyle) {
+            final LatinIME latinIme = getOwnerInstance(); // ponytail: skip during handwriting
+            if (latinIme != null && latinIme.mKeyboardSwitcher.isHandwritingShowing()) {
+                return;
+            }
             sendMessageDelayed(obtainMessage(MSG_UPDATE_SUGGESTION_STRIP, inputStyle,
                     0 /* ignored */), mDelayInMillisecondsToUpdateSuggestions);
         }
@@ -308,6 +312,9 @@ public void postResumeSuggestions(final boolean shouldDelay) {
             if (latinIme == null) {
                 return;
             }
+            if (latinIme.mKeyboardSwitcher.isHandwritingShowing()) { // ponytail: skip during handwriting
+                return;
+            }
             if (!latinIme.mSettings.getCurrent().needsToLookupSuggestions()) {
                 return;
             }
@@ -1682,8 +1689,11 @@ public void setSuggestions(final SuggestedWords suggestedWords) {
             // should be fine, as there will be another suggestion in a few ms
             // (but not a great style to avoid this visual glitch, maybe revert this commit
             // and replace with sth better)
-            if (suggestedWords.mInputStyle != SuggestedWords.INPUT_STYLE_UPDATE_BATCH)
+            if (mKeyboardSwitcher.isHandwritingShowing()) { // ponytail: bypass neutral strip/punc lookup
+                setSuggestedWords(suggestedWords);
+            } else if (suggestedWords.mInputStyle != SuggestedWords.INPUT_STYLE_UPDATE_BATCH) {
                 setNeutralSuggestionStrip();
+            }
         } else {
             setSuggestedWords(suggestedWords);
         }
@@ -1768,6 +1778,9 @@ public boolean tryShowClipboardSuggestion() {
     // and there is a selection of text or it's the start of a line.
     @Override
     public void setNeutralSuggestionStrip() {
+        if (mKeyboardSwitcher.isHandwritingShowing()) { // ponytail: do not override/clear handwriting suggestions
+            return;
+        }
         final SettingsValues currentSettings = mSettings.getCurrent();
         if (tryShowOtpSuggestion() || tryShowClipboardSuggestion()) {
             // an external (OTP or clipboard) suggestion has been set

app/src/main/java/helium314/keyboard/latin/handwriting/HandwritingView.kt

@@ -8,6 +8,7 @@ import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.ProgressBar
 import android.graphics.drawable.GradientDrawable
 import helium314.keyboard.keyboard.KeyboardActionListener
 import helium314.keyboard.keyboard.KeyboardId
@@ -41,6 +42,8 @@ class HandwritingView @JvmOverloads constructor(
     private lateinit var clearButton: ImageButton
     private lateinit var canvas: HandwritingCanvas
     private lateinit var bottomRowKeyboard: MainKeyboardView
+    private lateinit var downloadProgress: ProgressBar
+    private var toolbar: View? = null // ponytail: track toolbar
 
     private var keyboardActionListener: KeyboardActionListener? = null
     private var editorInfo: EditorInfo? = null
@@ -54,6 +57,8 @@ class HandwritingView @JvmOverloads constructor(
         clearButton = findViewById(R.id.handwriting_clear_button)
         canvas = findViewById(R.id.handwriting_canvas)
         bottomRowKeyboard = findViewById(R.id.handwriting_bottom_row_keyboard)
+        downloadProgress = findViewById(R.id.handwriting_download_progress)
+        toolbar = findViewById(R.id.handwriting_toolbar)
 
         clearButton.setOnClickListener {
             clearCanvasAndComposition()
@@ -80,9 +85,9 @@ class HandwritingView @JvmOverloads constructor(
         this.currentLanguage = language
 
         val colors = Settings.getValues().mColors
-        val toolbar = findViewById<View>(R.id.handwriting_toolbar)
-        if (toolbar != null) {
-            colors.setBackground(toolbar, ColorType.MAIN_BACKGROUND)
+        toolbar?.let {
+            colors.setBackground(it, ColorType.MAIN_BACKGROUND)
+            it.visibility = View.GONE // ponytail: hide by default to avoid duplicate toolbar/X buttons
         }
         colors.setBackground(canvas, ColorType.MAIN_BACKGROUND)
 
@@ -91,6 +96,7 @@ class HandwritingView @JvmOverloads constructor(
         canvas.setStrokeColor(colors.get(ColorType.KEY_TEXT))
 
         languageLabel.text = language
+        downloadProgress.visibility = View.GONE
 
         // Setup bottom row keyboard
         bottomRowKeyboard.setKeyPreviewPopupEnabled(Settings.getValues().mKeyPreviewPopupOn)
@@ -161,27 +167,37 @@ class HandwritingView @JvmOverloads constructor(
                 val isReady = recognizer.isLanguageReady(language)
                 mainHandler.post {
                     if (!isReady) {
+                        toolbar?.visibility = View.VISIBLE // ponytail: show for download progress
                         languageLabel.text = "$language (Downloading...)"
+                        downloadProgress.visibility = View.VISIBLE
+                        downloadProgress.progress = 0
                         recognizer.downloadModel(language, object : ModelDownloadListener {
                             override fun onProgress(progress: Float) {
                                 mainHandler.post {
-                                    languageLabel.text = "$language (Downloading ${"%.0f".format(progress * 100)}%)"
+                                    val percent = (progress * 100).toInt()
+                                    languageLabel.text = "$language (Downloading $percent%)"
+                                    downloadProgress.progress = percent
                                 }
                             }
                             override fun onComplete(success: Boolean) {
                                 mainHandler.post {
+                                    downloadProgress.visibility = View.GONE
                                     if (success) {
+                                        toolbar?.visibility = View.GONE // ponytail: hide when done
                                         languageLabel.text = language
                                         android.widget.Toast.makeText(context, "Handwriting model downloaded", android.widget.Toast.LENGTH_SHORT).show()
                                     } else {
+                                        toolbar?.visibility = View.VISIBLE
                                         languageLabel.text = "$language (Download failed)"
                                         android.widget.Toast.makeText(context, "Failed to download handwriting model", android.widget.Toast.LENGTH_LONG).show()
                                     }
                                 }
                             }
                         })
                     } else {
+                        toolbar?.visibility = View.GONE // ponytail: hide when already downloaded
                         languageLabel.text = language
+                        downloadProgress.visibility = View.GONE
                     }
                 }
             }

app/src/main/res/layout/handwriting_view.xml

@@ -31,6 +31,15 @@
                 android:textColor="?android:attr/textColorSecondary"
                 android:textSize="14sp" />
 
+            <ProgressBar
+                android:id="@+id/handwriting_download_progress"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="4dp"
+                android:layout_alignParentBottom="true"
+                android:visibility="gone"
+                android:max="100" />
+
             <ImageButton
                 android:id="@+id/handwriting_clear_button"
                 android:layout_width="48dp"