diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 8cf7943de73..aadda62ceda 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -1175,7 +1175,6 @@ public class com/facebook/react/bridge/ReactInstanceManagerInspectorTarget : jav public fun (Lcom/facebook/react/bridge/ReactInstanceManagerInspectorTarget$TargetDelegate;)V public fun close ()V public fun sendDebuggerResumeCommand ()V - public fun sendDebuggerStepOverCommand ()V } public abstract interface class com/facebook/react/bridge/ReactInstanceManagerInspectorTarget$TargetDelegate { @@ -2443,7 +2442,6 @@ public abstract interface class com/facebook/react/devsupport/interfaces/DevSupp public abstract interface class com/facebook/react/devsupport/interfaces/DevSupportManager$PausedInDebuggerOverlayCommandListener { public abstract fun onResume ()V - public abstract fun onStepOver ()V } public abstract interface class com/facebook/react/devsupport/interfaces/ErrorCustomizer { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index c85a737b73d..c12e171c69a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1516,14 +1516,6 @@ public class ReactInstanceManager { mInspectorTarget.sendDebuggerResumeCommand(); } } - - @Override - public void onStepOver() { - UiThreadUtil.assertOnUiThread(); - if (mInspectorTarget != null) { - mInspectorTarget.sendDebuggerStepOverCommand(); - } - } }); } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java index a0395cdb959..f99291dabad 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java @@ -42,8 +42,6 @@ public class ReactInstanceManagerInspectorTarget implements AutoCloseable { public native void sendDebuggerResumeCommand(); - public native void sendDebuggerStepOverCommand(); - public void close() { mHybridData.resetNative(); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java index 897c4ed8651..a877ec1c30a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java @@ -1191,12 +1191,10 @@ public abstract class DevSupportManagerBase implements DevSupportManager { pausedText.setText(message); View resumeButton = Assertions.assertNotNull(dialogView.findViewById(R.id.resume_button)); resumeButton.setOnClickListener((v) -> listener.onResume()); - View stepOverButton = - Assertions.assertNotNull(dialogView.findViewById(R.id.step_over_button)); - stepOverButton.setOnClickListener((v) -> listener.onStepOver()); Window dialogWindow = mPausedInDebuggerDialog.getWindow(); if (dialogWindow != null) { dialogWindow.setGravity(Gravity.TOP); + dialogWindow.setBackgroundDrawableResource(R.drawable.paused_in_debugger_background); } mPausedInDebuggerDialog.show(); }); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt index 2353d65ab19..c16751534e9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt @@ -125,7 +125,5 @@ public interface DevSupportManager : JSExceptionHandler { public interface PausedInDebuggerOverlayCommandListener { public fun onResume() - - public fun onStepOver() } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java index f2caeff7bd8..1ac87ed7deb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java @@ -483,14 +483,6 @@ public class ReactHostImpl implements ReactHost { mReactHostInspectorTarget.sendDebuggerResumeCommand(); } } - - @Override - public void onStepOver() { - UiThreadUtil.assertOnUiThread(); - if (mReactHostInspectorTarget != null) { - mReactHostInspectorTarget.sendDebuggerStepOverCommand(); - } - } }); } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt index 67368d673c4..c6f916155ab 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt @@ -26,8 +26,6 @@ internal class ReactHostInspectorTarget(private val reactHostImpl: ReactHostImpl public external fun sendDebuggerResumeCommand() - public external fun sendDebuggerStepOverCommand() - override fun close() { mHybridData.resetNative() } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.cpp index 042e5cf934d..c97907bc63d 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.cpp @@ -88,16 +88,6 @@ void ReactInstanceManagerInspectorTarget::sendDebuggerResumeCommand() { } } -void ReactInstanceManagerInspectorTarget::sendDebuggerStepOverCommand() { - if (inspectorTarget_) { - inspectorTarget_->sendCommand(HostCommand::DebuggerStepOver); - } else { - jni::throwNewJavaException( - "java/lang/IllegalStateException", - "Cannot send command while the Fusebox backend is not enabled"); - } -} - void ReactInstanceManagerInspectorTarget::registerNatives() { registerHybrid({ makeNativeMethod( @@ -105,9 +95,6 @@ void ReactInstanceManagerInspectorTarget::registerNatives() { makeNativeMethod( "sendDebuggerResumeCommand", ReactInstanceManagerInspectorTarget::sendDebuggerResumeCommand), - makeNativeMethod( - "sendDebuggerStepOverCommand", - ReactInstanceManagerInspectorTarget::sendDebuggerStepOverCommand), }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.h index b9ec235d089..4aead15d30e 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.h @@ -45,7 +45,6 @@ class ReactInstanceManagerInspectorTarget delegate); void sendDebuggerResumeCommand(); - void sendDebuggerStepOverCommand(); static void registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp index 0575aba4f54..dbcfa3f0a8b 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp @@ -73,25 +73,12 @@ void JReactHostInspectorTarget::sendDebuggerResumeCommand() { } } -void JReactHostInspectorTarget::sendDebuggerStepOverCommand() { - if (inspectorTarget_) { - inspectorTarget_->sendCommand(HostCommand::DebuggerStepOver); - } else { - jni::throwNewJavaException( - "java/lang/IllegalStateException", - "Cannot send command while the Fusebox backend is not enabled"); - } -} - void JReactHostInspectorTarget::registerNatives() { registerHybrid({ makeNativeMethod("initHybrid", JReactHostInspectorTarget::initHybrid), makeNativeMethod( "sendDebuggerResumeCommand", JReactHostInspectorTarget::sendDebuggerResumeCommand), - makeNativeMethod( - "sendDebuggerStepOverCommand", - JReactHostInspectorTarget::sendDebuggerStepOverCommand), }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h index aea5ab41732..e27655793ae 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h @@ -54,7 +54,6 @@ class JReactHostInspectorTarget static void registerNatives(); void sendDebuggerResumeCommand(); - void sendDebuggerStepOverCommand(); jsinspector_modern::HostTarget* getInspectorTarget(); diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-hdpi/ic_step_over.png b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-hdpi/ic_step_over.png deleted file mode 100644 index 5fd364d79d5..00000000000 Binary files a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-hdpi/ic_step_over.png and /dev/null differ diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-mdpi/ic_step_over.png b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-mdpi/ic_step_over.png deleted file mode 100644 index 781df20a9ac..00000000000 Binary files a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-mdpi/ic_step_over.png and /dev/null differ diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xhdpi/ic_step_over.png b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xhdpi/ic_step_over.png deleted file mode 100644 index 5a1b26c72a4..00000000000 Binary files a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xhdpi/ic_step_over.png and /dev/null differ diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xxhdpi/ic_step_over.png b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xxhdpi/ic_step_over.png deleted file mode 100644 index fa30e23a241..00000000000 Binary files a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xxhdpi/ic_step_over.png and /dev/null differ diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xxxhdpi/ic_step_over.png b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xxxhdpi/ic_step_over.png deleted file mode 100644 index f708d64dd37..00000000000 Binary files a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable-xxxhdpi/ic_step_over.png and /dev/null differ diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/paused_in_debugger_background.xml b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/paused_in_debugger_background.xml new file mode 100644 index 00000000000..5b1da238fc4 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/res/devsupport/drawable/paused_in_debugger_background.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/layout/paused_in_debugger_view.xml b/packages/react-native/ReactAndroid/src/main/res/devsupport/layout/paused_in_debugger_view.xml index ce9ca674565..9d250308b05 100644 --- a/packages/react-native/ReactAndroid/src/main/res/devsupport/layout/paused_in_debugger_view.xml +++ b/packages/react-native/ReactAndroid/src/main/res/devsupport/layout/paused_in_debugger_view.xml @@ -5,12 +5,9 @@ android:id="@+id/layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#ffffc1" - android:divider="#cacaca" android:gravity="center" android:layoutDirection="ltr" android:orientation="horizontal" - android:showDividers="middle" tools:ignore="MissingDefaultResource" > @@ -18,10 +15,10 @@ android:id="@+id/paused_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingHorizontal="12dp" + android:paddingStart="14dp" android:text="" android:textColor="@android:color/black" - android:textSize="14sp" + android:textSize="16sp" android:textStyle="bold" app:autoSizeTextType="uniform" /> @@ -36,15 +33,4 @@ android:paddingVertical="8dp" android:src="@drawable/ic_resume" /> - -