diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt index e2e13d7dc96..ad9bff58219 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt @@ -20,12 +20,11 @@ class RNTesterActivity : ReactActivity() { override fun onCreate(savedInstanceState: Bundle?) { // Get remote param before calling super which uses it - val bundle = activity.getIntent()?.getExtras() + val bundle = activity.intent?.extras if (bundle != null && bundle.containsKey(PARAM_ROUTE)) { val routeUri = "rntester://example/${bundle.getString(PARAM_ROUTE)}Example" - initialProps = Bundle() - initialProps?.putString("exampleFromAppetizeParams", routeUri) + initialProps = Bundle().apply { putString("exampleFromAppetizeParams", routeUri) } } super.onCreate(savedInstanceState) diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyLegacyViewManager.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyLegacyViewManager.kt index d7e101b7d3c..68504be6b06 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyLegacyViewManager.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyLegacyViewManager.kt @@ -35,15 +35,13 @@ internal class MyLegacyViewManager(reactContext: ReactApplicationContext) : } @ReactProp(name = ViewProps.COLOR) - fun setColor(view: MyNativeView, color: String) { - view.setBackgroundColor(Color.parseColor(color)) + fun setColor(view: MyNativeView, color: String?) { + color?.let { view.setBackgroundColor(Color.parseColor(it)) } } @ReactProp(name = "cornerRadius") - fun setCornerRadius(view: MyNativeView, cornerRadius: Float) { - if (cornerRadius !== null) { - view.setCornerRadius(cornerRadius) - } + fun setCornerRadius(view: MyNativeView, cornerRadius: Float?) { + cornerRadius?.let { view.setCornerRadius(it) } } override fun getExportedViewConstants(): Map = mapOf("PI" to 3.14) diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt index c9365d72802..50e7708a422 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. */ +@file:Suppress("DEPRECATION") // As we want to test RCTEventEmitter here package com.facebook.react.uiapp.component import android.graphics.Color