Kotlin Multiplattform - Use the badge on desktop (gdg-berlin-android#220)

Author: mariobodemann

.github/workflows/main.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Assemble Release
-        run: ./gradlew :app:assembleRelease --no-daemon
+        run: ./gradlew :android:assembleRelease --no-daemon
       - name: Check folders after assembleRelease
         run: tree -P '*.apk' --prune
       - name: Upload Release APK to GitHub Artifact

.github/workflows/pr.yml

@@ -26,7 +26,7 @@ jobs:
       - name: "Validate Gradle wrapper"
         uses: gradle/wrapper-validation-action@v1
       - name: "Assemble Debug"
-        run: ./gradlew :app:assembleDebug --no-daemon
+        run: ./gradlew :android:assembleDebug --no-daemon
       - name: "Upload Debug APK to GitHub"
         uses: actions/upload-artifact@v3
         with:
@@ -93,5 +93,5 @@ jobs:
       - name: "Validate Gradle wrapper"
         uses: gradle/wrapper-validation-action@v1
       - name: "Test"
-        run: ./gradlew test
+        run: ./gradlew linuxTest
 

zeapp/app/.gitignore zeapp/android/.gitignore

@@ -36,7 +36,26 @@ android {
         vectorDrawables {
             useSupportLibrary = true
         }
-        resourceConfigurations.addAll(listOf("ar-rEG", "de-rDE", "en-rGB", "fr", "hi", "hr-rHR", "ja", "lt", "mr", "nl", "sq", "tr", "uk", "ur", "bs", "pt-rBR"))
+        resourceConfigurations.addAll(
+            listOf(
+                "ar-rEG",
+                "de-rDE",
+                "en-rGB",
+                "fr",
+                "hi",
+                "hr-rHR",
+                "ja",
+                "lt",
+                "mr",
+                "nl",
+                "sq",
+                "tr",
+                "uk",
+                "ur",
+                "bs",
+                "pt-rBR",
+            ),
+        )
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -63,7 +82,7 @@ android {
             buildConfigField(
                 "String",
                 "OPEN_API_TOKEN",
-                "\"${System.getenv("DALE2_TOKEN")}\"" ?: "\"\""
+                "\"${System.getenv("DALE2_TOKEN")}\"" ?: "\"\"",
             )
 
             firebaseAppDistribution {
@@ -82,7 +101,7 @@ android {
 
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
 
             if (enableRelease) {
@@ -129,7 +148,7 @@ android {
                 "META-INF/LGPL2.1",
                 "META-INF/*.kotlin_module",
                 "META-INF/LICENSE.*",
-                "META-INF/LICENSE-notice.*"
+                "META-INF/LICENSE-notice.*",
             )
         }
     }
@@ -149,6 +168,7 @@ detekt {
 
 dependencies {
     implementation(platform(libs.androidx.compose.bom))
+    implementation(project(":badge"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -160,7 +180,6 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.retrofit2.retrofit)
     implementation(libs.retrofit2.converter.gson)
-    implementation(libs.mik3y.usb.serial.android)
     implementation(libs.zxing)
     implementation(libs.material3.wsc)
     implementation(libs.dagger.hilt)

zeapp/app/build.gradle.kts zeapp/android/build.gradle.kts

@@ -1,7 +1,8 @@
+package de.berlindroid.zeapp
+
 import androidx.compose.ui.test.*
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import de.berlindroid.zeapp.ZeMainActivity
 import org.junit.Rule
 import org.junit.Test
 

zeapp/app/detekt-baseline.xml zeapp/android/detekt-baseline.xml

@@ -1,7 +1,6 @@
 package de.berlindroid.zeapp
 
 import android.app.Application
-import com.hoho.android.usbserial.BuildConfig
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 

zeapp/app/google-services.json zeapp/android/google-services.json

@@ -79,6 +79,7 @@ import de.berlindroid.zeapp.zeui.ZeImageDrawEditorDialog
 import de.berlindroid.zeapp.zeui.ZeNavigationPad
 import de.berlindroid.zeapp.zeui.zetheme.ZeBadgeAppTheme
 import de.berlindroid.zeapp.zevm.ZeBadgeViewModel
+import de.berlindroid.zekompanion.getPlatform
 import timber.log.Timber
 import android.content.res.Configuration as AndroidConfig
 import androidx.compose.foundation.Image as ZeImage
@@ -248,6 +249,9 @@ private fun ZeAbout(
                 style = MaterialTheme.typography.bodyMedium,
                 fontSize = 24.sp,
             )
+            ZeText(
+                text = "Running on '${getPlatform()}'."
+            )
             ZeLazyColumn {
                 items(lines) { line ->
                     ZeRow(