macOS and iOS upload to App Store (#168)

.github/workflows/publish-app.yml

@@ -74,3 +74,110 @@
             if:  github.event_name != 'workflow_dispatch' || github.event.inputs.publish_track == ''
             run: fastlane production
             working-directory: "./chameleonultragui/"
+      build-macos:
+        runs-on: macos-latest
+        env:
+            APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+            APP_STORE_CONNECT_KEY_IDENTIFIER: ${{ secrets.APP_STORE_CONNECT_KEY_IDENTIFIER }}
+        steps:
+          - uses: actions/checkout@v3
+            with:
+              fetch-depth: 100
+          - uses: subosito/flutter-action@v2
+            with:
+              flutter-version: '3.10.6' # https://github.com/flutter/flutter/issues/132725
+              channel: 'any'
+          - name: Enable macOS
+            run: flutter config --enable-macos-desktop
+          - name: Install tools
+            run: brew install automake libtool create-dmg
+          - name: Install Codemagic
+            run: pip3 install codemagic-cli-tools
+          - name: Export private key
+            uses: mobiledevops/secret-to-file-action@v1
+            with:
+              base64-encoded-secret: ${{ secrets.APP_STORE_CONNECT_PRIVATE_KEY }}
+              filename: "AuthKey.p8"
+              working-directory: "./chameleonultragui"
+          - name: Export certificate
+            uses: mobiledevops/secret-to-file-action@v1
+            with:
+              base64-encoded-secret: ${{ secrets.APP_STORE_CERTIFICATE }}
+              filename: "cert_key"
+              working-directory: "./chameleonultragui"
+          - name: Build and upload executable
+            working-directory: "./chameleonultragui"
+            run: |
+              export APP_STORE_CONNECT_PRIVATE_KEY=`cat AuthKey.p8`
+              app-store-connect fetch-signing-files run.chameleon.gui --platform MAC_OS  --type MAC_APP_STORE --certificate-key=@file:cert_key --create
+              app-store-connect list-certificates --type MAC_INSTALLER_DISTRIBUTION --certificate-key=@file:cert_key --save
+              keychain initialize
+              keychain add-certificates
+              xcode-project use-profiles
+              flutter build macos --release --build-number ${{ github.run_number }} --build-name "1.0.${{ github.run_number }}"
+              APP_NAME=$(find $(pwd) -name "*.app")
+              PACKAGE_NAME=$(basename "$APP_NAME" .app).pkg
+              xcrun productbuild --component "$APP_NAME" /Applications/ unsigned.pkg
+              INSTALLER_CERT_NAME=$(keychain list-certificates \
+                        | jq '[.[]
+                          | select(.common_name
+                          | contains("Mac Developer Installer"))
+                          | .common_name][0]' \
+                        | xargs)
+              xcrun productsign --sign "$INSTALLER_CERT_NAME" unsigned.pkg "$PACKAGE_NAME"
+              rm -f unsigned.pkg
+              app-store-connect publish --path "$PACKAGE_NAME"
+              while [[ -z "$BUILD_ID" ]]; do
+                  BUILD_ID=$(app-store-connect list-builds --build-version-number ${{ github.run_number }} --processing-state VALID | grep -B 7 "Min os version: 10.14" | awk '/^Id:/ {print $2}')
+                  if [[ -z "$BUILD_ID" ]]; then
+                      echo "Build is not ready, retrying in 5 seconds..."
+                      sleep 5
+                  fi
+              done
+              app-store-connect builds submit-to-app-store --cancel-previous-submissions --platform=MAC_OS --version-string="1.0.${{ github.run_number }}" --whats-new="Compiled from `git log --pretty=format:%s --oneline --ancestry-path HEAD~1..HEAD`" --version-string="1.0.${{ github.run_number }}" $BUILD_ID || true
+      build-ios:
+        runs-on: macos-latest
+        env:
+            APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+            APP_STORE_CONNECT_KEY_IDENTIFIER: ${{ secrets.APP_STORE_CONNECT_KEY_IDENTIFIER }}
+        steps:
+          - uses: actions/checkout@v3
+            with:
+              fetch-depth: 100
+          - uses: subosito/flutter-action@v2
+            with:
+              channel: 'stable'
+          - name: Install tools
+            run: brew install automake libtool create-dmg
+          - name: Install Codemagic
+            run: pip3 install codemagic-cli-tools
+          - name: Export private key
+            uses: mobiledevops/secret-to-file-action@v1
+            with:
+              base64-encoded-secret: ${{ secrets.APP_STORE_CONNECT_PRIVATE_KEY }}
+              filename: "AuthKey.p8"
+              working-directory: "./chameleonultragui"
+          - name: Export certificate
+            uses: mobiledevops/secret-to-file-action@v1
+            with:
+              base64-encoded-secret: ${{ secrets.APP_STORE_CERTIFICATE }}
+              filename: "cert_key"
+              working-directory: "./chameleonultragui"
+          - name: Build and upload executable
+            working-directory: "./chameleonultragui"
+            run: |
+              export APP_STORE_CONNECT_PRIVATE_KEY=`cat AuthKey.p8`
+              app-store-connect fetch-signing-files $(xcode-project detect-bundle-id) --platform IOS --type IOS_APP_STORE --certificate-key=@file:cert_key --create
+              keychain initialize
+              keychain add-certificates
+              xcode-project use-profiles
+              flutter build ipa --release --export-options-plist=$HOME/export_options.plist --build-number ${{ github.run_number }} --build-name "1.0.${{ github.run_number }}"
+              app-store-connect publish --path $(find $(pwd) -name "*.ipa")
+              while [[ -z "$BUILD_ID" ]]; do
+                  BUILD_ID=$(app-store-connect list-builds --build-version-number ${{ github.run_number }} --processing-state VALID | grep -B 7 "Min os version: 11.0" | awk '/^Id:/ {print $2}')
+                  if [[ -z "$BUILD_ID" ]]; then
+                      echo "Build is not ready, retrying in 30 seconds..."
+                      sleep 30
+                  fi
+              done
+              app-store-connect builds submit-to-app-store --cancel-previous-submissions --platform=IOS --version-string="1.0.${{ github.run_number }}" --whats-new="Compiled from `git log --pretty=format:%s --oneline --ancestry-path HEAD~1..HEAD`" --version-string="1.0.${{ github.run_number }}" $BUILD_ID || true

README.md

@@ -1,7 +1,7 @@
 # Chameleon Ultra GUI
 A GUI for the Chameleon Ultra/Chameleon Lite written in Flutter for cross platform operation
 
-[![Autobuild](https://github.com/GameTec-live/ChameleonUltraGUI/actions/workflows/buildapp.yml/badge.svg)](https://github.com/GameTec-live/ChameleonUltraGUI/actions/workflows/buildapp.yml) 
+[![Auto build](https://github.com/GameTec-live/ChameleonUltraGUI/actions/workflows/buildapp.yml/badge.svg)](https://github.com/GameTec-live/ChameleonUltraGUI/actions/workflows/buildapp.yml) 
 [![Open collective](https://opencollective.com/chameleon-ultra-gui/tiers/badge.svg)](https://opencollective.com/chameleon-ultra-gui#support)
 
 ## Installation
@@ -10,7 +10,7 @@ You can download the latest builds from GitHub Actions [here](https://github.com
 App available in those stores:
 - Google Play: https://play.google.com/store/apps/details?id=io.chameleon.ultra
 - F-Store: not yet
-- App Store: not yet
+- App Store: https://apps.apple.com/app/chameleon-ultra-gui/id6462919364 (macOS only)
 - Arch Linux (AUR): not yet
 - Flathub: not yet
 - Chocolatey (Windows): not yet
@@ -47,15 +47,6 @@ If you want to collaborate by adding your language to the application, you can d
 ![Read Card Page](/screenshots/7.png)
 ![Read Card Page Mifare Classic](/screenshots/8.png)
 
-<details>
-  <summary>Mac and IOS</summary>
-
-  ### Mac and IOS
-  Why are there no macOS and iOS builds?
-
-  We are pending Proxgrid permission to use Chameleon Ultra name to complete app review in App Store. This might take ~1 week, we hope apps will be published at start of September.
-</details>
-
 ## Donate
 You want to support us and donate? Thank you, you make it possible for us to keep this app free and make it easier to publish this app on the Apple App Store.
 

chameleonultragui/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.chameleonultragui">
+    package="io.chameleon.gui">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

chameleonultragui/ios/Runner.xcodeproj/project.pbxproj

@@ -356,16 +356,19 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = P2523ZA3C9;
+				DEVELOPMENT_TEAM = 3C55G8H34S;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "CU GUI";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.chumleon.internal.chameleonultragui;
+				PRODUCT_BUNDLE_IDENTIFIER = run.chameleon.gui;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -485,16 +488,19 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = P2523ZA3C9;
+				DEVELOPMENT_TEAM = 3C55G8H34S;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "CU GUI";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.chumleon.internal.chameleonultragui;
+				PRODUCT_BUNDLE_IDENTIFIER = run.chameleon.gui;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -508,16 +514,19 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = P2523ZA3C9;
+				DEVELOPMENT_TEAM = 3C55G8H34S;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "CU GUI";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.chumleon.internal.chameleonultragui;
+				PRODUCT_BUNDLE_IDENTIFIER = run.chameleon.gui;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

chameleonultragui/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "logo 2.png",
       "idiom" : "universal",
-      "filename" : "LaunchImage.png",
       "scale" : "1x"
     },
     {
+      "filename" : "logo.png",
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
+      "filename" : "logo 1.png",
       "idiom" : "universal",
-      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

chameleonultragui/ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,9 +16,11 @@
                         <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                                <rect key="frame" x="-380" y="-38" width="1080.333333333333" height="1080"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -28,10 +32,10 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="80.916030534351137" y="264.08450704225356"/>
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="1080" height="1080"/>
     </resources>
 </document>

chameleonultragui/ios/Runner/Info.plist

@@ -24,36 +24,38 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>Need BLE permission</string>
+	<string>Need BLE permission to connect to Chameleon</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Need BLE permission</string>
+	<string>Need BLE permission to connect to Chameleon</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>Need Location permission</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Need Location permission</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Need Location permission</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Need Photo Library access</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+	<key>UIStatusBarStyle</key>
+	<string></string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
-		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>

chameleonultragui/linux/CMakeLists.txt

@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "chameleonultragui")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.chameleonultragui")
+set(APPLICATION_ID "run.chameleon.gui")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.

chameleonultragui/macos/Runner/Configs/AppInfo.xcconfig

@@ -8,7 +8,7 @@
 PRODUCT_NAME = Chameleon Ultra GUI
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.chameleonultragui
+PRODUCT_BUNDLE_IDENTIFIER = run.chameleon.gui
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2023 Chameleon Development. All rights reserved.

chameleonultragui/macos/Runner/Info.plist

@@ -28,5 +28,9 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 </dict>
 </plist>

chameleonultragui/windows/runner/Runner.rc

@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.example" "\0"
-            VALUE "FileDescription", "chameleonultragui" "\0"
+            VALUE "CompanyName", "Chameleon Development" "\0"
+            VALUE "FileDescription", "Chameleon Ultra GUI app" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "chameleonultragui" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2023 Chameleon Development. All rights reserved." "\0"
             VALUE "OriginalFilename", "chameleonultragui.exe" "\0"
             VALUE "ProductName", "chameleonultragui" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"