Skip to content

Commit 88f943a

Browse files
colemancdacolemancda
committed
Fix generated code
1 parent 2a1bc4b commit 88f943a

31 files changed

+146
-84
lines changed

‎Sources/AndroidMaterial/AppBarLayout+LayoutParams+ScrollEffect.swift‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@ import JavaKitReflection
44
import JavaRuntime
55

66
extension AppBarLayout.LayoutParams {
7-
@JavaInterface("com.google.android.material.appbar.AppBarLayout$LayoutParams$ScrollEffect", extends: Annotation.self)
8-
public struct ScrollEffect {
9-
@JavaMethod
10-
public func equals(_ arg0: JavaObject?) -> Bool
117

12-
@JavaMethod
13-
public func toString() -> String
8+
public typealias ScrollEffect = AppBarLayoutLayoutParamsScrollEffect
9+
}
10+
11+
@JavaInterface("com.google.android.material.appbar.AppBarLayout$LayoutParams$ScrollEffect", extends: Annotation.self)
12+
public struct AppBarLayoutLayoutParamsScrollEffect {
13+
@JavaMethod
14+
public func equals(_ arg0: JavaObject?) -> Bool
15+
16+
@JavaMethod
17+
public func toString() -> String
1418

15-
@JavaMethod
16-
public func hashCode() -> Int32
19+
@JavaMethod
20+
public func hashCode() -> Int32
1721

18-
@JavaMethod
19-
public func annotationType() -> JavaClass<Annotation>!
20-
}
22+
@JavaMethod
23+
public func annotationType() -> JavaClass<Annotation>!
2124
}

‎Sources/AndroidMaterial/AppBarLayout+LayoutParams+ScrollFlags.swift‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,22 @@ import JavaKitReflection
44
import JavaRuntime
55

66
extension AppBarLayout.LayoutParams {
7-
@JavaInterface("com.google.android.material.appbar.AppBarLayout$LayoutParams$ScrollFlags", extends: Annotation.self)
8-
public struct ScrollFlags {
9-
@JavaMethod
10-
public func equals(_ arg0: JavaObject?) -> Bool
7+
8+
public typealias ScrollFlags = AppBarLayoutLayoutParamsScrollFlags
9+
}
10+
11+
12+
@JavaInterface("com.google.android.material.appbar.AppBarLayout$LayoutParams$ScrollFlags", extends: Annotation.self)
13+
public struct AppBarLayoutLayoutParamsScrollFlags {
14+
@JavaMethod
15+
public func equals(_ arg0: JavaObject?) -> Bool
1116

12-
@JavaMethod
13-
public func toString() -> String
17+
@JavaMethod
18+
public func toString() -> String
1419

15-
@JavaMethod
16-
public func hashCode() -> Int32
20+
@JavaMethod
21+
public func hashCode() -> Int32
1722

18-
@JavaMethod
19-
public func annotationType() -> JavaClass<Annotation>!
20-
}
23+
@JavaMethod
24+
public func annotationType() -> JavaClass<Annotation>!
2125
}

‎Sources/AndroidMaterial/AppBarLayout+OnOffsetChangedListener.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import JavaKit
33
import JavaRuntime
44

