Merge pull request #2224 from DimensionDev/feature/native-macos

Feature/native macos

Author: Tlaster

.github/workflows/crowdin-upload.yml

@@ -5,7 +5,8 @@ on:
     branches: [master]
     paths:
       - "**/values/strings.xml"
-      - "iosApp/flare/Localizable.xcstrings"
+      - "crowdin.yml"
+      - "appleApp/Shared/FlareAppleResource/Resources/Localizable.xcstrings"
 
 jobs:
   crowdin:

.github/workflows/desktop.yml

@@ -22,7 +22,6 @@ concurrency:
 jobs:
   build-macos:
     runs-on: [macos-26]
-    timeout-minutes: 30
     steps:
       - uses: yumis-coconudge/clean-workspace-action@v1
 
@@ -34,55 +33,150 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          distribution: 'jetbrains'
+          distribution: "jetbrains"
           java-version: 25
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
+      - name: Install XcodeGen
+        run: brew install xcodegen
       - name: import certs
-        id: import-cert
         if: startsWith(github.ref, 'refs/tags/')
         uses: apple-actions/import-codesign-certs@v6
         with:
           p12-file-base64: ${{ secrets.MACOS_CERT_BASE64 }}
           p12-password: ${{ secrets.MACOS_CERT_PASSWORD }}
-      - name: Create Embedded Provision Profile
+      - name: Install macOS Provision Profile
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          echo "$MACOS_EMBEDDED_PROVISION" > desktopApp/embedded.provisionprofile.b64
-          base64 -d -i desktopApp/embedded.provisionprofile.b64 > desktopApp/embedded.provisionprofile    
+          mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+          echo "$MACOS_EMBEDDED_PROVISION" > "$RUNNER_TEMP/native-macos.provisionprofile.b64"
+          base64 -d -i "$RUNNER_TEMP/native-macos.provisionprofile.b64" > "$RUNNER_TEMP/native-macos.provisionprofile"
+          security cms -D -i "$RUNNER_TEMP/native-macos.provisionprofile" > "$RUNNER_TEMP/native-macos-profile.plist"
+          profile_uuid=$(/usr/libexec/PlistBuddy -c "Print UUID" "$RUNNER_TEMP/native-macos-profile.plist")
+          profile_name=$(/usr/libexec/PlistBuddy -c "Print Name" "$RUNNER_TEMP/native-macos-profile.plist")
+          cp "$RUNNER_TEMP/native-macos.provisionprofile" "$HOME/Library/MobileDevice/Provisioning Profiles/$profile_uuid.provisionprofile"
+          echo "NATIVE_MACOS_PROVISIONING_PROFILE=$profile_uuid" >> "$GITHUB_ENV"
+          echo "NATIVE_MACOS_PROVISIONING_PROFILE_SPECIFIER=$profile_name" >> "$GITHUB_ENV"
         env:
           MACOS_EMBEDDED_PROVISION: ${{ secrets.MACOS_EMBEDDED_PROVISION }}
-      - name: Create Runtime Provision Profile
+      - name: Resolve native macOS signing identities
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          echo "$MACOS_RUNTIME_PROVISION" > desktopApp/runtime.provisionprofile.b64
-          base64 -d -i desktopApp/runtime.provisionprofile.b64 > desktopApp/runtime.provisionprofile    
+          set -euo pipefail
+
+          security find-identity -v -p codesigning
+          security find-identity -v -p basic
+
+          app_identity=$(security find-identity -v -p codesigning | sed -n 's/.*"\(3rd Party Mac Developer Application: .* (7LFDZ96332)\)".*/\1/p' | head -n 1)
+          installer_identity=$(security find-identity -v -p basic | sed -n 's/.*"\(3rd Party Mac Developer Installer: .* (7LFDZ96332)\)".*/\1/p' | head -n 1)
+
+          if [ -z "$app_identity" ]; then
+            echo "No 3rd Party Mac Developer Application identity found for team 7LFDZ96332."
+            exit 1
+          fi
+
+          if [ -z "$installer_identity" ]; then
+            echo "No 3rd Party Mac Developer Installer identity found for team 7LFDZ96332."
+            exit 1
+          fi
+
+          echo "NATIVE_MACOS_APP_SIGNING_IDENTITY=$app_identity" >> "$GITHUB_ENV"
+          echo "NATIVE_MACOS_INSTALLER_SIGNING_IDENTITY=$installer_identity" >> "$GITHUB_ENV"
+      - name: Add Firebase config
         env:
