Fixed ViewOnClickListener

Author: colemancda

Demo/app/src/main/java/com/pureswift/swiftandroid/ViewOnClickListener.kt

@@ -2,7 +2,7 @@ package com.pureswift.swiftandroid
 
 import android.view.View
 
-class ViewOnClickListener(val id: String): View.OnClickListener {
+class ViewOnClickListener(val action: SwiftObject): View.OnClickListener {
 
     external override fun onClick(view: View)
 }

Sources/AndroidSwiftUI/AndroidButton.swift

@@ -109,10 +109,7 @@ extension AndroidButton {
         let view = AndroidWidget.Button(context)
         updateView(view)
         // set on click listener
-        let id = UUID().uuidString
-        let listener = ViewOnClickListener(id: id)
-        assert(listener.getId() == id)
-        listener.action = self.action
+        let listener = ViewOnClickListener(action: action)
         view.setClickable(true)
         view.setOnClickListener(listener.as(AndroidView.View.OnClickListener.self))
         return view

Sources/AndroidSwiftUI/AndroidImageButton.swift

@@ -49,16 +49,15 @@ extension AndroidImageButton {
     func createView(context: AndroidContent.Context) -> AndroidWidget.ImageButton {
         let view = AndroidWidget.ImageButton(context)
         updateView(view)
+        // set on click listener
+        let listener = ViewOnClickListener(action: action)
+        view.setClickable(true)
+        view.setOnClickListener(listener.as(AndroidView.View.OnClickListener.self))
         return view
     }
 
     func updateView(_ view: AndroidWidget.ImageButton) {
         // update label
         self.label.updateImageView(view)
-        // set on click listener
-        let listener = ViewOnClickListener()
-        listener.action = self.action
-        view.setClickable(true)
-        view.setOnClickListener(listener.as(AndroidView.View.OnClickListener.self))
     }
 }

Sources/AndroidSwiftUI/OnClickListener.swift

@@ -10,50 +10,38 @@ import AndroidKit
 
 @JavaClass("com.pureswift.swiftandroid.ViewOnClickListener", extends: AndroidView.View.OnClickListener.self)
 open class ViewOnClickListener: JavaObject {
-        
-    @JavaMethod
-    @_nonoverride public convenience init(id: String, environment: JNIEnvironment? = nil)
+    
+    public typealias Action = () -> ()
 
     @JavaMethod
-    func getId() -> String
+    @_nonoverride public convenience init(action: SwiftObject?, environment: JNIEnvironment? = nil)
 
-    deinit {
-        log("\(self).\(#function) ID \(getId())")
-    }
+    @JavaMethod
+    public func getAction() -> SwiftObject?
 }
 
 @JavaImplementation("com.pureswift.swiftandroid.ViewOnClickListener")
 extension ViewOnClickListener {
 
     @JavaMethod
     func onClick() {
-        log("\(self).\(#function) ID \(getId())")
+        log("\(self).\(#function)")
         // drain queue
         RunLoop.main.run(until: Date() + 0.01)
-        // get action
-        guard let action else {
-            logError("\(self).\(#function): No Action Configured")
-            return
-        }
-        Task {
-            await MainActor.run {
-                action()
-                log("\(self).\(#function) ID \(getId()) Executed")
-            }
-        }
+        action()
+        RunLoop.main.run(until: Date() + 0.01)
     }
 }
 
 public extension ViewOnClickListener {
 
-    static private(set) var actions: [String: (() -> ())] = [:]
-    
-    var action: (() -> ())? {
-        get {
-            Self.actions[getId()]
-        } set {
-            Self.actions[getId()] = newValue
-        }
+    convenience init(action: @escaping () -> (), environment: JNIEnvironment? = nil) {
+        let object = SwiftObject(action, environment: environment)
+        self.init(action: object, environment: environment)
+    }
+        
+    var action: (() -> ()) {
+        getAction()!.valueObject().value as! Action
     }
 }
 
@@ -64,7 +52,6 @@ extension ViewOnClickListener {
     static let log = try! JavaClass<AndroidUtil.Log>()
 
     func log(_ string: String) {
-        
         _ = Self.log.d(Self.logTag, string)
     }