From 79014a81d5e782a6a311e845e71addf51b82e7ca Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Fri, 26 Jun 2020 15:14:56 +0200
Subject: [PATCH] app/internal/window: [iOS] move logic out of GioAppDelegate

We'd like to remove GioAppDelegate when Gio is embedded with
gogio's -buildmode=archive. Minimize the code in GioAppDelegate.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 app/internal/window/os_ios.go      |  5 +++
 app/internal/window/os_ios.m       | 63 +++++++++++++++++-------------
 app/internal/window/runmain_ios.go | 12 ------
 3 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 app/internal/window/runmain_ios.go

diff --git a/app/internal/window/os_ios.go b/app/internal/window/os_ios.go
index 67bcdde1..1865454d 100644
--- a/app/internal/window/os_ios.go
+++ b/app/internal/window/os_ios.go
@@ -309,3 +309,8 @@ func NewWindow(win Callbacks, opts *Options) error {
 
 func Main() {
 }
+
+//export gio_runMain
+func gio_runMain() {
+	runMain()
+}
diff --git a/app/internal/window/os_ios.m b/app/internal/window/os_ios.m
index f25f8a65..93f36e62 100644
--- a/app/internal/window/os_ios.m
+++ b/app/internal/window/os_ios.m
@@ -13,45 +13,32 @@
 
 @interface GioViewController : UIViewController
 @property(weak) UIScreen *screen;
+
++ (UIWindow *)createWindow;
 @end
 
 @implementation GioAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-	gio_runMain();
-
-	self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-	GioViewController *controller = [[GioViewController alloc] initWithNibName:nil bundle:nil];
-	controller.screen = self.window.screen;
-    self.window.rootViewController = controller;
-    [self.window makeKeyAndVisible];
+	self.window = [GioViewController createWindow];
+	[self.window makeKeyAndVisible];
 	return YES;
 }
-
-- (void)applicationWillResignActive:(UIApplication *)application {
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application {
-	GioViewController *vc = (GioViewController *)self.window.rootViewController;
-	UIView *drawView = vc.view.subviews[0];
-	if (drawView != nil) {
-		onStop((__bridge CFTypeRef)drawView);
-	}
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application {
-	GioViewController *c = (GioViewController*)self.window.rootViewController;
-	UIView *drawView = c.view.subviews[0];
-	if (drawView != nil) {
-		CFTypeRef viewRef = (__bridge CFTypeRef)drawView;
-		gio_onDraw(viewRef);
-	}
-}
 @end
 
 @implementation GioViewController
 CGFloat _keyboardHeight;
 
++ (UIWindow *)createWindow {
+	UIWindow *window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+	GioViewController *controller = [[self alloc] initWithNibName:nil bundle:nil];
+	controller.screen = window.screen;
+	window.rootViewController = controller;
+	return window;
+}
+
 - (void)loadView {
+	gio_runMain();
+
 	CGRect zeroFrame = CGRectMake(0, 0, 0, 0);
 	self.view = [[UIView alloc] initWithFrame:zeroFrame];
 	self.view.layoutMargins = UIEdgeInsetsMake(0, 0, 0, 0);
@@ -76,6 +63,28 @@ CGFloat _keyboardHeight;
 											 selector:@selector(keyboardWillHide:)
 												 name:UIKeyboardWillHideNotification
 											   object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver: self
+											 selector: @selector(applicationDidEnterBackground:)
+												 name: UIApplicationDidEnterBackgroundNotification
+											   object: nil];
+	[[NSNotificationCenter defaultCenter] addObserver: self
+											 selector: @selector(applicationWillEnterForeground:)
+												 name: UIApplicationWillEnterForegroundNotification
+											   object: nil];
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+	UIView *drawView = self.view.subviews[0];
+	if (drawView != nil) {
+		gio_onDraw((__bridge CFTypeRef)drawView);
+	}
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+	UIView *drawView = self.view.subviews[0];
+	if (drawView != nil) {
+		onStop((__bridge CFTypeRef)drawView);
+	}
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
diff --git a/app/internal/window/runmain_ios.go b/app/internal/window/runmain_ios.go
deleted file mode 100644
index 461c6977..00000000
--- a/app/internal/window/runmain_ios.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Unlicense OR MIT
-
-// +build darwin,ios
-
-package window
-
-import "C"
-
-//export gio_runMain
-func gio_runMain() {
-	runMain()
-}