Going Multiplatform

.github/actions/setup/action.yml

@@ -0,0 +1,33 @@
+name: Setup
+description: Prepares workspace
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: "zulu"
+        java-version: "21"
+        cache: "gradle"
+
+    - name: Set up Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Validate Gradle wrapper
+      uses: gradle/actions/wrapper-validation@v3
+
+    - name: Grant execute permission for Gradle wrapper
+      shell: bash
+      run: chmod +x gradlew
+
+    - name: Cache Gradle dependencies
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+          !~/.gradle/wrapper/dists/**/gradle*.zip
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', 'gradle/libs.versions.toml') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-

.github/workflows/verify.yml

@@ -12,63 +12,69 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  android:
-    runs-on: macos-13
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        api-level:
-          - 21
-          - 29
-
+  test:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - name: Test
+        run: ./gradlew koverXmlReport
 
-    - name: Set up JDK
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'zulu'
-        java-version: '17'
-        cache: 'gradle'
+      - name: Report
+        uses: mi-kas/kover-report@v1
+        with:
+          path: ${{ github.workspace }}/shared/build/reports/kover/report.xml
+          title: Code Coverage
+          update-comment: true
+          min-coverage-changed-files: 80
 
-    - name: Set up Android SDK
-      uses: android-actions/setup-android@v3
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports
+          path: "**/build/reports"
+        if: always()
 
-    - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@v3
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup
+        uses: ./.github/actions/setup
 
-    - name: Grant execute permission for Gradle wrapper
-      run: chmod +x gradlew
+      - name: Lint
+        run: ./gradlew lintDebug
 
-    - name: Cache Gradle dependencies
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-          !~/.gradle/wrapper/dists/**/gradle*.zip
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: lint-reports
+          path: "**/build/reports/lint-results-debug.html"
+        if: always()
 
-    - name: Build
-      run: ./gradlew build --no-daemon
+  detekt:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Run unit tests
-      run: ./gradlew testBetaDebugUnitTest
+      - name: Setup
+        uses: ./.github/actions/setup
 
-    - name: Run instrumentation tests
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ matrix.api-level }}
-        script: ./gradlew connectedBetaDebugAndroidTest
+      - name: Detekt
+        run: ./gradlew detektMetadataMain
 
-    - name: Upload test reports
-      uses: actions/upload-artifact@v4
-      with:
-        name: reports
-        path: app/build/reports
-        overwrite: true
-      if: always()
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: detekt-reports
+          path: "**/build/reports/detekt"
+        if: always()

.gitignore

@@ -47,3 +47,5 @@ captures/
 *.aab
 output.json
 output-metadata.json
+
+.kotlin/

README.md

