Added support to show/hide screen keyboard. Refactored [SkikoUIViewController]. (#455)

samples/SkiaMultiplatformSample/src/iosMain/kotlin/org/jetbrains/skiko/sample/App.ios.kt

@@ -6,6 +6,7 @@ import org.jetbrains.skiko.GenericSkikoView
 import org.jetbrains.skiko.SkiaLayer
 import org.jetbrains.skiko.SkikoView
 import org.jetbrains.skiko.SkikoViewController
+import org.jetbrains.skiko.SkikoUIView
 import org.jetbrains.skiko.SkikoGestureEventKind
 import platform.UIKit.*
 import platform.Foundation.*
@@ -37,13 +38,13 @@ class SkikoAppDelegate : UIResponder, UIApplicationDelegateProtocol {
 
     override fun application(application: UIApplication, didFinishLaunchingWithOptions: Map<Any?, *>?): Boolean {
         window = UIWindow(frame = UIScreen.mainScreen.bounds)
-        window!!.rootViewController = SkikoViewController(SkikoGestureEventKind.values()).apply {
-            setAppFactory { layer ->
-                GenericSkikoView(layer, makeApp(layer)).also {
-                    layer.skikoView = it
+        window!!.rootViewController = SkikoViewController(
+            SkikoUIView(
+                SkiaLayer(SkikoGestureEventKind.values()).apply {
+                    skikoView = GenericSkikoView(this, makeApp(this))
                 }
-            }
-        }
+            )
+        )
         window!!.makeKeyAndVisible()
         return true
     }

skiko/src/iosMain/kotlin/org/jetbrains/skiko/SkiaLayer.ios.kt

@@ -24,6 +24,16 @@ actual open class SkiaLayer {
         return true
     }
 
+    fun showScreenKeyboard() {
+        view?.becomeFirstResponder()
+    }
+
+    fun hideScreenKeyboard() { view?.resignFirstResponder() }
+
+    fun isScreenKeyboardOpen(): Boolean {
+        return if (view == null) false else view!!.isFirstResponder
+    }
+
     actual var renderApi: GraphicsApi
         get() = GraphicsApi.METAL
         set(value) { throw UnsupportedOperationException() }

skiko/src/iosMain/kotlin/org/jetbrains/skiko/SkikoViewController.kt

 package org.jetbrains.skiko
 
+import kotlinx.cinterop.CValue
 import kotlinx.cinterop.ExportObjCClass
 import kotlinx.cinterop.useContents
+import platform.CoreGraphics.CGRect
 import platform.CoreGraphics.CGRectMake
 import platform.Foundation.NSCoder
 import platform.UIKit.UIEvent
 import platform.UIKit.UITouch
 import platform.UIKit.UIScreen
+import platform.UIKit.UIView
 import platform.UIKit.UIViewController
 import platform.UIKit.setFrame
 import platform.UIKit.contentScaleFactor
@@ -15,22 +18,63 @@ import platform.UIKit.UIPress
 import platform.UIKit.UIPressesEvent
 
 @ExportObjCClass
-class SkikoViewController : UIViewController, UIKeyInputProtocol {
-    private var gestures: Array<SkikoGestureEventKind>? = null
-
+class SkikoViewController : UIViewController {
     @OverrideInit
     constructor() : super(nibName = null, bundle = null)
+    @OverrideInit
+    constructor(coder: NSCoder) : super(coder)
+
+    constructor(skikoUIView: SkikoUIView) : this() {
+        this.skikoUIView = skikoUIView
+    }
+
+    private var skikoUIView: SkikoUIView? = null
+
+    override fun loadView() {
+        if (skikoUIView == null) {
+            super.loadView()
+        } else {
+            this.view = skikoUIView!!.load()
+        }
+    }
+
+    // viewDidUnload() is deprecated and not called.
+    override fun viewDidDisappear(animated: Boolean) {
+        skikoUIView?.detach()
+    }
+}
 
+@ExportObjCClass
+class SkikoUIView : UIView, UIKeyInputProtocol {
+    @OverrideInit
+    constructor(frame: CValue<CGRect>) : super(frame)
     @OverrideInit
     constructor(coder: NSCoder) : super(coder)
 
-    constructor(gestures: Array<SkikoGestureEventKind>? = null) : this() {
-        this.gestures = gestures
+    private var skiaLayer: SkiaLayer? = null
+
+    constructor(skiaLayer: SkiaLayer, frame: CValue<CGRect> = CGRectMake(0.0, 0.0, 1.0, 1.0)) : super(frame) {
+        this.skiaLayer = skiaLayer
     }
 
-    override fun canBecomeFirstResponder() = true
+    fun detach() = skiaLayer?.detach()
+
+    fun load(): SkikoUIView {
+        val (width, height) = UIScreen.mainScreen.bounds.useContents {
+            this.size.width to this.size.height
+        }
+        setFrame(CGRectMake(0.0, 0.0, width, height))
+        contentScaleFactor = UIScreen.mainScreen.scale
+        skiaLayer?.attachTo(this)
+
+        return this
+    }
+
+    fun showScreenKeyboard() = becomeFirstResponder()
+    fun hideScreenKeyboard() = resignFirstResponder()
+    fun isScreenKeyboardOpen() = isFirstResponder
 
-    private var keyEvent: UIPress? = null
+    var keyEvent: UIPress? = null
     private var inputText: String = ""
     override fun hasText(): Boolean {
         return inputText.length > 0
@@ -38,18 +82,20 @@ class SkikoViewController : UIViewController, UIKeyInputProtocol {
 
     override fun insertText(theText: String) {
         inputText += theText
-        skikoLayer.skikoView?.onInputEvent(toSkikoTypeEvent(theText, keyEvent))
+        skiaLayer?.skikoView?.onInputEvent(toSkikoTypeEvent(theText, keyEvent))
     }
 
     override fun deleteBackward() {
         inputText = inputText.dropLast(1)
     }
 
+    override fun canBecomeFirstResponder() = true
+
     override fun pressesBegan(presses: Set<*>, withEvent: UIPressesEvent?) {
         if (withEvent != null) {
             for (press in withEvent.allPresses) {
                 keyEvent = press as UIPress
-                skikoLayer.skikoView?.onKeyboardEvent(
+                skiaLayer?.skikoView?.onKeyboardEvent(
                     toSkikoKeyboardEvent(press, SkikoKeyboardEventKind.DOWN)
                 )
             }
@@ -61,7 +107,7 @@ class SkikoViewController : UIViewController, UIKeyInputProtocol {
         if (withEvent != null) {
             for (press in withEvent.allPresses) {
                 keyEvent = press as UIPress
-                skikoLayer.skikoView?.onKeyboardEvent(
+                skiaLayer?.skikoView?.onKeyboardEvent(
                     toSkikoKeyboardEvent(press, SkikoKeyboardEventKind.UP)
                 )
             }
@@ -80,7 +126,7 @@ class SkikoViewController : UIViewController, UIKeyInputProtocol {
                 SkikoTouchEvent(x, y, SkikoTouchEventKind.STARTED, timestamp, event)
             )
         }
-        skikoLayer.skikoView?.onTouchEvent(events.toTypedArray())
+        skiaLayer?.skikoView?.onTouchEvent(events.toTypedArray())
     }
 
     override fun touchesEnded(touches: Set<*>, withEvent: UIEvent?) {
@@ -94,7 +140,7 @@ class SkikoViewController : UIViewController, UIKeyInputProtocol {
                 SkikoTouchEvent(x, y, SkikoTouchEventKind.ENDED, timestamp, event)
             )
         }
-        skikoLayer.skikoView?.onTouchEvent(events.toTypedArray())
+        skiaLayer?.skikoView?.onTouchEvent(events.toTypedArray())
     }
 
     override fun touchesMoved(touches: Set<*>, withEvent: UIEvent?) {
@@ -108,7 +154,7 @@ class SkikoViewController : UIViewController, UIKeyInputProtocol {
                 SkikoTouchEvent(x, y, SkikoTouchEventKind.MOVED, timestamp, event)
             )
         }
-        skikoLayer.skikoView?.onTouchEvent(events.toTypedArray())
+        skiaLayer?.skikoView?.onTouchEvent(events.toTypedArray())
     }
 
     override fun touchesCancelled(touches: Set<*>, withEvent: UIEvent?) {
@@ -122,31 +168,6 @@ class SkikoViewController : UIViewController, UIKeyInputProtocol {
                 SkikoTouchEvent(x, y, SkikoTouchEventKind.CANCELLED, timestamp, event)
             )
         }
-        skikoLayer.skikoView?.onTouchEvent(events.toTypedArray())
-    }
-
-    internal lateinit var appFactory: (SkiaLayer) -> SkikoView
-    fun setAppFactory(appFactory: (SkiaLayer) -> SkikoView) {
-        this.appFactory = appFactory
-    }
-
-    private lateinit var skikoLayer: SkiaLayer
-    override fun viewDidLoad() {
-        super.viewDidLoad()
-
-        val (width, height) = UIScreen.mainScreen.bounds.useContents {
-            this.size.width to this.size.height
-        }
-        skikoLayer = SkiaLayer(gestures).apply {
-            skikoView = appFactory(this)
-        }
-        view.contentScaleFactor = UIScreen.mainScreen.scale
-        view.setFrame(CGRectMake(0.0, 0.0, width, height))
-        skikoLayer.attachTo(this.view)
-    }
-
-    // viewDidUnload() is deprecated and not called.
-    override fun viewDidDisappear(animated: Boolean) {
-        skikoLayer.detach()
+        skiaLayer?.skikoView?.onTouchEvent(events.toTypedArray())
     }
 }