This commit is contained in:
Clément Le Bihan
2024-01-09 17:18:13 +01:00
parent dd09827d08
commit 5ba815590a
5 changed files with 11 additions and 29 deletions

View File

@@ -1,10 +1,10 @@
/* eslint-disable @typescript-eslint/ban-types */
import { NativeStackNavigationProp, NativeStackScreenProps, createNativeStackNavigator } from '@react-navigation/native-stack';
import {
NavigationProp,
ParamListBase,
useNavigation as navigationHook,
} from '@react-navigation/native';
NativeStackNavigationProp,
NativeStackScreenProps,
createNativeStackNavigator,
} from '@react-navigation/native-stack';
import { ParamListBase, useNavigation as navigationHook } from '@react-navigation/native';
import React, { ComponentProps, ComponentType, useEffect, useMemo } from 'react';
import { DarkTheme, DefaultTheme, NavigationContainer } from '@react-navigation/native';
import { RootState, useSelector } from './state/Store';
@@ -174,8 +174,9 @@ type RouteParams<Routes extends Record<string, Route>> = {
type PrivateRoutesParams = RouteParams<typeof protectedRoutes>;
type PublicRoutesParams = RouteParams<typeof publicRoutes>;
type TabsRoutesParams = RouteParams<typeof tabRoutes>;
type AppRouteParams = Omit<PrivateRoutesParams, "Tabs"> & { Tabs: { screen: keyof TabsRoutesParams } } &
PublicRoutesParams &
type AppRouteParams = Omit<PrivateRoutesParams, 'Tabs'> & {
Tabs: { screen: keyof TabsRoutesParams };
} & PublicRoutesParams &
TabsRoutesParams & { Oops: undefined };
const RouteToScreen = <T extends {}>(Component: Route<T>['component']) =>

View File

@@ -3,7 +3,6 @@ import ButtonBase from './UI/ButtonBase';
import { Translate, TranslationKey, translate } from '../i18n/i18n';
import { Play, Star1 } from 'iconsax-react-native';
import { useNavigation } from '../Navigation';
import { StackActions } from '@react-navigation/native';
type ScoreModalProps = {
songId: number;
@@ -22,21 +21,6 @@ type ScoreModalProps = {
};
const ScoreModal = (props: ScoreModalProps) => {
// const props = {
// songId: 1,
// overallScore: 74,
// precision: 0,
// score: {
// missed: 9,
// good: 1,
// great: 2,
// perfect: 4,
// wrong: 0,
// max_score: 100,
// current_streak: 1,
// max_streak: 11,
// } as const
// } as const; //TODO DELETE ME
const navigation = useNavigation();
const theme = useTheme();
const score = (props.overallScore * 100) / props.score.max_score;
@@ -96,9 +80,7 @@ const ScoreModal = (props: ScoreModalProps) => {
icon={Play}
type="outlined"
title={translate('playAgain')}
onPress={() =>
navigation.replace('Play', { songId: props.songId })
}
onPress={() => navigation.replace('Play', { songId: props.songId })}
/>
<ButtonBase
style={{}}

View File

@@ -1,5 +1,5 @@
import { useBreakpointValue, ScrollView, Text } from 'native-base';
import { SafeAreaView, View } from 'react-native';
import { View } from 'react-native';
import { useQuery } from '../Queries';
import API from '../API';
import { LoadingView } from '../components/Loading';

View File

@@ -1,6 +1,6 @@
import React from 'react';
import { useBreakpointValue, useTheme } from 'native-base';
import { ScrollView, useWindowDimensions } from 'react-native';
import { useWindowDimensions } from 'react-native';
import {
TabView,
SceneMap,

View File

@@ -1,5 +1,4 @@
/* eslint-disable no-mixed-spaces-and-tabs */
import { StackActions } from '@react-navigation/native';
import React, { useEffect, useRef, useState } from 'react';
import { SafeAreaView, Platform } from 'react-native';
import Animated, {