Develop refactor architecture

.gitignore

@@ -24,6 +24,10 @@ out/
 # Release artifacts (uncomment or adjust as needed)
 app/release/*
 release/
+signing.properties
+github.properties
+app/google-services.json
+/app/src/main/play/keys/*
 
 ###############################################################################
 # LOCAL CONFIG / ENV FILES
@@ -97,14 +101,4 @@ lint/tmp/
 ###############################################################################
 # KOTLIN
 ###############################################################################
-.kotlin
-
-###############################################################################
-# API KEYS
-###############################################################################
-/apikeys.properties
-
-###############################################################################
-# OTHER DEV FILES
-###############################################################################
-/local/api_lesson.json
+.kotlin

app/build.gradle.kts

@@ -1,81 +1,146 @@
-import org.jetbrains.kotlin.konan.properties.Properties
+/*
+ * Copyright (©) 2026 Mihai-Cristian Condrea
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
+import java.util.Properties
+import kotlin.toString
 
 plugins {
-    alias(notation = libs.plugins.androidApplication)
-    alias(notation = libs.plugins.jetbrainsKotlinAndroid)
-    alias(notation = libs.plugins.jetbrainsKotlinParcelize)
+    alias(notation = libs.plugins.android.application)
+    alias(notation = libs.plugins.kotlin.compose)
     alias(notation = libs.plugins.kotlin.serialization)
-    alias(notation = libs.plugins.googlePlayServices)
-    alias(notation = libs.plugins.googleFirebase)
-    alias(notation = libs.plugins.compose.compiler)
-    alias(notation = libs.plugins.devToolsKsp)
+    alias(notation = libs.plugins.kotlin.parcelize)
+    alias(notation = libs.plugins.google.devtools.ksp)
+    alias(notation = libs.plugins.google.mobile.services) apply false
+    alias(notation = libs.plugins.firebase.crashlytics) apply false
+    alias(notation = libs.plugins.firebase.performance) apply false
     alias(notation = libs.plugins.about.libraries)
+    alias(notation = libs.plugins.mannodermaus.android.junit5)
+}
+
+val hasGoogleServicesConfig: Boolean = listOf(
+    "google-services.json",
+    "src/debug/google-services.json",
+    "src/release/google-services.json",
+).any { path -> file(path).exists() }
+
+if (hasGoogleServicesConfig) {
+    apply(plugin = libs.plugins.google.mobile.services.get().pluginId)
+    apply(plugin = libs.plugins.firebase.crashlytics.get().pluginId)
+    apply(plugin = libs.plugins.firebase.performance.get().pluginId)
 }
 
 android {
-    compileSdk = 35
     namespace = "com.d4rk.androidtutorials"
+    compileSdk {
+        version = release(36) {
+            minorApiLevel = 1
+        }
+    }
 
     defaultConfig {
         applicationId = "com.d4rk.androidtutorials"
-        minSdk = 23
-        targetSdk = 35
-        versionCode = 118
-        versionName = "1.2.3"
+        minSdk = 26
+        targetSdk = 36
+        versionCode = 122
+        versionName = "2.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         @Suppress("UnstableApiUsage")
         androidResources.localeFilters += listOf(
-            "en" ,
-            "bg-rBG" ,
-            "de-rDE" ,
-            "es-rGQ" ,
-            "fr-rFR" ,
-            "hi-rIN" ,
-            "hu-rHU" ,
-            "in-rID" ,
-            "it-rIT" ,
-            "ja-rJP" ,
-            "pl-rPL" ,
-            "pt-rBR" ,
-            "ro-rRO" ,
-            "ru-rRU" ,
-            "sv-rSE" ,
-            "th-rTH" ,
-            "tr-rTR" ,
-            "uk-rUA" ,
-            "zh-rTW" ,
+            "ar-rEG",
+            "bg-rBG",
+            "bn-rBD",
+            "de-rDE",
+            "en",
+            "es-rGQ",
+            "es-rMX",
+            "fil-rPH",
+            "fr-rFR",
+            "hi-rIN",
+            "hu-rHU",
+            "in-rID",
+            "it-rIT",
+            "ja-rJP",
+            "ko-rKR",
+            "pl-rPL",
+            "pt-rBR",
+            "ro-rRO",
+            "ru-rRU",
+            "sv-rSE",
+            "th-rTH",
+            "tr-rTR",
+            "uk-rUA",
+            "ur-rPK",
+            "vi-rVN",
+            "zh-rTW"
         )
-
         vectorDrawables {
             useSupportLibrary = true
         }
+        multiDexEnabled = true
+
+        val githubProps = Properties()
+        val githubFile = rootProject.file("github.properties")
+        val githubToken = if (githubFile.exists()) {
+            githubProps.load(githubFile.inputStream())
+            githubProps["GITHUB_TOKEN"].toString()
+        } else {
+            ""
+        }
+        buildConfigField("String", "GITHUB_TOKEN", "\"$githubToken\"")
+        buildConfigField("String", "FAQ_PRODUCT_ID", "\"com.d4rk.androidtutorials\"")
     }
 
-    buildTypes {
-        release {
-            isDebuggable = false
-        }
+    signingConfigs {
+        create("release")
 
-        debug {
-            isDebuggable = true
+        val signingProps = Properties()
+        val signingFile = rootProject.file("signing.properties")
+
+        if (signingFile.exists()) {
+            signingProps.load(signingFile.inputStream())
+
+            signingConfigs.getByName("release").apply {
+                storeFile = file(signingProps["STORE_FILE"].toString())
+                storePassword = signingProps["STORE_PASSWORD"].toString()
+                keyAlias = signingProps["KEY_ALIAS"].toString()
+                keyPassword = signingProps["KEY_PASSWORD"].toString()
+            }
+        } else {
+            android.buildTypes.getByName("release").signingConfig = null
         }
     }
 
-    buildTypes.forEach { buildType ->
-        val keystoreFile : File = project.rootProject.file("apikeys.properties")
-        val properties : Properties = Properties()
-        properties.load(keystoreFile.inputStream())
-        val apiKey : String = properties.getProperty("API_KEY") ?: ""
-
-        with(buildType) {
-            multiDexEnabled = true
-            isMinifyEnabled = false
-            isShrinkResources = false
-            buildConfigField(type = "String" , name = "API_KEY" , value = apiKey)
-            proguardFiles(
-                getDefaultProguardFile(name = "proguard-android-optimize.txt") ,
-                "proguard-rules.pro"
-            )
+    buildTypes {
+        release {
+            val signingFile = rootProject.file("signing.properties")
+            signingConfig = if (signingFile.exists()) {
+                signingConfigs.getByName("release")
+            } else {
+                null
+            }
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile(name = "proguard-android-optimize.txt"), "proguard-rules.pro")
+            if (hasGoogleServicesConfig) {
+                configure<CrashlyticsExtension> {
+                    mappingFileUploadEnabled = true
+                }
+            }
         }
     }
 
@@ -84,10 +149,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_21
     }
 
-    kotlinOptions {
-        jvmTarget = "21"
-    }
-
     buildFeatures {
         buildConfig = true
         compose = true
@@ -109,21 +170,26 @@ android {
 dependencies {
 
     // App Core
-    implementation(dependencyNotation = "com.github.D4rK7355608:AppToolkit:0.0.55") {
+    implementation(dependencyNotation = "com.github.MihaiCristianCondrea:App-Toolkit-for-Android:2.0.8") {
         isTransitive = true
     }
 
     // Code view
     implementation(dependencyNotation = libs.compose.code.editor)
 
-    // Coil
-    implementation(dependencyNotation = libs.coil.svg)
-
-    // Google
-    implementation(dependencyNotation = libs.generativeai)
+    // Firebase AI Logic
+    implementation(dependencyNotation = libs.firebase.ai)
 
     // KSP
     ksp(dependencyNotation = libs.androidx.room.compiler)
     implementation(dependencyNotation = libs.androidx.room.ktx)
     implementation(dependencyNotation = libs.androidx.room.runtime)
+
+    // Unit Tests
+    testImplementation(dependencyNotation = libs.bundles.unitTest)
+    testRuntimeOnly(dependencyNotation = libs.bundles.unitTestRuntime)
+
+    // Instrumentation Tests
+    androidTestImplementation(dependencyNotation = libs.bundles.instrumentationTest)
+    debugImplementation(dependencyNotation = libs.androidx.compose.ui.test.manifest)
 }