build: remove standardOptimised flavor

Author: LeanBitLab

app/build.gradle.kts

@@ -40,10 +40,6 @@ android {
             dimension = "privacy"
             minSdk = 23
         }
-        create("standardOptimised") {
-            dimension = "privacy"
-            minSdk = 23
-        }
         create("offline") {
             dimension = "privacy"
             applicationIdSuffix = ".offline"
@@ -110,7 +106,6 @@ android {
                 "standard" -> "1"
                 "offline" -> "2"
                 "offlinelite" -> "3"
-                "standardOptimised" -> "4"
                 else -> ""
             }
             if (number.isNotEmpty()) {
@@ -199,13 +194,7 @@ android {
         disable += "ExtraTranslation"
     }
 
-    sourceSets {
-        getByName("standardOptimised") {
-            java.srcDirs("src/standard/java")
-            res.srcDirs("src/standard/res")
-            manifest.srcFile("src/standard/AndroidManifest.xml")
-        }
-    }
+
 }
 
 dependencies {
@@ -234,8 +223,6 @@ dependencies {
     // gemini ai proofreading
     "standardImplementation"("com.google.ai.client.generativeai:generativeai:0.9.0")
     "standardImplementation"("androidx.security:security-crypto:1.1.0-alpha06") // for encrypted API key storage
-    "standardOptimisedImplementation"("com.google.ai.client.generativeai:generativeai:0.9.0")
-    "standardOptimisedImplementation"("androidx.security:security-crypto:1.1.0-alpha06")
 
     // local llm proofreading (offline)
     "offlineImplementation"("io.github.ljcamargo:llamacpp-kotlin:0.4.0")
@@ -252,7 +239,6 @@ dependencies {
     // ML Kit's internal asset manager and native library loader use the host app context,
     // so the host app must compile and include the client library resources/libraries.
     "standardImplementation"("com.google.mlkit:digital-ink-recognition:19.0.0")
-    "standardOptimisedImplementation"("com.google.mlkit:digital-ink-recognition:19.0.0")
 
     // test
     testImplementation(kotlin("test"))
@@ -268,11 +254,9 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 }
 
-// Disable baseline/ART profile tasks to guarantee deterministic reproducible builds (except for standardOptimised)
+// Disable baseline/ART profile tasks to guarantee deterministic reproducible builds
 tasks.configureEach {
     if (name.contains("ArtProfile", ignoreCase = true)) {
-        if (!name.contains("StandardOptimised", ignoreCase = true)) {
-            enabled = false
-        }
+        enabled = false
     }
 }

app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java

@@ -505,7 +505,7 @@ public void afterTextChanged(Editable s) {
             downloadBtn.setTextSize(12); // Keep it small to fit
             downloadBtn.setAllCaps(false);
             downloadBtn.setOnClickListener(v -> {
-                if ("standard".equals(BuildConfig.FLAVOR) || "standardOptimised".equals(BuildConfig.FLAVOR)) {
+                if ("standard".equals(BuildConfig.FLAVOR)) {
                     downloadEmojiDictionary();
                     downloadBtn.setText("Downloading...");
                     downloadBtn.setEnabled(false);

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

@@ -272,7 +272,7 @@ enum class ToolbarMode {
 val toolbarKeyStrings = entries.associateWithTo(EnumMap(ToolbarKey::class.java)) { it.toString().lowercase(Locale.US) }
 
 private val excludedKeys by lazy {
-    val customAiKeys = if (BuildConfig.FLAVOR != "standard" && BuildConfig.FLAVOR != "standardOptimised" && BuildConfig.FLAVOR != "offline")
+    val customAiKeys = if (BuildConfig.FLAVOR != "standard" && BuildConfig.FLAVOR != "offline")
         ToolbarKey.entries.filter { it.name.startsWith("CUSTOM_AI_") }
     else emptyList()
     val otherKeys = if (BuildConfig.FLAVOR == "offlinelite")

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

@@ -266,7 +266,7 @@ fun WelcomeWizard(
                         { step++ },
                         { step-- }
                     ) {
-                        if (BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardOptimised") {
+                        if (BuildConfig.FLAVOR == "standard") {
                             val service = remember { helium314.keyboard.latin.utils.ProofreadService(ctx) }
                             var currentProvider by remember { mutableStateOf(service.getProvider()) }
                             val aiConfigured = when (currentProvider) {

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

@@ -27,7 +27,7 @@ fun AIIntegrationScreen(
         return
     }
 
-    if (BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardOptimised") {
+    if (BuildConfig.FLAVOR == "standard") {
         StandardAIIntegrationScreen(onClickBack)
     } else {
         OfflineAIIntegrationScreen(onClickBack)

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

@@ -537,7 +537,7 @@ fun createAdvancedSettings(context: Context) = listOfNotNull(
             )
         }
     },
-    if (BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardOptimised" || BuildConfig.FLAVOR == "offline") Setting(context, SettingsWithoutKey.CUSTOM_AI_KEYS, R.string.custom_ai_keys_title, R.string.custom_ai_keys_summary) {
+    if (BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "offline") Setting(context, SettingsWithoutKey.CUSTOM_AI_KEYS, R.string.custom_ai_keys_title, R.string.custom_ai_keys_summary) {
         Preference(
             name = it.title,
             description = it.description,

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

@@ -96,7 +96,7 @@ fun LibrariesHubScreen(
                         )
 
                         // Handwriting Input Plugin
-                        if (BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardOptimised") {
+                        if (BuildConfig.FLAVOR == "standard") {
                             var handwritingInstalled by remember { mutableStateOf(HandwritingLoader.hasPlugin(context)) }
                             LoadHandwritingPluginPreference(
                                 title = stringResource(R.string.libraries_hub_handwriting_title),

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

@@ -97,8 +97,8 @@ fun createToolbarSettings(context: Context): List<Setting> {
     val filter = { name: String ->
         val lowerName = name.lowercase()
         when {
-            lowerName.startsWith("custom_ai_") -> BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardOptimised" || BuildConfig.FLAVOR == "offline"
-            lowerName == "handwriting" -> BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardOptimised"
+            lowerName.startsWith("custom_ai_") -> BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "offline"
+            lowerName == "handwriting" -> BuildConfig.FLAVOR == "standard"
             lowerName in listOf("proofread", "translate", "clipboard_search") -> BuildConfig.FLAVOR != "offlinelite"
             else -> true
         }