Modularize project to run 2 application within the same codebase

.github/workflows/android_ci.yml

@@ -129,4 +129,5 @@ jobs:
                       adb shell pm list packages >/dev/null
                       sleep 10
                       adb shell getprop sys.boot_completed
-                      ./gradlew connectedCoreDebugAndroidTest --stacktrace
+                      ./gradlew connectedConjugateDebugAndroidTest --stacktrace
+                      ./gradlew connectedKeyboardsDebugAndroidTest --stacktrace

app/build.gradle.kts

@@ -46,6 +46,27 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+
+    productFlavors {
+        create("keyboards") {
+            applicationIdSuffix = ".keyboards"
+            isDefault = true
+            resValue(
+                "string",
+                "app_launcher_name",
+                "Scribe"
+            )
+        }
+        create("conjugate") {
+            applicationIdSuffix = ".conjugate"
+            resValue(
+                "string",
+                "app_launcher_name",
+                "Conjugate"
+            )
+        }
+    }
+
     packaging {
         resources {
             pickFirsts.add("META-INF/LICENSE*")
@@ -114,10 +135,7 @@ android {
     }
 
     flavorDimensions.add("variants")
-    productFlavors {
-        create("core")
-        create("fdroid")
-    }
+
 
     sourceSets {
         getByName("main").java.srcDirs("src/main/kotlin")

app/src/conjugate/java/be/scri/activities/MainActivity.kt

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+@file:Suppress("ktlint:standard:kdoc")
+/**
+ * Implements the main activity with a custom action bar, ViewPager navigation, and dynamic UI adjustments.
+ */
+
+package be.scri.activities
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import be.scri.ui.screens.SampleScreen
+
+/**
+ * The main entry point of the app.
+ * Initializes theme settings, navigation, and sets up the main UI using Jetpack Compose.
+ */
+class MainActivity : ComponentActivity() {
+    /**
+     * Initializes the app on launch. Sets the theme based on user preferences, sets up edge-to-edge
+     * layout, and builds the UI using Compose.
+     */
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            SampleScreen()
+        }
+    }
+}

app/src/conjugate/java/be/scri/ui/screens/SampleScreen.kt

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package be.scri.ui.screens
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun SampleScreen(modifier: Modifier = Modifier) {
+    MaterialTheme {
+        Box(
+            modifier = modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text(
+                text = "Conjugate App",
+                style = MaterialTheme.typography.bodyLarge,
+            )
+        }
+    }
+}

app/src/conjugate/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

app/src/conjugate/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <group android:scaleX="0.7"
+      android:scaleY="0.7"
+      android:translateX="153.6"
+      android:translateY="153.6">
+    <path
+        android:pathData="M0,0h1024v1024h-1024z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="512"
+            android:startY="0"
+            android:endX="512"
+            android:endY="1024"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF4CADE6"/>
+          <item android:offset="1" android:color="#FF3E95CC"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M152,292.5C152,256.3 181.3,227 217.5,227H806.5C842.7,227 872,256.3 872,292.5V750.6C872,786.8 842.7,816.1 806.5,816.1H217.5C181.3,816.1 152,786.8 152,750.6V292.5ZM531.6,285.9L806.5,285.9C810.2,285.9 813.1,288.8 813.1,292.5L813.1,416.8H210.9V456.1L492.4,456.1V587L210.9,587V626.3L492.4,626.3V757.2H217.5C213.8,757.2 210.9,754.3 210.9,750.6V292.5C210.9,288.8 213.8,285.9 217.5,285.9L492.4,285.9V416.8H531.6V285.9ZM531.6,587V456.1L813.1,456.1V587L531.6,587ZM531.6,757.2H806.5C810.2,757.2 813.1,754.3 813.1,750.6L813.1,626.3L531.6,626.3V757.2Z"
+        android:strokeAlpha="0.15"
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.15"/>
+    <path
+        android:pathData="M217.5,285.9H806.5C810.2,285.9 813.1,288.8 813.1,292.5V750.6C813.1,754.3 810.2,757.2 806.5,757.2H217.5C213.8,757.2 210.9,754.3 210.9,750.6L210.9,626.3L492.4,626.3V757.2H531.6V626.3L813.1,626.3V587L531.6,587V456.1L813.1,456.1V416.8H210.9V292.5C210.9,288.8 213.8,285.9 217.5,285.9ZM492.4,456.1V587L210.9,587L210.9,456.1L492.4,456.1ZM152,292.5C152,256.3 181.3,227 217.5,227H806.5C842.7,227 872,256.3 872,292.5V750.6C872,786.8 842.7,816.1 806.5,816.1H217.5C181.3,816.1 152,786.8 152,750.6V292.5ZM531.6,416.8V285.9H492.4V416.8H531.6Z"
+        android:fillColor="#FAFAFA"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>

app/src/conjugate/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/conjugate/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

build.gradle.kts

@@ -13,7 +13,7 @@ buildscript {
 
     dependencies {
         classpath("io.nlopez.compose.rules:ktlint:0.4.17")
-        classpath("com.android.tools.build:gradle:8.7.0")
+        classpath("com.android.tools.build:gradle:8.13.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8")
         classpath("org.jlleitschuh.gradle:ktlint-gradle:12.1.1")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Jan 04 09:48:27 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME