Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[menu-bar] Add alert when trying to install build with no available devices #38

Merged
merged 2 commits into from
Aug 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
### 💡 Others

- Refetch devices list after launching a simulator. ([#37](https://github.com/expo/orbit/pull/37) by [@gabrieldonadel](https://github.com/gabrieldonadel))
- Improve Popover height estimations. ([#38](https://github.com/expo/orbit/pull/38) by [@gabrieldonadel](https://github.com/gabrieldonadel))
- Add alert when trying to install build with no available device. ([#38](https://github.com/expo/orbit/pull/38) by [@gabrieldonadel](https://github.com/gabrieldonadel))

## 0.1.1 — 2023-08-10

Expand Down
25 changes: 13 additions & 12 deletions apps/menu-bar/src/popover/Core.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {memo, useCallback, useEffect, useState} from 'react';
import {SectionList} from 'react-native';
import {Alert, SectionList} from 'react-native';

import {useDeepLinking} from '../hooks/useDeepLinking';
import {downloadBuildAsync} from '../commands/downloadBuildAsync';
Expand Down Expand Up @@ -29,7 +29,7 @@ import {
import {useDeviceAudioPreferences} from '../hooks/useDeviceAudioPreferences';
import {useSafeDisplayDimensions} from '../hooks/useSafeDisplayDimensions';
import {useExpoTheme} from '../utils/useExpoTheme';
import SectionHeader from './SectionHeader';
import SectionHeader, {SECTION_HEADER_HEIGHT} from './SectionHeader';
import Item from './Item';
import {FOOTER_HEIGHT} from './Footer';

Expand All @@ -52,7 +52,7 @@ function Core(props: Props) {
const [status, setStatus] = useState(Status.LISTENING);
const [progress, setProgress] = useState(0);

const {devices} = useListDevices();
const {devices, refetch} = useListDevices();
const {emulatorWithoutAudio} = useDeviceAudioPreferences();
const theme = useExpoTheme();

Expand All @@ -64,7 +64,9 @@ function Core(props: Props) {
FOOTER_HEIGHT -
BUILDS_SECTION_HEIGHT -
30;
const heightOfAllDevices = DEVICE_ITEM_HEIGHT * devices?.length;
const heightOfAllDevices =
DEVICE_ITEM_HEIGHT * devices?.length +
SECTION_HEADER_HEIGHT * (sections?.length || 0);
const estimatedListHeight =
heightOfAllDevices <= estimatedAvailableSizeForDevices ||
estimatedAvailableSizeForDevices <= 0
Expand Down Expand Up @@ -136,7 +138,10 @@ function Core(props: Props) {
const platform = getPlatformFromURI(url);
let device = getDeviceByPlatform(platform);
if (!device) {
return; // handle error
Alert.alert(
`You don't have any ${platform} device available to run this build, please make your environment is configured correctly and try again.`,
);
return;
}

const deviceId = getDeviceId(device);
Expand Down Expand Up @@ -255,13 +260,9 @@ function Core(props: Props) {
sections={sections}
style={{minHeight: estimatedListHeight}}
SectionSeparatorComponent={Separator}
renderSectionHeader={({section: {label}}) => {
return (
<View px="medium">
<SectionHeader label={label} />
</View>
);
}}
renderSectionHeader={({section: {label}}) => (
<SectionHeader label={label} />
)}
renderItem={({item: device}: {item: Device}) => {
const platform = getDeviceOS(device);
const id = getDeviceId(device);
Expand Down
24 changes: 14 additions & 10 deletions apps/menu-bar/src/popover/SectionHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
import React, {memo} from 'react';

import {Text} from '../components';
import {Text, View} from '../components';
import {useTheme} from '../providers/ThemeProvider';

export const SECTION_HEADER_HEIGHT = 20;

type Props = {
label: string;
};

const SectionHeader = ({label}: Props) => {
const theme = useTheme();
return (
<Text
weight="semibold"
size="tiny"
color="default"
// @ts-ignore
// eslint-disable-next-line react-native/no-inline-styles
style={{opacity: theme === 'dark' ? 0.65 : 0.85}}>
{label}
</Text>
<View px="medium">
<Text
weight="semibold"
size="tiny"
color="default"
// @ts-ignore
// eslint-disable-next-line react-native/no-inline-styles
style={{opacity: theme === 'dark' ? 0.65 : 0.85}}>
{label}
</Text>
</View>
);
};

Expand Down