Merge pull request #104 from ito-org/screen-upload

added screen upload

App/App.tsx

@@ -21,11 +21,12 @@ import {Endangerment} from './screens/Endangerment';
 import {BluetoothNotification} from './screens/BluetoothNotification';
 import {SymptomInfo} from './screens/SymptomInfo';
 import {DataUpload} from './screens/DataUpload';
-import {ConfirmationCode} from './screens/ConfirmationCode';
 import {AlphaPositiveResult} from './screens/AlphaPositiveResult';
 import {IDMatch} from './screens/IDMatch';
 import AsyncStorage from '@react-native-community/async-storage'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import {PositiveResult} from './screens/PositiveResult';
+import {Upload} from './screens/Upload';
+import {Home} from './screens/Home';
 
 const Stack = createStackNavigator();
 
@@ -39,11 +40,12 @@ export type RootStackParamList = {
   Endangerment: undefined;
   BluetoothNotification: undefined;
   SymptomInfo: undefined;
-  ConfirmationCode: undefined;
   DataUpload: undefined;
   AlphaPositiveResult: undefined;
   IDMatch: undefined;
   PositiveResult: undefined;
+  Upload: undefined;
+  Home: undefined;
 };
 
 declare const global: {HermesInternal: null | {}};
@@ -66,6 +68,8 @@ export const App: React.FC<void> = () => {
           <Stack.Screen name="HomeBluetooth" component={HomeBluetooth} />
           <Stack.Screen name="Endangerment" component={Endangerment} />
           <Stack.Screen name="PositiveResult" component={PositiveResult} />
+          <Stack.Screen name="Upload" component={Upload} />
+          <Stack.Screen name="Home" component={Home} />
           <Stack.Screen
             name="BluetoothNotification"
             component={BluetoothNotification}
@@ -77,7 +81,6 @@ export const App: React.FC<void> = () => {
             name="AlphaPositiveResult"
             component={AlphaPositiveResult}
           />
-          <Stack.Screen name="ConfirmationCode" component={ConfirmationCode} />
           <Stack.Screen name="DataUpload" component={DataUpload} />
         </Stack.Navigator>
       </NavigationContainer>

App/screens/AlphaPositiveResult.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {Text, View, StyleSheet, NativeModules} from 'react-native';
+import {Text, View, StyleSheet} from 'react-native';
 import {StackNavigationProp} from '@react-navigation/stack';
 import {RootStackParamList} from 'App/App';
 import {BasicButton} from '../components/BasicButton';
@@ -70,18 +70,7 @@ export const AlphaPositiveResult: React.FC<{
       <View style={styles.buttonContainer}>
         <BasicButton
           title={t('alphaPositiveResult.buttonTitleReleaseResult')}
-          onPress={(): void => {
-            const now = Date.now() / 1000;
-            const sevenDaysAgo = now - 7 * 24 * 60 * 60;
-            NativeModules.ItoBluetooth.publishBeaconUUIDs(
-              sevenDaysAgo,
-              now,
-              (success: boolean) => {
-                console.log('upload ' + success ? 'succeeded' : 'failed');
-              },
-            );
-            navigation.navigate('PositiveResult');
-          }}
+          onPress={(): void => navigation.navigate('PositiveResult')}
         />
       </View>
     </View>