From b5267d9436fc9fe76cedfdf57e12a093ef2f293f Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Fri, 26 Jan 2024 21:54:37 -0800 Subject: [PATCH] Enable `ANDROIDLINT` in React Native (#42675) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/42675 `ANDROIDLINT` config now has a base setup for RN. This enables it in arc linter, and fixes automatically fixable issues. Changelog: [Internal] Reviewed By: joevilches Differential Revision: D53115471 fbshipit-source-id: 2556c21770f7c7ca54d1bccfff527d39df20101e --- .../com/facebook/react/TaskConfiguration.kt | 2 +- .../react/tasks/internal/PrepareBoostTask.kt | 2 +- .../facebook/react/utils/DependencyUtils.kt | 2 +- .../kotlin/com/facebook/react/utils/Os.kt | 2 +- .../react/animated/NativeAnimatedModule.java | 2 +- .../bridge/interop/InteropModuleRegistry.java | 2 +- .../react/common/JavascriptException.java | 2 +- .../common/mapbuffer/ReadableMapBuffer.kt | 6 +- .../DefaultNewArchitectureEntryPoint.kt | 8 +- .../DefaultTurboModuleManagerDelegate.kt | 4 +- .../react/fabric/DevToolsReactPerfLogger.java | 6 +- .../modules/debug/AnimationsDebugModule.java | 3 +- .../fresco/ReactNetworkImageRequest.java | 2 +- .../modules/network/ProgressResponseBody.java | 4 +- .../network/ReactCookieJarContainer.java | 2 +- .../packagerconnection/FileIoHandler.java | 4 +- .../processing/ReactPropertyProcessor.java | 2 +- .../react/runtime/internal/bolts/Task.java | 4 +- .../bolts/UnobservedErrorNotifier.java | 2 +- .../react/uimanager/LayoutShadowNode.java | 4 +- .../views/image/ScaleTypeStartInside.java | 2 +- .../progressbar/ProgressBarContainerView.java | 2 +- .../views/scroll/OnScrollDispatchHelper.java | 4 +- .../react/views/text/ReactTextShadowNode.java | 3 +- .../text/TextLayoutManagerMapBuffer.java | 2 +- .../internal/span/CustomLineHeightSpan.java | 2 +- .../view/ReactViewBackgroundManager.java | 6 +- .../drawable/redbox_top_border_background.xml | 3 +- .../src/main/res/shell/values/styles.xml | 3 +- .../react/bridge/BaseJavaModuleTest.kt | 6 +- .../bridge/interop/FakeRCTEventEmitter.kt | 4 +- .../devsupport/MultipartStreamReaderTest.kt | 2 +- .../react/modules/dialog/DialogModuleTest.kt | 2 +- .../ReactPropAnnotationSetterSpecTest.kt | 22 ++-- .../react/uimanager/ReactPropConstantsTest.kt | 28 ++--- .../ReactPropForShadowNodeSpecTest.kt | 14 +-- .../react/uimanager/SimpleViewPropertyTest.kt | 6 +- .../testutils/fakes/FakeEventDispatcher.kt | 18 ++-- .../facebook/testutils/fakes/FakeYogaNode.kt | 82 +++++++------- .../testutils/shadows/ShadowSoLoader.kt | 2 +- .../java/com/helloworld/MainApplication.kt | 2 +- .../res/drawable/rn_edit_text_material.xml | 3 +- .../react/uiapp/RNTesterApplication.kt | 2 +- .../res/drawable/ic_launcher_background.xml | 102 ++++++++++++------ .../res/drawable/ic_launcher_foreground.xml | 12 ++- .../app/src/main/res/layout/activity_main.xml | 6 +- 46 files changed, 226 insertions(+), 179 deletions(-) diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt index e839e5c37ba..b676d471b4c 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt @@ -23,7 +23,7 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio val targetName = variant.name.capitalizeCompat() val targetPath = variant.name - val buildDir = this.layout.buildDirectory.get().asFile + val buildDir = layout.buildDirectory.get().asFile // Resources: generated/assets/react//index.android.bundle val resourcesDir = File(buildDir, "generated/res/react/$targetPath") // Bundle: generated/assets/react//index.android.bundle diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt index ee680337af4..e3da9e4aa44 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt @@ -40,7 +40,7 @@ abstract class PrepareBoostTask : DefaultTask() { it.into(outputDir) } File(outputDir.asFile.get(), "boost").apply { - renameTo(File(this.parentFile, "boost_${boostVersion.get()}")) + renameTo(File(parentFile, "boost_${boostVersion.get()}")) } } } diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt index a4df3b8e0fb..aedd296d40e 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt @@ -119,7 +119,7 @@ internal object DependencyUtils { fun readVersionAndGroupStrings(propertiesFile: File): Pair { val reactAndroidProperties = Properties() propertiesFile.inputStream().use { reactAndroidProperties.load(it) } - val versionStringFromFile = reactAndroidProperties[INTERNAL_VERSION_NAME] as? String ?: "" + val versionStringFromFile = (reactAndroidProperties[INTERNAL_VERSION_NAME] as? String).orEmpty() // If on a nightly, we need to fetch the -SNAPSHOT artifact from Sonatype. val versionString = if (versionStringFromFile.startsWith("0.0.0") || "-nightly-" in versionStringFromFile) { diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/Os.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/Os.kt index 6b3fa4a3e88..e00a793ca86 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/Os.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/Os.kt @@ -40,6 +40,6 @@ internal object Os { if (isWindows()) { this.relativeTo(base).path } else { - this.absolutePath + absolutePath } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java index 76749aaff7f..8a719ca35af 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java @@ -122,7 +122,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec } public int getValue() { - return this.value; + return value; } public static BatchExecutionOpCodes fromId(int id) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.java index f47199edc63..412c6ddf59a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.java @@ -26,7 +26,7 @@ public class InteropModuleRegistry { private final HashMap supportedModules; public InteropModuleRegistry() { - this.supportedModules = new HashMap<>(); + supportedModules = new HashMap<>(); } public boolean shouldReturnInteropModule(Class requestedModule) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java index b3945ee2508..bb560a71af0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java @@ -25,7 +25,7 @@ public class JavascriptException extends RuntimeException } public @Nullable String getExtraDataAsJson() { - return this.extraDataAsJson; + return extraDataAsJson; } public JavascriptException setExtraDataAsJson(@Nullable String extraDataAsJson) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt index b70fe1d2384..f4ea0f33ec8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt @@ -38,13 +38,13 @@ class ReadableMapBuffer : MapBuffer { @DoNotStrip private constructor(hybridData: HybridData) { - this.mHybridData = hybridData - this.buffer = importByteBuffer() + mHybridData = hybridData + buffer = importByteBuffer() readHeader() } private constructor(buffer: ByteBuffer) { - this.mHybridData = null + mHybridData = null this.buffer = buffer readHeader() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt index c6a024dcfa6..b837a299ad0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt @@ -41,10 +41,10 @@ object DefaultNewArchitectureEntryPoint { ReactFeatureFlags.useNativeViewConfigsInBridgelessMode = fabricEnabled && bridgelessEnabled ReactFeatureFlags.unstable_useTurboModuleInterop = bridgelessEnabled - this.privateFabricEnabled = fabricEnabled - this.privateTurboModulesEnabled = turboModulesEnabled - this.privateConcurrentReactEnabled = fabricEnabled - this.privateBridgelessEnabled = bridgelessEnabled + privateFabricEnabled = fabricEnabled + privateTurboModulesEnabled = turboModulesEnabled + privateConcurrentReactEnabled = fabricEnabled + privateBridgelessEnabled = bridgelessEnabled DefaultSoLoader.maybeLoadSoLibrary() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt index 45ca857cab2..c6f9446ada5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt @@ -41,14 +41,14 @@ private constructor( mutableListOf() fun addCxxReactPackage(provider: () -> CxxReactPackage): Builder { - this.cxxReactPackageProviders.add({ _ -> provider() }) + cxxReactPackageProviders.add({ _ -> provider() }) return this } fun addCxxReactPackage( provider: (context: ReactApplicationContext) -> CxxReactPackage ): Builder { - this.cxxReactPackageProviders.add(provider) + cxxReactPackageProviders.add(provider) return this } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java index 481c42d0826..4288a457f80 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java @@ -51,8 +51,8 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener private final int mCounter; public FabricCommitPointData(long timeStamp, int counter) { - this.mTimeStamp = timeStamp; - this.mCounter = counter; + mTimeStamp = timeStamp; + mCounter = counter; } public long getTimeStamp() { @@ -69,7 +69,7 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener private final Map mPoints = new HashMap<>(); private FabricCommitPoint(int commitNumber) { - this.mCommitNumber = commitNumber; + mCommitNumber = commitNumber; } private void addPoint(ReactMarkerConstants key, FabricCommitPointData data) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java index 7af7fe98c0d..95b24e3de2d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java @@ -65,7 +65,8 @@ class AnimationsDebugModule extends NativeAnimationsDebugModuleSpec { FpsDebugFrameCallback.FpsInfo fpsInfo = mFrameCallback.getFpsInfo((long) animationStopTimeMs); if (fpsInfo == null) { - Toast.makeText(getReactApplicationContext(), "Unable to get FPS info", Toast.LENGTH_LONG); + Toast.makeText(getReactApplicationContext(), "Unable to get FPS info", Toast.LENGTH_LONG) + .show(); } else { String fpsString = String.format( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java index 1f1e936a6e0..e36c378e4ee 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java @@ -24,7 +24,7 @@ public class ReactNetworkImageRequest extends ImageRequest { protected ReactNetworkImageRequest(ImageRequestBuilder builder, ReadableMap headers) { super(builder); - this.mHeaders = headers; + mHeaders = headers; } public ReadableMap getHeaders() { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java index e2bb720288b..7faf343c3a1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.java @@ -25,8 +25,8 @@ public class ProgressResponseBody extends ResponseBody { private long mTotalBytesRead; public ProgressResponseBody(ResponseBody responseBody, ProgressListener progressListener) { - this.mResponseBody = responseBody; - this.mProgressListener = progressListener; + mResponseBody = responseBody; + mProgressListener = progressListener; mTotalBytesRead = 0L; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ReactCookieJarContainer.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ReactCookieJarContainer.java index 2f9cddd4d6e..e5d36a8d30e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ReactCookieJarContainer.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ReactCookieJarContainer.java @@ -28,7 +28,7 @@ public class ReactCookieJarContainer implements CookieJarContainer { @Override public void removeCookieJar() { - this.cookieJar = null; + cookieJar = null; } @Override diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java index bbcc413dd88..50dff8ff548 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java @@ -104,12 +104,12 @@ public class FileIoHandler implements Runnable { if (!(params instanceof Number)) { throw new Exception("params must be a file handle"); } - TtlFileInputStream stream = mOpenFiles.get((int) params); + TtlFileInputStream stream = mOpenFiles.get(params); if (stream == null) { throw new Exception("invalid file handle, it might have timed out"); } - mOpenFiles.remove((int) params); + mOpenFiles.remove(params); stream.close(); responder.respond(""); } catch (Exception e) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java index 4144038e80b..89ef8ca44e2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java @@ -704,7 +704,7 @@ public class ReactPropertyProcessor extends ProcessorBase { public ReactPropertyException(String message, PropertyInfo propertyInfo) { super(message); - this.element = propertyInfo.element; + element = propertyInfo.element; } public ReactPropertyException(String message, Element element) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java index cb5399b6c12..1f4db71e336 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java @@ -647,7 +647,7 @@ public class Task implements TaskInterface { synchronized (lock) { completed = this.isCompleted(); if (!completed) { - this.continuations.add( + continuations.add( new Continuation() { @Override public Void then(Task task) { @@ -704,7 +704,7 @@ public class Task implements TaskInterface { synchronized (lock) { completed = this.isCompleted(); if (!completed) { - this.continuations.add( + continuations.add( new Continuation() { @Override public Void then(Task task) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java index 02021011c40..5ddf687ad10 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java @@ -24,7 +24,7 @@ class UnobservedErrorNotifier { @Override protected void finalize() throws Throwable { try { - Task faultedTask = this.task; + Task faultedTask = task; if (faultedTask != null) { Task.UnobservedExceptionHandler ueh = Task.getUnobservedExceptionHandler(); if (ueh != null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java index b966d4590b5..8e6f7379f14 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java @@ -44,8 +44,8 @@ public class LayoutShadowNode extends ReactShadowNodeImpl { private MutableYogaValue() {} private MutableYogaValue(MutableYogaValue mutableYogaValue) { - this.value = mutableYogaValue.value; - this.unit = mutableYogaValue.unit; + value = mutableYogaValue.value; + unit = mutableYogaValue.unit; } void setFromDynamic(Dynamic dynamic) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java index 5f6bad0e12b..124bcb9d6dc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.java @@ -28,7 +28,7 @@ class ScaleTypeStartInside extends ScalingUtils.AbstractScaleType { float dx = parentRect.left; float dy = parentRect.top; outTransform.setScale(scale, scale); - outTransform.postTranslate((int) (dx + 0.5f), (int) (dy + 0.5f)); + outTransform.postTranslate((dx + 0.5f), (dy + 0.5f)); } @Override diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java index f5a5d2f9f61..aa2caedaf2c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.java @@ -46,7 +46,7 @@ import com.facebook.react.bridge.JSApplicationIllegalArgumentException; } public void setColor(@Nullable Integer color) { - this.mColor = color; + mColor = color; } public void setIndeterminate(boolean indeterminate) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java index 46dc67a8115..9ef956d70e6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java @@ -47,10 +47,10 @@ public class OnScrollDispatchHelper { } public float getXFlingVelocity() { - return this.mXFlingVelocity; + return mXFlingVelocity; } public float getYFlingVelocity() { - return this.mYFlingVelocity; + return mYFlingVelocity; } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java index 96bb3495cd3..be27e77d139 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java @@ -359,8 +359,7 @@ public class ReactTextShadowNode extends ReactBaseTextShadowNode { Spanned text = Assertions.assertNotNull( - this.mPreparedSpannableText, - "Spannable element has not been prepared in onBeforeLayout"); + mPreparedSpannableText, "Spannable element has not been prepared in onBeforeLayout"); TextInlineViewPlaceholderSpan[] placeholders = text.getSpans(0, text.length(), TextInlineViewPlaceholderSpan.class); ArrayList shadowNodes = new ArrayList<>(placeholders.length); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java index ca49eb72eef..8f8ce7f1a01 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java @@ -126,7 +126,7 @@ public class TextLayoutManagerMapBuffer { return false; } - MapBuffer fragment = fragments.getMapBuffer((short) 0); + MapBuffer fragment = fragments.getMapBuffer(0); MapBuffer textAttributes = fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES); if (!textAttributes.contains(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION)) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java index 682a7dd3ddc..59c7847a58c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java @@ -18,7 +18,7 @@ public class CustomLineHeightSpan implements LineHeightSpan, ReactSpan { private final int mHeight; public CustomLineHeightSpan(float height) { - this.mHeight = (int) Math.ceil(height); + mHeight = (int) Math.ceil(height); } public int getLineHeight() { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java index 9b479fa4221..5c616597d50 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java @@ -22,13 +22,13 @@ public class ReactViewBackgroundManager { private int mColor = Color.TRANSPARENT; public ReactViewBackgroundManager(View view) { - this.mView = view; + mView = view; } public void cleanup() { ViewCompat.setBackground(mView, null); - this.mView = null; - this.mReactBackgroundDrawable = null; + mView = null; + mReactBackgroundDrawable = null; } private ReactViewBackgroundDrawable getOrCreateReactViewBackground() { diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/redbox_top_border_background.xml b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/redbox_top_border_background.xml index 32e4bbd5644..84ca14602c8 100644 --- a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/redbox_top_border_background.xml +++ b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/redbox_top_border_background.xml @@ -11,7 +11,8 @@ + android:color="#B3B3B3" + /> diff --git a/packages/react-native/ReactAndroid/src/main/res/shell/values/styles.xml b/packages/react-native/ReactAndroid/src/main/res/shell/values/styles.xml index 18deec89859..34c0a01c81a 100644 --- a/packages/react-native/ReactAndroid/src/main/res/shell/values/styles.xml +++ b/packages/react-native/ReactAndroid/src/main/res/shell/values/styles.xml @@ -4,7 +4,8 @@ @android:color/black