Add ListViewAdapter.Context

Author: colemancda

Demo/App.swiftpm/Sources/ContentView.swift

@@ -23,20 +23,22 @@ struct ContentView: View {
     }
 
     var body: some View {
-        HStack {
+        VStack {/*
             HStack {
                 VStack(spacing: 20) {
                     Image("globe")
                     Text("Hello World")
                     Text(verbatim: date.formatted(date: .numeric, time: .complete))
-                    HStack {
-                        Text("Counter:")
-                        Text(verbatim: counter.description)
+                    if counter > 0 {
+                        HStack {
+                            Text("Counter:")
+                            Text(verbatim: counter.description)
+                        }
                     }
                     Button("Increment") {
                         counter += 1
                         if counter > 20 {
-                            counter = 1
+                            counter = 0
                         }
                     }
                 }
@@ -57,11 +59,11 @@ struct ContentView: View {
                     task?.cancel()
                     task = nil
                 }
+            }*/
+            List(items) { item in
+                Text(verbatim: item.title)
             }
         }
-        List(items) { item in
-            Text(verbatim: item.title)
-        }
     }
 }
 

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

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ListAdapter
 
-class ListViewAdapter(val swiftObject: SwiftObject): ListAdapter {
+class ListViewAdapter(val context: SwiftObject): ListAdapter {
 
     external override fun getCount(): Int
 

Sources/AndroidSwiftUI/AndroidListView.swift

@@ -34,17 +34,16 @@ extension AndroidListView {
 
     func createView(context: AndroidContent.Context) -> AndroidWidget.ListView {
         let view = AndroidWidget.ListView(context)
-        updateView(view)
+        let adapterContext = ListViewAdapter.Context(items: items)
+        let swiftObject = SwiftObject(adapterContext)
+        let adapter = ListViewAdapter(swiftObject: swiftObject)
+        view.setAdapter(adapter.as(Adapter.self))
         return view
     }
 
     func updateView(_ view: AndroidWidget.ListView) {
-        //let adapter = view.getAdapter().as(ArrayAdapter<JavaString>.self) as! ArrayAdapter<JavaString>
-        //adapter.clear()
-        let adapter = ArrayAdapter<JavaString>()
-        for item in self.items {
-            adapter.add(JavaString(item))
-        }
-        view.setAdapter(adapter.as(Adapter.self))
+        let adapterContext = ListViewAdapter.Context(items: items)
+        let adapter = view.getAdapter().as(ListViewAdapter.self) as! ListViewAdapter
+        adapter.context = adapterContext
     }
 }

Sources/AndroidSwiftUI/ListViewAdapter.swift

@@ -28,22 +28,22 @@ extension ListViewAdapter {
 
     @JavaMethod
     func isEmpty() -> Bool {
-        true
+        context.items.isEmpty
     }
 
     @JavaMethod
     func getCount() -> Int32 {
-        0
+        Int32(context.items.count)
     }
 
     @JavaMethod
     func getItem(position: Int32) -> JavaObject? {
-        nil
+        JavaString(context.items[Int(position)])
     }
 
     @JavaMethod
     func getItemId(position: Int32) -> Int64 {
-        0
+        Int64(position)
     }
 
     @JavaMethod
@@ -58,7 +58,14 @@ extension ListViewAdapter {
 
     @JavaMethod
     func getView(position: Int32, convertView: AndroidView.View?, parent: ViewGroup?) -> AndroidView.View? {
-        nil
+        guard let parent else {
+            assertionFailure()
+            return nil
+        }
+        let view = TextView(parent.getContext())
+        let item = context.items[Int(position)]
+        view.text = item
+        return view
     }
 
     @JavaMethod
@@ -82,6 +89,23 @@ extension ListViewAdapter {
     }
 }
 
+extension ListViewAdapter {
+    
+    struct Context {
+        
+        let items: [String]
+    }
+    
+    var context: Context {
+        get {
+            getContext().valueObject().value as! Context
+        }
+        set {
+            getContext().valueObject().value = newValue
+        }
+    }
+}
+
 extension ListViewAdapter {
 
     static var logTag: String { "ListViewAdapter" }