Feature 3

.gitignore

@@ -11,3 +11,5 @@ web-build/
 
 # macOS
 .DS_Store
+
+src/env.json

App.tsx

@@ -1,59 +1,24 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
-import React, { useEffect } from "react";
-import { NavigationContainer } from "@react-navigation/native";
-import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
-//import { createMaterialBottomTabNavigator } from "@react-navigation/material-bottom-tabs";
-import { TaskListScreen, TweetListScreen } from "./src/Screens";
+import { StatusBar } from "expo-status-bar";
+import React from "react";
+import { StyleSheet, Text, View } from "react-native";
 
-import { Provider as PaperProvider } from "react-native-paper";
-import { TaskNavigation } from './src/TaskNavigation';
-import { TweetNavigation } from './src/TweetNavigation';
-import { LogBox } from "react-native";
-import Ionicons from 'react-native-vector-icons/Ionicons';
-
-
-LogBox.ignoreLogs(["Setting a timer for a long period of time"]);
-
-
-//const Tab = createMaterialBottomTabNavigator();
-const Tab = createBottomTabNavigator();
+//Screenのimport
+import { SignUpScreen } from "./src/Screens/Screens";
+import { BottomTabNavigation } from "./src/Navigations/BottomTabNavigation"
 
 export default function App() {
-  return (
-    <NavigationContainer>
-      <Tab.Navigator
-        screenOptions={({ route }) => ({
-          tabBarIcon: ({ focused, color, size }) => {
-            let iconName = "list-circle";
-
-            if (route.name === "Task") {
-              iconName = focused ? "clipboard-outline" : "clipboard-outline";
-            } else if (route.name === "Tweet") {
-              iconName = focused ? "chatbox-outline" : "chatbox-outline";
-            }
-
-            // You can return any component that you like here!
-            return <Ionicons name={iconName} size={size} color={color} />;
-          },
-        })}
-        tabBarOptions={{
-          activeTintColor: "#0f5c55",
-          inactiveTintColor: "#c4d4e3",
-        }}
-      >
-        <Tab.Screen name="Task" component={TaskNavigation} />
-        <Tab.Screen name="Tweet" component={TweetNavigation} />
-      </Tab.Navigator>
-    </NavigationContainer>
-  );
+  if (true){
+    return <BottomTabNavigation />; 
+  } else {
+    return <SignUpScreen />;
+  }
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
+    backgroundColor: "#fff",
+    alignItems: "center",
+    justifyContent: "center",
   },
 });

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@react-native-community/async-storage": "^1.12.1",
     "@react-native-community/datetimepicker": "3.0.4",
-    "@react-native-community/masked-view": "^0.1.10",
+    "@react-native-community/masked-view": "0.1.10",
     "@react-navigation/bottom-tabs": "^5.11.2",
     "@react-navigation/drawer": "^5.11.4",
     "@react-navigation/material-bottom-tabs": "^5.3.10",
@@ -19,15 +19,16 @@
     "@types/react-native-vector-icons": "^6.4.6",
     "expo": "~40.0.0",
     "expo-status-bar": "~1.0.3",
+    "firebase": "7.9.0",
     "moment": "^2.29.1",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
-    "react-native-gesture-handler": "^1.9.0",
+    "react-native-gesture-handler": "~1.8.0",
     "react-native-paper": "^4.4.1",
-    "react-native-reanimated": "^1.13.2",
-    "react-native-safe-area-context": "^3.1.9",
-    "react-native-screens": "^2.15.0",
+    "react-native-reanimated": "~1.13.0",
+    "react-native-safe-area-context": "3.1.9",
+    "react-native-screens": "~2.15.0",
     "react-native-storage": "^1.0.1",
     "react-native-super-grid": "^4.0.3",
     "react-native-vector-icons": "^7.1.0",

src/@types/App.d.ts