@@ -1,14 +1,9 @@
-> [!NOTE]  
-> This app is currently being redeveloped in [Kotlin Multiplatform](https://kotlinlang.org/docs/multiplatform.html) to support additional platforms such as iOS.
-> You can follow its development on branch [feature/multiplatform](https://github.com/Faltenreich/Diaguard/tree/feature/multiplatform) and pull request [#51](https://github.com/Faltenreich/Diaguard/pull/51).
-> Therefore development for the native version on this branch has been slowed down but pull requests will be accepted nonetheless.
-
 # Diaguard
 
-[![version](https://img.shields.io/badge/Release-3.13.0-478063.svg)](https://github.com/Faltenreich/Diaguard/releases)
-[![ci](https://github.com/Faltenreich/Diaguard/actions/workflows/verify.yml/badge.svg)](https://github.com/Faltenreich/Diaguard/actions/workflows/verify.yml)
+[![version](https://img.shields.io/badge/Release-4.0.0-478063.svg)](https://github.com/Faltenreich/Diaguard/releases)
+[![pipeline](https://github.com/Faltenreich/Diaguard/actions/workflows/verify.yml/badge.svg)](https://github.com/Faltenreich/Diaguard/actions/workflows/verify.yml)
 
-<img src="./resource/image/marketing/showcase.png" width="750" alt=""> 
+<img src="./resource/image/marketing/showcase.png" width="750"> 
 
 Diaguard is an Android app for people with diabetes mellitus.
 
@@ -26,13 +21,13 @@ It replaces the handwritten diary and helps the user to quickly and easily recor
 * Estimated HbA1c
 * Statistics
 * Dark Mode
-* Localized in English, German, French, Spanish, Italian and Russian
+* Localized in English, German, French, Spanish and Italian
 
-<img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="100" alt=""> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="100" alt=""> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="100" alt="">  <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="100" alt=""> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" width="100" alt=""> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/6.png" width="100" alt=""> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/7.png" width="100" alt=""> 
+<img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="100"> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="100"> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="100">  <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="100"> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" width="100"> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/6.png" width="100"> <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/7.png" width="100"> 
 
 ## Distribution
 
-<a href='https://play.google.com/store/apps/details?id=com.faltenreich.diaguard'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width="250"/></a><a href='https://f-droid.org/de/packages/com.faltenreich.diaguard'><img alt='Get it on F-Droid' src='https://f-droid.org/badge/get-it-on.png' width="250"/></a>
+<a href='https://play.google.com/store/apps/details?id=com.faltenreich.diaguard'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width="250"/></a><a href='https://f-droid.org/de/packages/com.faltenreich.diaguard'><img alt='Get it on F-Droid' src='https://gitlab.com/fdroid/artwork/-/raw/master/badge/get-it-on.png' width="250"/></a>
 
 ## About
 
@@ -63,7 +58,7 @@ For these reasons, Diaguard has been, is and will always be free of cost.
 If you want to buy me a beer or support me in general, please use the donate button and be aware of my thanks.
 
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AM6HG633T4BWY&source=url">
- <img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" width="100" alt=""/>
+ <img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" width="100"/>
 </a>
 
 ## Development
@@ -82,9 +77,9 @@ English is used as general language for naming things. Everything except the loc
 
 Localization takes place locally and affects following components:
 
-* User interfaces: localized via [Android resources](https://developer.android.com/guide/topics/resources/localization) (one [strings.xml](/app/src/main/res/values/strings.xml) per language)
-* Common food: localized via custom file import (one [food_common.csv](/app/src/main/assets/seed/food_common.csv) for all languages)
-* Default tags: localized via custom file import (one [tags.csv](/app/src/main/assets/seed/tags.csv) for all languages)
+* User interfaces: localized via [Android resources](https://developer.android.com/guide/topics/resources/localization) (one [strings.xml](/shared/src/commonMain/resources/MR/base/strings.xml) per language)
+* Common food: localized via custom file import (one [food_common.csv](/shared/src/commonMain/resources/MR/files/food_common.csv) for all languages)
+* Default tags: localized via custom file import (one [tags.csv](/shared/src/commonMain/resources/MR/files/tags.csv) for all languages)
 
 Currently the localization process requires certain programming skills. This should and could be improved by using an external service in order to support localizations by non-developers.
 
@@ -98,7 +93,7 @@ Domain-driven design improves the structure by grouping files in features. Every
 
 #### Testing
 
-Testing takes place via [JUnit](https://junit.org) and [Espresso](https://developer.android.com/training/testing/espresso). Tests are few in number and far from perfect, since most of Diaguard has been developed in the early of days of one developer. However the decision to go open source came with a code of conduct, and instrumentation testing major features was the first step in a right direction. The goal now is to unit- and instrumentation test every new and edited feature in order to increase the quality with every commit.
+Testing takes place via [JUnit](https://junit.org), [Espresso](https://developer.android.com/training/testing/espresso) and [Robolectric](http://robolectric.org). Tests are few in number and far from perfect, since most of Diaguard has been developed in the early of days of one developer. However the decision to go open source came with a code of conduct, and instrumentation testing major features was the first step in a right direction. The goal now is to unit- and instrumentation test every new and edited feature in order to increase the quality with every commit.
 
 #### Third-party licenses
 
@@ -109,7 +104,6 @@ This software uses following technologies with great appreciation:
 * [Apache Commons Text](http://commons.apache.org/proper/commons-text)
 * [App Privacy Policy Generator](https://github.com/nisrulz/app-privacy-policy-generator)
 * [BetterPickers](https://github.com/code-troopers/android-betterpickers)
-* [Droid Sans](https://github.com/google/fonts)
 * [EventBus](https://github.com/greenrobot/EventBus)
 * [FloatingActionButton](https://github.com/Clans/FloatingActionButton)
 * [Gson](https://github.com/google/gson)
@@ -126,6 +120,7 @@ This software uses following technologies with great appreciation:
 * [PDFjet](http://pdfjet.com)
 * [Picasso](http://square.github.io/picasso)
 * [Retrofit](https://square.github.io/retrofit)
+* [Robolectric](http://robolectric.org)
 * [Schweizer Nährwertdatenbank](http://naehrwertdaten.ch)
 * [Shields.io](https://shields.io)
 
@@ -156,4 +151,4 @@ Additionally to the permissions, conditions and limitations of the GPLv3, the pe
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-<img src="./resource/image/logo/logo_legacy.png" width="100" alt="">
+<img src="./resource/image/logo/logo_legacy.png" width="100">

androidApp/build.gradle.kts

@@ -0,0 +1,80 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = Constants.NameSpace
+    compileSdk = Constants.CompileSdk
+
+    defaultConfig {
+        minSdk = Constants.MinSdk
+        targetSdk = Constants.TargetSdk
+        versionCode = Constants.VersionCode
+        versionName = Constants.VersionName
+        testInstrumentationRunner = "${Constants.NameSpace}.TestInstrumentationRunner"
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
+    }
+
+    buildTypes {
+        getByName("debug") {
+            isMinifyEnabled = false
+            isShrinkResources = false
+        }
+        getByName("release") {
+            isMinifyEnabled = true
+            isShrinkResources = true
+        }
+    }
+
+    flavorDimensions += "version"
+    productFlavors {
+        create("demo") {
+            applicationId = Constants.NameSpace
+        }
+        create("beta") {
+            applicationId = "${Constants.NameSpace}.beta"
+        }
+        create("store") {
+            applicationId = Constants.NameSpace
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
+        compose = true
+    }
+
+    compileOptions {
+        // Support for java.time on API 25 and older
+        isCoreLibraryDesugaringEnabled = true
+    }
+
+    packagingOptions.resources.excludes += "META-INF/versions/9/previous-compilation-data.bin"
+}
+
+kotlin {
+    jvmToolchain(Constants.JavaVersion)
+}
+
+dependencies {
+    implementation(project(":shared"))
+
+    coreLibraryDesugaring(libs.android.desugar)
+
+    testImplementation(libs.junit)
+
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.androidx.test.junit.ktx)
+    androidTestImplementation(platform(libs.koin.bom))
+    androidTestImplementation(libs.koin.test)
+
+    implementation(libs.activity.compose)
+
+    implementation(platform(libs.koin.bom))
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.compose)
+}

androidApp/src/androidTest/kotlin/com/faltenreich/diaguard/TestApplication.kt

@@ -0,0 +1,23 @@
+package com.faltenreich.diaguard
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+
+class TestApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        startKoin {
+            androidContext(ApplicationProvider.getApplicationContext())
+            modules(appModules())
+        }
+    }
+
+    override fun onTerminate() {
+        stopKoin()
+        super.onTerminate()
+    }
+}

androidApp/src/androidTest/kotlin/com/faltenreich/diaguard/TestInstrumentationRunner.kt

@@ -0,0 +1,16 @@
+package com.faltenreich.diaguard
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+
+class TestInstrumentationRunner : AndroidJUnitRunner() {
+
+    override fun newApplication(
+        classLoader: ClassLoader?,
+        className: String?,
+        context: Context?,
+    ): Application {
+        return super.newApplication(classLoader, TestApplication::class.java.name, context)
+    }
+}

androidApp/src/androidTest/kotlin/com/faltenreich/diaguard/export/pdf/AndroidPdfExportTest.kt

@@ -0,0 +1,21 @@
+package com.faltenreich.diaguard.export.pdf
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class AndroidPdfExportTest {
+
+    @Test
+    fun testExport() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        // TODO: val file = File.createTempFile("tmp", "pdf", context.cacheDir)
+        val export = AndroidPdfExport(context)
+        // TODO: Inject file
+        export (
+            document {  }
+        )
+    }
+}