Merge branch 'develop' into feature/po-editor-script

Frank1234 · web-flow · commit 12b488fca55a · 2025-10-29T14:24:34.000+01:00
diff --git a/.github/workflows/_prepare-all.yml b/.github/workflows/_prepare-all.yml
diff --git a/.github/workflows/_prepare-release.yml b/.github/workflows/_prepare-release.yml
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -2,6 +2,11 @@ name: Debug Builds
 
 on: [ push ] # run on all pushes on any branch
 
+# Cancel any in-progress runs of this workflow if a new run is triggered within the same branch or PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
diff --git a/.github/workflows/firebase-app-distribution.yml b/.github/workflows/firebase-app-distribution.yml
@@ -5,6 +5,11 @@ on:
   pull_request:
     branches: [ 'develop' ]
 
+# Cancel any in-progress runs of this workflow if a new run is triggered within the same branch or PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
@@ -22,12 +27,13 @@ jobs:
         run: |
           echo $ENCODED_STRING > keystore-b64.txt
           base64 -d <keystore-b64.txt >upload-keystore.jks
+      # The secrets.gradle file that is stored as text, does not need to be decoded
+      # and can be directly written to a file
+      # This file is used by the gradle build to sign the APK
+      - name: Create secrets.gradle
+        run: echo "${{ secrets.SECRETS_GRADLE }}" > secrets.gradle
 
       - name: Build Prod Release APK
-        env:
-          RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
-          RELEASE_KEYSTORE_ALIAS: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
-          RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
         run: ./gradlew assembleProdRelease --stacktrace
 
       - name: Upload Release APK to Artifacts
@@ -44,13 +50,9 @@ jobs:
           app: ${{ secrets.FIREBASE_PROD_APP_ID }}
           credentials: ${{ secrets.FIREBASE_CREDENTIALS }}
           # groups: "beta-testers" // add this line if you want to specify a group of testers which will be invited to test this build. Make sure to create the group in Firebase Console first.
-          releaseNotes: Release build for ${{ github.ref_name }} branch - Run ${{ github.run_number }} - ${{ github.sha }}
+          release-notes: Release build for ${{ github.ref_name }} branch - Run ${{ github.run_number }} - ${{ github.sha }}
 
       - name: Build Prod Release Bundle
-        env:
-          RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
-          RELEASE_KEYSTORE_ALIAS: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
-          RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
         run: ./gradlew bundleProdRelease --stacktrace
 
       - name: Upload Release Bundle to Artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,11 @@ on:
   pull_request:
     branches: [ '*' ] # run on all pull requests
 
+# Cancel any in-progress runs of this workflow if a new run is triggered within the same branch or PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: macos-latest # use [ self-hosted, macOS ] to host on our own mac mini, which is twice as fast and cheaper than hosting on a github runner. See README for more info.
@@ -20,12 +25,13 @@ jobs:
         run: |
           echo $ENCODED_STRING > keystore-b64.txt
           base64 -d <keystore-b64.txt >upload-keystore.jks
+      # The secrets.gradle file that is stored as text, does not need to be decoded
+      # and can be directly written to a file
+      # This file is used by the gradle build to sign the APK
+      - name: Create secrets.gradle
+        run: echo "${{ secrets.SECRETS_GRADLE }}" > secrets.gradle
 
       - name: Build Prod Release APK
-        env:
-          RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
-          RELEASE_KEYSTORE_ALIAS: ${{ secrets.RELEASE_KEYSTORE_ALIAS }}
-          RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
         run: ./gradlew assembleProdRelease --stacktrace
 
       - name: Upload Release APK to Artifacts
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@
 .externalNativeBuild
 .cxx
 local.properties
