This commit is contained in:
Clément Le Bihan
2023-11-28 23:12:45 +01:00
parent 84ea0b3743
commit 95da2cc500
5 changed files with 42 additions and 36 deletions
+5 -1
View File
@@ -55,7 +55,11 @@ const protectedRoutes = () =>
options: { headerShown: false },
link: '/V2',
},
Play: { component: PlayView, options: { headerShown: false, title: translate("play") }, link: '/play/:songId' },
Play: {
component: PlayView,
options: { headerShown: false, title: translate('play') },
link: '/play/:songId',
},
Settings: {
component: SettingsTab,
options: { headerShown: false },
+1 -2
View File
@@ -1,6 +1,6 @@
import { Pressable, useTheme } from 'native-base';
import React, { useRef } from 'react';
import { Animated, StyleSheet, StyleProp, ViewStyle } from 'react-native';
import { Animated, StyleProp, ViewStyle } from 'react-native';
interface InteractiveBaseProps {
children?: React.ReactNode;
@@ -254,5 +254,4 @@ const InteractiveBase: React.FC<InteractiveBaseProps> = ({
);
};
export default InteractiveBase;
+6 -1
View File
@@ -24,7 +24,12 @@ type ScaffoldCCProps = {
enableScroll?: boolean;
};
const ScaffoldCC = ({ children, routeName, withPadding = true, enableScroll = true }: ScaffoldCCProps) => {
const ScaffoldCC = ({
children,
routeName,
withPadding = true,
enableScroll = true,
}: ScaffoldCCProps) => {
const userQuery = useQuery(API.getUserInfo);
const screenSize = useBreakpointValue({ base: 'small', md: 'big' });
+1 -2
View File
@@ -60,8 +60,7 @@ const GoldenRatio = () => {
direction={isPhone ? 'row-reverse' : 'column-reverse'}
header={<HomeMainSongCard {...cards[3]} />}
>
<View style={{ display: 'flex', width: '100%', height: '100%'}}>
</View>
<View style={{ display: 'flex', width: '100%', height: '100%' }}></View>
</GoldenRatioPanel>
</GoldenRatioPanel>
</GoldenRatioPanel>
+29 -30
View File
@@ -308,7 +308,6 @@ const PlayView = ({ songId, route }: RouteProps<PlayViewProps>) => {
}
return (
<View style={{ display: 'flex', flex: 1, backgroundColor: '#cdd4fd' }}>
<SafeAreaView
style={{
flexGrow: 1,
@@ -335,35 +334,35 @@ const PlayView = ({ songId, route }: RouteProps<PlayViewProps>) => {
}}
>
<PopupCC
title={translate('selectPlayMode')}
description={translate('selectPlayModeExplaination')}
isVisible={type === undefined}
setIsVisible={
navigation.canGoBack()
? (isVisible) => {
if (!isVisible) {
// If we dismiss the popup, Go to previous page
navigation.goBack();
}
}
: undefined
}
>
<Row style={{ justifyContent: 'space-between' }}>
<ButtonBase
style={{}}
type="outlined"
title={translate('practiceBtn')}
onPress={async () => setType('practice')}
/>
<ButtonBase
style={{}}
type="filled"
title={translate('playBtn')}
onPress={async () => setType('normal')}
/>
</Row>
</PopupCC>
title={translate('selectPlayMode')}
description={translate('selectPlayModeExplaination')}
isVisible={type === undefined}
setIsVisible={
navigation.canGoBack()
? (isVisible) => {
if (!isVisible) {
// If we dismiss the popup, Go to previous page
navigation.goBack();
}
}
: undefined
}
>
<Row style={{ justifyContent: 'space-between' }}>
<ButtonBase
style={{}}
type="outlined"
title={translate('practiceBtn')}
onPress={async () => setType('practice')}
/>
<ButtonBase
style={{}}
type="filled"
title={translate('playBtn')}
onPress={async () => setType('normal')}
/>
</Row>
</PopupCC>
{(
[
[