Skip to content

Commit be69126

Browse files
colemancdacolemancda
committed
Fixed TextView superclass
1 parent 4e2237d commit be69126

File tree

10 files changed

+56
-55
lines changed

10 files changed

+56
-55
lines changed

‎Sources/AndroidView/View.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ import JavaRuntime
1313
@JavaClass("android.view.View", implements: Drawable.Callback.self, KeyEvent.Callback.self)
1414
open class View: JavaObject {
1515
@JavaMethod
16-
@_nonoverride public convenience init(_ arg0: Context?, environment: JNIEnvironment? = nil)
16+
@_nonoverride public convenience init(_ arg0: AndroidContent.Context?, environment: JNIEnvironment? = nil)
1717

1818
@JavaMethod
19-
@_nonoverride public convenience init(_ arg0: Context?, _ arg1: AttributeSet?, _ arg2: Int32, environment: JNIEnvironment? = nil)
19+
@_nonoverride public convenience init(_ arg0: AndroidContent.Context?, _ arg1: AttributeSet?, _ arg2: Int32, environment: JNIEnvironment? = nil)
2020

2121
@JavaMethod
22-
@_nonoverride public convenience init(_ arg0: Context?, _ arg1: AttributeSet?, environment: JNIEnvironment? = nil)
22+
@_nonoverride public convenience init(_ arg0: AndroidContent.Context?, _ arg1: AttributeSet?, environment: JNIEnvironment? = nil)
2323

2424
@JavaMethod
25-
@_nonoverride public convenience init(_ arg0: Context?, _ arg1: AttributeSet?, _ arg2: Int32, _ arg3: Int32, environment: JNIEnvironment? = nil)
26-
25+
@_nonoverride public convenience init(_ arg0: AndroidContent.Context?, _ arg1: AttributeSet?, _ arg2: Int32, _ arg3: Int32, environment: JNIEnvironment? = nil)
26+
2727
@JavaMethod
2828
open func onMeasure(_ arg0: Int32, _ arg1: Int32)
2929

‎Sources/AndroidWidget/AutoCompleteTextView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open class AutoCompleteTextView: EditText {
1717
open override func onWindowFocusChanged(_ arg0: Bool)
1818

1919
@JavaMethod
20-
open func onDetachedFromWindow()
20+
open override func onDetachedFromWindow()
2121

2222
@JavaMethod
2323
open func setOnItemClickListener(_ arg0: AdapterView.OnItemClickListener?)
@@ -131,7 +131,7 @@ open class AutoCompleteTextView: EditText {
131131
open func setOnClickListener(_ arg0: ViewSwitcher.OnClickListener?)
132132

133133
@JavaMethod
134-
open func onDisplayHint(_ arg0: Int32)
134+
open override func onDisplayHint(_ arg0: Int32)
135135

136136
@JavaMethod
137137
open override func onAttachedToWindow()

‎Sources/AndroidWidget/CheckedTextView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ open class CheckedTextView: TextView {
3232
open func isChecked() -> Bool
3333

3434
@JavaMethod
35-
open func setVisibility(_ arg0: Int32)
35+
open override func setVisibility(_ arg0: Int32)
3636

3737
@JavaMethod
3838
open func toggle()

‎Sources/AndroidWidget/Chronometer.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ open class Chronometer: TextView {
2020
open func getBase() -> Int64
2121

2222
@JavaMethod
23-
open func onWindowVisibilityChanged(_ arg0: Int32)
23+
open override func onWindowVisibilityChanged(_ arg0: Int32)
2424

2525
@JavaMethod
26-
open func onDetachedFromWindow()
26+
open override func onDetachedFromWindow()
2727

2828
@JavaMethod
29-
open func getContentDescription() -> CharSequence!
29+
open override func getContentDescription() -> CharSequence!
3030

3131
@JavaMethod
3232
open override func getAccessibilityClassName() -> CharSequence!

‎Sources/AndroidWidget/CompoundButton.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ open class CompoundButton: Button {
2626
open override func getCompoundPaddingRight() -> Int32
2727

2828
@JavaMethod
29-
open func setStateDescription(_ arg0: CharSequence?)
29+
open override func setStateDescription(_ arg0: CharSequence?)
3030

3131
@JavaMethod
3232
open override func getAccessibilityClassName() -> CharSequence!
@@ -41,7 +41,7 @@ open class CompoundButton: Button {
4141
open func setButtonDrawable(_ arg0: Int32)
4242

4343
@JavaMethod
44-
open func performClick() -> Bool
44+
open override func performClick() -> Bool
4545

4646
@JavaMethod
4747
open override func getAutofillType() -> Int32

‎Sources/AndroidWidget/DigitalClock.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.DigitalClock")
66
open class DigitalClock: TextView {
77
@JavaMethod
8-
open func onDetachedFromWindow()
8+
open override func onDetachedFromWindow()
99

1010
@JavaMethod
1111
open override func getAccessibilityClassName() -> CharSequence!

‎Sources/AndroidWidget/EditText.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open class EditText: TextView {
1717
open func extendSelection(_ arg0: Int32)
1818

1919
@JavaMethod
20-
open func onSizeChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
20+
open override func onSizeChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
2121

2222
@JavaMethod
2323
open func setSelection(_ arg0: Int32, _ arg1: Int32)

‎Sources/AndroidWidget/TextClock.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open class TextClock: TextView {
1414
open override func onVisibilityAggregated(_ arg0: Bool)
1515

1616
@JavaMethod
17-
open func onDetachedFromWindow()
17+
open override func onDetachedFromWindow()
1818

1919
@JavaMethod
2020
open func is24HourModeEnabled() -> Bool

‎Sources/AndroidWidget/TextView.swift‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import JavaKit
44
import JavaKitCollection
55
import JavaKitFunction
66
import JavaRuntime
7+
import AndroidView
78

89
@JavaClass("android.widget.TextView")
9-
open class TextView: JavaObject {
10+
open class TextView: AndroidView.View {
1011
@JavaMethod
1112
open func length() -> Int32
1213

@@ -26,64 +27,64 @@ open class TextView: JavaObject {
2627
open func getText() -> CharSequence!
2728

2829
@JavaMethod
29-
open func onWindowFocusChanged(_ arg0: Bool)
30+
open override func onWindowFocusChanged(_ arg0: Bool)
3031

3132
@JavaMethod
32-
open func onVisibilityAggregated(_ arg0: Bool)
33+
open override func onVisibilityAggregated(_ arg0: Bool)
3334

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

3738
@JavaMethod
38-
open func hasOverlappingRendering() -> Bool
39+
open override func hasOverlappingRendering() -> Bool
3940

4041
@JavaMethod
41-
open func getLeftFadingEdgeStrength() -> Float
42+
open override func getLeftFadingEdgeStrength() -> Float
4243

4344
@JavaMethod
44-
open func getRightFadingEdgeStrength() -> Float
45+
open override func getRightFadingEdgeStrength() -> Float
4546

4647
@JavaMethod
47-
open func computeHorizontalScrollRange() -> Int32
48+
open override func computeHorizontalScrollRange() -> Int32
4849

4950
@JavaMethod
50-
open func computeVerticalScrollRange() -> Int32
51+
open override func computeVerticalScrollRange() -> Int32
5152

5253
@JavaMethod
53-
open func computeVerticalScrollExtent() -> Int32
54+
open override func computeVerticalScrollExtent() -> Int32
5455

5556
@JavaMethod
56-
open func onScreenStateChanged(_ arg0: Int32)
57+
open override func onScreenStateChanged(_ arg0: Int32)
5758

5859
@JavaMethod
59-
open func onRtlPropertiesChanged(_ arg0: Int32)
60+
open override func onRtlPropertiesChanged(_ arg0: Int32)
6061

6162
@JavaMethod
62-
open func isPaddingOffsetRequired() -> Bool
63+
open override func isPaddingOffsetRequired() -> Bool
6364

6465
@JavaMethod
65-
open func getLeftPaddingOffset() -> Int32
66+
open override func getLeftPaddingOffset() -> Int32
6667

6768
@JavaMethod
68-
open func getRightPaddingOffset() -> Int32
69+
open override func getRightPaddingOffset() -> Int32
6970

7071
@JavaMethod
71-
open func getTopPaddingOffset() -> Int32
72+
open override func getTopPaddingOffset() -> Int32
7273

7374
@JavaMethod
74-
open func getBottomPaddingOffset() -> Int32
75+
open override func getBottomPaddingOffset() -> Int32
7576

7677
@JavaMethod
77-
open func drawableHotspotChanged(_ arg0: Float, _ arg1: Float)
78+
open override func drawableHotspotChanged(_ arg0: Float, _ arg1: Float)
7879

7980
@JavaMethod
80-
open func drawableStateChanged()
81+
open override func drawableStateChanged()
8182

8283
@JavaMethod
83-
open func jumpDrawablesToCurrentState()
84+
open override func jumpDrawablesToCurrentState()
8485

8586
@JavaMethod
86-
open func onCreateDrawableState(_ arg0: Int32) -> [Int32]
87+
open override func onCreateDrawableState(_ arg0: Int32) -> [Int32]
8788

8889
@JavaMethod
8990
open func setAutoSizeTextTypeWithDefaults(_ arg0: Int32)
@@ -281,34 +282,34 @@ open class TextView: JavaObject {
281282
open func getOffsetForPosition(_ arg0: Float, _ arg1: Float) -> Int32
282283

283284
@JavaMethod
284-
open func getAccessibilityClassName() -> CharSequence!
285+
open override func getAccessibilityClassName() -> CharSequence!
285286

286287
@JavaMethod
287-
open func performLongClick() -> Bool
288+
open override func performLongClick() -> Bool
288289

289290
@JavaMethod
290-
open func showContextMenu() -> Bool
291+
open override func showContextMenu() -> Bool
291292

292293
@JavaMethod
293-
open func showContextMenu(_ arg0: Float, _ arg1: Float) -> Bool
294+
open override func showContextMenu(_ arg0: Float, _ arg1: Float) -> Bool
294295

295296
@JavaMethod
296-
open func getAutofillType() -> Int32
297+
open override func getAutofillType() -> Int32
297298

298299
@JavaMethod
299-
open func getAutofillHints() -> [String]
300+
open override func getAutofillHints() -> [String]
300301

301302
@JavaMethod
302-
open func setEnabled(_ arg0: Bool)
303+
open override func setEnabled(_ arg0: Bool)
303304

304305
@JavaMethod
305-
open func cancelLongPress()
306+
open override func cancelLongPress()
306307

307308
@JavaMethod
308-
open func onScrollChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
309+
open override func onScrollChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
309310

310311
@JavaMethod
311-
open func onAttachedToWindow()
312+
open override func onAttachedToWindow()
312313

313314
@JavaMethod
314315
open func getDefaultEditable() -> Bool
@@ -626,25 +627,25 @@ open class TextView: JavaObject {
626627
open func setScroller(_ arg0: Scroller?)
627628

628629
@JavaMethod
629-
open func computeScroll()
630+
open override func computeScroll()
630631

631632
@JavaMethod
632-
open func setPadding(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
633+
open override func setPadding(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
633634

634635
@JavaMethod
635-
open func setPaddingRelative(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
636+
open override func setPaddingRelative(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
636637

637638
@JavaMethod
638-
open func setSelected(_ arg0: Bool)
639+
open override func setSelected(_ arg0: Bool)
639640

640641
@JavaMethod
641-
open func getBaseline() -> Int32
642+
open override func getBaseline() -> Int32
642643

643644
@JavaMethod
644-
open func onMeasure(_ arg0: Int32, _ arg1: Int32)
645+
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)
645646

646647
@JavaMethod
647-
open func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)
648+
open override func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)
648649

649650
@JavaMethod
650651
open func setAutoSizeTextTypeUniformWithConfiguration(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)

‎Sources/AndroidWidget/ToggleButton.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ open class ToggleButton: CompoundButton {
2929
open func getDisabledAlpha() -> Float
3030

3131
@JavaMethod
32-
open func onFinishInflate()
32+
open override func onFinishInflate()
3333
}
3434
extension JavaClass<ToggleButton> {
3535
@JavaStaticField(isFinal: true)

0 commit comments

Comments
 (0)