Browse Source

Search and calendar are connected

ErnestoOrtiz2 3 years ago
parent
commit
705f9df514
1 changed files with 0 additions and 6 deletions
  1. 0
    6
      App.js

+ 0
- 6
App.js View File

88
     return(
88
     return(
89
       <Provider store={store}>
89
       <Provider store={store}>
90
         <NavigationContainer>
90
         <NavigationContainer>
91
-<<<<<<< HEAD
92
-          <Drawer.Navigator>
93
-            <Drawer.Screen name={" "} options={{drawerLabel: "Home", headerTransparent: true}} children={this.createHomeStack}/>
94
-          </Drawer.Navigator>
95
-=======
96
           <Stack.Navigator initialRouteName="Home">
91
           <Stack.Navigator initialRouteName="Home">
97
             <Stack.Screen name="Home" options={{headerTransparent: true, headerTitle: " "}} component={HomeScreen} />
92
             <Stack.Screen name="Home" options={{headerTransparent: true, headerTitle: " "}} component={HomeScreen} />
98
             <Stack.Screen name="Calendar"  component={Calendario}/>
93
             <Stack.Screen name="Calendar"  component={Calendario}/>
99
             <Stack.Screen name = "StateTime" component={Time}/>
94
             <Stack.Screen name = "StateTime" component={Time}/>
100
             <Stack.Screen name = "Search" component={Search}/>
95
             <Stack.Screen name = "Search" component={Search}/>
101
           </Stack.Navigator>
96
           </Stack.Navigator>
102
->>>>>>> 629a93ce3e1893879f58184298be77795abcf401
103
         </NavigationContainer>
97
         </NavigationContainer>
104
       </Provider>
98
       </Provider>
105
 
99