-          MACOS_RUNTIME_PROVISION: ${{ secrets.MACOS_RUNTIME_PROVISION }}
-      # Run tests
-      - name: Run Tests
-        run: ./gradlew jvmTest
-      - name: Build with Gradle
+          GOOGLE_SERVICE_INFO_PLIST_B64: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_B64 }}
+        run: |
+          if [ -n "${GOOGLE_SERVICE_INFO_PLIST_B64:-}" ]; then
+            mkdir -p appleApp/Firebase
+            printf '%s' "$GOOGLE_SERVICE_INFO_PLIST_B64" | base64 -D > appleApp/Firebase/GoogleService-Info.plist
+          else
+            echo "GOOGLE_SERVICE_INFO_PLIST_B64 is not set; Firebase config will not be bundled."
+          fi
+      - name: Generate Xcode project
+        run: xcodegen generate --spec appleApp/project.yml
+      - name: Resolve native macOS version
+        run: |
+          marketing_version="$(sed -n 's/^versionName=//p' fdroid.properties | head -n 1)"
+
+          if [[ "$GITHUB_REF_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            marketing_version="$GITHUB_REF_NAME"
+          fi
+
+          if [ -z "$marketing_version" ]; then
+            echo "Unable to resolve native macOS marketing version"
+            exit 1
+          fi
+
+          echo "NATIVE_MACOS_MARKETING_VERSION=$marketing_version" >> "$GITHUB_ENV"
+          echo "NATIVE_MACOS_BUILD_NUMBER=$GITHUB_RUN_NUMBER" >> "$GITHUB_ENV"
+      - name: Build native macOS app
+        if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+        working-directory: ./appleApp
         env:
-          BUILD_NUMBER: ${{github.run_number}}
-          BUILD_VERSION: ${{github.ref_name}}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-        run: ./gradlew :desktop:check :desktop:build --stacktrace
-      - name: Package with Gradle
+        run: |
+          xcodebuild build \
+            -project Flare.xcodeproj \
+            -scheme macOS \
+            -configuration Release \
+            -destination "generic/platform=macOS" \
+            -derivedDataPath build/DerivedData \
+            -skipPackagePluginValidation \
+            -skipMacroValidation \
+            GRADLE_JVM_ARGS="-Xmx16G -Dfile.encoding=UTF-8" \
+            JAVA_OPTS="-Xmx16G" \
+            MARKETING_VERSION="$NATIVE_MACOS_MARKETING_VERSION" \
+            CURRENT_PROJECT_VERSION="$NATIVE_MACOS_BUILD_NUMBER" \
+            CODE_SIGNING_ALLOWED=NO
+      - name: Archive native macOS app
+        if: startsWith(github.ref, 'refs/tags/')
+        working-directory: ./appleApp
         env:
-          BUILD_NUMBER: ${{github.run_number}}
-          BUILD_VERSION: ${{github.ref_name}}
+          FIREBASE_CRASHLYTICS_UPLOAD_SYMBOLS: ${{ startsWith(github.ref, 'refs/tags/') && '1' || '0' }}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-        run: ./gradlew :desktop:packageReleasePkg --stacktrace
-      - name: Archive macOS artifacts Product
+        run: |
+          xcodebuild archive \
+            -project Flare.xcodeproj \
+            -scheme macOS \
+            -configuration Release \
+            -destination "generic/platform=macOS" \
+            -archivePath "$RUNNER_TEMP/Flare-native-macOS.xcarchive" \
+            -derivedDataPath build/DerivedData \
+            -skipPackagePluginValidation \
+            -skipMacroValidation \
+            DEVELOPMENT_TEAM=7LFDZ96332 \
+            CODE_SIGN_STYLE=Manual \
+            CODE_SIGN_IDENTITY="$NATIVE_MACOS_APP_SIGNING_IDENTITY" \
+            NATIVE_MACOS_PROVISIONING_PROFILE_SPECIFIER="$NATIVE_MACOS_PROVISIONING_PROFILE_SPECIFIER" \
+            NATIVE_MACOS_PROVISIONING_PROFILE="$NATIVE_MACOS_PROVISIONING_PROFILE" \
+            GRADLE_JVM_ARGS="-Xmx16G -Dfile.encoding=UTF-8" \
+            JAVA_OPTS="-Xmx16G" \
+            MARKETING_VERSION="$NATIVE_MACOS_MARKETING_VERSION" \
+            CURRENT_PROJECT_VERSION="$NATIVE_MACOS_BUILD_NUMBER"
+      - name: Package native macOS app
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          set -euo pipefail
+
+          app_path="$RUNNER_TEMP/Flare-native-macOS.xcarchive/Products/Applications/Flare.app"
+          if [ ! -d "$app_path" ]; then
+            echo "No archived app found at $app_path"
+            exit 1
+          fi
+
+          mkdir -p appleApp/build/native-macos/pkg
+          safe_ref="${GITHUB_REF_NAME//\//-}"
+          pkg_path="appleApp/build/native-macos/pkg/Flare-native-macOS-$safe_ref.pkg"
+          productbuild --sign "$NATIVE_MACOS_INSTALLER_SIGNING_IDENTITY" --component "$app_path" /Applications "$pkg_path"
+      - name: Upload native macOS package
         if: startsWith(github.ref, 'refs/tags/')
         uses: actions/upload-artifact@v6
         with:
-          name: macOS-package
-          path: desktopApp/build/compose/binaries/main-release/pkg/*.pkg
-  
+          name: Native-macOS-package
+          path: appleApp/build/native-macos/pkg/*.pkg
+
   build-windows:
     runs-on: [windows-latest]
     timeout-minutes: 30
@@ -97,7 +191,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          distribution: 'jetbrains'
+          distribution: "jetbrains"
           java-version: 25
       # Run tests
       - name: Run Tests
@@ -198,7 +292,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          distribution: 'jetbrains'
+          distribution: "jetbrains"
           java-version: 25
       # Run tests
       - name: Run Tests

.github/workflows/ios.yml

@@ -43,12 +43,22 @@ jobs:
         run: xcodebuild -downloadPlatform iOS
       - name: Install XcodeGen
         run: brew install xcodegen
+      - name: Add Firebase config
+        env:
+          GOOGLE_SERVICE_INFO_PLIST_B64: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_B64 }}
+        run: |
+          if [ -n "${GOOGLE_SERVICE_INFO_PLIST_B64:-}" ]; then
+            mkdir -p appleApp/Firebase
+            printf '%s' "$GOOGLE_SERVICE_INFO_PLIST_B64" | base64 -D > appleApp/Firebase/GoogleService-Info.plist
+          else
+            echo "GOOGLE_SERVICE_INFO_PLIST_B64 is not set; Firebase config will not be bundled."
+          fi
       - name: Generate Xcode project
-        run: xcodegen generate --spec iosApp/project.yml
+        run: xcodegen generate --spec appleApp/project.yml
       - name: Build
-        working-directory: ./iosApp
+        working-directory: ./appleApp
         env:
-          scheme: Flare
+          scheme: iOS
           platform: ${{ 'iOS Simulator' }}
         run: |
           # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)

.gitignore

@@ -18,15 +18,15 @@ local.properties
 signing.properties
 
 build/
-iosApp/Podfile.lock
-iosApp/Pods/*
-iosApp/Flare.xcworkspace/*
-iosApp/Flare.xcodeproj/*
+*/Podfile.lock
+*/Pods/*
+*/Flare.xcworkspace/*
+*/Flare.xcodeproj/*
 shared/shared.podspec
 .kotlin
 .history
 .lh
-iosApp/K_D/
+appleApp/K_D/
 *.sh
 !.github/scripts/*.sh
 .env

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Flare uses [ktlint](https://github.com/pinterest/ktlint) to check the code style
 ### iOS
  - Make sure you have JDK 25 installed
  - Make sure you have a Mac with Xcode 26 installed
- - open `iosApp/Flare.xcodeproj` in Xcode
+ - open `appleApp/Flare.xcodeproj` in Xcode
  - Build and run the app
 
 ### Desktop
@@ -46,10 +46,10 @@ The project is split into theses parts:
  - `shared`: The common code, including bussiness logic.
  - `compose-ui`: The Compose UI code that shared between Android, iOS, Desktop.
  - `app`: The Android app.
- - `iosApp`: The iOS app.
+ - `appleApp`: The iOS and macOS apps.
  - `desktopApp`: The desktop app for Windows/macOS.  
 
-Most of the business logic is in `shared`, and the platform specific code and UI is in `app` and `iosApp`.
+Most of the business logic is in `shared`, and the platform specific code and UI is in `app` and `appleApp`.
 Flare uses [Kotlin Multiplatform](https://kotlinlang.org/docs/multiplatform.html) to share code between platforms, [Jetpack Compose](https://developer.android.com/jetpack/compose) for the UI on Android, [SwiftUI](https://developer.apple.com/xcode/swiftui/) for the UI on iOS.
 
 ### Business logic

README.md

@@ -55,9 +55,7 @@ Here're some features we're planning to implement in the future.
 ### iOS
  - Make sure you have JDK 25 installed
  - Make sure you have a Mac with Xcode 26 installed
- - Install XcodeGen with `brew install xcodegen`
- - Run `xcodegen generate --spec iosApp/project.yml`
- - open `iosApp/Flare.xcodeproj` in Xcode
+ - open `appleApp/Flare.xcodeproj` in Xcode
  - Build and run the app
 
 ### Desktop

app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt

@@ -53,6 +53,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -87,6 +88,7 @@ import dev.dimension.flare.ui.component.status.LazyStatusVerticalStaggeredGrid
 import dev.dimension.flare.ui.component.status.MediaItem
 import dev.dimension.flare.ui.component.status.StatusPlaceholder
 import dev.dimension.flare.ui.component.status.status
+import dev.dimension.flare.ui.model.ClickContext
 import dev.dimension.flare.ui.model.UiMedia
 import dev.dimension.flare.ui.model.UiRelation
 import dev.dimension.flare.ui.model.UiStrings
@@ -628,6 +630,7 @@ private fun ProfileMediaTab(
     modifier: Modifier = Modifier,
 ) {
     val isBigScreen = isBigScreen()
+    val uriHandler = LocalUriHandler.current
     CompositionLocalProvider(
         LocalTimelineAppearance provides
             LocalTimelineAppearance.current.copy(
@@ -672,16 +675,26 @@ private fun ProfileMediaTab(
                             .clickable {
                                 val content = item.status
                                 if (content is UiTimelineV2.Post) {
-                                    onItemClicked(
-                                        item.statusKey,
-                                        item.index,
-                                        when (media) {
-                                            is UiMedia.Image -> media.previewUrl
-                                            is UiMedia.Video -> media.thumbnailUrl
-                                            is UiMedia.Gif -> media.previewUrl
-                                            else -> null
-                                        },
-                                    )
+                                    when (content.mediaClickPolicy) {
+                                        UiTimelineV2.Post.MediaClickPolicy.OpenStatusMedia -> {
+                                            onItemClicked(
+                                                item.statusKey,
+                                                item.index,
+                                                when (media) {
+                                                    is UiMedia.Image -> media.previewUrl
+                                                    is UiMedia.Video -> media.thumbnailUrl
+                                                    is UiMedia.Gif -> media.previewUrl
+                                                    else -> null
+                                                },
+                                            )
+                                        }
+
+                                        UiTimelineV2.Post.MediaClickPolicy.OpenPostClickEvent -> {
+                                            content.onClicked.invoke(
+                                                ClickContext(launcher = uriHandler::openUri),
+                                            )
+                                        }
+                                    }
                                 }
                             },
                 )