Unify Showcase and ShowcaseFuse into a single project (#100)

* Unify Showcase and ShowcaseFuse into a single project

* Run two workflows for building in Lite and Fuse modes

* Update dependency layout

* Fix SkipSQL import

* Update SQLPlayground and fastlane metadata

* Rename SKIP_FUSE_MODE to SKIP_MODE_FUSE and continue unifying playgrounds

* Re-enable BlendModePlayground and ListPlayground

* Re-enable more playgrounds

* Update app metadata [skip ci]

* Remove unused screenshot [skip ci]

* Restore more Showcase playgrounds

* Add back LabeledContentPlayground

Author: marcprux

.github/workflows/skipapp.yml .github/workflows/showcase-fuse.yml.github/workflows/skipapp.yml renamed to .github/workflows/showcase-fuse.yml

@@ -1,10 +1,10 @@
-name: skipapp-showcase
+name: skipapp-showcase-fuse
 on:
   push:
     branches: [ main ]
     tags: "[0-9]+.[0-9]+.[0-9]+"
   schedule:
-    - cron: '30 16 * * *'
+    - cron: '30 2,6,10,14,18,22 * * *'
   workflow_dispatch:
   pull_request:
 
@@ -16,6 +16,8 @@ permissions:
 jobs:
   call-workflow:
     uses: skiptools/actions/.github/workflows/skip-app.yml@v1
+    with:
+      env: SKIP_MODE=fuse
     secrets:
       # These optional secrets enable the Android app to be signed
       KEYSTORE_JKS: ${{ secrets.KEYSTORE_JKS }}
@@ -28,4 +30,3 @@ jobs:
       APPLE_MOBILEPROVISION: ${{ secrets.APPLE_MOBILEPROVISION }}
       # This secret enables the iOS app to be uploaded to the App Store
       APPLE_APPSTORE_APIKEY: ${{ secrets.APPLE_APPSTORE_APIKEY }}
-

.github/workflows/showcase-lite.yml

@@ -0,0 +1,20 @@
+name: skipapp-showcase-lite
+on:
+  push:
+    branches: [ main ]
+    tags: "[0-9]+.[0-9]+.[0-9]+"
+  schedule:
+    - cron: '30 0,4,8,12,16,20 * * *'
+  workflow_dispatch:
+  pull_request:
+
+permissions:
+  contents: write
+  id-token: write
+  attestations: write
+
+jobs:
+  call-workflow:
+    uses: skiptools/actions/.github/workflows/skip-app.yml@v1
+    with:
+      env: SKIP_MODE=lite

Android/app/build.gradle.kts

@@ -33,6 +33,15 @@ android {
         // versionName = MARKETING_VERSION
     }
 
+    // Needed when packaging the Swift runtime .so files in Skip Fuse mode;
+    // harmless in Skip Lite mode.
+    packaging {
+        jniLibs {
+            keepDebugSymbols.add("**/*.so")
+            pickFirsts.add("**/*.so")
+        }
+    }
+
     buildFeatures {
         buildConfig = true
     }

Android/app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
     </queries>
 
     <application
-        android:label="${PRODUCT_NAME}"
+        android:label="Skip Showcase"
         android:name=".AndroidAppMain"
         android:allowBackup="true"
         android:supportsRtl="true"
@@ -68,7 +68,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="org.appfair.app.showcaselite" android:host="auth" />
+                <data android:scheme="org.appfair.app.showcase" android:host="auth" />
             </intent-filter>
         </activity>
 

Android/fastlane/metadata/android/en-US/full_description.txt

@@ -1,3 +1,27 @@
-This app demonstrates the output of the Skip transpiler, which takes an iOS SwiftUI app and converts into an Android Jetpack Compose app. 
+Skip Showcase is a comprehensive, interactive catalog of user interface components built with Skip, the cross-platform development tool that lets you write one app in Swift and SwiftUI and run it natively on both iOS and Android.
 
-This application shows the various components that are generated from the SwiftUI transpilation.
+This app is written entirely in Swift and SwiftUI. On iOS, it runs as a standard native SwiftUI app. On Android, the same Swift code is compiled natively using the official Swift SDK for Android, and Skip's SkipUI framework translates SwiftUI views into Jetpack Compose, producing a genuinely native Android experience.
+
+Skip Showcase is the ideal way to compare how SwiftUI components look and behave across both platforms. Every screen in the app is the same Swift source code running on both iOS and Android, so you can see exactly how Skip maps SwiftUI to native Android controls.
+
+The app covers a wide range of SwiftUI features, including:
+
+UI Controls: Button, Toggle, Slider, Stepper, Picker, DatePicker, TextField, SecureField, TextEditor, Menu, and more.
+
+Layout: Stack views (HStack, VStack, ZStack), Grid, Form, List, ScrollView, Spacer, GeometryReader, ViewThatFits, SafeArea, and Frame.
+
+Navigation: NavigationStack, TabView, Sheet, ConfirmationDialog, Alert, Toolbar, DisclosureGroup, and Link.
+
+Graphics and Effects: Shape, Gradient, Shadow, Blur, BlendMode, Mask, Overlay, Border, Animation, Transition, Transform, and Color effects.
+
+Data and State: @State, @Observable, @Environment, Preference keys, FocusState, ScenePhase, Storage, Timer, and Notification.
+
+Text and Media: Text styling, SF Symbols, Image, VideoPlayer, Lottie animations, and Localization.
+
+Platform Integration: Haptic feedback, Keyboard handling, Pasteboard, ShareLink, Searchable, WebView, Map, SQL database, Keychain, Document picker, and Web authentication.
+
+Custom Compose: Demonstrates how to embed custom Jetpack Compose views directly within SwiftUI code using Skip's ComposeView bridging.
+
+Skip Showcase is open source. Browse the source code at https://github.com/skiptools/skipapp-showcase-fuse to see how each component is implemented.
+
+Learn more about Skip at https://skip.dev

Android/fastlane/metadata/android/en-US/images/featureGraphic.png

@@ -1 +1 @@
-A catalog of widgets for Skip apps
+Interactive SwiftUI component catalog for iOS and Android, built with Skip

Android/fastlane/metadata/android/en-US/short_description.txt

@@ -34,7 +34,7 @@ MACOSX_DEPLOYMENT_TARGET = 14.0
 SUPPORTS_MACCATALYST = NO
 
 // iPhone + iPad
-// TARGETED_DEVICE_FAMILY = 1,2
+TARGETED_DEVICE_FAMILY = 1,2
 
 // iPhone only
 TARGETED_DEVICE_FAMILY = 1
@@ -60,9 +60,12 @@ CODE_SIGN_ENTITLEMENTS = Entitlements.plist
 
 PRODUCT_BUNDLE_IDENTIFIER[config=Release] = org.appfair.app.Showcase
 
-DEVELOPMENT_TEAM[config=Release] = 25KG25YA3R
-CODE_SIGN_IDENTITY[config=Release] = Apple Distribution: The App Fair Project Inc (25KG25YA3R)
-CODE_SIGN_STYLE[config=Release] = Manual
-PROVISIONING_PROFILE_SPECIFIER[config=Release] = org.appfair.app.Showcase
+DEVELOPMENT_TEAM = 25KG25YA3R
+
+CODE_SIGN_IDENTITY[config=Debug] = Apple Development
+CODE_SIGN_IDENTITY[config=Release] = Apple Distribution
 
+CODE_SIGN_STYLE[config=Debug] = Automatic
+CODE_SIGN_STYLE[config=Release] = Manual
 
+PROVISIONING_PROFILE_SPECIFIER[config=Release] = org.appfair.app.Showcase AppStore

Darwin/Showcase.xcconfig

@@ -8,8 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		490010192BACD83F0000DE33 /* protest_guerrilla.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 490010182BACD83F0000DE33 /* protest_guerrilla.ttf */; };
-		49231BAC2AC5BCEF00F98ADF /* ShowcaseApp in Frameworks */ = {isa = PBXBuildFile; productRef = 49231BAB2AC5BCEF00F98ADF /* ShowcaseApp */; };
-		49231BAD2AC5BCEF00F98ADF /* ShowcaseApp in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 49231BAB2AC5BCEF00F98ADF /* ShowcaseApp */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		49231BAC2AC5BCEF00F98ADF /* Showcase in Frameworks */ = {isa = PBXBuildFile; productRef = 49231BAB2AC5BCEF00F98ADF /* Showcase */; };
+		49231BAD2AC5BCEF00F98ADF /* Showcase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 49231BAB2AC5BCEF00F98ADF /* Showcase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		499CD43B2AC5B799001AE8D8 /* Main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49F90C2B2A52156200F06D93 /* Main.swift */; };
 		499CD4402AC5B799001AE8D8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 49F90C2F2A52156300F06D93 /* Assets.xcassets */; };
 		49DAAD422D2F51F60086DB92 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 49DAAD412D2F51F60086DB92 /* Localizable.xcstrings */; };
