diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java index 2b6ae8057..417638dd2 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java @@ -10,9 +10,6 @@ package com.facebook.react.testing; import com.facebook.react.modules.debug.DeveloperSettings; -/** - * Default ReactSettings for tests. - */ public class ReactSettingsForTests implements DeveloperSettings { @Override @@ -29,4 +26,9 @@ public class ReactSettingsForTests implements DeveloperSettings { public boolean isJSDevModeEnabled() { return true; } + + @Override + public boolean isElementInspectorEnabled() { + return false; + } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java index 9c3454fe8..291f63adc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java @@ -33,6 +33,7 @@ public class DevInternalSettings implements private static final String PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host"; private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug"; private static final String PREFS_RELOAD_ON_JS_CHANGE_KEY = "reload_on_js_change"; + private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug"; private final SharedPreferences mPreferences; private final DevSupportManager mDebugManager; @@ -83,4 +84,12 @@ public class DevInternalSettings implements public void setReloadOnJSChangeEnabled(boolean enabled) { mPreferences.edit().putBoolean(PREFS_RELOAD_ON_JS_CHANGE_KEY, enabled).apply(); } + + public boolean isElementInspectorEnabled() { + return mPreferences.getBoolean(PREFS_INSPECTOR_DEBUG_KEY, false); + } + + public void setElementInspectorEnabled(boolean enabled) { + mPreferences.edit().putBoolean(PREFS_INSPECTOR_DEBUG_KEY, enabled).apply(); + } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java index 0a5d1da14..3e38a19fb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java @@ -265,10 +265,13 @@ public class DevSupportManager implements NativeModuleCallExceptionHandler { } }); options.put( - mApplicationContext.getString(R.string.catalyst_inspect_element), + mDevSettings.isElementInspectorEnabled() + ? mApplicationContext.getString(R.string.catalyst_element_inspector_off) + : mApplicationContext.getString(R.string.catalyst_element_inspector), new DevOptionHandler() { @Override public void onOptionSelected() { + mDevSettings.setElementInspectorEnabled(!mDevSettings.isElementInspectorEnabled()); mReactInstanceCommandsHandler.toggleElementInspector(); } }); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DeveloperSettings.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DeveloperSettings.java index 13a230fc3..5ff8dfbf7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DeveloperSettings.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DeveloperSettings.java @@ -28,4 +28,9 @@ public interface DeveloperSettings { * @return Whether dev mode should be enabled in JS bundles. */ boolean isJSDevModeEnabled(); + + /** + * @return Whether element inspector is enabled. + */ + boolean isElementInspectorEnabled(); } diff --git a/ReactAndroid/src/main/res/devsupport/values-cs/strings.xml b/ReactAndroid/src/main/res/devsupport/values-cs/strings.xml index c3432a9a8..426afdffd 100644 --- a/ReactAndroid/src/main/res/devsupport/values-cs/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-cs/strings.xml @@ -12,5 +12,5 @@ Čekejte prosím... Fetching JS bundle Unable to download JS bundle - Prozkoumat prvek + Prozkoumat prvek diff --git a/ReactAndroid/src/main/res/devsupport/values-da/strings.xml b/ReactAndroid/src/main/res/devsupport/values-da/strings.xml index 1d91235a5..0456813b0 100644 --- a/ReactAndroid/src/main/res/devsupport/values-da/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-da/strings.xml @@ -12,5 +12,5 @@ Vent venligst... Fetching JS bundle Unable to download JS bundle - Inspicer element + Inspicer element diff --git a/ReactAndroid/src/main/res/devsupport/values-de/strings.xml b/ReactAndroid/src/main/res/devsupport/values-de/strings.xml index 993f9ef5d..3f3831ac5 100644 --- a/ReactAndroid/src/main/res/devsupport/values-de/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-de/strings.xml @@ -12,5 +12,5 @@ Bitte warten Sie ... Fetching JS bundle Unable to download JS bundle - Element untersuchen + Element untersuchen diff --git a/ReactAndroid/src/main/res/devsupport/values-el/strings.xml b/ReactAndroid/src/main/res/devsupport/values-el/strings.xml index 4686909c1..d441a14fb 100644 --- a/ReactAndroid/src/main/res/devsupport/values-el/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-el/strings.xml @@ -12,5 +12,5 @@ Περιμένετε... Fetching JS bundle Unable to download JS bundle - Εξέταση στοιχείου + Εξέταση στοιχείου diff --git a/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml b/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml index ff57f5143..de9b5103c 100644 --- a/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml @@ -12,5 +12,5 @@ Please wait... Fetching JS bundle Unable to download JS bundle - Inspect Element + Show Inspector diff --git a/ReactAndroid/src/main/res/devsupport/values-es-rES/strings.xml b/ReactAndroid/src/main/res/devsupport/values-es-rES/strings.xml index 79c6256d8..babdb30d2 100644 --- a/ReactAndroid/src/main/res/devsupport/values-es-rES/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-es-rES/strings.xml @@ -12,5 +12,5 @@ Espera... Fetching JS bundle Unable to download JS bundle - Inspeccionar elemento + Inspeccionar elemento diff --git a/ReactAndroid/src/main/res/devsupport/values-es/strings.xml b/ReactAndroid/src/main/res/devsupport/values-es/strings.xml index f83b2b96e..770fd6d0c 100644 --- a/ReactAndroid/src/main/res/devsupport/values-es/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-es/strings.xml @@ -12,5 +12,5 @@ Espera... Fetching JS bundle Unable to download JS bundle - Inspeccionar elemento + Inspeccionar elemento diff --git a/ReactAndroid/src/main/res/devsupport/values-fb-rLL/strings.xml b/ReactAndroid/src/main/res/devsupport/values-fb-rLL/strings.xml index cf7e56e35..2b4f0a2ab 100644 --- a/ReactAndroid/src/main/res/devsupport/values-fb-rLL/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-fb-rLL/strings.xml @@ -12,5 +12,5 @@ (অনুগ্রহ করে অপেক্ষা করুন….) Fetching JS bundle Unable to download JS bundle - (तत्व निरीक्षण गर्नुहोस्) + (तत्व निरीक्षण गर्नुहोस्) diff --git a/ReactAndroid/src/main/res/devsupport/values-fb/strings.xml b/ReactAndroid/src/main/res/devsupport/values-fb/strings.xml index 4a3ea031e..9af8d4bad 100644 --- a/ReactAndroid/src/main/res/devsupport/values-fb/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-fb/strings.xml @@ -12,5 +12,5 @@ [Please wait...#71bad104a80f916d3bfb1ffa23a487af:1] [Fetching JS bundle#0de4127d4fc6e7d1e265e07433f26e25:1] [Unable to download JS bundle#51057ecd2555f91873cce4c452e1ea03:1] - [Inspect Element#c1b106c92869437ebd88f326d632b973:1] + [Show Inspector#c1b106c92869437ebd88f326d632b973:1] diff --git a/ReactAndroid/src/main/res/devsupport/values-fi/strings.xml b/ReactAndroid/src/main/res/devsupport/values-fi/strings.xml index 2468d372e..6499928f2 100644 --- a/ReactAndroid/src/main/res/devsupport/values-fi/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-fi/strings.xml @@ -12,5 +12,5 @@ Odota… Fetching JS bundle Unable to download JS bundle - Tarkista elementti + Tarkista elementti diff --git a/ReactAndroid/src/main/res/devsupport/values-fr/strings.xml b/ReactAndroid/src/main/res/devsupport/values-fr/strings.xml index f9fcf21a0..d805db875 100644 --- a/ReactAndroid/src/main/res/devsupport/values-fr/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-fr/strings.xml @@ -12,5 +12,5 @@ Veuillez patienter... Fetching JS bundle Unable to download JS bundle - Inspecter l’élément + Inspecter l’élément diff --git a/ReactAndroid/src/main/res/devsupport/values-hu/strings.xml b/ReactAndroid/src/main/res/devsupport/values-hu/strings.xml index d44f8dc8f..cfa294b08 100644 --- a/ReactAndroid/src/main/res/devsupport/values-hu/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-hu/strings.xml @@ -12,5 +12,5 @@ Kérjük, várj... Fetching JS bundle Unable to download JS bundle - Elem megtekintése + Elem megtekintése diff --git a/ReactAndroid/src/main/res/devsupport/values-in/strings.xml b/ReactAndroid/src/main/res/devsupport/values-in/strings.xml index fe3b189a5..0b5a2dbb9 100644 --- a/ReactAndroid/src/main/res/devsupport/values-in/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-in/strings.xml @@ -12,5 +12,5 @@ Harap tunggu... Fetching JS bundle Unable to download JS bundle - Periksa Elemen + Periksa Elemen diff --git a/ReactAndroid/src/main/res/devsupport/values-it/strings.xml b/ReactAndroid/src/main/res/devsupport/values-it/strings.xml index d9fe2dddf..0ee3764be 100644 --- a/ReactAndroid/src/main/res/devsupport/values-it/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-it/strings.xml @@ -12,5 +12,5 @@ Attendi... Fetching JS bundle Unable to download JS bundle - Esamina elemento + Esamina elemento diff --git a/ReactAndroid/src/main/res/devsupport/values-ja/strings.xml b/ReactAndroid/src/main/res/devsupport/values-ja/strings.xml index 3ae3b6917..25e5291e8 100644 --- a/ReactAndroid/src/main/res/devsupport/values-ja/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-ja/strings.xml @@ -12,5 +12,5 @@ しばらくお待ちください Fetching JS bundle Unable to download JS bundle - 要素を確認 + 要素を確認 diff --git a/ReactAndroid/src/main/res/devsupport/values-ko/strings.xml b/ReactAndroid/src/main/res/devsupport/values-ko/strings.xml index 21384a3a7..8f0d66338 100644 --- a/ReactAndroid/src/main/res/devsupport/values-ko/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-ko/strings.xml @@ -12,5 +12,5 @@ 기다려주세요... Fetching JS bundle Unable to download JS bundle - 요소 검사 + 요소 검사 diff --git a/ReactAndroid/src/main/res/devsupport/values-nb/strings.xml b/ReactAndroid/src/main/res/devsupport/values-nb/strings.xml index 24f646c97..88450696a 100644 --- a/ReactAndroid/src/main/res/devsupport/values-nb/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-nb/strings.xml @@ -12,5 +12,5 @@ Vent litt ... Fetching JS bundle Unable to download JS bundle - Inspiser element + Inspiser element diff --git a/ReactAndroid/src/main/res/devsupport/values-nl/strings.xml b/ReactAndroid/src/main/res/devsupport/values-nl/strings.xml index 85d5d70f9..3fe195b32 100644 --- a/ReactAndroid/src/main/res/devsupport/values-nl/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-nl/strings.xml @@ -12,5 +12,5 @@ Even geduld... Fetching JS bundle Unable to download JS bundle - Element inspecteren + Element inspecteren diff --git a/ReactAndroid/src/main/res/devsupport/values-pl/strings.xml b/ReactAndroid/src/main/res/devsupport/values-pl/strings.xml index b96d4f04f..88e9de7a1 100644 --- a/ReactAndroid/src/main/res/devsupport/values-pl/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-pl/strings.xml @@ -12,5 +12,5 @@ Zaczekaj... Fetching JS bundle Unable to download JS bundle - Zbadaj element + Zbadaj element diff --git a/ReactAndroid/src/main/res/devsupport/values-pt-rPT/strings.xml b/ReactAndroid/src/main/res/devsupport/values-pt-rPT/strings.xml index 98d7879bb..1c5354bdc 100644 --- a/ReactAndroid/src/main/res/devsupport/values-pt-rPT/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-pt-rPT/strings.xml @@ -12,5 +12,5 @@ Aguarda... Fetching JS bundle Unable to download JS bundle - Inspect Element + Show Inspector diff --git a/ReactAndroid/src/main/res/devsupport/values-pt/strings.xml b/ReactAndroid/src/main/res/devsupport/values-pt/strings.xml index ec3284c27..aca1d88b0 100644 --- a/ReactAndroid/src/main/res/devsupport/values-pt/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-pt/strings.xml @@ -12,5 +12,5 @@ Aguarde... Fetching JS bundle Unable to download JS bundle - Inspect Element + Show Inspector diff --git a/ReactAndroid/src/main/res/devsupport/values-ro/strings.xml b/ReactAndroid/src/main/res/devsupport/values-ro/strings.xml index 021a3fa34..71b20b37e 100644 --- a/ReactAndroid/src/main/res/devsupport/values-ro/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-ro/strings.xml @@ -12,5 +12,5 @@ Please wait... Fetching JS bundle Unable to download JS bundle - Inspect Element + Show Inspector diff --git a/ReactAndroid/src/main/res/devsupport/values-ru/strings.xml b/ReactAndroid/src/main/res/devsupport/values-ru/strings.xml index 6d2ea955a..ee462ab36 100644 --- a/ReactAndroid/src/main/res/devsupport/values-ru/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-ru/strings.xml @@ -12,5 +12,5 @@ Подождите... Fetching JS bundle Unable to download JS bundle - Проверить элемент + Проверить элемент diff --git a/ReactAndroid/src/main/res/devsupport/values-sv/strings.xml b/ReactAndroid/src/main/res/devsupport/values-sv/strings.xml index da23a64ea..034403368 100644 --- a/ReactAndroid/src/main/res/devsupport/values-sv/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-sv/strings.xml @@ -12,5 +12,5 @@ Vänta ... Fetching JS bundle Unable to download JS bundle - Inspektionselement + Inspektionselement diff --git a/ReactAndroid/src/main/res/devsupport/values-th/strings.xml b/ReactAndroid/src/main/res/devsupport/values-th/strings.xml index 57ecdc141..da3454ae4 100644 --- a/ReactAndroid/src/main/res/devsupport/values-th/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-th/strings.xml @@ -12,5 +12,5 @@ โปรดรอ... Fetching JS bundle Unable to download JS bundle - ตรวจสอบอิลิเมนต์ + ตรวจสอบอิลิเมนต์ diff --git a/ReactAndroid/src/main/res/devsupport/values-tr/strings.xml b/ReactAndroid/src/main/res/devsupport/values-tr/strings.xml index 62b511849..afeccc0b7 100644 --- a/ReactAndroid/src/main/res/devsupport/values-tr/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-tr/strings.xml @@ -12,5 +12,5 @@ Lütfen bekleyin... Fetching JS bundle Unable to download JS bundle - Öğeyi Denetle + Öğeyi Denetle diff --git a/ReactAndroid/src/main/res/devsupport/values-vi/strings.xml b/ReactAndroid/src/main/res/devsupport/values-vi/strings.xml index 2f35967da..0e37ac1bc 100644 --- a/ReactAndroid/src/main/res/devsupport/values-vi/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-vi/strings.xml @@ -12,5 +12,5 @@ Vui lòng đợi... Fetching JS bundle Unable to download JS bundle - Kiểm tra phần tử + Kiểm tra phần tử diff --git a/ReactAndroid/src/main/res/devsupport/values-zh-rCN/strings.xml b/ReactAndroid/src/main/res/devsupport/values-zh-rCN/strings.xml index 021308f2d..ab8a485d5 100644 --- a/ReactAndroid/src/main/res/devsupport/values-zh-rCN/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-zh-rCN/strings.xml @@ -12,5 +12,5 @@ 请稍等... Fetching JS bundle Unable to download JS bundle - 检查元素 + 检查元素 diff --git a/ReactAndroid/src/main/res/devsupport/values-zh-rHK/strings.xml b/ReactAndroid/src/main/res/devsupport/values-zh-rHK/strings.xml index cd2c73c36..68be2f34c 100644 --- a/ReactAndroid/src/main/res/devsupport/values-zh-rHK/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-zh-rHK/strings.xml @@ -12,5 +12,5 @@ 請稍候…… Fetching JS bundle Unable to download JS bundle - 檢查項目 + 檢查項目 diff --git a/ReactAndroid/src/main/res/devsupport/values-zh-rTW/strings.xml b/ReactAndroid/src/main/res/devsupport/values-zh-rTW/strings.xml index bad914ff3..e8e3a392e 100644 --- a/ReactAndroid/src/main/res/devsupport/values-zh-rTW/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-zh-rTW/strings.xml @@ -12,5 +12,5 @@ 請稍候…… Fetching JS bundle Unable to download JS bundle - 檢查元素 + 檢查元素 diff --git a/ReactAndroid/src/main/res/devsupport/values/strings.xml b/ReactAndroid/src/main/res/devsupport/values/strings.xml index 8969fe61e..1e60598d3 100644 --- a/ReactAndroid/src/main/res/devsupport/values/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values/strings.xml @@ -14,7 +14,8 @@ Unable to download JS bundle. Did you forget to start the development server or connect your device? Connecting to remote debugger Unable to connect with remote debugger - Inspect Element + Show Inspector + Hide Inspector Start Profile Stop Profile