Skip to content

Commit 891e1be

Browse files
committed
Update LinearLayout superclass
1 parent f6f1e2c commit 891e1be

File tree

9 files changed

+51
-34
lines changed

9 files changed

+51
-34
lines changed

Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,8 @@ let package = Package(
478478
"AndroidJava",
479479
"AndroidUtil",
480480
"AndroidApp",
481-
"AndroidView"
481+
"AndroidView",
482+
"AndroidContent"
482483
],
483484
exclude: ["swift-java.config"],
484485
swiftSettings: [

Sources/AndroidWidget/ActionMenuView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaRuntime
55
@JavaClass("android.widget.ActionMenuView")
66
open class ActionMenuView: LinearLayout {
77
@JavaMethod
8-
open func onDetachedFromWindow()
8+
open override func onDetachedFromWindow()
99

1010
@JavaMethod
1111
open override func generateDefaultLayoutParams() -> ActionMenuView.LayoutParams!

Sources/AndroidWidget/LinearLayout.swift

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
22
import JavaKit
33
import JavaRuntime
4+
import AndroidView
45

56
@JavaClass("android.widget.LinearLayout")
6-
open class LinearLayout: JavaObject {
7+
open class LinearLayout: ViewGroup {
78
@JavaMethod
8-
open func onRtlPropertiesChanged(_ arg0: Int32)
9+
open override func onRtlPropertiesChanged(_ arg0: Int32)
910

1011
@JavaMethod
1112
open func setHorizontalGravity(_ arg0: Int32)
@@ -23,7 +24,7 @@ open class LinearLayout: JavaObject {
2324
open func setBaselineAlignedChildIndex(_ arg0: Int32)
2425

2526
@JavaMethod
26-
open func getAccessibilityClassName() -> CharSequence!
27+
open override func getAccessibilityClassName() -> CharSequence!
2728

2829
@JavaMethod
2930
open func generateDefaultLayoutParams() -> LinearLayout.LayoutParams!
@@ -32,7 +33,7 @@ open class LinearLayout: JavaObject {
3233
open func generateLayoutParams(_ arg0: ViewSwitcher.LayoutParams?) -> LinearLayout.LayoutParams!
3334

3435
@JavaMethod
35-
open func shouldDelayChildPressedState() -> Bool
36+
open override func shouldDelayChildPressedState() -> Bool
3637

3738
@JavaMethod
3839
open func setGravity(_ arg0: Int32)
@@ -74,17 +75,18 @@ open class LinearLayout: JavaObject {
7475
open func getOrientation() -> Int32
7576

7677
@JavaMethod
77-
open func getBaseline() -> Int32
78+
open override func getBaseline() -> Int32
7879

7980
@JavaMethod
80-
open func onMeasure(_ arg0: Int32, _ arg1: Int32)
81+
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)
8182

8283
@JavaMethod
83-
open func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)
84+
open override func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)
8485

8586
@JavaMethod
8687
open func checkLayoutParams(_ arg0: ViewSwitcher.LayoutParams?) -> Bool
8788
}
89+
8890
extension JavaClass<LinearLayout> {
8991
@JavaStaticField(isFinal: true)
9092
public var HORIZONTAL: Int32
@@ -524,3 +526,17 @@ extension JavaClass<LinearLayout> {
524526
@JavaStaticField(isFinal: true)
525527
public var VISIBLE: Int32
526528
}
529+
530+
// MARK: - Accessors
531+
532+
public extension LinearLayout {
533+
534+
var gravity: Int32 {
535+
get {
536+
getGravity()
537+
}
538+
set {
539+
setGravity(newValue)
540+
}
541+
}
542+
}

Sources/AndroidWidget/NumberPicker.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@ open class NumberPicker: LinearLayout {
1414
open func setFormatter(_ arg0: NumberPicker.Formatter?)
1515

1616
@JavaMethod
17-
open func getTopFadingEdgeStrength() -> Float
17+
open override func getTopFadingEdgeStrength() -> Float
1818

1919
@JavaMethod
20-
open func getBottomFadingEdgeStrength() -> Float
20+
open override func getBottomFadingEdgeStrength() -> Float
2121

2222
@JavaMethod
23-
open func computeVerticalScrollRange() -> Int32
23+
open override func computeVerticalScrollRange() -> Int32
2424

2525
@JavaMethod
26-
open func computeVerticalScrollOffset() -> Int32
26+
open override func computeVerticalScrollOffset() -> Int32
2727

2828
@JavaMethod
29-
open func computeVerticalScrollExtent() -> Int32
29+
open override func computeVerticalScrollExtent() -> Int32
3030

3131
@JavaMethod
32-
open func onDetachedFromWindow()
32+
open override func onDetachedFromWindow()
3333

3434
@JavaMethod
35-
open func drawableStateChanged()
35+
open override func drawableStateChanged()
3636

3737
@JavaMethod
38-
open func jumpDrawablesToCurrentState()
38+
open override func jumpDrawablesToCurrentState()
3939

4040
@JavaMethod
4141
open func setOnScrollListener(_ arg0: NumberPicker.OnScrollListener?)
@@ -59,13 +59,13 @@ open class NumberPicker: LinearLayout {
5959
open func getSelectionDividerHeight() -> Int32
6060

6161
@JavaMethod
62-
open func performClick() -> Bool
62+
open override func performClick() -> Bool
6363

6464
@JavaMethod
65-
open func performLongClick() -> Bool
65+
open override func performLongClick() -> Bool
6666

6767
@JavaMethod
68-
open func setEnabled(_ arg0: Bool)
68+
open override func setEnabled(_ arg0: Bool)
6969

7070
@JavaMethod
7171
open func getTextSize() -> Float
@@ -77,13 +77,13 @@ open class NumberPicker: LinearLayout {
7777
open func setTextColor(_ arg0: Int32)
7878

7979
@JavaMethod
80-
open func scrollBy(_ arg0: Int32, _ arg1: Int32)
80+
open override func scrollBy(_ arg0: Int32, _ arg1: Int32)
8181

8282
@JavaMethod
83-
open func computeScroll()
83+
open override func computeScroll()
8484

8585
@JavaMethod
86-
open func getSolidColor() -> Int32
86+
open override func getSolidColor() -> Int32
8787

8888
@JavaMethod
8989
open func getMinValue() -> Int32

Sources/AndroidWidget/RadioGroup.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ open class RadioGroup: LinearLayout {
2323
open override func generateDefaultLayoutParams() -> LinearLayout.LayoutParams!
2424

2525
@JavaMethod
26-
open func getAutofillType() -> Int32
26+
open override func getAutofillType() -> Int32
2727

2828
@JavaMethod
29-
open func onFinishInflate()
29+
open override func onFinishInflate()
3030

3131
@JavaMethod
3232
open func clearCheck()

Sources/AndroidWidget/SearchView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ open class SearchView: LinearLayout {
99
open func getQuery() -> CharSequence!
1010

1111
@JavaMethod
12-
open func onWindowFocusChanged(_ arg0: Bool)
12+
open override func onWindowFocusChanged(_ arg0: Bool)
1313

1414
@JavaMethod
15-
open func onDetachedFromWindow()
15+
open override func onDetachedFromWindow()
1616

1717
@JavaMethod
1818
open override func getAccessibilityClassName() -> CharSequence!
@@ -63,7 +63,7 @@ open class SearchView: LinearLayout {
6363
open func onActionViewExpanded()
6464

6565
@JavaMethod
66-
open func clearFocus()
66+
open override func clearFocus()
6767

6868
@JavaMethod
6969
open func setMaxWidth(_ arg0: Int32)

Sources/AndroidWidget/TabWidget.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaRuntime
55
@JavaClass("android.widget.TabWidget", implements: ViewSwitcher.OnFocusChangeListener.self)
66
open class TabWidget: LinearLayout {
77
@JavaMethod
8-
open func getChildDrawingOrder(_ arg0: Int32, _ arg1: Int32) -> Int32
8+
open override func getChildDrawingOrder(_ arg0: Int32, _ arg1: Int32) -> Int32
99

1010
@JavaMethod
1111
open override func getAccessibilityClassName() -> CharSequence!
@@ -29,10 +29,10 @@ open class TabWidget: LinearLayout {
2929
open func focusCurrentTab(_ arg0: Int32)
3030

3131
@JavaMethod
32-
open func setEnabled(_ arg0: Bool)
32+
open override func setEnabled(_ arg0: Bool)
3333

3434
@JavaMethod
35-
open func onSizeChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
35+
open override func onSizeChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
3636

3737
@JavaMethod
3838
open func setCurrentTab(_ arg0: Int32)
@@ -41,7 +41,7 @@ open class TabWidget: LinearLayout {
4141
open func setDividerDrawable(_ arg0: Int32)
4242

4343
@JavaMethod
44-
open func removeAllViews()
44+
open override func removeAllViews()
4545
}
4646
extension JavaClass<TabWidget> {
4747
@JavaStaticField(isFinal: true)

Sources/AndroidWidget/TableLayout.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ open class TableLayout: LinearLayout {
4747
open func isColumnShrinkable(_ arg0: Int32) -> Bool
4848

4949
@JavaMethod
50-
open func requestLayout()
50+
open override func requestLayout()
5151

5252
@JavaMethod
5353
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)

Sources/AndroidWidget/ZoomControls.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ open class ZoomControls: LinearLayout {
2020
open func setZoomSpeed(_ arg0: Int64)
2121

2222
@JavaMethod
23-
open func hasFocus() -> Bool
23+
open override func hasFocus() -> Bool
2424

2525
@JavaMethod
2626
open func show()

0 commit comments

Comments
 (0)