@@ -22,7 +22,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				49231BAD2AC5BCEF00F98ADF /* ShowcaseApp in Embed Frameworks */,
+				49231BAD2AC5BCEF00F98ADF /* Showcase in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -49,7 +49,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49231BAC2AC5BCEF00F98ADF /* ShowcaseApp in Frameworks */,
+				49231BAC2AC5BCEF00F98ADF /* Showcase in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -117,7 +117,7 @@
 			);
 			name = Showcase;
 			packageProductDependencies = (
-				49231BAB2AC5BCEF00F98ADF /* ShowcaseApp */,
+				49231BAB2AC5BCEF00F98ADF /* Showcase */,
 			);
 			productName = App;
 			productReference = 490A40BF2B37A3C300275405 /* Showcase.app */;
@@ -288,9 +288,9 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		49231BAB2AC5BCEF00F98ADF /* ShowcaseApp */ = {
+		49231BAB2AC5BCEF00F98ADF /* Showcase */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = ShowcaseApp;
+			productName = Showcase;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

Darwin/Showcase.xcodeproj/project.pbxproj

@@ -1 +1,19 @@
-The Skip Showcase app is a tour of the of the user interface of a dual-platform app built with Skip technology.
+Skip Showcase is a comprehensive, interactive catalog of user interface components built with Skip, the cross-platform development tool that lets you write one app in Swift and SwiftUI and run it natively on all mobile platforms.
+
+This app is written entirely in Swift and SwiftUI. On iOS, it runs as a standard native SwiftUI app. On other platforms, the same Swift code is compiled natively using the official Swift SDK for other platforms, and Skip's SkipUI framework translates SwiftUI views into Jetpack Compose, producing a genuinely native experience.
+
+Skip Showcase is the ideal way to compare how SwiftUI components look and behave across both platforms. Install the app on both devices to see exactly how Skip maps SwiftUI to native controls elsewhere, using the same Swift source code on both platforms.
+
+The app covers a wide range of SwiftUI features, including:
+
+- UI Controls: Button, Toggle, Slider, Stepper, Picker, DatePicker, TextField, SecureField, TextEditor, Menu, and more
+- Layout: Stacks, Grid, Form, List, ScrollView, GeometryReader, ViewThatFits, SafeArea, and Frame
+- Navigation: NavigationStack, TabView, Sheet, ConfirmationDialog, Alert, Toolbar, and Link
+- Graphics: Shape, Gradient, Shadow, Blur, BlendMode, Mask, Animation, Transition, and Color effects
+- State Management: @State, @Observable, @Environment, Preference keys, FocusState, and Timer
+- Text and Media: Text styling, SF Symbols, Image, VideoPlayer, Lottie animations, and Localization
+- Platform Integration: Haptic feedback, Pasteboard, ShareLink, Searchable, WebView, Map, SQL, and Keychain
+
+Skip Showcase is open source. Browse the source code at https://github.com/skiptools/skipapp-showcase-fuse to see how each component is implemented.
+
+Learn more about Skip at https://skip.dev