[menu-bar] Bump version to 1.2.1 (#216)

* [menu-bar] Bump version to 1.2.1 * Show debug menu in release mode * update changelog
expo · Nov 5, 2024 · 10af6f4 · 10af6f4
1 parent acd176c
commit 10af6f4
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,9 +8,17 @@
 
 ### 🐛 Bug fixes
 
+### 🛠 Breaking changes
+
+## 1.2.1— 2024-11-05
+
+### 🐛 Bug fixes
+
 - Fixed CLI on x64 machines. ([#215](https://github.com/expo/orbit/pull/215) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
-### 🛠 Breaking changes
+### 💡 Others
+
+- Show Debug Window in release mode. ([#216](https://github.com/expo/orbit/pull/216) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ## 1.2.0 — 2024-11-05
 

diff --git a/apps/menu-bar/macos/ExpoMenuBar-macOS/Info.plist b/apps/menu-bar/macos/ExpoMenuBar-macOS/Info.plist
@@ -58,7 +58,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>28</string>
+	<string>29</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/apps/menu-bar/package.json b/apps/menu-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orbit",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "archive": "yarn update-cli && xcodebuild archive -workspace macos/ExpoMenuBar.xcworkspace -scheme ExpoMenuBar-macOS -destination 'generic/platform=macOS,name=Any Mac' -archivePath build/ExpoOrbit.xcarchive",

diff --git a/apps/menu-bar/src/components/DebugLogs/ObjectInspector.tsx b/apps/menu-bar/src/components/DebugLogs/ObjectInspector.tsx
@@ -36,7 +36,7 @@ export const ObjectInspector = ({ obj, name }: { obj: any; name?: string }) => {
       {isObject && isOpen ? (
         <View style={{ marginLeft: 10 }}>
           {Object.keys(obj).map((key) => (
-            <ObjectInspector obj={obj[key]} name={isArray ? `[${key}]` : key} />
+            <ObjectInspector key={key} obj={obj[key]} name={isArray ? `[${key}]` : key} />
           ))}
         </View>
       ) : null}

diff --git a/apps/menu-bar/src/components/NativeColorPalette.tsx b/apps/menu-bar/src/components/NativeColorPalette.tsx
@@ -4,11 +4,34 @@ import { FlatList, TouchableOpacity, Text, View, StyleSheet } from 'react-native
 
 import { PlatformColor } from '../modules/PlatformColor';
 
+const SMALL_SQUARE_SIZE = 25;
+const NUMBER_OF_COLUMNS = 9;
+
 const NativeColorPalette = () => {
   const [selectedColor, setSelectedColor] = useState<string>();
   const [, setClipboardString] = useClipboard();
   return (
     <View style={styles.container}>
+      <View style={{ alignItems: 'flex-start' }}>
+        <FlatList
+          data={colorsArray}
+          renderItem={({ item }) => {
+            return (
+              <TouchableOpacity
+                style={[
+                  styles.smallSquare,
+                  {
+                    backgroundColor: PlatformColor(item),
+                  },
+                ]}
+                onPress={() => setSelectedColor((prev) => (prev !== item ? item : undefined))}
+              />
+            );
+          }}
+          keyExtractor={(item) => item}
+          numColumns={NUMBER_OF_COLUMNS}
+        />
+      </View>
       {selectedColor ? (
         <View style={styles.selectedContainer}>
           <View
@@ -26,24 +49,6 @@ const NativeColorPalette = () => {
           </TouchableOpacity>
         </View>
       ) : null}
-      <FlatList
-        data={colorsArray}
-        renderItem={({ item }) => {
-          return (
-            <TouchableOpacity
-              style={[
-                styles.smallSquare,
-                {
-                  backgroundColor: PlatformColor(item),
-                },
-              ]}
-              onPress={() => setSelectedColor((prev) => (prev !== item ? item : undefined))}
-            />
-          );
-        }}
-        keyExtractor={(item) => item}
-        numColumns={9}
-      />
     </View>
   );
 };
@@ -52,12 +57,13 @@ export default NativeColorPalette;
 
 const styles = StyleSheet.create({
   container: {
+    flexDirection: 'row',
     borderWidth: 2,
     borderColor: PlatformColor('tertiaryLabelColor'),
   },
   smallSquare: {
-    height: 25,
-    width: 25,
+    height: SMALL_SQUARE_SIZE,
+    width: SMALL_SQUARE_SIZE,
   },
   bigSquare: {
     height: 40,
@@ -71,7 +77,6 @@ const styles = StyleSheet.create({
   },
   selectedColorText: {
     margin: 10,
-    flex: 1,
   },
 });
 

diff --git a/apps/menu-bar/src/windows/Settings.tsx b/apps/menu-bar/src/windows/Settings.tsx
@@ -210,16 +210,6 @@ const Settings = () => {
                     </View>
                   </Row>
                 ) : null}
-                {__DEV__ ? (
-                  <TouchableOpacity
-                    onPress={() => WindowsNavigator.open('DebugMenu')}
-                    style={[
-                      styles.debugButton,
-                      getStylesForColor('primary', theme)?.touchableStyle,
-                    ]}>
-                    <SystemIconView systemIconName="ladybug" />
-                  </TouchableOpacity>
-                ) : null}
                 <Button title="Log Out" onPress={handleLogout} style={styles.button} />
               </Row>
             ) : (
@@ -343,14 +333,21 @@ const Settings = () => {
           </View>
         </View>
       </View>
-      <Text color="secondary" size="tiny" align="center">
-        {`Version: ${MenuBarModule.appVersion} ${
-          MenuBarModule.buildVersion ? `(${MenuBarModule.buildVersion})` : ''
-        }`}
-      </Text>
-      <Text color="secondary" size="tiny" align="center">
-        Copyright 650 Industries Inc, 2023
-      </Text>
+      <View>
+        <Text color="secondary" size="tiny" align="center">
+          {`Version: ${MenuBarModule.appVersion} ${
+            MenuBarModule.buildVersion ? `(${MenuBarModule.buildVersion})` : ''
+          }`}
+        </Text>
+        <Text color="secondary" size="tiny" align="center">
+          Copyright 650 Industries Inc, 2023
+        </Text>
+        <TouchableOpacity
+          onPress={() => WindowsNavigator.open('DebugMenu')}
+          style={[styles.debugButton, getStylesForColor('primary', theme)?.touchableStyle]}>
+          <SystemIconView systemIconName="ladybug" />
+        </TouchableOpacity>
+      </View>
     </View>
   );
 };
@@ -375,6 +372,9 @@ const styles = StyleSheet.create({
     marginTop: -3,
   },
   debugButton: {
+    position: 'absolute',
+    bottom: 0,
+    right: 0,
     height: 32,
     borderRadius: 6,
     paddingHorizontal: 8,