Merge branch 'development' into renovate/configure

.github/workflows/PR.yml

@@ -0,0 +1,84 @@
+name: PR job
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - development
+  pull_request:
+    paths-ignore:
+      - "**.md"
+      - "*.png"
+      - docs
+
+jobs:
+  pre-conditions:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          distribution: corretto
+          java-version: 18
+
+      - name: detekt
+        run: ./gradlew detekt --stacktrace
+
+      - name: GitHub Action for SwiftLint (Only files changed in the PR)
+        uses: norio-nomura/[email protected]
+        env:
+          WORKING_DIRECTORY: ./iosApp
+
+  build-android:
+    needs: pre-conditions
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          distribution: corretto
+          java-version: 18
+
+      - name: Build
+        run: ./gradlew build --stacktrace
+
+  build-ios:
+    needs: pre-conditions
+    runs-on: macos-13
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          distribution: corretto
+          java-version: 18
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Select Xcode version
+        run: |
+          XCODE_VERSION="15.0"
+          sudo xcode-select -s "/Applications/Xcode_${XCODE_VERSION}.app"
+
+      - name: Build
+        run: |
+          cd iosApp
+          rm -f iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+          xcodebuild -resolvePackageDependencies -project iosApp.xcodeproj
+          xcodebuild build-for-testing \
+            -scheme "iosApp" \
+            -project iosApp.xcodeproj \
+            -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \
+            -allowProvisioningUpdates \
+            -configuration Debug \
+            DEVELOPMENT_TEAM=${{ secrets.APPLE_TEAM_ID }}  # Reference the GitHub secret here

README.md

@@ -2,6 +2,8 @@
 
 EAPlayers is a Kotlin Multiplatform project that leverages **Compose Multiplatform** for both Android and iOS to provide a fully native mobile app experience. The project uses [EA's Drop API](https://drop-api.ea.com) to fetch player information.
 
+![GitHub Actions build status](https://github.com/kaszabimre/EAPlayers/actions/workflows/PR.yml/badge.svg)
+
 ![iOS](https://img.shields.io/badge/iOS-000000?style=for-the-badge&logo=ios&logoColor=white)
 ![Android](https://img.shields.io/badge/Android-3DDC84?style=for-the-badge&logo=android&logoColor=white)
 ![Kotlin](https://img.shields.io/badge/Kotlin-0095D5?&style=for-the-badge&logo=kotlin&logoColor=white)

build.gradle.kts

@@ -55,3 +55,7 @@ allprojects {
         jvmTarget = libs.versions.javaTargetCompatibility.get()
     }
 }
+
+dependencies {
+    detektPlugins(libs.detekt.formatting)
+}

composeApp/build.gradle.kts

@@ -29,7 +29,6 @@ kotlin {
             baseName = "ComposeApp"
         }
     }
-
     sourceSets {
         androidMain.dependencies {
             implementation(compose.preview)
@@ -48,14 +47,18 @@ kotlin {
             implementation(libs.ktor.client.core)
             implementation(libs.koin.core)
             implementation(libs.koin.compose.multiplatform)
-            implementation("co.touchlab:stately-common:2.0.5")
+            implementation(libs.stately.common)
 
             implementation(libs.coil.compose.core)
             implementation(libs.coil.compose)
             implementation(libs.coil.mp)
             implementation(libs.coil.network.ktor)
 
+            // Modules
             implementation(projects.shared)
+            implementation(projects.modules.core)
+            implementation(projects.modules.domain)
+            implementation(projects.modules.theme)
         }
     }
 }
@@ -96,6 +99,7 @@ android {
         buildConfig = true
     }
     dependencies {
+        implementation(libs.androidx.compose.material)
         implementation(libs.kotlinx.coroutines.android)
         debugImplementation(compose.uiTooling)
         implementation(libs.compose.ui)

composeApp/src/commonMain/composeResources/values/strings.xml

@@ -0,0 +1,14 @@
+<resources>
+    <string name="abilities">Abilities</string>
+    <string name="rating">Rating</string>
+    <string name="position">Position</string>
+    <string name="height">Height</string>
+    <string name="team_mates">Team mates</string>
+    <string name="player_rank">Rank: %1$s</string>
+    <string name="nationality">Nationality</string>
+    <string name="team">Team</string>
+    <string name="rank">Rank</string>
+    <string name="rating_with_param">Rating: %1$s</string>
+    <string name="position_with_param">Position: %1$s</string>
+    <string name="player_image_desc">%1$s %2$s's image</string>
+</resources>