55
extension AppBarLayout {
6-
@JavaInterface("com.google.android.material.appbar.AppBarLayout$OnOffsetChangedListener", extends: AppBarLayout.BaseOnOffsetChangedListener<AppBarLayout>.self)
6+
@JavaInterface("com.google.android.material.appbar.AppBarLayout$OnOffsetChangedListener", extends: AppBarLayout.BaseOnOffsetChangedListener.self)
77
public struct OnOffsetChangedListener {
88
@JavaMethod
99
public func onOffsetChanged(_ arg0: AppBarLayout?, _ arg1: Int32)

‎Sources/AndroidMaterial/AppBarLayout.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ open class AppBarLayout: LinearLayout {
3131
open func isLiftOnScroll() -> Bool
3232

3333
@JavaMethod
34-
open func getBehavior() -> CircularRevealCoordinatorLayout.Behavior<AppBarLayout>!
34+
open func getBehavior() -> CircularRevealCoordinatorLayout.Behavior!
3535

3636
@JavaMethod
3737
open func getMinimumHeightForVisibleOverlappingContent() -> Int32

‎Sources/AndroidMaterial/BadgeDrawable.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// BadgeDrawable.swift
3+
// SwiftAndroid
4+
//
5+
// Created by Alsey Coleman Miller on 6/17/25.
6+
//
7+
8+
import JavaKit
9+
import AndroidGraphics
10+
11+
@JavaClass("com.google.android.material.badge.BadgeDrawable")
12+
open class BadgeDrawable: Drawable {
13+
14+
15+
}

‎Sources/AndroidMaterial/BaseMotionStrategy.swift‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// BaseMotionStrategy.swift
3+
// SwiftAndroid
4+
//
5+
// Created by Alsey Coleman Miller on 6/17/25.
6+
//
7+
8+
import JavaKit
9+
10+
@JavaClass("com.google.android.material.floatingactionbutton.BaseMotionStrategy")
11+
open class BaseMotionStrategy: JavaObject {
12+
13+
14+
}

‎Sources/AndroidMaterial/BottomSheetBehavior+SavedState.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extension BottomSheetBehavior {
1010
@_nonoverride public convenience init(_ arg0: Parcelable?, _ arg1: Int32, environment: JNIEnvironment? = nil)
1111

1212
@JavaMethod
13-
@_nonoverride public convenience init(_ arg0: Parcelable?, _ arg1: BottomSheetBehavior<JavaObject>?, environment: JNIEnvironment? = nil)
13+
@_nonoverride public convenience init(_ arg0: Parcelable?, _ arg1: BottomSheetBehavior?, environment: JNIEnvironment? = nil)
1414

1515
@JavaMethod
1616
@_nonoverride public convenience init(_ arg0: Parcel?, _ arg1: JavaClassLoader?, environment: JNIEnvironment? = nil)

‎Sources/AndroidMaterial/BottomSheetBehavior.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ open class BottomSheetBehavior: CircularRevealCoordinatorLayout.Behavior {
157157
@JavaMethod
158158
open func setState(_ arg0: Int32)
159159
}
160-
extension JavaClass {
160+
extension JavaClass<BottomSheetBehavior> {
161161
@JavaStaticField(isFinal: true)
162162
public var STATE_DRAGGING: Int32
163163

@@ -198,5 +198,5 @@ extension JavaClass {
198198
public var SAVE_NONE: Int32
199199

200200
@JavaStaticMethod
201-
public func from(_ arg0: View?) -> BottomSheetBehavior<View>!
201+
public func from(_ arg0: View?) -> BottomSheetBehavior!
202202
}

‎Sources/AndroidMaterial/BottomSheetDialog.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ open class BottomSheetDialog: Dialog {
2222
open override func onDetachedFromWindow()
2323

2424
@JavaMethod
25-
open override func setContentView(_ arg0: View?)
25+
open func setContentView(_ arg0: View?)
2626

2727
@JavaMethod
28-
open override func setContentView(_ arg0: View?, _ arg1: ViewGroup.LayoutParams?)
28+
open func setContentView(_ arg0: View?, _ arg1: ViewGroup.LayoutParams?)
2929

3030
@JavaMethod
3131
open override func setContentView(_ arg0: Int32)
3232

3333
@JavaMethod
34-
open override func onCreate(_ arg0: Bundle?)
34+
open func onCreate(_ arg0: Bundle?)
3535

3636
@JavaMethod
3737
open override func setCancelable(_ arg0: Bool)
@@ -40,7 +40,7 @@ open class BottomSheetDialog: Dialog {
4040
open override func setCanceledOnTouchOutside(_ arg0: Bool)
4141

4242
@JavaMethod
43-
open func getBehavior() -> BottomSheetBehavior<FrameLayout>!
43+
open func getBehavior() -> BottomSheetBehavior!
4444

4545
@JavaMethod
4646
open func setDismissWithAnimation(_ arg0: Bool)

‎Sources/AndroidMaterial/ChildrenAlphaProperty.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ open class ChildrenAlphaProperty: Property {
2020
}
2121
extension JavaClass<ChildrenAlphaProperty> {
2222
@JavaStaticField(isFinal: true)
23-
public var CHILDREN_ALPHA: Property<ViewGroup, JavaFloat>!
23+
public var CHILDREN_ALPHA: Property!
2424
}

0 commit comments

Comments
 (0)