diff --git a/front/components/loading.tsx b/front/components/loading.tsx index 04df863..c35e304 100644 --- a/front/components/loading.tsx +++ b/front/components/loading.tsx @@ -1,7 +1,7 @@ import { useTheme } from "@react-navigation/native"; -import Spinner from 'react-native-loading-spinner-overlay'; +import { ActivityIndicator } from "react-native-paper"; const LoadingComponent = () => { - return + return } export default LoadingComponent; \ No newline at end of file diff --git a/front/package.json b/front/package.json index d476bbe..a5dad4f 100644 --- a/front/package.json +++ b/front/package.json @@ -30,7 +30,6 @@ "react-dom": "17.0.2", "react-i18next": "^11.18.3", "react-native": "0.68.2", - "react-native-loading-spinner-overlay": "^3.0.1", "react-native-paper": "^4.12.2", "react-native-safe-area-context": "4.2.4", "react-native-screens": "~3.11.1", diff --git a/front/views/SongLobbyView.tsx b/front/views/SongLobbyView.tsx index ae3cfea..8cc7de4 100644 --- a/front/views/SongLobbyView.tsx +++ b/front/views/SongLobbyView.tsx @@ -14,8 +14,12 @@ const SongLobbyView = () => { const route = useRoute(); const props: SongLobbyProps = route.params as any; const { isLoading, isError, data } = useQuery(['song', props.songId], API.getSong(props.songId)) + if (isLoading) + return + + return - { isLoading && } + {props.songId} diff --git a/front/yarn.lock b/front/yarn.lock index 0cdc352..1d3780c 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -7010,11 +7010,6 @@ react-native-iphone-x-helper@^1.3.1: resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010" integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg== -react-native-loading-spinner-overlay@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/react-native-loading-spinner-overlay/-/react-native-loading-spinner-overlay-3.0.1.tgz#092481b8cce157d3af5ef942f845ad981f96bd36" - integrity sha512-4GdR54HQnKg2HPSSisVizfTLuyhSh4splY9eb8mKiYF1Ihjn/5EmdNo5bN3S7uKPFRC3WLzIZIouX6G6fXfnjw== - react-native-paper@^4.12.2: version "4.12.2" resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-4.12.2.tgz#31ed8011afd994d54dd403ed0099295fc1616d26"