Release v3.7.0: Groq API separation, OfflineLite cleanup, and UI fixes

Author: LeanBitLab

app/build.gradle.kts

@@ -22,8 +22,8 @@ android {
         applicationId = "helium314.keyboardl"
         minSdk = 21
         targetSdk = 35
-        versionCode = 3609
-        versionName = "3.6.9"
+        versionCode = 3700
+        versionName = "3.7.0"
 
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
@@ -109,12 +109,12 @@ android {
         compose = true
     }
 
-//    externalNativeBuild {
-//        ndkBuild {
-//            path = File("src/main/jni/Android.mk")
-//        }
-//    }
-////    ndkVersion = "28.0.13004108"
+    externalNativeBuild {
+        ndkBuild {
+            path = File("src/main/jni/Android.mk")
+        }
+    }
+//    ndkVersion = "28.0.13004108"
 
     packaging {
         jniLibs {

app/src/main/java/helium314/keyboard/latin/dictionary/ExpandableBinaryDictionary.java

@@ -39,12 +39,17 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- * Abstract base class for an expandable dictionary that can be created and updated dynamically
- * during runtime. When updated it automatically generates a new binary dictionary to handle future
- * queries in native code. This binary dictionary is written to internal storage.
+ * Abstract base class for an expandable dictionary that can be created and
+ * updated dynamically
+ * during runtime. When updated it automatically generates a new binary
+ * dictionary to handle future
+ * queries in native code. This binary dictionary is written to internal
+ * storage.
  * <p>
- * A class that extends this abstract class must have a static factory method named
- *   getDictionary(Context context, Locale locale, File dictFile, String dictNamePrefix)
+ * A class that extends this abstract class must have a static factory method
+ * named
+ * getDictionary(Context context, Locale locale, File dictFile, String
+ * dictNamePrefix)
  */
 abstract public class ExpandableBinaryDictionary extends Dictionary {
     private static final boolean DEBUG = false;
@@ -60,25 +65,25 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
     /**
      * The maximum length of a word in this dictionary.
      */
-    protected static final int MAX_WORD_LENGTH =
-            DecoderSpecificConstants.DICTIONARY_MAX_WORD_LENGTH;
+    protected static final int MAX_WORD_LENGTH = DecoderSpecificConstants.DICTIONARY_MAX_WORD_LENGTH;
 
     private static final int DICTIONARY_FORMAT_VERSION = FormatSpec.VERSION4;
 
-    private static final WordProperty[] DEFAULT_WORD_PROPERTIES_FOR_SYNC =
-            new WordProperty[0] /* default */;
+    private static final WordProperty[] DEFAULT_WORD_PROPERTIES_FOR_SYNC = new WordProperty[0] /* default */;
 
     /** The application context. */
     public final Context mContext;
 
     /**
-     * The binary dictionary generated dynamically from the fusion dictionary. This is used to
+     * The binary dictionary generated dynamically from the fusion dictionary. This
+     * is used to
      * answer unigram and bigram queries.
      */
     private BinaryDictionary mBinaryDictionary;
 
     /**
-     * The name of this dictionary, used as a part of the filename for storing the binary
+     * The name of this dictionary, used as a part of the filename for storing the
+     * binary
      * dictionary.
      */
     private final String mDictName;
@@ -107,8 +112,10 @@ static boolean matchesExpectedBinaryDictFormatVersionForThisType(final int forma
     }
 
     private static boolean needsToMigrateDictionary(final int formatVersion) {
-        // When we bump up the dictionary format version, the old version should be added to here
-        // for supporting migration. Note that native code has to support reading such formats.
+        // When we bump up the dictionary format version, the old version should be
+        // added to here
+        // for supporting migration. Note that native code has to support reading such
+        // formats.
         return formatVersion == FormatSpec.VERSION402;
     }
 
@@ -119,13 +126,14 @@ public boolean isValidDictionaryLocked() {
     /**
      * Creates a new expandable binary dictionary.
      *
-     * @param context The application context of the parent.
+     * @param context  The application context of the parent.
      * @param dictName The name of the dictionary. Multiple instances with the same
-     *        name is supported.
-     * @param locale the dictionary locale.
+     *                 name is supported.
+     * @param locale   the dictionary locale.
      * @param dictType the dictionary type, as a human-readable string
-     * @param dictFile dictionary file path. if null, use default dictionary path based on
-     *        dictionary type.
+     * @param dictFile dictionary file path. if null, use default dictionary path
+     *                 based on
+     *                 dictionary type.
      */
     public ExpandableBinaryDictionary(final Context context, final String dictName,
             final Locale locale, final String dictType, final File dictFile) {
@@ -174,6 +182,9 @@ BinaryDictionary getBinaryDictionary() {
     public int getFrequency(final String word) {
         if (mLock.readLock().tryLock()) {
             try {
+                if (mBinaryDictionary == null) {
+                    return NOT_A_PROBABILITY;
+                }
                 return mBinaryDictionary.getFrequency(word);
             } finally {
                 mLock.readLock().unlock();
@@ -266,7 +277,8 @@ private void updateDictionaryWithWriteLock(@NonNull final Runnable updateTask) {
     }
 
     /**
-     * Adds unigram information of a word to the dictionary. May overwrite an existing entry.
+     * Adds unigram information of a word to the dictionary. May overwrite an
+     * existing entry.
      */
     public void addUnigramEntry(final String word, final int frequency,
             final String shortcutTarget, final int shortcutFreq, final boolean isNotAWord,
@@ -304,7 +316,8 @@ public void removeUnigramEntryDynamically(final String word) {
     }
 
     /**
-     * Adds n-gram information of a word to the dictionary. May overwrite an existing entry.
+     * Adds n-gram information of a word to the dictionary. May overwrite an
+     * existing entry.
      */
     public void addNgramEntry(@NonNull final NgramContext ngramContext, final String word,
             final int frequency, final int timestamp) {
@@ -362,12 +375,12 @@ public ArrayList<SuggestedWordInfo> getSuggestions(final ComposedData composedDa
                 if (mBinaryDictionary == null) {
                     return null;
                 }
-                final ArrayList<SuggestedWordInfo> suggestions =
-                        mBinaryDictionary.getSuggestions(composedData, ngramContext,
-                                proximityInfoHandle, settingsValuesForSuggestion, sessionId,
-                                weightForLocale, inOutWeightOfLangModelVsSpatialModel);
+                final ArrayList<SuggestedWordInfo> suggestions = mBinaryDictionary.getSuggestions(composedData,
+                        ngramContext,
+                        proximityInfoHandle, settingsValuesForSuggestion, sessionId,
+                        weightForLocale, inOutWeightOfLangModelVsSpatialModel);
                 if (mBinaryDictionary.isCorrupted()) {
-                    Log.i(TAG, "Dictionary (" + mDictName +") is corrupted. "
+                    Log.i(TAG, "Dictionary (" + mDictName + ") is corrupted. "
                             + "Remove and regenerate it.");
                     removeBinaryDictionary();
                 }
@@ -407,7 +420,8 @@ public boolean isInDictionary(final String word) {
     }
 
     protected boolean isInDictionaryLocked(final String word) {
-        if (mBinaryDictionary == null) return false;
+        if (mBinaryDictionary == null)
+            return false;
         return mBinaryDictionary.isInDictionary(word);
     }
 
@@ -434,14 +448,15 @@ public int getMaxFrequencyOfExactMatches(final String word) {
         return NOT_A_PROBABILITY;
     }
 
-
     /**
-     * Loads the current binary dictionary from internal storage. Assumes the dictionary file
+     * Loads the current binary dictionary from internal storage. Assumes the
+     * dictionary file
      * exists.
      */
     void loadBinaryDictionaryLocked() {
         if (DBG_STRESS_TEST) {
-            // Test if this class does not cause problems when it takes long time to load binary
+            // Test if this class does not cause problems when it takes long time to load
+            // binary
             // dictionary.
             try {
                 Log.w(TAG, "Start stress in loading: " + mDictName);
@@ -493,13 +508,18 @@ boolean isNeededToRecreate() {
     }
 
     /**
-     * Load the current binary dictionary from internal storage. If the dictionary file doesn't
-     * exists or needs to be regenerated, the new dictionary file will be asynchronously generated.
-     * However, the dictionary itself is accessible even before the new dictionary file is actually
-     * generated. It may return a null result for getSuggestions() in that case by design.
+     * Load the current binary dictionary from internal storage. If the dictionary
+     * file doesn't
+     * exists or needs to be regenerated, the new dictionary file will be
+     * asynchronously generated.
+     * However, the dictionary itself is accessible even before the new dictionary
+     * file is actually
+     * generated. It may return a null result for getSuggestions() in that case by
+     * design.
      */
     public final void reloadDictionaryIfRequired() {
-        if (!isReloadRequired()) return;
+        if (!isReloadRequired())
+            return;
         asyncReloadDictionary();
     }
 
@@ -531,7 +551,8 @@ private void asyncReloadDictionary() {
                     final BinaryDictionary binaryDictionary = getBinaryDictionary();
                     if (binaryDictionary != null && !(isValidDictionaryLocked()
                             // TODO: remove the check below
-                            && matchesExpectedBinaryDictFormatVersionForThisType(binaryDictionary.getFormatVersion()))) {
+                            && matchesExpectedBinaryDictFormatVersionForThisType(
+                                    binaryDictionary.getFormatVersion()))) {
                         // Binary dictionary or its format version is not valid. Regenerate
                         // the dictionary file. createNewDictionaryLocked will remove the
                         // existing files if appropriate.
@@ -567,8 +588,7 @@ public DictionaryStats getDictionaryStats() {
         reloadDictionaryIfRequired();
         final String dictName = mDictName;
         final File dictFile = mDictFile;
-        final AsyncResultHolder<DictionaryStats> result =
-                new AsyncResultHolder<>("DictionaryStats");
+        final AsyncResultHolder<DictionaryStats> result = new AsyncResultHolder<>("DictionaryStats");
         asyncExecuteTaskWithLock(mLock.readLock(), new Runnable() {
             @Override
             public void run() {
@@ -597,8 +617,7 @@ public void dumpAllWordsForDebug() {
             }
             int token = 0;
             do {
-                final BinaryDictionary.GetNextWordPropertyResult result =
-                        binaryDictionary.getNextWordProperty(token);
+                final BinaryDictionary.GetNextWordPropertyResult result = binaryDictionary.getNextWordProperty(token);
                 final WordProperty wordProperty = result.mWordProperty;
                 if (wordProperty == null) {
                     Log.d(tag, " dictionary is empty.");
@@ -615,8 +634,7 @@ public void dumpAllWordsForDebug() {
      */
     public WordProperty[] getWordPropertiesForSyncing() {
         reloadDictionaryIfRequired();
-        final AsyncResultHolder<WordProperty[]> result =
-                new AsyncResultHolder<>("WordPropertiesForSync");
+        final AsyncResultHolder<WordProperty[]> result = new AsyncResultHolder<>("WordPropertiesForSync");
         asyncExecuteTaskWithLock(mLock.readLock(), () -> {
             final ArrayList<WordProperty> wordPropertyList = new ArrayList<>();
             final BinaryDictionary binaryDictionary = getBinaryDictionary();
@@ -626,8 +644,8 @@ public WordProperty[] getWordPropertiesForSyncing() {
             int token = 0;
             do {
                 // TODO: We need a new API that returns *new* un-synced data.
-                final BinaryDictionary.GetNextWordPropertyResult nextWordPropertyResult =
-                        binaryDictionary.getNextWordProperty(token);
+                final BinaryDictionary.GetNextWordPropertyResult nextWordPropertyResult = binaryDictionary
+                        .getNextWordProperty(token);
                 final WordProperty wordProperty = nextWordPropertyResult.mWordProperty;
                 if (wordProperty == null) {
                     break;

app/src/main/java/helium314/keyboard/latin/utils/GroqModels.kt

@@ -11,5 +11,5 @@ object GroqModels {
         "groq/compound-mini",
         "canopylabs/orpheus-v1-english"
     )
-    const val DEFAULT_MODEL = "llama-3.3-70b-versatile"
+    const val DEFAULT_MODEL = "llama-3.1-8b-instant"
 }

app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt

@@ -121,13 +121,21 @@ enum class ToolbarMode {
 
 val toolbarKeyStrings = entries.associateWithTo(EnumMap(ToolbarKey::class.java)) { it.toString().lowercase(Locale.US) }
 
+private val excludedKeys by lazy {
+    if (helium314.keyboard.latin.BuildConfig.FLAVOR == "offlinelite")
+        listOf(CLOSE_HISTORY, PROOFREAD, TRANSLATE)
+    else
+        listOf(CLOSE_HISTORY)
+}
+
 val defaultToolbarPref by lazy {
     val default = when (helium314.keyboard.latin.BuildConfig.FLAVOR) {
         "offline" -> listOf(SETTINGS, VOICE, CLIPBOARD, UNDO, INCOGNITO, COPY, PASTE, PROOFREAD, TRANSLATE)
         "offlinelite" -> listOf(SETTINGS, VOICE, CLIPBOARD, UNDO, INCOGNITO, COPY, PASTE)
         else -> listOf(SETTINGS, VOICE, CLIPBOARD, UNDO, PROOFREAD, TRANSLATE, INCOGNITO, COPY, PASTE)
     }
-    val others = entries.filterNot { it in default || it == CLOSE_HISTORY }
+        
+    val others = entries.filterNot { it in default || it in excludedKeys }
     default.joinToString(Separators.ENTRY) { it.name + Separators.KV + true } + Separators.ENTRY +
             others.joinToString(Separators.ENTRY) { it.name + Separators.KV + false }
 }
@@ -137,7 +145,8 @@ val defaultPinnedToolbarPref by lazy {
         "offlinelite" -> listOf(CLIPBOARD)
         else -> listOf(CLIPBOARD, PROOFREAD)
     }
-    entries.filterNot { it == CLOSE_HISTORY }.joinToString(Separators.ENTRY) {
+
+    entries.filterNot { it in excludedKeys }.joinToString(Separators.ENTRY) {
         it.name + Separators.KV + (it in pinnedDefault)
     }
 }

app/src/main/java/helium314/keyboard/settings/SearchScreen.kt

@@ -104,10 +104,22 @@ fun SearchSettingsScreen(
         },
         filteredItems = { 
             SettingsActivity.settingsContainer.filter(it).filter { setting ->
-                if (helium314.keyboard.latin.BuildConfig.FLAVOR == "offline") {
-                    setting.key.contains("gemini", ignoreCase = true).not()
-                } else {
-                    true
+                val key = setting.key
+                when (helium314.keyboard.latin.BuildConfig.FLAVOR) {
+                    "offlinelite" -> {
+                        !key.startsWith("gemini") &&
+                        !key.startsWith("groq") &&
+                        !key.startsWith("huggingface") &&
+                        !key.startsWith("ai_provider") &&
+                        !key.startsWith("offline_model_path")
+                    }
+                    "offline" -> {
+                        !key.startsWith("gemini") &&
+                        !key.startsWith("groq") &&
+                        !key.startsWith("huggingface") &&
+                        !key.startsWith("ai_provider")
+                    }
+                    else -> true
                 }
             } 
         },

app/src/main/java/helium314/keyboard/settings/screens/AIIntegrationScreen.kt

@@ -19,6 +19,12 @@ private val providerState = MutableStateFlow<String?>(null)
 fun AIIntegrationScreen(
     onClickBack: () -> Unit,
 ) {
+    // Hide AI settings completely in offlinelite flavor
+    if (BuildConfig.FLAVOR == "offlinelite") {
+        onClickBack()
+        return
+    }
+    
     if (BuildConfig.FLAVOR == "standard") {
         StandardAIIntegrationScreen(onClickBack)
     } else {