misc: upgrade to Expo SDK 58

Move the app from SDK 55 onto React Native 0.88 so later widget and auth work can use the SDK 58 packages.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
joshuafhigginsandCursor committed 2026-10-20 17:20:25 -04:00 Verified
1 parent 82c4187826
commit 6c3a474bb0
11 files changed
+3786 -4862

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
import { NativeTabs } from 'expo-router/unstable-native-tabs';
import { NativeTabs } from 'expo-router/native-tabs';
export default function TabLayout() {
return (
+28 -18
View File
@@ -1,4 +1,3 @@
import { Button, ContextMenu, Host } from '@expo/ui/swift-ui';
import { Ionicons } from '@expo/vector-icons';
import * as Burnt from 'burnt';
import { SymbolView } from 'expo-symbols';
@@ -19,6 +18,7 @@ import api from '../../../src/services/api';
import { syncDevicesToWidget } from '../../../src/services/widgetSync';
import { Device } from '../../../src/types';
import { useAuth } from '@/src/context/AuthContext';
import { DeviceContextMenu } from '@/src/components/DeviceContextMenu';
const isAuthError = (error: unknown) =>
typeof error === 'object' &&
@@ -43,7 +43,6 @@ export default function DeviceListScreen() {
const fetchDevices = useCallback(async (showLoading = false) => {
try {
if (showLoading) setIsLoading(true);
const data = await api.getDevices();
setDevices(data);
// Sync devices to iOS widget
@@ -66,8 +65,31 @@ export default function DeviceListScreen() {
useEffect(() => {
if (!isAuthenticated) return;
fetchDevices(true);
}, [fetchDevices, isAuthenticated]);
let cancelled = false;
void api.getDevices().then(
data => {
if (cancelled) return;
setDevices(data);
syncDevicesToWidget(data);
setIsLoading(false);
},
(error: unknown) => {
if (cancelled) return;
if (isAuthError(error)) {
setDevices([]);
} else {
const message =
error instanceof Error ? error.message : 'Failed to load devices';
Alert.alert('Error', message);
}
setIsLoading(false);
}
);
return () => {
cancelled = true;
};
}, [isAuthenticated]);
useEffect(() => {
if (!isAuthenticated) return;
@@ -301,17 +323,7 @@ export default function DeviceListScreen() {
const isOffline = item.status?.toLowerCase() === 'offline';
return (
<Host>
<ContextMenu>
<ContextMenu.Items>
<Button
systemImage="trash"
role="destructive"
label="Delete Device"
onPress={() => handleDelete(item)}
/>
</ContextMenu.Items>
<ContextMenu.Trigger>
<DeviceContextMenu onDelete={() => handleDelete(item)}>
<View
style={[
styles.deviceCard,
@@ -392,9 +404,7 @@ export default function DeviceListScreen() {
/>
</View>
</View>
</ContextMenu.Trigger>
</ContextMenu>
</Host>
</DeviceContextMenu>
);
};
+81 -54
View File
@@ -12,6 +12,60 @@ import { useAuth } from '../../../src/context/AuthContext';
import { useRouter } from 'expo-router';
import Constants from 'expo-constants';
function SettingItem({
label,
value,
onPress,
textColor,
subTextColor,
borderBottomColor,
}: {
label: string;
value?: string;
onPress?: () => void;
textColor: string;
subTextColor: string;
borderBottomColor: string;
}) {
return (
<TouchableOpacity
style={[styles.settingItem, { borderBottomColor }]}
onPress={onPress}
disabled={!onPress}
activeOpacity={onPress ? 0.7 : 1}
>
<Text style={[styles.settingLabel, { color: textColor }]}>{label}</Text>
<View style={styles.settingValueContainer}>
<Text
style={[styles.settingValue, { color: subTextColor }]}
numberOfLines={1}
>
{value}
</Text>
</View>
</TouchableOpacity>
);
}
function ActionButton({
title,
onPress,
backgroundColor,
}: {
title: string;
onPress: () => void;
backgroundColor: string;
}) {
return (
<TouchableOpacity
style={[styles.actionButton, { backgroundColor }]}
onPress={onPress}
>
<Text style={styles.actionButtonText}>{title}</Text>
</TouchableOpacity>
);
}
export default function SettingsScreen() {
const { user, serverAddress, logout } = useAuth();
const router = useRouter();
@@ -22,7 +76,6 @@ export default function SettingsScreen() {
const sectionTitleBg = isDark ? '#111111' : '#f9f9f9';
const textColor = isDark ? '#fff' : '#333';
const subTextColor = isDark ? '#c6c6c8' : '#666';
const primary = isDark ? '#0A84FF' : '#007AFF';
const destructiveColor = '#f44336';
const handleLogout = () => {
@@ -39,55 +92,7 @@ export default function SettingsScreen() {
]);
};
const SettingItem = ({
label,
value,
onPress,
}: {
label: string;
value?: string;
onPress?: () => void;
}) => (
<TouchableOpacity
style={[
styles.settingItem,
{ borderBottomColor: isDark ? 'rgba(255,255,255,0.03)' : '#f0f0f0' },
]}
onPress={onPress}
disabled={!onPress}
activeOpacity={onPress ? 0.7 : 1}
>
<Text style={[styles.settingLabel, { color: textColor }]}>{label}</Text>
<View style={styles.settingValueContainer}>
<Text
style={[styles.settingValue, { color: subTextColor }]}
numberOfLines={1}
>
{value}
</Text>
</View>
</TouchableOpacity>
);
const ActionButton = ({
title,
onPress,
destructive = false,
}: {
title: string;
onPress: () => void;
destructive?: boolean;
}) => (
<TouchableOpacity
style={[
styles.actionButton,
{ backgroundColor: destructive ? destructiveColor : primary },
]}
onPress={onPress}
>
<Text style={styles.actionButtonText}>{title}</Text>
</TouchableOpacity>
);
const borderBottomColor = isDark ? 'rgba(255,255,255,0.03)' : '#f0f0f0';
return (
<ScrollView style={[styles.container, { backgroundColor: bgColor }]} contentInsetAdjustmentBehavior='automatic'>
@@ -109,9 +114,27 @@ export default function SettingsScreen() {
>
Information
</Text>
<SettingItem label={user?.email ? 'Email' : 'Username'} value={user?.email || user?.username} />
<SettingItem label="Server URL" value={serverAddress || 'N/A'} />
<SettingItem label="App Version" value={`${Constants.expoConfig?.version}`} />
<SettingItem
label={user?.email ? 'Email' : 'Username'}
value={user?.email || user?.username}
textColor={textColor}
subTextColor={subTextColor}
borderBottomColor={borderBottomColor}
/>
<SettingItem
label="Server URL"
value={serverAddress || 'N/A'}
textColor={textColor}
subTextColor={subTextColor}
borderBottomColor={borderBottomColor}
/>
<SettingItem
label="App Version"
value={`${Constants.expoConfig?.version}`}
textColor={textColor}
subTextColor={subTextColor}
borderBottomColor={borderBottomColor}
/>
</View>
<View
@@ -131,7 +154,11 @@ export default function SettingsScreen() {
>
Actions
</Text>
<ActionButton title="Logout" onPress={handleLogout} destructive />
<ActionButton
title="Logout"
onPress={handleLogout}
backgroundColor={destructiveColor}
/>
</View>
<View style={styles.footer}>