Skip to content

Commit ac0cf30

Browse files
colemancdacolemancda
committed
Fixed RecyclerView.Adapter 
1 parent 42e260a commit ac0cf30

15 files changed

+44
-42
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import AndroidKit
99

1010
@JavaClass("com.pureswift.swiftandroid.RecyclerViewAdapter")
11-
open class RecyclerViewAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder> {
11+
open class RecyclerViewAdapter: RecyclerView.Adapter {
1212

1313
@JavaMethod
1414
@_nonoverride public convenience init(swiftObject: SwiftObject?, environment: JNIEnvironment? = nil)

‎Sources/AndroidX/AdapterListUpdateCallback.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaRuntime
55
@JavaClass("androidx.recyclerview.widget.AdapterListUpdateCallback", implements: ListUpdateCallback.self)
66
open class AdapterListUpdateCallback: JavaObject {
77
@JavaMethod
8-
@_nonoverride public convenience init(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?, environment: JNIEnvironment? = nil)
8+
@_nonoverride public convenience init(_ arg0: RecyclerView.Adapter?, environment: JNIEnvironment? = nil)
99

1010
@JavaMethod
1111
open func onInserted(_ arg0: Int32, _ arg1: Int32)

‎Sources/AndroidX/AsyncListDiffer.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import JavaRuntime
77
@JavaClass("androidx.recyclerview.widget.AsyncListDiffer")
88
open class AsyncListDiffer<T: AnyJavaObject>: JavaObject {
99
@JavaMethod
10-
@_nonoverride public convenience init(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?, _ arg1: DiffUtil.ItemCallback<JavaObject>?, environment: JNIEnvironment? = nil)
10+
@_nonoverride public convenience init(_ arg0: RecyclerView.Adapter?, _ arg1: DiffUtil.ItemCallback<JavaObject>?, environment: JNIEnvironment? = nil)
1111

1212
@JavaMethod
1313
@_nonoverride public convenience init(_ arg0: ListUpdateCallback?, _ arg1: AsyncDifferConfig<JavaObject>?, environment: JNIEnvironment? = nil)

‎Sources/AndroidX/ConcatAdapter.swift‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ import JavaKit
55
import JavaKitCollection
66
import JavaRuntime
77

8-
public typealias ConcatAdapter = RecyclerView.Adapter<RecyclerView.ViewHolder>.Concat
8+
public typealias ConcatAdapter = RecyclerView.Adapter.Concat
99

1010
extension RecyclerView.Adapter {
1111

1212
@JavaClass("androidx.recyclerview.widget.ConcatAdapter")
13-
open class Concat: RecyclerView.Adapter<VH> {
13+
open class Concat: RecyclerView.Adapter {
1414

1515
@JavaMethod
16-
@_nonoverride public convenience init(_ arg0: [RecyclerView.Adapter<RecyclerView.ViewHolder>?], environment: JNIEnvironment? = nil)
16+
@_nonoverride public convenience init(_ arg0: [RecyclerView.Adapter?], environment: JNIEnvironment? = nil)
1717

1818
@JavaMethod
19-
@_nonoverride public convenience init(_ arg0: ConcatAdapter.Config?, _ arg1: [RecyclerView.Adapter<RecyclerView.ViewHolder>?], environment: JNIEnvironment? = nil)
19+
@_nonoverride public convenience init(_ arg0: ConcatAdapter.Config?, _ arg1: [RecyclerView.Adapter?], environment: JNIEnvironment? = nil)
2020

2121
@JavaMethod
22-
@_nonoverride public convenience init(_ arg0: List<RecyclerView.Adapter<RecyclerView.ViewHolder>>?, environment: JNIEnvironment? = nil)
22+
@_nonoverride public convenience init(_ arg0: List<RecyclerView.Adapter>?, environment: JNIEnvironment? = nil)
2323

2424
@JavaMethod
25-
@_nonoverride public convenience init(_ arg0: ConcatAdapter.Config?, _ arg1: List<RecyclerView.Adapter<RecyclerView.ViewHolder>>?, environment: JNIEnvironment? = nil)
25+
@_nonoverride public convenience init(_ arg0: ConcatAdapter.Config?, _ arg1: List<RecyclerView.Adapter>?, environment: JNIEnvironment? = nil)
2626

2727
@JavaMethod
2828
open override func onDetachedFromRecyclerView(_ arg0: RecyclerView?)
@@ -34,19 +34,19 @@ extension RecyclerView.Adapter {
3434
open override func getItemCount() -> Int32
3535

3636
@JavaMethod
37-
open func addAdapter(_ arg0: Int32, _ arg1: RecyclerView.Adapter<RecyclerView.ViewHolder>?) -> Bool
37+
open func addAdapter(_ arg0: Int32, _ arg1: RecyclerView.Adapter?) -> Bool
3838

3939
@JavaMethod
40-
open func addAdapter(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?) -> Bool
40+
open func addAdapter(_ arg0: RecyclerView.Adapter?) -> Bool
4141

4242
@JavaMethod
4343
open override func setHasStableIds(_ arg0: Bool)
4444

4545
@JavaMethod
46-
open func removeAdapter(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?) -> Bool
46+
open func removeAdapter(_ arg0: RecyclerView.Adapter?) -> Bool
4747

4848
@JavaMethod
49-
open override func setStateRestorationPolicy(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy?)
49+
open override func setStateRestorationPolicy(_ arg0: RecyclerView.Adapter.StateRestorationPolicy?)
5050

5151
@JavaMethod
5252
open override func onFailedToRecycleView(_ arg0: RecyclerView.ViewHolder?) -> Bool
@@ -55,10 +55,10 @@ extension RecyclerView.Adapter {
5555
open override func onViewRecycled(_ arg0: RecyclerView.ViewHolder?)
5656

5757
@JavaMethod
58-
open func getWrappedAdapterAndPosition(_ arg0: Int32) -> Pair<RecyclerView.Adapter<RecyclerView.ViewHolder>, JavaInteger>!
58+
open func getWrappedAdapterAndPosition(_ arg0: Int32) -> Pair<RecyclerView.Adapter, JavaInteger>!
5959

6060
@JavaMethod
61-
open func getAdapters() -> List<RecyclerView.Adapter<RecyclerView.ViewHolder>>!
61+
open func getAdapters() -> List<RecyclerView.Adapter>!
6262

6363
@JavaMethod
6464
open override func getItemId(_ arg0: Int32) -> Int64
@@ -70,7 +70,7 @@ extension RecyclerView.Adapter {
7070
open override func onViewAttachedToWindow(_ arg0: RecyclerView.ViewHolder?)
7171

7272
@JavaMethod
73-
open override func findRelativeAdapterPositionIn(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?, _ arg1: RecyclerView.ViewHolder?, _ arg2: Int32) -> Int32
73+
open override func findRelativeAdapterPositionIn(_ arg0: RecyclerView.Adapter?, _ arg1: RecyclerView.ViewHolder?, _ arg2: Int32) -> Int32
7474

7575
@JavaMethod
7676
open override func getItemViewType(_ arg0: Int32) -> Int32
@@ -82,3 +82,4 @@ extension RecyclerView.Adapter {
8282
open override func onBindViewHolder(_ arg0: RecyclerView.ViewHolder?, _ arg1: Int32)
8383
}
8484
}
85+

‎Sources/AndroidX/ConcatAdapterController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ open class ConcatAdapterController: JavaObject {
2323
open func onViewRecycled(_ arg0: RecyclerView.ViewHolder?)
2424

2525
@JavaMethod
26-
open func getCopyOfAdapters() -> List<RecyclerView.Adapter<RecyclerView.ViewHolder>>!
26+
open func getCopyOfAdapters() -> List<RecyclerView.Adapter>!
2727

2828
@JavaMethod
29-
open func getLocalAdapterPosition(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?, _ arg1: RecyclerView.ViewHolder?, _ arg2: Int32) -> Int32
29+
open func getLocalAdapterPosition(_ arg0: RecyclerView.Adapter?, _ arg1: RecyclerView.ViewHolder?, _ arg2: Int32) -> Int32
3030

3131
@JavaMethod
32-
open func getWrappedAdapterAndPosition(_ arg0: Int32) -> Pair<RecyclerView.Adapter<RecyclerView.ViewHolder>, JavaInteger>!
32+
open func getWrappedAdapterAndPosition(_ arg0: Int32) -> Pair<RecyclerView.Adapter, JavaInteger>!
3333

3434
@JavaMethod
3535
open func onChanged(_ arg0: NestedAdapterWrapper?)
@@ -71,7 +71,7 @@ open class ConcatAdapterController: JavaObject {
7171
open func onStateRestorationPolicyChanged(_ arg0: NestedAdapterWrapper?)
7272

7373
@JavaMethod
74-
open func getBoundAdapter(_ arg0: RecyclerView.ViewHolder?) -> RecyclerView.Adapter<RecyclerView.ViewHolder>!
74+
open func getBoundAdapter(_ arg0: RecyclerView.ViewHolder?) -> RecyclerView.Adapter!
7575

7676
@JavaMethod
7777
open func onCreateViewHolder(_ arg0: ViewGroup?, _ arg1: Int32) -> RecyclerView.ViewHolder!

‎Sources/AndroidX/DiffUtil+DiffResult.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extension DiffUtil {
99
open func dispatchUpdatesTo(_ arg0: ListUpdateCallback?)
1010

1111
@JavaMethod
12-
open func dispatchUpdatesTo(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?)
12+
open func dispatchUpdatesTo(_ arg0: RecyclerView.Adapter?)
1313

1414
@JavaMethod
1515
open func convertOldPositionToNew(_ arg0: Int32) -> Int32

‎Sources/AndroidX/ListAdapter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaKitCollection
55
import JavaRuntime
66

77
@JavaClass("androidx.recyclerview.widget.ListAdapter")
8-
open class ListAdapter<T: AnyJavaObject, VH: RecyclerView.ViewHolder>: RecyclerView.Adapter<VH> {
8+
open class ListAdapter: RecyclerView.Adapter {
99
@JavaMethod
1010
open override func getItemCount() -> Int32
1111

‎Sources/AndroidX/NestedAdapterWrapper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaRuntime
55
@JavaClass("androidx.recyclerview.widget.NestedAdapterWrapper")
66
open class NestedAdapterWrapper: JavaObject {
77
@JavaField(isFinal: true)
8-
public var adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>!
8+
public var adapter: RecyclerView.Adapter!
99

1010
@JavaMethod
1111
open func getItemId(_ arg0: Int32) -> Int64

‎Sources/AndroidX/RecyclerView+Adapter+StateRestorationPolicy.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension RecyclerView.Adapter {
1313
}
1414

1515
public var enumValue: StateRestorationPolicyCases! {
16-
let classObj = try! JavaClass<RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy>(environment: javaEnvironment)
16+
let classObj = try! JavaClass<RecyclerView.Adapter.StateRestorationPolicy>(environment: javaEnvironment)
1717
if self.equals(classObj.ALLOW?.as(JavaObject.self)) {
1818
return StateRestorationPolicyCases.ALLOW
1919
} else if self.equals(classObj.PREVENT_WHEN_EMPTY?.as(JavaObject.self)) {
@@ -31,7 +31,7 @@ extension RecyclerView.Adapter {
3131
} else {
3232
try! JavaVirtualMachine.shared().environment()
3333
}
34-
let classObj = try! JavaClass<RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy>(environment: _environment)
34+
let classObj = try! JavaClass<RecyclerView.Adapter.StateRestorationPolicy>(environment: _environment)
3535
switch enumValue {
3636
case .ALLOW:
3737
if let ALLOW = classObj.ALLOW {
@@ -55,19 +55,19 @@ extension RecyclerView.Adapter {
5555
}
5656
}
5757
}
58-
extension JavaClass<RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy> {
58+
extension JavaClass<RecyclerView.Adapter.StateRestorationPolicy> {
5959
@JavaStaticField(isFinal: true)
60-
public var ALLOW: RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy!
60+
public var ALLOW: RecyclerView.Adapter.StateRestorationPolicy!
6161

6262
@JavaStaticField(isFinal: true)
63-
public var PREVENT_WHEN_EMPTY: RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy!
63+
public var PREVENT_WHEN_EMPTY: RecyclerView.Adapter.StateRestorationPolicy!
6464

6565
@JavaStaticField(isFinal: true)
66-
public var PREVENT: RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy!
66+
public var PREVENT: RecyclerView.Adapter.StateRestorationPolicy!
6767

6868
@JavaStaticMethod
69-
public func values() -> [RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy?]
69+
public func values() -> [RecyclerView.Adapter.StateRestorationPolicy?]
7070

7171
@JavaStaticMethod
72-
public func valueOf(_ arg0: String) -> RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy!
72+
public func valueOf(_ arg0: String) -> RecyclerView.Adapter.StateRestorationPolicy!
7373
}

‎Sources/AndroidX/RecyclerView+Adapter.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import JavaRuntime
77
extension RecyclerView {
88

99
@JavaClass("androidx.recyclerview.widget.RecyclerView$Adapter")
10-
open class Adapter<VH: RecyclerView.ViewHolder>: JavaObject {
10+
open class Adapter: JavaObject {
11+
1112
@JavaMethod
1213
@_nonoverride public convenience init(environment: JNIEnvironment? = nil)
1314

@@ -30,7 +31,7 @@ extension RecyclerView {
3031
open func setHasStableIds(_ arg0: Bool)
3132

3233
@JavaMethod
33-
open func setStateRestorationPolicy(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy?)
34+
open func setStateRestorationPolicy(_ arg0: RecyclerView.Adapter.StateRestorationPolicy?)
3435

3536
@JavaMethod
3637
open func onFailedToRecycleView(_ arg0: RecyclerView.ViewHolder?) -> Bool
@@ -75,7 +76,7 @@ extension RecyclerView {
7576
open func notifyItemRemoved(_ arg0: Int32)
7677

7778
@JavaMethod
78-
open func getStateRestorationPolicy() -> RecyclerView.Adapter<RecyclerView.ViewHolder>.StateRestorationPolicy!
79+
open func getStateRestorationPolicy() -> RecyclerView.Adapter.StateRestorationPolicy!
7980

8081
@JavaMethod
8182
open func hasStableIds() -> Bool
@@ -90,7 +91,7 @@ extension RecyclerView {
9091
open func onViewAttachedToWindow(_ arg0: RecyclerView.ViewHolder?)
9192

9293
@JavaMethod
93-
open func findRelativeAdapterPositionIn(_ arg0: RecyclerView.Adapter<RecyclerView.ViewHolder>?, _ arg1: RecyclerView.ViewHolder?, _ arg2: Int32) -> Int32
94+
open func findRelativeAdapterPositionIn(_ arg0: RecyclerView.Adapter?, _ arg1: RecyclerView.ViewHolder?, _ arg2: Int32) -> Int32
9495

9596
@JavaMethod
9697
open func getItemViewType(_ arg0: Int32) -> Int32

0 commit comments

Comments
 (0)