Merge branch 'main' into keyboard

Author: angrezichatterbox

app/src/keyboards/java/be/scri/helpers/KeyHandler.kt

@@ -20,9 +20,9 @@ import be.scri.services.GeneralKeyboardIME
 class KeyHandler(
     private val ime: GeneralKeyboardIME,
 ) {
-    private val suggestionHandler = SuggestionHandler(ime)
+    private val suggestionHandler = ime.suggestionHandler
     private val spaceKeyProcessor = SpaceKeyProcessor(ime, suggestionHandler)
-    private val autocompletionHandler = AutocompletionHandler(ime)
+    private val autocompletionHandler = ime.autocompletionHandler
 
     /** Tracks if the last key pressed was a space, used for "period on double space" logic. */
     private var wasLastKeySpace: Boolean = false

app/src/keyboards/java/be/scri/helpers/ui/KeyboardUIManager.kt

@@ -62,13 +62,17 @@ class KeyboardUIManager(
 
         fun getKeyboardLayoutXML(): Int
 
+        fun getCurrentKeyboardLayoutXML(): Int
+
         fun getCurrentEnterKeyType(): Int
 
         fun commitText(text: String)
 
         fun onKeyboardActionListener(): KeyboardView.OnKeyboardActionListener
 
         fun processLinguisticSuggestions(word: String)
+
+        fun isNumericKeyboardActive(): Boolean
     }
 
     var keyboardView: KeyboardView = binding.keyboardView
@@ -159,7 +163,12 @@ class KeyboardUIManager(
         val isUserDarkMode = getIsDarkModeOrNot(context)
 
         when (currentState) {
-            ScribeState.IDLE -> setupIdleView(language, emojiAutoSuggestionEnabled, autoSuggestEmojis)
+            ScribeState.IDLE ->
+                setupIdleView(
+                    language,
+                    emojiAutoSuggestionEnabled,
+                    autoSuggestEmojis,
+                )
             ScribeState.SELECT_COMMAND -> setupSelectCommandView(language)
             ScribeState.INVALID -> setupInvalidView(language, invalidCommandSource)
             ScribeState.TRANSLATE -> {
@@ -184,7 +193,7 @@ class KeyboardUIManager(
         emojiAutoSuggestionEnabled: Boolean,
         autoSuggestEmojis: MutableList<String>?,
     ) {
-        binding.commandOptionsBar.visibility = View.VISIBLE
+        binding.commandOptionsBar.visibility = if (listener.isNumericKeyboardActive()) View.GONE else View.VISIBLE
         binding.toolbarBar.visibility = View.GONE
 
         val isUserDarkMode = getIsDarkModeOrNot(context)
@@ -226,7 +235,11 @@ class KeyboardUIManager(
 
         binding.scribeKeyOptions.foreground = AppCompatResources.getDrawable(context, R.drawable.ic_scribe_icon_vector)
 
-        initializeKeyboard(listener.getKeyboardLayoutXML())
+        val keyboardXml = listener.getCurrentKeyboardLayoutXML()
+        initializeKeyboard(keyboardXml)
+        if (keyboardXml == R.xml.keys_symbols) {
+            setupCurrencySymbol(language)
+        }
 
         updateButtonVisibility(ScribeState.IDLE, emojiAutoSuggestionEnabled, autoSuggestEmojis)
         updateEmojiSuggestion(ScribeState.IDLE, emojiAutoSuggestionEnabled, autoSuggestEmojis)
@@ -239,7 +252,7 @@ class KeyboardUIManager(
      * (Translate, Conjugate, Plural).
      */
     private fun setupSelectCommandView(language: String) {
-        binding.commandOptionsBar.visibility = View.VISIBLE
+        binding.commandOptionsBar.visibility = if (listener.isNumericKeyboardActive()) View.GONE else View.VISIBLE
         binding.toolbarBar.visibility = View.GONE
 
         val isUserDarkMode = getIsDarkModeOrNot(context)
@@ -786,6 +799,8 @@ class KeyboardUIManager(
      * Disables all auto-suggestions and resets the suggestion buttons to their default, inactive state.
      */
     fun disableAutoSuggest(language: String) {
+        val isNumericKeyboard = listener.getCurrentKeyboardLayoutXML() == R.xml.keys_numeric
+
         binding.translateBtnRight.visibility = View.INVISIBLE
         binding.translateBtnLeft.visibility = View.INVISIBLE
         binding.translateBtn.visibility = View.VISIBLE
@@ -801,9 +816,20 @@ class KeyboardUIManager(
         binding.translateBtn.background = null
         binding.translateBtn.setOnClickListener(createSuggestionClickListener(suggestion1))
 
-        val suggestion2 = suggestions.getOrNull(1) ?: ""
-        binding.conjugateBtn.text = suggestion2
-        binding.conjugateBtn.setOnClickListener(createSuggestionClickListener(suggestion2))
+        if (isNumericKeyboard) {
+            binding.conjugateBtn.text = ""
+            binding.conjugateBtn.setOnClickListener(null)
+            binding.conjugateBtn.visibility = View.GONE
+            binding.separator2.visibility = View.GONE
+            binding.separator3.visibility = View.GONE
+        } else {
+            val suggestion2 = suggestions.getOrNull(1) ?: ""
+            binding.conjugateBtn.visibility = View.VISIBLE
+            binding.conjugateBtn.text = suggestion2
+            binding.conjugateBtn.setOnClickListener(createSuggestionClickListener(suggestion2))
+            binding.separator2.visibility = View.VISIBLE
+            binding.separator3.visibility = View.VISIBLE
+        }
 
         val suggestion3 = suggestions.getOrNull(2) ?: ""
         binding.pluralBtn.text = suggestion3

app/src/keyboards/java/be/scri/services/EnglishKeyboardIME.kt

@@ -32,7 +32,6 @@ class EnglishKeyboardIME : GeneralKeyboardIME("English") {
     override var inputTypeClass: Int = InputType.TYPE_CLASS_TEXT
     override var enterKeyType: Int = IME_ACTION_NONE
     override var switchToLetters: Boolean = false
-    override var hasTextBeforeCursor: Boolean = false
 
     private val keyHandler by lazy { KeyHandler(this) }
 

app/src/keyboards/java/be/scri/services/GeneralKeyboardIME.kt

@@ -123,8 +123,8 @@ abstract class GeneralKeyboardIME(
     private val shiftPermToggleSpeed: Int = DEFAULT_SHIFT_PERM_TOGGLE_SPEED
 
     private lateinit var dbManagers: DatabaseManagers
-    private lateinit var suggestionHandler: SuggestionHandler
-    private lateinit var autocompletionHandler: AutocompletionHandler
+    internal lateinit var suggestionHandler: SuggestionHandler
+    internal lateinit var autocompletionHandler: AutocompletionHandler
     private lateinit var autocompletionManager: AutocompletionDataManager
     private var dataContract: DataContract? = null
 
@@ -146,6 +146,7 @@ abstract class GeneralKeyboardIME(
     var wordSuggestions: List<String>? = null
     var checkIfPluralWord: Boolean = false
     private var currentEnterKeyType: Int? = null
+    private var isNumericKeyboardActive: Boolean = false
 
     internal var currentState: ScribeState = ScribeState.IDLE
     internal var invalidCommandSource: ScribeState = ScribeState.IDLE
@@ -178,6 +179,22 @@ abstract class GeneralKeyboardIME(
         internal const val MAX_TEXT_LENGTH = 1000
         const val COMMIT_TEXT_CURSOR_POSITION = 1
         internal const val CUSTOM_CURSOR = "│" // special tall cursor character
+
+        internal fun shouldUseNumericKeyboard(inputType: Int): Boolean =
+            when (inputType and TYPE_MASK_CLASS) {
+                TYPE_CLASS_NUMBER, TYPE_CLASS_DATETIME, TYPE_CLASS_PHONE -> true
+                else -> false
+            }
+
+        internal fun getKeyboardLayoutXMLForInputType(
+            inputType: Int,
+            letterKeyboardLayoutXML: Int,
+        ): Int =
+            if (shouldUseNumericKeyboard(inputType)) {
+                R.xml.keys_numeric
+            } else {
+                letterKeyboardLayoutXML
+            }
     }
 
     // MARK: Lifecycle Methods
@@ -286,25 +303,16 @@ abstract class GeneralKeyboardIME(
         // This setter triggers the logic in the property override if not shadowed.
         hasTextBeforeCursor = currentInputConnection?.getTextBeforeCursor(1, 0)?.isNotEmpty() == true
 
-        val keyboardXml =
-            when (inputTypeClass) {
-                TYPE_CLASS_NUMBER, TYPE_CLASS_DATETIME, TYPE_CLASS_PHONE -> {
-                    keyboardMode = keyboardSymbols
-                    R.xml.keys_symbols
-                }
-
-                else -> {
-                    keyboardMode = keyboardLetters
-                    getKeyboardLayoutXML()
-                }
-            }
+        isNumericKeyboardActive = shouldUseNumericKeyboard(attribute.inputType)
+        keyboardMode = if (isNumericKeyboardActive) keyboardSymbols else keyboardLetters
+        val keyboardXml = getKeyboardLayoutXMLForInputType(attribute.inputType, getKeyboardLayoutXML())
 
         loadLanguageData()
 
         keyboard = KeyboardBase(this, keyboardXml, enterKeyType)
         keyboardView?.setKeyboard(keyboard!!)
 
-        if (keyboardXml == R.xml.keys_symbols) {
+        if (this::uiManager.isInitialized && keyboardXml == R.xml.keys_symbols) {
             uiManager.setupCurrencySymbol(language)
         }
     }
@@ -334,7 +342,7 @@ abstract class GeneralKeyboardIME(
         banner.visibility =
             if (hasData) View.GONE else View.VISIBLE
         binding.commandOptionsBar.visibility =
-            if (hasData) View.VISIBLE else View.GONE
+            if (hasData && !isNumericKeyboardActive) View.VISIBLE else View.GONE
         val isDarkMode = getIsDarkModeOrNot(applicationContext)
         val bannerColor = if (isDarkMode) R.color.dark_tutorial_button_color else R.color.light_tutorial_button_color
         val bannerTextColor = if (isDarkMode) R.color.dark_button_outline_color else R.color.light_text_color
@@ -727,6 +735,22 @@ abstract class GeneralKeyboardIME(
 
     override fun getCurrentEnterKeyType(): Int = enterKeyType
 
+    override fun isNumericKeyboardActive(): Boolean = isNumericKeyboardActive
+
+    override fun getCurrentKeyboardLayoutXML(): Int =
+        when (keyboardMode) {
+            keyboardSymbols -> getPrimarySymbolKeyboardLayoutXML()
+            keyboardSymbolShift -> R.xml.keys_symbols_shift
+            else -> getKeyboardLayoutXML()
+        }
+
+    private fun getPrimarySymbolKeyboardLayoutXML(): Int =
+        if (isNumericKeyboardActive) {
+            R.xml.keys_numeric
+        } else {
+            R.xml.keys_symbols
+        }
+
     override fun onKeyboardActionListener(): KeyboardView.OnKeyboardActionListener = this
 
     override fun processLinguisticSuggestions(word: String) {
@@ -1171,7 +1195,7 @@ abstract class GeneralKeyboardIME(
                     R.xml.keys_symbols_shift
                 } else {
                     this.keyboardMode = keyboardSymbols
-                    R.xml.keys_symbols
+                    getPrimarySymbolKeyboardLayoutXML()
                 }
             keyboard = KeyboardBase(this, keyboardXml, enterKeyType)
             keyboardView!!.setKeyboard(keyboard!!)
@@ -1196,7 +1220,7 @@ abstract class GeneralKeyboardIME(
         val keyboardXml =
             if (keyboardMode == keyboardLetters) {
                 this.keyboardMode = keyboardSymbols
-                R.xml.keys_symbols
+                getPrimarySymbolKeyboardLayoutXML()
             } else {
                 this.keyboardMode = keyboardLetters
                 getKeyboardLayoutXML()

app/src/keyboards/java/be/scri/services/ItalianKeyboardIME.kt

@@ -32,7 +32,6 @@ class ItalianKeyboardIME : GeneralKeyboardIME("Italian") {
     override var inputTypeClass: Int = InputType.TYPE_CLASS_TEXT
     override var enterKeyType: Int = IME_ACTION_NONE
     override var switchToLetters: Boolean = false
-    override var hasTextBeforeCursor: Boolean = false
 
     private val keyHandler by lazy { KeyHandler(this) }
 

app/src/keyboards/java/be/scri/services/RussianKeyboardIME.kt

@@ -32,7 +32,6 @@ class RussianKeyboardIME : GeneralKeyboardIME("Russian") {
     override var inputTypeClass: Int = InputType.TYPE_CLASS_TEXT
     override var enterKeyType: Int = IME_ACTION_NONE
     override var switchToLetters: Boolean = false
-    override var hasTextBeforeCursor: Boolean = false
 
     private val keyHandler by lazy { KeyHandler(this) }
 

app/src/keyboards/java/be/scri/services/SwedishKeyboardIME.kt

@@ -42,7 +42,6 @@ class SwedishKeyboardIME : GeneralKeyboardIME("Swedish") {
     override var inputTypeClass: Int = InputType.TYPE_CLASS_TEXT
     override var enterKeyType: Int = IME_ACTION_NONE
     override var switchToLetters: Boolean = false
-    override var hasTextBeforeCursor: Boolean = false
 
     private val keyHandler by lazy { KeyHandler(this) }
 

app/src/main/java/be/scri/App.kt

@@ -43,6 +43,7 @@ import be.scri.ui.screens.ThirdPartyScreen
 import be.scri.ui.screens.WikimediaScreen
 import be.scri.ui.screens.about.AboutScreen
 import be.scri.ui.screens.download.CheckUpdateActions
+import be.scri.ui.screens.download.ConjugateDataDownloadViewModel
 import be.scri.ui.screens.download.ConjugateDownloadDataScreen
 import be.scri.ui.screens.download.DataDownloadViewModel
 import be.scri.ui.screens.download.DownloadActions
@@ -85,6 +86,7 @@ fun ScribeApp(
     isIncreaseTextSize: Boolean,
     modifier: Modifier = Modifier,
     downloadViewModel: DataDownloadViewModel = viewModel(),
+    conjugateDownloadViewModel: ConjugateDataDownloadViewModel = viewModel(),
 ) {
     val coroutineScope = rememberCoroutineScope()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
@@ -107,6 +109,26 @@ fun ScribeApp(
             cancelCheckForNewData = downloadViewModel::cancelCheckForNewData,
         )
 
+    // Conjugate-specific download actions
+    val conjugateDownloadStates = conjugateDownloadViewModel.downloadStates
+    val onConjugateDownloadAction = conjugateDownloadViewModel::handleDownloadAction
+    val onConjugateDownloadAll = conjugateDownloadViewModel::handleDownloadAllLanguages
+    val initializeConjugateStates = conjugateDownloadViewModel::initializeStates
+    val conjugateDownloadActions =
+        DownloadActions(
+            downloadStates = conjugateDownloadStates,
+            onDownloadAction = onConjugateDownloadAction,
+            onDownloadAll = onConjugateDownloadAll,
+            initializeStates = initializeConjugateStates,
+        )
+    val conjugateCheckUpdateState by conjugateDownloadViewModel.checkUpdateState.collectAsState()
+    val conjugateCheckUpdateActions =
+        CheckUpdateActions(
+            checkUpdateState = conjugateCheckUpdateState,
+            checkForNewData = conjugateDownloadViewModel::checkForNewData,
+            cancelCheckForNewData = conjugateDownloadViewModel::cancelCheckForNewData,
+        )
+
     val screens = remember(context) { BottomBarScreen.getScreens() }
     ScribeTheme(
         useDarkTheme = isDarkTheme,
@@ -265,8 +287,8 @@ fun ScribeApp(
                             navController.popBackStack()
                         },
                         isDarkTheme = isDarkTheme,
-                        downloadActions = downloadActions,
-                        checkUpdateActions = checkUpdateActions,
+                        downloadActions = conjugateDownloadActions,
+                        checkUpdateActions = conjugateCheckUpdateActions,
                         modifier = Modifier.padding(innerPadding),
                     )
                 }

app/src/main/java/be/scri/data/remote/ConjugateDynamicDbHelper.kt

@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package be.scri.data.remote
+
+import android.content.ContentValues
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteException
+import android.database.sqlite.SQLiteOpenHelper
+import android.util.Log
+import be.scri.data.model.DataResponse
+
+/**
+ * Helper class for managing dynamic SQLite databases for conjugate data (verbs only).
+ * It creates only the verbs table and inserts verb data according to the provided DataResponse.
+ */
+class ConjugateDynamicDbHelper(
+    context: Context,
+    language: String,
+) : SQLiteOpenHelper(context, "${language.uppercase()}ConjugateData.sqlite", null, 1) {
+    override fun onCreate(db: SQLiteDatabase) {
+        // Tables are created dynamically via syncConjugateDatabase from API contract.
+    }
+
+    override fun onUpgrade(
+        db: SQLiteDatabase,
+        old: Int,
+        new: Int,
+    ) {
+        // Dynamic schema updates are handled via syncConjugateDatabase.
+    }
+
+    /**
+     * Synchronizes the conjugate database schema and data based on the provided DataResponse.
+     * Only creates the verbs table and inserts verb data, ignoring other data types.
+     * @param response The data response containing the contract and data to be inserted.
+     */
+    fun syncConjugateDatabase(response: DataResponse) {
+        val db = writableDatabase
+        try {
+            db.beginTransaction()
+
+            // Check if verbs table exists in the contract
+            val verbsColumns = response.contract.fields["verbs"]
+            if (verbsColumns != null) {
+                // Create verbs table
+                val colDefinition = verbsColumns.keys.joinToString(", ") { "$it TEXT" }
+                db.execSQL("DROP TABLE IF EXISTS verbs")
+                db.execSQL(
+                    "CREATE TABLE verbs " +
+                        "(id INTEGER PRIMARY KEY AUTOINCREMENT, $colDefinition)",
+                )
+
+                // Insert verbs data
+                val verbsData = response.data["verbs"]
+                if (verbsData != null) {
+                    val cv = ContentValues()
+                    verbsData.forEach { row ->
+                        cv.clear()
+                        row.forEach { (key, value) ->
+                            cv.put(key, value?.toString() ?: "")
+                        }
+                        db.insert("verbs", null, cv)
+                    }
+                    Log.i("CONJUGATE_DB", "Successfully synced ${verbsData.size} verb records for ${response.language}")
+                } else {
+                    Log.w("CONJUGATE_DB", "No verbs data found in response for ${response.language}")
+                }
+            } else {
+                Log.e("CONJUGATE_DB", "No verbs table found in contract for ${response.language}")
+            }
+
+            db.setTransactionSuccessful()
+        } catch (e: SQLiteException) {
+            Log.e("CONJUGATE_DB", "Error during conjugate database sync: ${e.message}")
+            throw e
+        } finally {
+            db.endTransaction()
+            db.close()
+        }
+    }
+}