KMP

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  test_lint:
+  android_lint:
      runs-on: ubuntu-latest
      steps:
       - uses: actions/checkout@v3
@@ -12,10 +12,19 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
       - run: |
-          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
+          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.8.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
 
       - name: Kotlin lint
         run: ktlint
 
       - name: Android Lint
         run: ./gradlew lint
+
+  ios_lint:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Lint
+        run: |
+          swiftlint

.gitignore

@@ -16,4 +16,9 @@ local.properties
 .env
 .idea
 /app/release/
-/fastlane/report.xml
+/fastlane/report.xml
+.kotlin
+xcuserdata/
+iosApp.xcconfig
+*.zip
+*.ipa

.swiftlint.yml

@@ -0,0 +1,4 @@
+disabled_rules:
+  - line_length
+excluded:
+  - shared/build/

androidApp/build.gradle.kts

@@ -0,0 +1,92 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.kotlin.serialization)
+}
+
+android {
+    namespace = "org.blackcandy.android"
+    compileSdk = 36
+
+    defaultConfig {
+        applicationId = "org.blackcandy.android"
+        minSdk = 28
+        targetSdk = 34
+        versionCode = 3
+        versionName = "1.0.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    lint {
+        abortOnError = true
+    }
+
+    buildTypes {
+        getByName("release") {
+            isShrinkResources = true
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    buildFeatures {
+        viewBinding = true
+        compose = true
+    }
+}
+
+dependencies {
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.windowSizeClass)
+    implementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.window)
+    implementation(libs.androidx.window.core)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.security.crypto)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.androidx.annotation.experimental)
+
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.androidx.media3.session)
+    implementation(libs.androidx.media3.datasource.okhttp)
+
+    implementation(libs.google.material)
+    implementation(libs.google.accompanist.themeadapter.material3)
+
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.koin.androidx.compose)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.okhttp)
+    implementation(libs.ktor.client.content.negotiation)
+    implementation(libs.ktor.serialization.kotlinx.json)
+    implementation(libs.ktor.client.auth)
+    implementation(libs.coil.compose)
+    implementation(libs.reorderable)
+    implementation(libs.hotwire.core)
+    implementation(libs.hotwire.navigation.fragments)
+
+    implementation(project(":shared"))
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

app/proguard-rules.pro → androidApp/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/src/main/AndroidManifest.xml → androidApp/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
             </intent-filter>
         </activity>
         <service
-            android:name=".media.MusicService"
+            android:name="org.blackcandy.shared.media.MusicService"
             android:foregroundServiceType="mediaPlayback"
             android:exported="true">
             <intent-filter>

app/src/main/assets/json/configuration.json → androidApp/src/main/assets/json/configuration.json

@@ -9,7 +9,7 @@
       ],
       "properties": {
         "context": "default",
-        "uri": "turbo://fragment/web",
+        "uri": "hotwire://fragment/web",
         "pull_to_refresh_enabled": true
       }
     },
@@ -19,7 +19,7 @@
         "^/$"
       ],
       "properties": {
-        "uri": "turbo://fragment/web/home",
+        "uri": "hotwire://fragment/web/home",
         "presentation": "replace_root"
       }
     },
@@ -28,26 +28,17 @@
         "^/library$"
       ],
       "properties": {
-        "uri": "turbo://fragment/web/library",
+        "uri": "hotwire://fragment/web/library",
         "presentation": "replace_root"
       }
     },
-    {
-      "patterns": [
-        "^/account$"
-      ],
-      "properties": {
-        "context": "modal",
-        "uri": "turbo://fragment/sheets/account"
-      }
-    },
     {
       "patterns": [
         "^/dialog/*"
       ],
       "properties": {
         "context": "modal",
-        "uri": "turbo://fragment/web/bottom_sheet",
+        "uri": "hotwire://fragment/web/bottom_sheet",
         "pull_to_refresh_enabled": false
       }
     }

app/src/main/java/org/blackcandy/android/LoginActivity.kt → androidApp/src/main/java/org/blackcandy/android/LoginActivity.kt

@@ -10,7 +10,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import kotlinx.coroutines.launch
 import org.blackcandy.android.compose.login.LoginScreen
-import org.blackcandy.android.viewmodels.LoginViewModel
+import org.blackcandy.shared.viewmodels.LoginViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class LoginActivity : ComponentActivity() {