fix: recognize locally imported main_user.dict as valid main dictionary

Author: LeanBitLab

app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripLayoutHelper.java

@@ -371,6 +371,7 @@ public int layoutAndReturnStartIndexOfMoreSuggestions(
                 suggestedWords, mSuggestionsCountInStrip);
         final TextView centerWordView = mWordViews.get(mCenterPositionInStrip);
         final int stripWidth = stripView.getWidth();
+
         final int centerWidth = getSuggestionWidth(mCenterPositionInStrip, stripWidth);
         if (wordCountToShow == 1 || getTextScaleX(centerWordView.getText(), centerWidth,
                 centerWordView.getPaint()) < MIN_TEXT_XSCALE) {

app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.kt

@@ -370,6 +370,7 @@ class SuggestionStripView(context: Context, attrs: AttributeSet?, defStyle: Int)
     }
 
     fun setSuggestions(suggestions: SuggestedWords, isRtlLanguage: Boolean) {
+
         if (isShowingEmojiSuggestions && !helium314.keyboard.keyboard.KeyboardSwitcher.getInstance().isShowingEmojiPalettes) {
             isShowingEmojiSuggestions = false
         }

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

@@ -372,16 +372,16 @@ fun isMainDictionaryMissing(context: Context, locale: Locale): Boolean {
         }
         if (best != null) return false
     }
-    // 2. check if cache directory has a main.dict file
+    // 2. check if cache directory has a main.dict or main_user.dict file
     var cacheDir = DictionaryInfoUtils.getCacheDirectoryForLocale(locale, context)?.let { File(it) }
-    var hasMain = cacheDir?.exists() == true && cacheDir.isDirectory && cacheDir.listFiles()?.any { it.name == "main.dict" } == true
+    var hasMain = cacheDir?.exists() == true && cacheDir.isDirectory && cacheDir.listFiles()?.any { it.name.startsWith("main") && it.name.endsWith(".dict") } == true
     if (!hasMain && (locale.country.isNotEmpty() || locale.variant.isNotEmpty())) {
         val fallbackLocale = Locale(locale.language)
         cacheDir = DictionaryInfoUtils.getCacheDirectoryForLocale(fallbackLocale, context)?.let { File(it) }
-        hasMain = cacheDir?.exists() == true && cacheDir.isDirectory && cacheDir.listFiles()?.any { it.name == "main.dict" } == true
+        hasMain = cacheDir?.exists() == true && cacheDir.isDirectory && cacheDir.listFiles()?.any { it.name.startsWith("main") && it.name.endsWith(".dict") } == true
         if (!hasMain) {
             val variantDir = DictionaryInfoUtils.getFallbackVariantDirectory(locale, context)
-            hasMain = variantDir?.exists() == true && variantDir.isDirectory && variantDir.listFiles()?.any { it.name == "main.dict" } == true
+            hasMain = variantDir?.exists() == true && variantDir.isDirectory && variantDir.listFiles()?.any { it.name.startsWith("main") && it.name.endsWith(".dict") } == true
         }
     }
     if (hasMain) return false