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.

Sign up for GitHub

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

Improve layout for tablet screens on setup screens #284

Merged
merged 4 commits into from
Dec 18, 2024
Merged

Improve layout for tablet screens on setup screens #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20197e9
Implement better error visualization for linking.canOpen errors
CommanderRedYT Dec 18, 2024
cc1489a
Fix linting
CommanderRedYT Dec 18, 2024
3f16b04
Fix links not working
CommanderRedYT Dec 18, 2024
bdfe864
Improve layout for tablet screens on setup screens
CommanderRedYT Dec 18, 2024
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 android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<intent>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="https" />
<!-- https://stackoverflow.com/a/70672054 -->
<data android:host="*" />
</intent>
</queries>
</manifest>
60 changes: 60 additions & 0 deletions src/components/OrientationContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import type { FC, PropsWithChildren } from 'react';
import { Box } from 'react-native-flex-layout';

import useOrientation, { Orientation } from '@/hooks/useOrientation';

export interface OrientationContainerProps extends PropsWithChildren {
flexOnPortrait?: number;
flexOnLandscape?: number;
display?: 'flex' | 'none';
flexDirection?: 'row' | 'column';
alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline';
justifyContent?:
| 'flex-start'
| 'flex-end'
| 'center'
| 'space-between'
| 'space-around'
| 'space-evenly';
}

const OrientationContainer: FC<OrientationContainerProps> = ({
children,
flexOnLandscape = 0.5,
flexOnPortrait = 1,
display = 'flex',
flexDirection = 'column',
alignItems = 'stretch',
justifyContent = 'flex-start',
}) => {
const { orientation } = useOrientation();

return (
<Box
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
flexDirection: 'row',
height: '100%',
}}
>
<Box
style={{
flex:
orientation === Orientation.PORTRAIT
? flexOnPortrait
: flexOnLandscape,
display,
flexDirection,
alignItems,
justifyContent,
}}
>
{children}
</Box>
</Box>
);
};

export default OrientationContainer;
12 changes: 11 additions & 1 deletion src/components/firmware/FirmwareListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { FC } from 'react';
import { useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { Badge, Divider, List, Text, useTheme } from 'react-native-paper';
import Toast from 'react-native-toast-message';

import { Linking, View } from 'react-native';

Expand All @@ -18,6 +19,7 @@ import useDtuState from '@/hooks/useDtuState';
import useHasAuthConfigured from '@/hooks/useHasAuthConfigured';

import capitalize from '@/utils/capitalize';
import { rootLogging } from '@/utils/log';

import { minimumOpenDtuFirmwareVersion, spacing } from '@/constants';
import type { SupportedLanguage } from '@/translations';
Expand All @@ -35,6 +37,8 @@ const needsCapitalization: Record<SupportedLanguage, boolean> = {
de: true,
};

const log = rootLogging.extend('FirmwareListItem');

const FirmwareListItem: FC<FirmwareListItemProps> = ({
release,
selectRelease,
Expand All @@ -53,8 +57,14 @@ const FirmwareListItem: FC<FirmwareListItemProps> = ({

if (await Linking.canOpenURL(url)) {
await Linking.openURL(url);
} else {
log.error(`Cannot open URL: ${url}`);
Toast.show({
type: 'error',
text1: t('cannotOpenUrl'),
});
}
}, [release.html_url]);
}, [release.html_url, t]);

const handleInstallFirmware = useCallback(() => {
selectRelease(release);
Expand Down
8 changes: 6 additions & 2 deletions src/components/modals/ChangeLanguageModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
Text,
useTheme,
} from 'react-native-paper';
import Toast from 'react-native-toast-message';

import { Linking } from 'react-native';

Expand Down Expand Up @@ -53,10 +54,13 @@ const ChangeLanguageModal: FC<Omit<ModalProps, 'children'>> = props => {
if (await Linking.canOpenURL(weblateUrl)) {
await Linking.openURL(weblateUrl);
} else {
// TODO: Better error handling (issue #101)
log.error('Cannot open Weblate URL');
Toast.show({
type: 'error',
text1: t('cannotOpenUrl'),
});
}
}, []);
}, [t]);