-
-fastlane/report.xml
+secrets.gradle
+upload.keystore.jks
diff --git a/README.MD b/README.MD
@@ -101,12 +101,12 @@ can [generate a new keystore](https://developer.android.com/studio/publish/app-s
 The above command will encode the file contents to base64 and copy it to your clipboard. Save it to
 your repo's github secrets in the variable KEYSTORE_BASE_64.
 
-Also [add these repository secrets](./settings/secrets/actions/new) in github, and store them in
-your projects 1Password vault as well:
+Copy the file `./dummy_secrets.gradle` to `secrets.gradle` and fill in your own keystore details.
 
-- RELEASE_KEYSTORE_PASSWORD ('firstpass' for this template)
-- RELEASE_KEYSTORE_ALIAS ('template' for this template)
-- RELEASE_KEY_PASSWORD ('secondpass' for this template)
+Add the content of secrets.gradle to your Github repository secrets as well, as
+`SECRETS_GRADLE`. You can simply copy the content of the file to the github secret, no encoding needed.
+
+Also add the `upload-keystore.jks` file and `secrets.gradle` to 1password. This is important because the secrets cannot be read by any user in github, only by the CI system.
 
 #### Firebase app distribution
 
@@ -120,9 +120,9 @@ To change this to your own firebase project, you need to set two secrets:
 - `FIREBASE_CREDENTIALS` from your firebase project. More info how to obtain it can be found
   in [creating a service account](https://github.com/nickwph/firebase-app-distribution-action?tab=readme-ov-file#download-credentials-from-firebase).
 
-With the default configuration, all commits on develop will be pushed to Firebase App Distribution
-and users in the test group "beta-testers" will receive an email with a link to download the
-app.
+With the default configuration, all commits on develop will be pushed to Firebase App Distribution.
+To also make these available to a test group, you can enable the `groups` parameter in the
+[firebase yml](.github/workflows/firebase-app-distribution.yml) file.
 
 #### Self-hosted runner
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,6 +5,13 @@ plugins {
     alias libs.plugins.compose.compiler
 }
 
+if (file("$rootDir/secrets.gradle").exists()) {
+    apply from: "$rootDir/secrets.gradle"
+} else {
+    // Dummy secrets file for local development
+    println "[WARNING] Using dummy secrets file. You will only be able to create debug builds. Please create a secrets.gradle file in the project root with your signing secrets if you want to create release builds."
+    apply from:  "$rootDir/dummy_secrets.gradle"
+}
 apply from: "$rootDir/build.module.feature-and-app.gradle"
 apply from: "$rootDir/build.dep.navigation.gradle"
 
@@ -26,12 +33,20 @@ android {
         buildConfig = true
     }
 
+    packaging {
+        resources {
+            // Exclude duplicate META-INF files from dependencies to avoid build conflicts
+            // okhttp3:logging-interceptor and jspecify both contain META-INF/versions/9/OSGI-INF/MANIFEST.MF
+            excludes += '/META-INF/versions/9/OSGI-INF/MANIFEST.MF'
+        }
+    }
+
     signingConfigs {
         upload {
             storeFile file("../upload-keystore.jks")
-            storePassword System.getenv("RELEASE_KEYSTORE_PASSWORD")
-            keyAlias System.getenv("RELEASE_KEYSTORE_ALIAS")
-            keyPassword System.getenv("RELEASE_KEY_PASSWORD")
+            storePassword signingSecrets.upload.storePassword
+            keyAlias signingSecrets.upload.keyAlias
+            keyPassword signingSecrets.upload.keyPassword
         }
     }
 
@@ -79,3 +94,23 @@ dependencies {
     api platform(libs.firebaseBoM)
     implementation(libs.firebaseCrashlytics)
 }
+
+tasks.register("checkSigningConfig") {
+    doFirst {
+        def cfg = android.signingConfigs.upload
+        if(!cfg.storeFile?.exists()) {
+            throw new GradleException("Keystore file for Signing config 'upload' is not found.")
+        }
+        else if (
+                !cfg.storePassword ||
+                !cfg.keyAlias ||
+                !cfg.keyPassword) {
+            throw new GradleException("Signing config 'upload' is missing values for release build.")
+        }
+    }
+}
+
+// Attach checkSigningConfig to all release variant preBuild tasks
+tasks.matching { it.name =~ /assemble.*Release/ }.configureEach { task ->
+    task.dependsOn("checkSigningConfig")
+}
diff --git a/app/src/main/kotlin/nl/q42/template/logging/CrashlyticsLogger.kt b/app/src/main/kotlin/nl/q42/template/logging/CrashlyticsLogger.kt
@@ -1,7 +1,7 @@
 package nl.q42.template.logging
 
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
+import com.google.firebase.Firebase
+import com.google.firebase.crashlytics.crashlytics
 import io.github.aakira.napier.Antilog
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.LogLevel
diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     ext {
         minSdkVersion = 29
-        targetSdkVersion = 35
-        compileSdkVersion = 35
+        targetSdkVersion = 36
+        compileSdkVersion = 36
     }
 }
 
diff --git a/core/actionresult/src/main/kotlin/nl/q42/template/actionresult/data/ActionResultMapper.kt b/core/actionresult/src/main/kotlin/nl/q42/template/actionresult/data/ActionResultMapper.kt
@@ -25,8 +25,8 @@ private fun isTooManyRequests(httpStatusCode: Int?) = httpStatusCode == TOO_MANY
 suspend fun <T : Any> mapToActionResult(request: suspend () -> NetworkResponse<T, ApiErrorResponse>): ActionResult<T> =
     try {
         request().networkResponseToActionResult()
-    } catch (e: Exception) {
-        if (e is CancellationException) ActionResult.Error.Cancelled(e) else ActionResult.Error.Other(e)
+    } catch (t: Throwable) {
+        if (t is CancellationException) ActionResult.Error.Cancelled(t) else ActionResult.Error.Other(t)
     }
 
 private fun <T : Any> NetworkResponse<T, ApiErrorResponse>.networkResponseToActionResult(): ActionResult<T> =
diff --git a/core/actionresult/src/main/kotlin/nl/q42/template/actionresult/domain/ActionResult.kt b/core/actionresult/src/main/kotlin/nl/q42/template/actionresult/domain/ActionResult.kt
@@ -5,29 +5,29 @@ sealed class ActionResult<out T : Any?> {
     /**
      * An error class used so that feature modules can give an exact error message to the user.
      */
-    sealed class Error(open val exception: Exception) : ActionResult<Nothing>() {
+    sealed class Error(open val throwable: Throwable) : ActionResult<Nothing>() {
 
-        data class UnAuthorized(override val exception: Exception, val message: String?) : Error(exception)
+        data class UnAuthorized(override val throwable: Throwable, val message: String?) : Error(throwable)
 
-        data class TooManyRequests(override val exception: Exception) : Error(exception)
+        data class TooManyRequests(override val throwable: Throwable) : Error(throwable)
 
-        data class Cancelled(override val exception: Exception) : Error(exception)
+        data class Cancelled(override val throwable: Throwable) : Error(throwable)
 
         data class InvalidErrorResponse(
-            override val exception: Exception = Exception("API error format is invalid"),
+            override val throwable: Throwable = Throwable("API error format is invalid"),
             val httpStatusCode: Int? = null
         ) :
-            Error(exception)
+            Error(throwable)
 
-        data class ServerError(override val exception: Exception, val message: String) : Error(exception)
+        data class ServerError(override val throwable: Throwable, val message: String) : Error(throwable)
 
         data object NotFoundError : Error(Exception("404: Not Found"))
 
-        data class NetworkError(override val exception: Exception) : Error(exception)
+        data class NetworkError(override val throwable: Throwable) : Error(throwable)
 
-        data class Other(override val exception: Exception) : Error(exception)
+        data class Other(override val throwable: Throwable) : Error(throwable)
 
-        data object NotImplemented : Error(Exception("API error format not implemented"))
+        data object NotImplemented : Error(Throwable("API error format not implemented"))
     }
 
     data class Success<T : Any?>(val data: T) : ActionResult<T>()
diff --git a/core/ui/src/main/kotlin/nl/q42/template/ui/compose/composables/window/TopAppBar.kt b/core/ui/src/main/kotlin/nl/q42/template/ui/compose/composables/window/TopAppBar.kt
@@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -122,7 +119,7 @@ private fun TopAppBarPreview() {
             onNavIconClicked = {},
             actions = {
                 IconButton(onClick = {}) {
-                    Icon(Icons.Filled.Share, null)
+                    Icon(painter = painterResource(R.drawable.ic_share), null)
                 }
             },
             titleContentDescription = "Title Description",
@@ -140,10 +137,10 @@ private fun TopAppBarLongTitlePreview() {
             onNavIconClicked = {},
             actions = {
                 IconButton(onClick = {/* Do Something*/ }) {
-                    Icon(Icons.Filled.Share, null)
+                    Icon(painter = painterResource(R.drawable.ic_share), null)
                 }
                 IconButton(onClick = {/* Do Something*/ }) {
-                    Icon(Icons.Filled.Settings, null)
+                    Icon(painter = painterResource(R.drawable.ic_share), null)
                 }
             },
             titleContentDescription = "titleContentDescription",
diff --git a/core/ui/src/main/res/drawable/ic_share.xml b/core/ui/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M680,880q-50,0 -85,-35t-35,-85q0,-6 3,-28L282,568q-16,15 -37,23.5t-45,8.5q-50,0 -85,-35t-35,-85q0,-50 35,-85t85,-35q24,0 45,8.5t37,23.5l281,-164q-2,-7 -2.5,-13.5T560,200q0,-50 35,-85t85,-35q50,0 85,35t35,85q0,50 -35,85t-85,35q-24,0 -45,-8.5T598,288L317,452q2,7 2.5,13.5t0.5,14.5q0,8 -0.5,14.5T317,508l281,164q16,-15 37,-23.5t45,-8.5q50,0 85,35t35,85q0,50 -35,85t-85,35ZM680,800q17,0 28.5,-11.5T720,760q0,-17 -11.5,-28.5T680,720q-17,0 -28.5,11.5T640,760q0,17 11.5,28.5T680,800ZM200,520q17,0 28.5,-11.5T240,480q0,-17 -11.5,-28.5T200,440q-17,0 -28.5,11.5T160,480q0,17 11.5,28.5T200,520ZM680,240q17,0 28.5,-11.5T720,200q0,-17 -11.5,-28.5T680,160q-17,0 -28.5,11.5T640,200q0,17 11.5,28.5T680,240ZM680,760ZM200,480ZM680,200Z"
+      android:fillColor="#1f1f1f"/>
+</vector>
diff --git a/data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserRemoteDataSource.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserRemoteDataSource.kt
@@ -28,7 +28,7 @@ internal class UserRemoteDataSource @Inject constructor(
             }
 
             is ActionResult.Error -> {
-                Napier.e(apiActionResult.exception) { "getUser failed" }
+                Napier.e(apiActionResult.throwable) { "getUser failed" }
                 apiActionResult
             }
         }
diff --git a/dummy_secrets.gradle b/dummy_secrets.gradle
@@ -0,0 +1,20 @@
+ext {
+    signingSecrets = [
+            upload: [
+                    'storePassword' : '',
+                    'keyAlias' : '',
+                    'keyPassword' : '',
+            ]
+            // Additional signing configs can be added here
+    ]
+
+    apiKeys = [
+            // additional project secrets like API keys can be added here
+            dev = [
+
+            ],
+            prod = [
+
+            ]
+    ]
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/scripts/colorparser/ColorParser.kts b/scripts/colorparser/ColorParser.kts
diff --git a/scripts/colorparser/color_parser_input.kt b/scripts/colorparser/color_parser_input.kt

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`3`	`3`	`buildscript {`
`4`	`4`	`ext {`
`5`	`5`	`minSdkVersion = 29`
`6`		`- targetSdkVersion = 35`
`7`		`- compileSdkVersion = 35`
	`6`	`+ targetSdkVersion = 36`
	`7`	`+ compileSdkVersion = 36`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`