@@ -14,11 +14,26 @@ interface Tweet {
 type RootStackParamList = {
     TaskItem: string[]
     TaskAdd: {Task: Task};
-    TaskList: {Task: Task};
+    TaskList: {Task: Task, user: signedInUser};
     TaskDetail: {Task: Task};
     TaskEdit: undefined;
     TaskNavigation: undefined;
     TweetList: {Tweet: Tweet};
     TweetAdd: {Tweet: Tweet};
     TweetNavigation: undefined;
+    Welcome: undefined;
+    SignIn: undefined;
+    SignUp: undefined;
+    BottomTabNavigation: undefined;
+}
+
+
+type RootStackParamList2 = {
+    addTask: undefined;
+    editTask: undefined;
+};
+
+type signedInUser = {
+    email: string;
+    uid: string;
 }

src/Compose/items.tsx → src/Components/items.tsx

@@ -16,6 +16,8 @@ import {
 import { FAB } from "react-native-paper";
 import { color } from "react-native-reanimated";
 
+import { saveButtonStatus } from "../Stores/TaskStore"
+
 export interface ItemProps {
   defaultValue?: string;
   onChangeText?: (value: string) => void;
@@ -33,18 +35,18 @@ const [chosenDate, setChosenDate] = useState(new Date());
       setButtonColor("#2aefd1");
     } else {
       setButtonColor("#c4d4e3");
-    }
+    };
   }
 
   return (
     <View
       style={{
-        height: 220,
+        height: 170,
         backgroundColor: "#fff",
         flex: 1,
         alignItems: "flex-start",
       }}
-    >
+      >
       <FAB
         style={{ top: 20, left: 20, backgroundColor: buttonColor }}
         icon=""
@@ -63,7 +65,7 @@ const [chosenDate, setChosenDate] = useState(new Date());
           left: "25%",
           position: "absolute",
           top: 20,
-          height: 150,
+          height: 100,
           paddingBottom: 5,
           paddingLeft: 5,
 
@@ -73,7 +75,7 @@ const [chosenDate, setChosenDate] = useState(new Date());
         defaultValue={props.defaultValue}
       />
       <TouchableOpacity
-        style={{ top: 130, left: "50%" }}
+        style={{ top: 80, left: "50%" }}
         onPress={props.onPressAddButton}
       >
         <Text style={{ fontSize: 30, color: "#c4d4e3" }}>+</Text>

src/Navigations/BottomTabNavigation.tsx

@@ -0,0 +1,56 @@
+import { StatusBar } from "expo-status-bar";
+import { StyleSheet, Text, View } from "react-native";
+import React, { useEffect } from "react";
+import { NavigationContainer } from "@react-navigation/native";
+import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
+//import { createMaterialBottomTabNavigator } from "@react-navigation/material-bottom-tabs";
+import { TaskListScreen, TweetListScreen } from "../Screens/Screens";
+
+import { Provider as PaperProvider } from "react-native-paper";
+import { TaskNavigation, TweetNavigation } from "./Navigations";
+import { LogBox } from "react-native";
+import Ionicons from "react-native-vector-icons/Ionicons";
+
+LogBox.ignoreLogs(["Setting a timer for a long period of time"]);
+
+//const Tab = createMaterialBottomTabNavigator();
+const Tab = createBottomTabNavigator();
+
+export function BottomTabNavigation() {
+  return (
+    <NavigationContainer>
+      <Tab.Navigator
+        screenOptions={({ route }) => ({
+          tabBarIcon: ({ focused, color, size }) => {
+            let iconName = "list-circle";
+
+            if (route.name === "Task") {
+              iconName = focused ? "clipboard-outline" : "clipboard-outline";
+            } else if (route.name === "Tweet") {
+              iconName = focused ? "chatbox-outline" : "chatbox-outline";
+            }
+
+            // You can return any component that you like here!
+            return <Ionicons name={iconName} size={size} color={color} />;
+          },
+        })}
+        tabBarOptions={{
+          activeTintColor: "#0f5c55",
+          inactiveTintColor: "#c4d4e3",
+        }}
+      >
+        <Tab.Screen name="Task" component={TaskNavigation} />
+        <Tab.Screen name="Tweet" component={TweetNavigation} />
+      </Tab.Navigator>
+    </NavigationContainer>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: "#fff",
+    alignItems: "center",
+    justifyContent: "center",
+  },
+});

src/Navigations/Navigations.ts

@@ -0,0 +1,3 @@
+export * from "./BottomTabNavigation";
+export * from "./TaskNavigation";
+export * from "./TweetNavigation";

src/Navigations/StackScreen.tsx

@@ -0,0 +1,52 @@
+import React from "react";
+
+//navigation
+import { NavigationContainer } from "@react-navigation/native";
+import { createStackNavigator } from "@react-navigation/stack";
+import "react-native-gesture-handler";
+
+//Screens.tsでまとめたものをimport
+import {
+  SignInScreen,
+  SignUpScreen,
+  WelcomeScreen,
+  BottomTabNavigation,
+} from "../Screens/Screens";
+
+
+//Firebaseの設定
+import "./src/Fire";
+
+const Stack = createStackNavigator<RootStackParamList>();
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator initialRouteName="Welcome">
+        <Stack.Screen
+          name="Welcome"
+          component={WelcomeScreen}
+          options={{ headerShown: false }}
+        />
+
+        <Stack.Screen
+          name="SignIn"
+          component={SignInScreen}
+          options={{ headerShown: false }}
+        />
+
+        <Stack.Screen
+          name="SignUp"
+          component={SignUpScreen}
+          options={{ headerShown: false }}
+        />
+
+        <Stack.Screen
+          name="BottomTabNavigation"
+          component={BottomTabNavigation}
+          options={{ headerShown: false }}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}

src/TaskNavigation.tsx → src/Navigations/TaskNavigation.tsx

@@ -8,7 +8,7 @@ import {
   TaskEditScreen,
   TaskDetailScreen,
   //TweetNavigation,
-} from "./Screens";
+} from "../Screens/Screens";
 
 const Stack = createStackNavigator();
 

src/TweetNavigation.tsx → src/Navigations/TweetNavigation.tsx

@@ -5,7 +5,7 @@ import { createStackNavigator } from "@react-navigation/stack";
 import {
   TweetListScreen,
   TweetAddScreen,
-} from "./Screens";
+} from "../Screens/Screens";
 
 const Stack = createStackNavigator();
 

src/Screens/Screens.ts

@@ -0,0 +1,10 @@
+export * from "./TasksScreen/TaskListScreen";
+export * from "./TasksScreen/TaskAddScreen";
+export * from "./TasksScreen/TaskDetailScreen";
+export * from "./TasksScreen/TaskEditScreen";
+export * from "./TweetsScreen/TweetListScreen";
+export * from "./TweetsScreen/TweetAddScreen";
+export * from "./SingInUpScreen/SignInScreen";
+export * from "./SingInUpScreen/SignUpScreen";
+export * from "./SingInUpScreen/WelcomeScreen";
+export * from "../Navigations/BottomTabNavigation";