return (
<Portal>
Expand Down
2 changes: 1 addition & 1 deletion src/translations
Open in desktop
Submodule translations updated 1 files
+2 −1 en/translation.json
27 changes: 26 additions & 1 deletion src/views/navigation/screens/DebugGroup/DebugScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Box } from 'react-native-flex-layout';
import { Appbar, IconButton, List, Text, useTheme } from 'react-native-paper';
import Toast from 'react-native-toast-message';

import { ScrollView, View } from 'react-native';
import { Linking, ScrollView, View } from 'react-native';

import moment from 'moment';

Expand Down Expand Up @@ -204,6 +204,31 @@ const DebugScreen: FC<PropsWithNavigation> = ({ navigation }) => {
{JSON.stringify(theme, null, 2)}
</Text>
</List.Section>
<List.Section title="Linking testing">
<List.Item
title="Open GitHub (With canOpenURL)"
onPress={async () => {
const link =
'https://github.com/tbnobody/OpenDTU/releases/tag/v24.11.7-2-gdc1787b';
if (await Linking.canOpenURL(link)) {
await Linking.openURL(link);
} else {
Toast.show({
type: 'error',
text1: t('cannotOpenUrl'),
});
}
}}
/>
<List.Item
title="Open GitHub (Without canOpenURL)"
onPress={async () => {
await Linking.openURL(
'https://github.com/tbnobody/OpenDTU/releases/tag/v24.11.7-2-gdc1787b',
);
}}
/>
</List.Section>
<View style={{ height: spacing * 2 }} />
</ScrollView>
</Box>
Expand Down
200 changes: 107 additions & 93 deletions src/views/navigation/screens/InformationGroup/AboutAppScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import moment from 'moment';
import { setEnableAppUpdates } from '@/slices/settings';

import GenericRefreshModal from '@/components/modals/GenericRefreshModal';
import OrientationContainer from '@/components/OrientationContainer';
import ReleaseChangelog from '@/components/ReleaseChangelog';

import useHasNewAppVersion from '@/hooks/useHasNewAppVersion';
Expand Down Expand Up @@ -100,104 +101,117 @@ const AboutAppScreen: FC<PropsWithNavigation> = ({ navigation }) => {
title={t('aboutApp.refreshModal.title')}
warningText={t('aboutApp.refreshModal.warningText')}
/>
<Box style={{ width: '100%', flex: 1 }}>
<ScrollView>
<Box>
<Text style={{ textAlign: 'center' }} variant="titleLarge">
{packageJson.name} {packageJson.version}
</Text>
<Box p={8}>
<Text style={{ textAlign: 'center' }}>
{t('aboutApp.projectHint')}
</Text>
<Box mt={16} mb={8}>
<Button
buttonColor="#24292e"
textColor="#ffffff"
icon="github"
onPress={() => Linking.openURL(packageJson.repository.url)}
>
{t('aboutApp.viewOnGithub')}
</Button>
</Box>
</Box>
</Box>
{Config.DISABLE_IN_APP_UPDATES !== 'true' ? (
<>
<Divider />
<Box p={8}>
<Box
style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'center',
gap: 4,
}}
>
<Text variant="titleLarge" style={{ textAlign: 'center' }}>
{hasNewAppVersion
? t('aboutApp.newVersionAvailable')
: t('aboutApp.latestAppRelease')}
</Text>
<Badge
style={{
alignSelf: 'center',
backgroundColor: theme.colors.primary,
}}
>
{prettyTagName}
</Badge>
</Box>
<Box>
<Text variant="bodySmall" style={{ textAlign: 'center' }}>
{t('fetchedWithTime', {
time: formattedReleaseFetchTime,
})}
<OrientationContainer justifyContent="center">
<Box style={{ flex: 1 }}>
<Box style={{ width: '100%', flex: 1 }}>
<ScrollView>
<Box>
<Text style={{ textAlign: 'center' }} variant="titleLarge">
{packageJson.name} {packageJson.version}
</Text>
<Box p={8}>
<Text style={{ textAlign: 'center' }}>
{t('aboutApp.projectHint')}
</Text>
</Box>
<Surface
style={{ padding: 16, marginTop: 8, borderRadius: 16 }}
>
<ReleaseChangelog releaseBody={releaseInfo?.body} />
</Surface>
<Box mt={16} mb={8}>
<Button
buttonColor="#24292e"
textColor="#ffffff"
icon="github"
onPress={() =>
Linking.openURL(releaseInfo?.html_url || '')
}
disabled={!releaseInfo?.html_url}
>
{t('aboutApp.viewMore')}
</Button>
<Box mt={16} mb={8}>
<Button
buttonColor="#24292e"
textColor="#ffffff"
icon="github"
onPress={() =>
Linking.openURL(packageJson.repository.url)
}
>
{t('aboutApp.viewOnGithub')}
</Button>
</Box>
</Box>
</Box>
<Divider />
<List.Item
title={t('settings.activateInappUpdates')}
onPress={handleToggleInAppUpdates}
borderless
right={props => (
<Switch
{...props}
value={!!inAppUpdatesEnabled}
onValueChange={handleToggleInAppUpdates}
color={theme.colors.primary}
{Config.DISABLE_IN_APP_UPDATES !== 'true' ? (
<>
<Divider />
<Box p={8}>
<Box
style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'center',
gap: 4,
}}
>
<Text
variant="titleLarge"
style={{ textAlign: 'center' }}
>
{hasNewAppVersion
? t('aboutApp.newVersionAvailable')
: t('aboutApp.latestAppRelease')}
</Text>
<Badge
style={{
alignSelf: 'center',
backgroundColor: theme.colors.primary,
}}
>
{prettyTagName}
</Badge>
</Box>
<Box>
<Text
variant="bodySmall"
style={{ textAlign: 'center' }}
>
{t('fetchedWithTime', {
time: formattedReleaseFetchTime,
})}
</Text>
</Box>
<Surface
style={{ padding: 16, marginTop: 8, borderRadius: 16 }}
>
<ReleaseChangelog releaseBody={releaseInfo?.body} />
</Surface>
<Box mt={16} mb={8}>
<Button
buttonColor="#24292e"
textColor="#ffffff"
icon="github"
onPress={() =>
Linking.openURL(releaseInfo?.html_url || '')
}
disabled={!releaseInfo?.html_url}
>
{t('aboutApp.viewMore')}
</Button>
</Box>
</Box>
<Divider />
<List.Item
title={t('settings.activateInappUpdates')}
onPress={handleToggleInAppUpdates}
borderless
right={props => (
<Switch
{...props}
value={!!inAppUpdatesEnabled}
onValueChange={handleToggleInAppUpdates}
color={theme.colors.primary}
disabled={Config.DISABLE_IN_APP_UPDATES === 'true'}
/>
)}
disabled={Config.DISABLE_IN_APP_UPDATES === 'true'}
style={{
opacity:
Config.DISABLE_IN_APP_UPDATES === 'true' ? 0.5 : 1,
}}
/>
)}
disabled={Config.DISABLE_IN_APP_UPDATES === 'true'}
style={{
opacity: Config.DISABLE_IN_APP_UPDATES === 'true' ? 0.5 : 1,
}}
/>
</>
) : null}
<View style={{ height: spacing * 2 }} />
</ScrollView>
</Box>
</>
) : null}
<View style={{ height: spacing * 2 }} />
</ScrollView>
</Box>
</Box>
</OrientationContainer>
</StyledView>
</>
);
Expand Down
Loading
Loading