Updated ListViewAdapter

Author: colemancda

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

@@ -1,33 +1,17 @@
 package com.pureswift.swiftandroid
 
-import android.database.DataSetObserver
+import android.R
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ListAdapter
+import android.widget.ArrayAdapter
 
-class ListViewAdapter(val context: SwiftObject): ListAdapter {
+class ListViewAdapter<T: Any>(context: Context, val swiftObject: SwiftObject, val objects: ArrayList<T>) :
+    ArrayAdapter<T>(context, 0, objects) {
 
-    external override fun getCount(): Int
+        external override fun getView(position: Int, convertView: View?, parent: ViewGroup): View
 
-    external override fun isEmpty(): Boolean
-
-    external override fun getItem(position: Int): Any?
-
-    external override fun getItemId(position: Int): Long
-
-    external override fun getItemViewType(position: Int): Int
-
-    external override fun getViewTypeCount(): Int
-
-    external override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View?
-
-    external override fun areAllItemsEnabled(): Boolean
-
-    external override fun isEnabled(position: Int): Boolean
-
-    external override fun registerDataSetObserver(observer: DataSetObserver?)
-
-    external override fun unregisterDataSetObserver(observer: DataSetObserver?)
-
-    external override fun hasStableIds(): Boolean
-}
+        fun getResourceId(): Int {
+            return R.layout.simple_list_item_1
+        }
+}

Demo/app/src/main/swift/ListViewAdapter.swift

@@ -12,113 +12,50 @@ import AndroidKit
 open class ListViewAdapter: JavaObject {
 
     @JavaMethod
-    @_nonoverride public convenience init(swiftObject: SwiftObject!, environment: JNIEnvironment? = nil)
+    @_nonoverride public convenience init(
+        context: AndroidContent.Context?,
+        swiftObject: SwiftObject?,
+        objects: ArrayList<JavaObject>?,
+        environment: JNIEnvironment? = nil
+    )
 
     @JavaMethod
-    func getContext() -> SwiftObject!
+    func getSwiftObject() -> SwiftObject!
+    
+    @JavaMethod
+    func getResourceId() -> Int32
 }
 
 @JavaImplementation("com.pureswift.swiftandroid.ListViewAdapter")
 extension ListViewAdapter {
 
-    @JavaMethod
-    func hasStableIds() -> Bool {
-        log("\(self).\(#function)")
-        return true
-    }
-    
-    @JavaMethod
-    func isEmpty() -> Bool {
-        log("\(self).\(#function)")
-        return context.items.isEmpty
-    }
-    
-    @JavaMethod
-    func getCount() -> Int32 {
-        log("\(self).\(#function)")
-        return Int32(context.items.count)
-    }
-
-    @JavaMethod
-    func getItem(position: Int32) -> JavaObject? {
-        log("\(self).\(#function) \(position)")
-        return JavaString(context.items[Int(position)])
-    }
-    
-    @JavaMethod
-    func getItemId(position: Int32) -> Int64 {
-        log("\(self).\(#function)")
-        return Int64(position)
-    }
-
-    @JavaMethod
-    func getItemViewType(position: Int32) -> Int32 {
-        log("\(self).\(#function)")
-        return 0
-    }
-
-    @JavaMethod
-    func getViewTypeCount() -> Int32 {
-        log("\(self).\(#function)")
-        return 1
-    }
-
     @JavaMethod
     func getView(position: Int32, convertView: AndroidView.View?, parent: ViewGroup?) -> AndroidView.View? {
         log("\(self).\(#function) \(position)")
-        guard let parent else {
-            assertionFailure()
-            return nil
-        }
-        let view = TextView(parent.getContext())
-        let item = context.items[Int(position)]
-        view.text = item
-        return view
-    }
-
-    @JavaMethod
-    func areAllItemsEnabled() -> Bool {
-        log("\(self).\(#function)")
-        return true
-    }
-
-    @JavaMethod
-    func isEnabled(position: Int32) -> Bool {
-        log("\(self).\(#function) \(position)")
-        return true
-    }
-
-    @JavaMethod
-    func registerDataSetObserver(observer: JavaObject?) {
-        log("\(self).\(#function)")
-        
-    }
-
-    @JavaMethod
-    func unregisterDataSetObserver(observer: JavaObject?) {
-        log("\(self).\(#function)")
-        
+        return getView(position, convertView, parent)
     }
 }
 
 public extension ListViewAdapter {
 
-    struct Context {
-        
-        let items: [String]
-    }
+    typealias GetView = (Int32, AndroidView.View?, ViewGroup?) -> AndroidView.View?
 
-    var context: Context {
+    var getView: GetView {
         get {
-            getContext().valueObject().value as! Context
+            getSwiftObject().valueObject().value as! GetView
         }
         set {
-            getContext().valueObject().value = newValue
+            getSwiftObject().valueObject().value = newValue
         }
     }
 
-    convenience init(_ context: Context, environment: JNIEnvironment? = nil) {
-        self.init(swiftObject: SwiftObject(context), environment: environment)
+    convenience init(
+        context: AndroidContent.Context,
+        getView: @escaping (Int32, AndroidView.View?, ViewGroup?) -> AndroidView.View?,
+        objects: ArrayList<JavaObject>,
+        environment: JNIEnvironment? = nil
+    ) {
+        self.init(context: context, swiftObject: SwiftObject(getView), objects: objects, environment: environment)
     }
 }