Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions .github/workflows/scripts-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,39 @@ jobs:
run: ./scripts/build-ios-port.sh -q -DskipTests
timeout-minutes: 25

- name: Build sample iOS app and compile workspace
- name: Build sample iOS app and compile workspace (UIScene on)
id: build-ios-app-scene
env:
IOS_UISCENE: "true"
run: ./scripts/build-ios-app.sh -q -DskipTests
timeout-minutes: 30

- name: Run iOS UI screenshot tests (UIScene on)
env:
ARTIFACTS_DIR: ${{ github.workspace }}/artifacts/ios-ui-tests-scene-true
run: |
set -euo pipefail
mkdir -p "${ARTIFACTS_DIR}"

echo "workspace='${{ steps.build-ios-app-scene.outputs.workspace }}'"
echo "scheme='${{ steps.build-ios-app-scene.outputs.scheme }}'"

./scripts/run-ios-ui-tests.sh \
"${{ steps.build-ios-app-scene.outputs.workspace }}" \
"" \
"${{ steps.build-ios-app-scene.outputs.scheme }}"
timeout-minutes: 30

- name: Build sample iOS app and compile workspace (UIScene off)
id: build-ios-app
env:
IOS_UISCENE: "false"
run: ./scripts/build-ios-app.sh -q -DskipTests
timeout-minutes: 30

- name: Run iOS UI screenshot tests
- name: Run iOS UI screenshot tests (UIScene off)
env:
ARTIFACTS_DIR: ${{ github.workspace }}/artifacts
ARTIFACTS_DIR: ${{ github.workspace }}/artifacts/ios-ui-tests-scene-false
run: |
set -euo pipefail
mkdir -p "${ARTIFACTS_DIR}"
Expand Down
16 changes: 16 additions & 0 deletions Ports/iOSPort/nativeSources/CodenameOne_GLAppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
* need additional information or have any questions.
*/
#import <UIKit/UIKit.h>
#ifdef CN1_USE_UI_SCENE
#import <UIKit/UIScene.h>
#endif
//#define CN1_INCLUDE_NOTIFICATIONS
#ifdef CN1_INCLUDE_NOTIFICATIONS
#import <UserNotifications/UserNotifications.h>
Expand All @@ -40,4 +43,17 @@

@property (nonatomic, retain) IBOutlet CodenameOne_GLViewController *viewController;

#ifdef CN1_USE_UI_SCENE
- (void)cn1InstallRootViewControllerIntoWindow:(UIWindow *)window;
- (void)cn1ApplicationWillResignActive;
- (void)cn1ApplicationDidEnterBackground;
- (void)cn1ApplicationWillEnterForeground;
- (void)cn1ApplicationDidBecomeActive;
- (BOOL)cn1ContinueUserActivity:(NSUserActivity *)userActivity;
- (BOOL)cn1OpenURL:(UIApplication *)application
url:(NSURL *)url
sourceApplication:(NSString *)sourceApplication
annotation:(id)annotation;
#endif

@end
Loading
Loading