Skip to content

Commit 7b5a795

Browse files
mdvaccafacebook-github-bot
mdvacca
authored and
facebook-github-bot
committed
Fix names of view manager methods arguments (facebook#52571)
Summary: This diff fixes the following warning: ``` The corresponding parameter in the supertype 'XYZViewManager' is named 'value'. This may cause problems when calling this function with named arguments. ``` changelog: [Android][Changed] Changed method arguments names for Core ViewManagers to match the names of ViewManagerInterfaces Reviewed By: cortinico Differential Revision: D78170316
1 parent cf45aa9 commit 7b5a795

File tree

7 files changed

+70
-76
lines changed

7 files changed

+70
-76
lines changed

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,12 @@ internal class DebuggingOverlayManager :
3030

3131
override fun getDelegate(): ViewManagerDelegate<DebuggingOverlay> = delegate
3232

33-
override fun highlightTraceUpdates(
34-
view: DebuggingOverlay,
35-
providedTraceUpdates: ReadableArray
36-
): Unit {
33+
override fun highlightTraceUpdates(view: DebuggingOverlay, updates: ReadableArray): Unit {
3734
val formattedTraceUpdates = mutableListOf<TraceUpdate>()
3835

3936
var successfullyParsedPayload = true
40-
for (i in 0 until providedTraceUpdates.size()) {
41-
val traceUpdate = providedTraceUpdates.getMap(i) ?: continue
37+
for (i in 0 until updates.size()) {
38+
val traceUpdate = updates.getMap(i) ?: continue
4239
val serializedRectangle = traceUpdate.getMap("rectangle")
4340
if (serializedRectangle == null) {
4441
ReactSoftExceptionLogger.logSoftException(
@@ -82,12 +79,12 @@ internal class DebuggingOverlayManager :
8279
}
8380
}
8481

85-
override fun highlightElements(view: DebuggingOverlay, providedElements: ReadableArray): Unit {
82+
override fun highlightElements(view: DebuggingOverlay, elements: ReadableArray): Unit {
8683
val elementsRectangles = mutableListOf<RectF>()
8784

8885
var successfullyParsedPayload = true
89-
for (i in 0 until providedElements.size()) {
90-
val element = providedElements.getMap(i) ?: continue
86+
for (i in 0 until elements.size()) {
87+
val element = elements.getMap(i) ?: continue
9188
try {
9289
val left = element.getDouble("x").toFloat()
9390
val top = element.getDouble("y").toFloat()

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,20 @@ public class ReactDrawerLayoutManager :
108108
view.setDrawerWidth(widthInPx)
109109
}
110110

111-
public override fun setDrawerWidth(view: ReactDrawerLayout, width: Float?) {
112-
val widthInPx = width?.let { Math.round(it.dpToPx()) } ?: ReactDrawerLayout.DEFAULT_DRAWER_WIDTH
111+
public override fun setDrawerWidth(view: ReactDrawerLayout, value: Float?) {
112+
val widthInPx = value?.let { Math.round(it.dpToPx()) } ?: ReactDrawerLayout.DEFAULT_DRAWER_WIDTH
113113
view.setDrawerWidth(widthInPx)
114114
}
115115

116116
@ReactProp(name = "drawerLockMode")
117-
public override fun setDrawerLockMode(view: ReactDrawerLayout, drawerLockMode: String?) {
118-
when (drawerLockMode) {
117+
public override fun setDrawerLockMode(view: ReactDrawerLayout, value: String?) {
118+
when (value) {
119119
null,
120120
"unlocked" -> view.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
121121
"locked-closed" -> view.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
122122
"locked-open" -> view.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_OPEN)
123123
else -> {
124-
FLog.w(ReactConstants.TAG, "Unknown drawerLockMode $drawerLockMode")
124+
FLog.w(ReactConstants.TAG, "Unknown drawerLockMode $value")
125125
view.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
126126
}
127127
}

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,37 +38,34 @@ internal class ReactModalHostManager :
3838
}
3939

4040
@ReactProp(name = "animationType")
41-
override fun setAnimationType(view: ReactModalHostView, animationType: String?) {
42-
if (animationType != null) {
43-
view.animationType = animationType
41+
override fun setAnimationType(view: ReactModalHostView, value: String?) {
42+
if (value != null) {
43+
view.animationType = value
4444
}
4545
}
4646

4747
@ReactProp(name = "transparent")
48-
override fun setTransparent(view: ReactModalHostView, transparent: Boolean) {
49-
view.transparent = transparent
48+
override fun setTransparent(view: ReactModalHostView, value: Boolean) {
49+
view.transparent = value
5050
}
5151

5252
@ReactProp(name = "statusBarTranslucent")
53-
override fun setStatusBarTranslucent(view: ReactModalHostView, statusBarTranslucent: Boolean) {
54-
view.statusBarTranslucent = statusBarTranslucent
53+
override fun setStatusBarTranslucent(view: ReactModalHostView, value: Boolean) {
54+
view.statusBarTranslucent = value
5555
}
5656

5757
@ReactProp(name = "navigationBarTranslucent")
58-
override fun setNavigationBarTranslucent(
59-
view: ReactModalHostView,
60-
navigationBarTranslucent: Boolean
61-
) {
62-
view.navigationBarTranslucent = navigationBarTranslucent
58+
override fun setNavigationBarTranslucent(view: ReactModalHostView, value: Boolean) {
59+
view.navigationBarTranslucent = value
6360
}
6461

6562
@ReactProp(name = "hardwareAccelerated")
66-
override fun setHardwareAccelerated(view: ReactModalHostView, hardwareAccelerated: Boolean) {
67-
view.hardwareAccelerated = hardwareAccelerated
63+
override fun setHardwareAccelerated(view: ReactModalHostView, value: Boolean) {
64+
view.hardwareAccelerated = value
6865
}
6966

7067
@ReactProp(name = "visible")
71-
override fun setVisible(view: ReactModalHostView, visible: Boolean) {
68+
override fun setVisible(view: ReactModalHostView, value: Boolean) {
7269
// iOS only
7370
}
7471

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ internal class ReactProgressBarViewManager :
4949
}
5050

5151
@ReactProp(name = PROP_STYLE)
52-
override fun setStyleAttr(view: ProgressBarContainerView, styleName: String?) {
53-
view.setStyle(styleName)
52+
override fun setStyleAttr(view: ProgressBarContainerView, value: String?) {
53+
view.setStyle(value)
5454
}
5555

5656
@ReactProp(name = ViewProps.COLOR, customType = "Color")
57-
override fun setColor(view: ProgressBarContainerView, color: Int?) {
58-
view.color = color
57+
override fun setColor(view: ProgressBarContainerView, value: Int?) {
58+
view.color = value
5959
}
6060

6161
@ReactProp(name = PROP_INDETERMINATE)
62-
override fun setIndeterminate(view: ProgressBarContainerView, indeterminate: Boolean) {
63-
view.indeterminate = indeterminate
62+
override fun setIndeterminate(view: ProgressBarContainerView, value: Boolean) {
63+
view.indeterminate = value
6464
}
6565

6666
@ReactProp(name = PROP_PROGRESS)
67-
override fun setProgress(view: ProgressBarContainerView, progress: Double) {
68-
view.progress = progress
67+
override fun setProgress(view: ProgressBarContainerView, value: Double) {
68+
view.progress = value
6969
}
7070

7171
@ReactProp(name = PROP_ANIMATING)
72-
override fun setAnimating(view: ProgressBarContainerView, animating: Boolean) {
73-
view.animating = animating
72+
override fun setAnimating(view: ProgressBarContainerView, value: Boolean) {
73+
view.animating = value
7474
}
7575

7676
override fun setTestID(view: ProgressBarContainerView, value: String?) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ internal open class SwipeRefreshLayoutManager :
4242
override fun getName(): String = REACT_CLASS
4343

4444
@ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
45-
override fun setEnabled(view: ReactSwipeRefreshLayout, enabled: Boolean) {
46-
view.isEnabled = enabled
45+
override fun setEnabled(view: ReactSwipeRefreshLayout, value: Boolean) {
46+
view.isEnabled = value
4747
}
4848

4949
@ReactProp(name = "colors", customType = "ColorArray")
50-
override fun setColors(view: ReactSwipeRefreshLayout, colors: ReadableArray?) {
51-
if (colors != null) {
52-
val colorValues = IntArray(colors.size())
53-
for (i in 0..<colors.size()) {
54-
if (colors.getType(i) == ReadableType.Map) {
55-
colorValues[i] = ColorPropConverter.getColor(colors.getMap(i), view.context, 0)
50+
override fun setColors(view: ReactSwipeRefreshLayout, value: ReadableArray?) {
51+
if (value != null) {
52+
val colorValues = IntArray(value.size())
53+
for (i in 0..<value.size()) {
54+
if (value.getType(i) == ReadableType.Map) {
55+
colorValues[i] = ColorPropConverter.getColor(value.getMap(i), view.context, 0)
5656
} else {
57-
colorValues[i] = colors.getInt(i)
57+
colorValues[i] = value.getInt(i)
5858
}
5959
}
6060
view.setColorSchemeColors(*colorValues)
@@ -64,22 +64,22 @@ internal open class SwipeRefreshLayoutManager :
6464
}
6565

6666
@ReactProp(name = "progressBackgroundColor", customType = "Color")
67-
override fun setProgressBackgroundColor(view: ReactSwipeRefreshLayout, color: Int?) {
68-
view.setProgressBackgroundColorSchemeColor(color ?: Color.TRANSPARENT)
67+
override fun setProgressBackgroundColor(view: ReactSwipeRefreshLayout, value: Int?) {
68+
view.setProgressBackgroundColorSchemeColor(value ?: Color.TRANSPARENT)
6969
}
7070

7171
// TODO(T46143833): Remove this method once the 'size' prop has been migrated to String in JS.
7272
fun setSize(view: ReactSwipeRefreshLayout, value: Int): Unit {
7373
view.setSize(value)
7474
}
7575

76-
override fun setSize(view: ReactSwipeRefreshLayout, size: String?) {
77-
if (size == null || size.equals("default")) {
76+
override fun setSize(view: ReactSwipeRefreshLayout, value: String?) {
77+
if (value == null || value.equals("default")) {
7878
view.setSize(SwipeRefreshLayout.DEFAULT)
79-
} else if (size.equals("large")) {
79+
} else if (value.equals("large")) {
8080
view.setSize(SwipeRefreshLayout.LARGE)
8181
} else {
82-
throw IllegalArgumentException("Size must be 'default' or 'large', received: $size")
82+
throw IllegalArgumentException("Size must be 'default' or 'large', received: $value")
8383
}
8484
}
8585

@@ -97,13 +97,13 @@ internal open class SwipeRefreshLayoutManager :
9797
}
9898

9999
@ReactProp(name = "refreshing")
100-
override fun setRefreshing(view: ReactSwipeRefreshLayout, refreshing: Boolean) {
101-
view.isRefreshing = refreshing
100+
override fun setRefreshing(view: ReactSwipeRefreshLayout, value: Boolean) {
101+
view.isRefreshing = value
102102
}
103103

104104
@ReactProp(name = "progressViewOffset", defaultFloat = 0f)
105-
override fun setProgressViewOffset(view: ReactSwipeRefreshLayout, offset: Float) {
106-
view.setProgressViewOffset(offset)
105+
override fun setProgressViewOffset(view: ReactSwipeRefreshLayout, value: Float) {
106+
view.setProgressViewOffset(value)
107107
}
108108

109109
override fun setNativeRefreshing(view: ReactSwipeRefreshLayout, value: Boolean) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ internal class ReactSwitchManager :
4646
}
4747

4848
@ReactProp(name = "disabled", defaultBoolean = false)
49-
override fun setDisabled(view: ReactSwitch, disabled: Boolean) {
50-
view.isEnabled = !disabled
49+
override fun setDisabled(view: ReactSwitch, value: Boolean) {
50+
view.isEnabled = !value
5151
}
5252

5353
@ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
54-
override fun setEnabled(view: ReactSwitch, enabled: Boolean) {
55-
view.isEnabled = enabled
54+
override fun setEnabled(view: ReactSwitch, value: Boolean) {
55+
view.isEnabled = value
5656
}
5757

5858
@ReactProp(name = ViewProps.ON)
59-
override fun setOn(view: ReactSwitch, on: Boolean) {
60-
setValueInternal(view, on)
59+
override fun setOn(view: ReactSwitch, value: Boolean) {
60+
setValueInternal(view, value)
6161
}
6262

6363
@ReactProp(name = "value")
@@ -66,28 +66,28 @@ internal class ReactSwitchManager :
6666
}
6767

6868
@ReactProp(name = "thumbTintColor", customType = "Color")
69-
override fun setThumbTintColor(view: ReactSwitch, color: Int?) {
70-
setThumbColor(view, color)
69+
override fun setThumbTintColor(view: ReactSwitch, value: Int?) {
70+
setThumbColor(view, value)
7171
}
7272

7373
@ReactProp(name = "thumbColor", customType = "Color")
74-
override fun setThumbColor(view: ReactSwitch, color: Int?) {
75-
view.setThumbColor(color)
74+
override fun setThumbColor(view: ReactSwitch, value: Int?) {
75+
view.setThumbColor(value)
7676
}
7777

7878
@ReactProp(name = "trackColorForFalse", customType = "Color")
79-
override fun setTrackColorForFalse(view: ReactSwitch, color: Int?) {
80-
view.setTrackColorForFalse(color)
79+
override fun setTrackColorForFalse(view: ReactSwitch, value: Int?) {
80+
view.setTrackColorForFalse(value)
8181
}
8282

8383
@ReactProp(name = "trackColorForTrue", customType = "Color")
84-
override fun setTrackColorForTrue(view: ReactSwitch, color: Int?) {
85-
view.setTrackColorForTrue(color)
84+
override fun setTrackColorForTrue(view: ReactSwitch, value: Int?) {
85+
view.setTrackColorForTrue(value)
8686
}
8787

8888
@ReactProp(name = "trackTintColor", customType = "Color")
89-
override fun setTrackTintColor(view: ReactSwitch, color: Int?) {
90-
view.setTrackColor(color)
89+
override fun setTrackTintColor(view: ReactSwitch, value: Int?) {
90+
view.setTrackColor(value)
9191
}
9292

9393
override fun setNativeValue(view: ReactSwitch, value: Boolean) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedViewManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ internal class ReactUnimplementedViewManager :
3535
override fun getName(): String = REACT_CLASS
3636

3737
@ReactProp(name = "name")
38-
override fun setName(view: ReactUnimplementedView, name: String?): Unit =
39-
view.setName(name ?: "<null component name>")
38+
override fun setName(view: ReactUnimplementedView, value: String?): Unit =
39+
view.setName(value ?: "<null component name>")
4040

4141
internal companion object {
4242
const val REACT_CLASS: String = "UnimplementedNativeView"

0 commit comments

Comments
 (0)