From fece52fe8cc6b0987004882b8dbe14e7ffef67ab Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Tue, 18 May 2021 20:55:50 +0200 Subject: [PATCH] bump version in build.gradle, TestScreen - center spinner --- android/app/build.gradle | 4 ++-- src/screens/TestScreen/TestScreen.tsx | 13 ++++++++++--- .../TestScreen/components/Content/Content.tsx | 10 +++++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 369d517..2394b35 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -136,8 +136,8 @@ android { applicationId "com.dawidwysokinski.zdamegzaminzawodowy" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 3 - versionName "2.0.3" + versionCode 4 + versionName "2.0.4" } splits { abi { diff --git a/src/screens/TestScreen/TestScreen.tsx b/src/screens/TestScreen/TestScreen.tsx index 77d2eb2..aaf0dba 100644 --- a/src/screens/TestScreen/TestScreen.tsx +++ b/src/screens/TestScreen/TestScreen.tsx @@ -7,6 +7,7 @@ import { Query, Scalars } from 'libs/graphql'; import { AppStackParamList, Screen } from 'config/routing'; import { QUERY_GENERATE_TEST_SIMILAR_QUALIFICATIONS_QUALIFICATION } from './queries'; +import { StyleSheet } from 'react-native'; import { Container, Spinner } from 'native-base'; import QualificationNotFound from './components/QualificationNotFound/QualificationNotFound'; import Header from './components/Header/Header'; @@ -50,15 +51,15 @@ const TestScreen = ({ route }: TestScreenProps) => { )}`} /> {loading || networkStatus === NetworkStatus.refetch ? ( - - + + ) : data?.qualification ? ( data?.generateTest?.length ? ( refetch(undefined)} + onReset={refetch} /> ) : ( { ); }; +const styles = StyleSheet.create({ + spinnerWrapper: { + justifyContent: 'center', + }, +}); + export default TestScreen; diff --git a/src/screens/TestScreen/components/Content/Content.tsx b/src/screens/TestScreen/components/Content/Content.tsx index f92fee2..7f45131 100644 --- a/src/screens/TestScreen/components/Content/Content.tsx +++ b/src/screens/TestScreen/components/Content/Content.tsx @@ -1,14 +1,18 @@ import React from 'react'; import { StyleSheet } from 'react-native'; -import { Content as ContentNB } from 'native-base'; +import { Content as ContentNB, NativeBase } from 'native-base'; export interface ContentProps { children?: React.ReactNode; + contentContainerStyle?: NativeBase.Content['contentContainerStyle']; } -const Content = ({ children }: ContentProps) => { +const Content = ({ children, contentContainerStyle }: ContentProps) => { return ( - + {children} );