Update RecyclerViewAdapter

Author: colemancda

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

@@ -8,13 +8,17 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 class RecyclerViewAdapter(val swiftObject: SwiftObject) :
     RecyclerView.Adapter<ViewHolder>() {
 
-    class ViewHolder(val view: View, val swiftObject: SwiftObject) : RecyclerView.ViewHolder(view) {
+    class ViewHolder(view: View, val swiftObject: SwiftObject) : RecyclerView.ViewHolder(view) {
 
     }
 
     // Create new views (invoked by the layout manager)
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerViewAdapter.ViewHolder {
-        return onCreateViewHolderSwift(parent, viewType)
+        val viewHolder = onCreateViewHolderSwift(parent, viewType)
+        check(viewHolder.itemView != null) {
+            ("ViewHolder.itemView == nil")
+        }
+        return viewHolder
     }
 
     external fun onCreateViewHolderSwift(parent: ViewGroup, viewType: Int): RecyclerViewAdapter.ViewHolder

Demo/app/src/main/swift/RecyclerView.swift

@@ -21,44 +21,82 @@ open class RecyclerViewAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder> {
 extension RecyclerViewAdapter {
 
     @JavaMethod
-    public func onCreateViewHolderSwift(_ viewGroup: ViewGroup?, _ viewType: Int32) -> RecyclerView.ViewHolder! {
-        callback.onCreateViewHolder(viewGroup, viewType)
+    public func onCreateViewHolderSwift(_ viewGroup: ViewGroup?, _ viewType: Int32) -> RecyclerView.ViewHolder? {
+        log("\(self).\(#function) \(viewType)")
+        return callback.onCreateViewHolder?(viewGroup!, viewType)
     }
 
     @JavaMethod
     public func onBindViewHolderSwift(_ viewHolder: RecyclerView.ViewHolder?, _ position: Int32) {
-        callback.onBindViewHolder(viewHolder, position)
+        log("\(self).\(#function) \(position)")
+        callback.onBindViewHolder?(viewHolder!, position)
     }
 
     @JavaMethod
     public func getItemCountSwift() -> Int32 {
-        callback.getItemCount()
+        log("\(self).\(#function)")
+        return callback.getItemCount()
+    }
+}
+
+extension RecyclerViewAdapter {
+    
+    static var logTag: LogTag { "RecyclerViewAdapter" }
+        
+    static func log(_ string: String) {
+        try? AndroidLogger(tag: logTag, priority: .debug)
+            .log(string)
+    }
+    
+    static func logInfo(_ string: String) {
+        try? AndroidLogger(tag: logTag, priority: .info)
+            .log(string)
+    }
+    
+    static func logError(_ string: String) {
+        try? AndroidLogger(tag: logTag, priority: .error)
+            .log(string)
+    }
+    
+    func log(_ string: String) {
+        Self.log(string)
+    }
+    
+    func logError(_ string: String) {
+        Self.logError(string)
     }
 }
 
 public extension RecyclerViewAdapter {
 
-    struct Callback<T> {
+    struct Callback {
 
         var onCreateViewHolder: ((ViewGroup, Int32) -> RecyclerView.ViewHolder)?
 
-        var onBindViewHolder: ((RecyclerViewAdapter.ViewHolder<T>, Int32) -> ())?
+        var onBindViewHolder: ((RecyclerView.ViewHolder, Int32) -> ())?
 
-        var getItemCount: () -> Int32 = { return 0 }
+        var getItemCount: () -> Int32
 
-        public init(onCreateViewHolder: ((ViewGroup, Int32) -> RecyclerView.ViewHolder)? = nil, onBindViewHolder: ((RecyclerView.ViewHolder, Int32) -> Void)? = nil, getItemCount: @escaping () -> Int32) {
+        public init(
+            onCreateViewHolder: ((ViewGroup, Int32) -> RecyclerView.ViewHolder)? = nil,
+            onBindViewHolder: ((RecyclerView.ViewHolder, Int32) -> Void)? = nil,
+            getItemCount: @escaping () -> Int32 = { return 0 }
+        ) {
             self.onCreateViewHolder = onCreateViewHolder
             self.onBindViewHolder = onBindViewHolder
             self.getItemCount = getItemCount
         }
     }
+}
+
+public extension RecyclerViewAdapter {
 
     convenience init(_ callback: Callback, environment: JNIEnvironment? = nil) {
         let swiftObject = SwiftObject(callback, environment: environment)
         self.init(swiftObject: swiftObject, environment: environment)
     }
 
-    var callback: Callback<T> {
+    var callback: Callback {
         get {
             getSwiftObject().valueObject().value as! Callback
         }
@@ -71,7 +109,7 @@ public extension RecyclerViewAdapter {
 extension RecyclerViewAdapter {
 
     @JavaClass("com.pureswift.swiftandroid.RecyclerViewAdapter$ViewHolder")
-    open class ViewHolder<T>: RecyclerView.ViewHolder {
+    open class ViewHolder: RecyclerView.ViewHolder {
 
         @JavaMethod
         @_nonoverride public convenience init(view: AndroidView.View?, swiftObject: SwiftObject?, environment: JNIEnvironment? = nil)
@@ -83,14 +121,14 @@ extension RecyclerViewAdapter {
 
 public extension RecyclerViewAdapter.ViewHolder {
 
-    convenience init(_ value: T, view: AndroidView.View?, environment: JNIEnvironment? = nil) {
+    convenience init(_ value: Any, view: AndroidView.View?, environment: JNIEnvironment? = nil) {
         let swiftObject = SwiftObject(value, environment: environment)
         self.init(view: view, swiftObject: swiftObject, environment: environment)
     }
 
-    var value: T {
+    var value: Any {
         get {
-            getSwiftObject().valueObject().value as! T
+            getSwiftObject().valueObject().value
         }
         set {
             getSwiftObject().valueObject().value = newValue