expo-dev-menu 1.1.1 → 1.2.0

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 1.2.0 — 2022-08-11
+
+### 🎉 New features
+
+- Add landscape orienation support. ([#18509](https://github.com/expo/expo/pull/18509)) by [@ajsmth](https://github.com/ajsmth)
+
+### 🐛 Bug fixes
+
+- Fix the duplicated `DevMenuRNGestureHandlerStateManager.h` output file compilation error on iOS. ([#18562](https://github.com/expo/expo/pull/18562) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.1.1 — 2022-07-20
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '1.1.1'
+version = '1.2.0'
 
 // reanimated v2
 def reactNativeFilePath = ["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()
@@ -207,7 +207,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 10
-    versionName '1.1.1'
+    versionName '1.2.0'
   }
   lintOptions {
     abortOnError false

package/android/src/debug/java/expo/modules/devmenu/DevMenuManager.kt

@@ -21,7 +21,6 @@ import expo.interfaces.devmenu.DevMenuExtensionInterface
 import expo.interfaces.devmenu.DevMenuExtensionSettingsInterface
 import expo.interfaces.devmenu.DevMenuManagerInterface
 import expo.interfaces.devmenu.DevMenuPreferencesInterface
-import expo.interfaces.devmenu.expoapi.DevMenuExpoApiClientInterface
 import expo.interfaces.devmenu.items.DevMenuCallableProvider
 import expo.interfaces.devmenu.items.DevMenuDataSourceInterface
 import expo.interfaces.devmenu.items.DevMenuDataSourceItem
@@ -33,7 +32,6 @@ import expo.interfaces.devmenu.items.DevMenuScreen
 import expo.interfaces.devmenu.items.DevMenuScreenItem
 import expo.interfaces.devmenu.items.KeyCommand
 import expo.interfaces.devmenu.items.getItemsOfType
-import expo.modules.devmenu.api.DevMenuExpoApiClient
 import expo.modules.devmenu.api.DevMenuMetroClient
 import expo.modules.devmenu.detectors.ShakeDetector
 import expo.modules.devmenu.detectors.ThreeFingerLongPressDetector
@@ -61,7 +59,6 @@ object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
   private lateinit var devMenuHost: DevMenuHost
   private var currentReactInstanceManager: WeakReference<ReactInstanceManager?> = WeakReference(null)
   private var currentScreenName: String? = null
-  private val expoApiClient = DevMenuExpoApiClient()
   private var canLaunchDevMenuOnStart = true
   var testInterceptor: DevMenuTestInterceptor = DevMenuDisabledTestInterceptor()
 
@@ -478,8 +475,6 @@ object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
 
   override fun getMenuHost(): ReactNativeHost = devMenuHost
 
-  override fun getExpoApiClient(): DevMenuExpoApiClientInterface = expoApiClient
-
   override fun setCanLaunchDevMenuOnStart(canLaunchDevMenuOnStart: Boolean) {
     this.canLaunchDevMenuOnStart = canLaunchDevMenuOnStart
   }

package/android/src/main/java/expo/modules/devmenu/DevMenuActivity.kt

@@ -80,18 +80,6 @@ class DevMenuActivity : ReactActivity() {
     }
   }
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    // Due to a bug in API 26, we can't set the orientation in translucent activity.
-    // See https://stackoverflow.com/questions/48072438/java-lang-illegalstateexception-only-fullscreen-opaque-activities-can-request-o
-    requestedOrientation = if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
-      ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-    } else {
-      ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    }
-
-    super.onCreate(savedInstanceState)
-  }
-
   override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
     return if (keyCode == KeyEvent.KEYCODE_MENU || DevMenuManager.onKeyEvent(keyCode, event)) {
       DevMenuManager.closeMenu()

package/android/src/main/java/expo/modules/devmenu/modules/DevMenuInternalModule.kt

@@ -35,26 +35,11 @@ interface DevMenuInternalMenuControllerModuleInterface {
   fun fireCallback(name: String, promise: Promise)
 }
 
-interface DevMenuInternalSessionManagerModuleInterface {
-  fun restoreSession(): String?
-
-  @ReactMethod
-  fun restoreSessionAsync(promise: Promise)
-
-  @ReactMethod
-  fun setSessionAsync(session: ReadableMap?, promise: Promise)
-}
-
 interface DevMenuInternalFontManagerModuleInterface {
   @ReactMethod
   fun loadFontsAsync(promise: Promise)
 }
 
-interface DevMenuInternalWebBrowserModuleInterface {
-  @ReactMethod
-  fun openWebBrowserAsync(startUrl: String?, promise: Promise)
-}
-
 class DevMenuInternalModule(
   reactContext: ReactApplicationContext
 ) : ReactContextBaseJavaModule(reactContext),

package/android/src/main/java/expo/modules/devmenu/modules/DevMenuModule.kt

@@ -2,7 +2,6 @@ package expo.modules.devmenu.modules
 
 import com.facebook.react.bridge.*
 import expo.modules.devmenu.DevMenuManager
-import kotlinx.coroutines.launch
 
 class DevMenuModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
@@ -18,47 +17,11 @@ class DevMenuModule(reactContext: ReactApplicationContext) :
       }
   }
 
-  @ReactMethod
-  fun isLoggedInAsync(promise: Promise) {
-    promise.resolve(
-      devMenuManager
-        .getExpoApiClient()
-        .isLoggedIn()
-    )
-  }
-
-  @ReactMethod
-  fun queryMyProjectsAsync(promise: Promise) {
-    devMenuManager.coroutineScope.launch {
-      try {
-        devMenuManager
-          .getExpoApiClient()
-          .queryMyProjects()
-          .use {
-            @Suppress("DEPRECATION_ERROR")
-            promise.resolve(it.body()?.charStream()?.readText() ?: "")
-          }
-      } catch (e: Exception) {
-        promise.reject("ERR_DEVMENU_CANNOT_GET_PROJECTS", e.message, e)
-      }
-    }
-  }
-
   @ReactMethod
   fun openMenu() {
     openMenuOn(null)
   }
 
-  @ReactMethod
-  fun openProfile() {
-    openMenuOn("Profile")
-  }
-
-  @ReactMethod
-  fun openSettings() {
-    openMenuOn("Settings")
-  }
-
   override fun invalidate() {
     devMenuManager.registeredCallbacks = arrayListOf<String>()
     super.invalidate()

package/android/src/release/java/expo/modules/devmenu/DevMenuManager.kt

@@ -11,7 +11,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import expo.interfaces.devmenu.DevMenuDelegateInterface
 import expo.interfaces.devmenu.DevMenuManagerInterface
 import expo.interfaces.devmenu.DevMenuPreferencesInterface
-import expo.interfaces.devmenu.expoapi.DevMenuExpoApiClientInterface
 import expo.interfaces.devmenu.items.DevMenuDataSourceItem
 import expo.modules.devmenu.api.DevMenuMetroClient
 import kotlinx.coroutines.CoroutineScope
@@ -97,9 +96,6 @@ object DevMenuManager : DevMenuManagerInterface {
     throw IllegalStateException(DEV_MENU_IS_NOT_AVAILABLE)
   }
 
-  override fun getExpoApiClient(): DevMenuExpoApiClientInterface {
-    throw IllegalStateException(DEV_MENU_IS_NOT_AVAILABLE)
-  }
 
   override fun setCanLaunchDevMenuOnStart(canLaunchDevMenuOnStart: Boolean) {
     throw IllegalStateException(DEV_MENU_IS_NOT_AVAILABLE)

package/app/components/BottomSheet.tsx

@@ -67,6 +67,8 @@ type Props = {
   innerGestureHandlerRefs: [React.RefObject<PanGestureHandler>, React.RefObject<TapGestureHandler>];
 
   animationEnabled?: boolean;
+
+  screenHeight: number;
 };
 
 type State = {
@@ -77,8 +79,6 @@ type State = {
   heightOfContent: Animated.Value<number>;
 };
 
-const { height: screenHeight } = Dimensions.get('window');
-
 const P = <T extends any>(android: T, ios: T): T => (Platform.OS === 'ios' ? ios : android);
 
 const magic = {
@@ -532,7 +532,10 @@ export class BottomSheet extends React.Component<Props, State> {
     this.state.heightOfContent.setValue(height - this.state.initSnap);
   };
 
-  static renumber = (str: string) => (Number(str.split('%')[0]) * screenHeight) / 100;
+  static renumber = (str: string, screenHeight: number) => {
+    const result = (Number(str.split('%')[0]) * screenHeight) / 100;
+    return result;
+  };
 
   static getDerivedStateFromProps(props: Props, state: State | undefined): State {
     let snapPoints;
@@ -551,7 +554,7 @@ export class BottomSheet extends React.Component<Props, State> {
           if (typeof s === 'number') {
             return { val: s, ind: i };
           } else if (typeof s === 'string') {
-            return { val: BottomSheet.renumber(s), ind: i };
+            return { val: BottomSheet.renumber(s, props.screenHeight), ind: i };
           }
 
           throw new Error(`Invalid type for value ${s}: ${typeof s}`);
@@ -690,8 +693,10 @@ const styles = StyleSheet.create({
   },
   container: {
     overflow: 'hidden',
-    borderTopLeftRadius: 10,
-    borderTopRightRadius: 10,
+    borderRadius: 10,
+    maxWidth: 525,
+    width: '100%',
+    alignSelf: 'center',
   },
   fullscreenView: {
     width: '100%',

package/app/components/Main.tsx

@@ -351,6 +351,7 @@ export function Main({ registeredCallbacks = [] }: MainProps) {
           </Row>
         </Button.ScaleOnPressContainer>
       </View>
+      <Spacer.Vertical size="large" />
     </View>
   );
 }

package/app/hooks/useBottomSheet.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, StyleSheet, Pressable } from 'react-native';
+import { View, StyleSheet, Pressable, useWindowDimensions } from 'react-native';
 import Animated from 'react-native-reanimated';
 
 import { BottomSheet } from '../components/BottomSheet';
@@ -55,6 +55,8 @@ export function BottomSheetProvider({ children }: BottomSheetProviderProps) {
     outputRange: [0, 0.5],
   });
 
+  const { height: screenHeight } = useWindowDimensions();
+
   return (
     <BottomSheetContext.Provider value={{ collapse }}>
       <View style={styles.container}>
@@ -69,6 +71,7 @@ export function BottomSheetProvider({ children }: BottomSheetProviderProps) {
           />
         </Pressable>
         <BottomSheet
+          screenHeight={screenHeight}
           ref={bottomSheetRef}
           callbackNode={callbackNode.current}
           snapPoints={snapPoints}>