Merge pull request #7

ASAA-221 - Desktop

.github/auto_assign.yaml

@@ -10,7 +10,6 @@ reviewers:
   - br-Emery
   - BottleRocket-Colin
   - harishrpatel
-  - MMurrayAtBR
 
 # A list of keywords to be skipped the process that add reviewers if pull requests include it
 skipKeywords:

.github/workflows/gradle-publish.yml

@@ -8,10 +8,8 @@
 name: Gradle Package
 
 on:
-#  push:
-#    branches: [ "main" ]
-#  pull_request:
-#    branches: [ "main" ]
+  push:
+    branches: [ "deploy" ]
 
 jobs:
   build:
@@ -36,11 +34,13 @@ jobs:
         with:
           arguments: build
 
+
       # The USERNAME and TOKEN need to correspond to the credentials environment variables used in
       # the publishing section of your build.gradle
       - name: Publish to GitHub Packages
         uses: gradle/[email protected]
         with:
           arguments: publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_PUBLISH_USERNAME: ${{ secrets.REPO_READ_WRITE_USER }}
+          GH_PUBLISH_PASSWORD: ${{ secrets.REPO_READ_WRITE_TOKEN }}

gradle/libs.versions.toml

@@ -1,4 +1,12 @@
 [versions]
+# Publishing version
+launchpad-compose = "0.1.0"
+
+# Android SDK versions
+compile-sdk = "34"
+min-sdk = "24"
+
+# Dependency versions
 agp = "8.2.2"
 androidx-window = "1.2.0"
 compose-plugin = "1.5.12"
@@ -7,9 +15,6 @@ kt-lint-gradle = "11.6.1"
 navigation-compose = "2.7.7"
 precompose = "1.5.11"
 
-compile-sdk = "34"
-min-sdk = "24"
-launchpad-compose = "0.0.4"
 
 [libraries]
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }

kmp-launchpad-compose/build.gradle.kts

@@ -21,16 +21,12 @@ kotlin {
         }
     }
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "kmp-launchpad-compose"
-            isStatic = true
-        }
-    }
+    jvm("desktop")
+    task("testClasses")
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         androidMain.dependencies {
@@ -81,8 +77,8 @@ publishing {
             name = "GitHubPackages"
             url = uri("https://maven.pkg.github.com/BottleRocketStudios/KMP-LaunchPad-Compose")
             credentials {
-                username = System.getenv("REPO_READ_WRITE_USER")
-                password = System.getenv("REPO_READ_WRITE_TOKEN")
+                username = System.getenv("REPO_READ_WRITE_USER") ?: System.getenv("GH_PUBLISH_USERNAME")
+                password = System.getenv("REPO_READ_WRITE_TOKEN") ?: System.getenv("GH_PUBLISH_PASSWORD")
             }
         }
     }

kmp-launchpad-compose/src/desktopMain/kotlin/com/bottlerocketstudios/launchpad/compose/util/CurrencyUtils.Launchpad_Compose.kmp-launchpad-compose.desktop.kt

@@ -0,0 +1,22 @@
+package com.bottlerocketstudios.launchpad.compose.util
+
+import java.text.NumberFormat
+import java.util.Currency
+import java.util.Locale
+
+/**
+ * Kotlin Multiplatform function - convertToCurrencyString
+ *
+ * This function takes a Double value representing a raw amount of currency,
+ * and returns a String representing that amount formatted appropriately as
+ * currency for the current locale of the device running the code.
+ *
+ * @param [amount] The raw amount of currency as a Double
+ * @return A string representing that amount in the appropriate currency
+ *         format for the device's current locale.
+ */
+actual fun Double?.toCurrency(): String {
+    val numberFormat = NumberFormat.getCurrencyInstance()
+    numberFormat.currency = Currency.getInstance(Locale.getDefault())
+    return numberFormat.format(this ?: 0.0)
+}