Zh: Discussion about the implementation of Chinese settings

.gitignore

@@ -9,4 +9,5 @@ crashreporting.properties
 keystore.properties
 key.jks
 java/res/raw/mozc.data
-.cxx
+.cxx
+java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "java/res-large"]
 	path = java/res-large
 	url = https://gitlab.futo.org/keyboard/keyboard-large-resources.git
+[submodule "java/assets/futo-swipe"]
+	path = java/assets/futo-swipe
+	url = https://huggingface.co/futo-org/futo-swipe

build.gradle

@@ -366,6 +366,12 @@ android {
         mlModelBinding true
         buildConfig true
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 dependencies {
@@ -375,15 +381,15 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.8.4'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4'
     implementation 'androidx.activity:activity-compose:1.9.1'
-    implementation platform('androidx.compose:compose-bom:2024.06.00')
+    implementation platform('androidx.compose:compose-bom:2025.06.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-compose:2.7.7'
+    implementation 'androidx.navigation:navigation-compose:2.10.0-alpha02'
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
@@ -396,7 +402,7 @@ dependencies {
     unstableImplementation 'ch.acra:acra-mail:5.11.1'
     unstableImplementation 'ch.acra:acra-dialog:5.11.1'
 
-    implementation 'sh.calvin.reorderable:reorderable:2.2.0'
+    implementation 'sh.calvin.reorderable:reorderable:3.0.0'
 
     //implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1'
@@ -420,6 +426,8 @@ dependencies {
     implementation files('libs/rime-release.aar')
     // End for RIME
 
+    implementation files('libs/futo-swipe-release.aar')
+
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 

common/src/org/futo/inputmethod/latin/common/InputPointers.java

@@ -16,19 +16,41 @@
 
 package org.futo.inputmethod.latin.common;
 
+import android.util.Log;
+
 import org.futo.inputmethod.annotations.UsedForTesting;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import javax.annotation.Nonnull;
 
+import kotlin.Pair;
+
 // TODO: This class is not thread-safe.
 public final class InputPointers {
+    public static final class GestureSegment {
+        public final int pointerId;
+        public final ResizableIntArray x = new ResizableIntArray(0);
+        public final ResizableIntArray y = new ResizableIntArray(0);
+        public final ResizableIntArray t = new ResizableIntArray(0);
+
+        public GestureSegment(int pointerId) {
+            this.pointerId = pointerId;
+        }
+    }
     private static final boolean DEBUG_TIME = false;
+    private static final boolean DEBUG_TRACE = false;
+    private static final String TAG = "InputPointers";
 
     private final int mDefaultCapacity;
     private final ResizableIntArray mXCoordinates;
     private final ResizableIntArray mYCoordinates;
     private final ResizableIntArray mPointerIds;
     private final ResizableIntArray mTimes;
+    private final ArrayList<GestureSegment> mGestureSegments = new ArrayList<>();
+    private final HashMap<Integer, GestureSegment> mActivePointerSegments = new HashMap<>();
 
     public InputPointers(final int defaultCapacity) {
         mDefaultCapacity = defaultCapacity;
@@ -73,17 +95,27 @@ public void addPointer(final int x, final int y, final int pointerId, final int
     }
 
     public void set(@Nonnull final InputPointers ip) {
+        if(DEBUG_TRACE) Log.d(TAG, "set " + System.identityHashCode(this) + " ip=" + System.identityHashCode(ip));
         mXCoordinates.set(ip.mXCoordinates);
         mYCoordinates.set(ip.mYCoordinates);
         mPointerIds.set(ip.mPointerIds);
         mTimes.set(ip.mTimes);
+
+        mGestureSegments.clear();
+        mGestureSegments.addAll(ip.getGestureSegments());
+        mActivePointerSegments.clear();
     }
 
     public void copy(@Nonnull final InputPointers ip) {
+        if(DEBUG_TRACE) Log.d(TAG, "copy " + System.identityHashCode(this) + " ip=" + System.identityHashCode(ip));
         mXCoordinates.copy(ip.mXCoordinates);
         mYCoordinates.copy(ip.mYCoordinates);
         mPointerIds.copy(ip.mPointerIds);
         mTimes.copy(ip.mTimes);
+
+        mGestureSegments.clear();
+        mGestureSegments.addAll(ip.getGestureSegments());
+        mActivePointerSegments.clear();
     }
 
     /**
@@ -99,13 +131,40 @@ public void copy(@Nonnull final InputPointers ip) {
     public void append(final int pointerId, @Nonnull final ResizableIntArray times,
             @Nonnull final ResizableIntArray xCoordinates,
             @Nonnull final ResizableIntArray yCoordinates, final int startPos, final int length) {
+        if(DEBUG_TRACE) {
+            Log.d(TAG, "add " + pointerId + " " + length + " " + System.identityHashCode(this) + " " + Thread.currentThread().getId());
+            Log.d(TAG, "  x:" + xCoordinates.get(startPos) + "->" + xCoordinates.get(startPos + length - 1));
+            Log.d(TAG, "  y:" + yCoordinates.get(startPos) + "->" + yCoordinates.get(startPos + length - 1));
+            Log.d(TAG, "  t:" + times.get(startPos) + "->" + times.get(startPos + length - 1));
+        }
         if (length == 0) {
             return;
         }
         mXCoordinates.append(xCoordinates, startPos, length);
         mYCoordinates.append(yCoordinates, startPos, length);
         mPointerIds.fill(pointerId, mPointerIds.getLength(), length);
         mTimes.append(times, startPos, length);
+
+        GestureSegment seg = mActivePointerSegments.get(pointerId);
+        if(seg == null) {
+            Log.e(TAG, "Attempting to append points to pointerId " + pointerId + " which was not pressed down!!");
+            return;
+        }
+        seg.x.append(xCoordinates, startPos, length);
+        seg.y.append(yCoordinates, startPos, length);
+        seg.t.append(times, startPos, length);
+    }
+
+    public void onPointerDown(final int pointerId) {
+        if(DEBUG_TRACE) Log.d(TAG, "down " + pointerId + " " + System.identityHashCode(this));
+        GestureSegment seg = new GestureSegment(pointerId);
+        mActivePointerSegments.put(pointerId, seg);
+        mGestureSegments.add(seg);
+
+    }
+    public void onPointerUp(final int pointerId) {
+        if(DEBUG_TRACE) Log.d(TAG, "up " + pointerId + " " + System.identityHashCode(this));
+        //mActivePointerSegments.remove(pointerId);
     }
 
     /**
@@ -118,16 +177,36 @@ public void shift(final int elementCount) {
         mYCoordinates.shift(elementCount);
         mPointerIds.shift(elementCount);
         mTimes.shift(elementCount);
+
+        for(int i=0; i<elementCount; i++) mGestureSegments.remove(0);
     }
 
     public void reset() {
+        if(DEBUG_TRACE) Log.d(TAG, "reset full" + Thread.currentThread().getId());
+        resetNonBatch();
+        resetForBatch();
+    }
+
+    public void resetNonBatch() {
+        if(DEBUG_TRACE) Log.d(TAG, "(reset nonbatch)" + Thread.currentThread().getId());
         final int defaultCapacity = mDefaultCapacity;
         mXCoordinates.reset(defaultCapacity);
         mYCoordinates.reset(defaultCapacity);
         mPointerIds.reset(defaultCapacity);
         mTimes.reset(defaultCapacity);
     }
 
+    public void resetForBatch() {
+        if(DEBUG_TRACE) Log.d(TAG, "(reset forbatch)" + Thread.currentThread().getId());
+        mGestureSegments.clear();
+        mActivePointerSegments.clear();
+    }
+
+    public void upAllPointers() {
+        if(DEBUG_TRACE) Log.d(TAG, "up all pointers " + Thread.currentThread().getId());
+        mActivePointerSegments.clear();
+    }
+
     public int getPointerSize() {
         return mXCoordinates.getLength();
     }
@@ -147,6 +226,9 @@ public int[] getPointerIds() {
         return mPointerIds.getPrimitiveArray();
     }
 
+    @Nonnull
+    public List<GestureSegment> getGestureSegments() { return mGestureSegments; }
+
     /**
      * Gets the time each point was registered, in milliseconds, relative to the first event in the
      * sequence.

java/AndroidManifest.xml

@@ -27,6 +27,12 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
 
+    <!-- For clipboard manager reading screenshots -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"
+        android:minSdkVersion="33" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove"/>
 
     <application android:label="@string/english_ime_name"
@@ -35,6 +41,7 @@
          android:supportsRtl="true"
          android:allowBackup="true"
          android:largeHeap="true"
+         android:enableOnBackInvokedCallback="true"
          android:name=".CrashLoggingApplication">
 
         <!-- Services -->
@@ -182,13 +189,20 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
+            tools:node="remove"
+            tools:ignore="MissingClass" />
 
         <provider
             android:authorities="${applicationId}.font"
             android:name=".content.KbContentProvider"
             android:exported="false"
             android:grantUriPermissions="true" />
+
+        <provider
+            android:authorities="${applicationId}.clipboard"
+            android:name=".uix.actions.clipboard.ClipboardProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
     </application>
 
     <!-- To query enabled input methods for voice IME detection -->

java/res/drawable/ripple_emoji_view.xml

@@ -15,7 +15,7 @@
   -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorAccent">
+    android:color="@android:color/white">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <corners android:radius="12dp" />

java/res/drawable/swipemodel_indicator.xml

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="6.01dp"
+    android:viewportWidth="14"
+    android:viewportHeight="6.01">
+  <path
+      android:pathData="M1.647,3.725C1.647,3.725 1.647,3.215 3.42,1.648C5.922,-0.565 7.944,5.31 11.093,3.445C12.353,2.698 12.353,1.913 12.353,1.913"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M1.647,4.267C1.647,4.267 1.647,3.756 3.42,2.189C5.922,-0.024 7.944,5.852 11.093,3.986C12.353,3.24 12.353,2.454 12.353,2.454"
+      android:strokeAlpha="0.66"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M1.647,4.777C1.647,4.777 1.647,4.267 3.42,2.699C5.922,0.487 7.944,6.362 11.093,4.496C12.353,3.75 12.353,2.964 12.353,2.964"
+      android:strokeAlpha="0.33"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+</vector>

java/res/layout/emoji_category.xml

@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="#00000000"
-    android:paddingTop="24dp"
-    android:paddingBottom="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:textSize="22sp"/>
+    android:paddingTop="16dp"
+    android:paddingBottom="4dp"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:textSize="16sp"
+    android:fontFamily="sans-serif-medium"/>