diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
index a6b108ad..3b2cc951 100644
--- a/.github/workflows/android_ci.yml
+++ b/.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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6f31a949..a99047de 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -115,7 +115,9 @@ git remote add upstream https://github.com/scribe-org/Scribe-Android.git
3. Open the Scribe-Android directory in Android Studio
-4. In order to [run Scribe on an emulator](https://developer.android.com/studio/run/emulator):
+4. The application has 2 build variants more of which could be read at [here](#build-variants)
+
+5. In order to [run Scribe on an emulator](https://developer.android.com/studio/run/emulator):
- In the top bar find and select the "Device Manager" option
- [Create a device](https://developer.android.com/studio/run/managing-avds) and select it once it's been made
@@ -133,6 +135,17 @@ git remote add upstream https://github.com/scribe-org/Scribe-Android.git
> [!NOTE]
> Feel free to contact the team in the [Android room on Matrix](https://matrix.to/#/#ScribeAndroid:matrix.org) if you're having problems getting your environment setup!
+
+## Build Variant Selection [`⇧`](#contents)
+
+The project includes **two build variants**, each corresponding to a different application.
+
+Build variants can be selected from **Build → Select Build Variant** in Android Studio:
+
+- **`conjugateDebug`** → Conjugate app
+- **`keyboardDebug`** → Keyboard app
+
+
## Pre-commit Hooks [`⇧`](#contents)
Scribe-Android uses pre-commit hooks to maintain a clean and consistent codebase. These hooks help automatically check for issues such as formatting, trailing whitespace, and linting errors. Here's how to set up pre-commit for Scribe-Android:
diff --git a/README.md b/README.md
index eed6597e..962429fc 100644
--- a/README.md
+++ b/README.md
@@ -190,9 +190,28 @@ pre-commit install # install pre-commit hooks
# App Setup [`⇧`](#contents)
+### Codebase Overview
+The Scribe-Android codebase consists of two separate applications
+
+- Keyboard Application — the actual Scribe language keyboard (IME)
+
+- Conjugate Application — a application for verb conjugations.
+
+Each application is built and run independently using Android Studio build variants.
+
+To select a built variant
+
+1. Open the project in Android Studio
+2. Navigate to Build → Select Build Variant
+3. Choose the required variant:
+ * **KeyboardDebug** — Scribe keyboard application (IME)
+ * **ConjugateDebug** — Scribe Conjugate application
+
> [!NOTE]
> Currently Scribe-Android does not work as a floating keyboard.
+The Default variant would be `keyboardDebug`
+
Users access Scribe language keyboards through the following:
- Open the app and press **`Enable Keyboard`**
@@ -200,6 +219,7 @@ Users access Scribe language keyboards through the following:
- Choose from the available Scribe language keyboards
- When typing press 🌐 or the keyboard button to select keyboards
+
# Supported Languages [`⇧`](#contents)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 81b5e876..b3e548f4 100644
--- a/app/build.gradle.kts
+++ b/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")
diff --git a/app/src/conjugate/ic_launcher-playstore.png b/app/src/conjugate/ic_launcher-playstore.png
new file mode 100644
index 00000000..06fc5b22
Binary files /dev/null and b/app/src/conjugate/ic_launcher-playstore.png differ
diff --git a/app/src/conjugate/java/be/scri/activities/MainActivity.kt b/app/src/conjugate/java/be/scri/activities/MainActivity.kt
new file mode 100644
index 00000000..d8aa98f8
--- /dev/null
+++ b/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()
+ }
+ }
+}
diff --git a/app/src/conjugate/java/be/scri/ui/screens/SampleScreen.kt b/app/src/conjugate/java/be/scri/ui/screens/SampleScreen.kt
new file mode 100644
index 00000000..08dfa9a7
--- /dev/null
+++ b/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,
+ )
+ }
+ }
+}
diff --git a/app/src/conjugate/res/drawable/ic_launcher_background.xml b/app/src/conjugate/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..ca3826a4
--- /dev/null
+++ b/app/src/conjugate/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/conjugate/res/drawable/ic_launcher_foreground.xml b/app/src/conjugate/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..0520adc1
--- /dev/null
+++ b/app/src/conjugate/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+