Merge de cambios main/Home_page.js y main/RoomScreen.js

App.js

@@ -17,6 +17,16 @@ import HomeScreen from './screens/HomeScreen';
 //import Loading from './components/Loading';
 import Loading from './screens/main/Loading';
 import { firebaseConfig } from './config/firebaseConfig';
+<<<<<<< HEAD
+=======
+import { Text, View } from 'react-native';
+import { styles } from './config/styles';
+
+import HomeScreen from './screens/main/Home_page';
+import RoomScreen from './screens/main/RoomScreen'
+import { Provider} from 'react-redux'
+import { createStore, applyMiddleware } from 'redux';
+>>>>>>> devErnesto
 import rootReducer from './redux/reducers'
 
 
@@ -75,7 +85,7 @@ export default class App extends Component {
       return (
         <NavigationContainer>
           <Stack.Navigator>
-            <Stack.Screen name={" "} options={{headerShown: false}} component={LoginScreen}/>
+            <Stack.Screen name={"Login"} options={{headerShown: false}} component={LoginScreen}/>
             <Stack.Screen name={"Register"} options={{headerTransparent: true, headerTitle: " "}} component={RegisterScreen}/>
           </Stack.Navigator>
         </NavigationContainer>
@@ -85,9 +95,16 @@ export default class App extends Component {
     return(
       <Provider store={store}>
         <NavigationContainer>
+<<<<<<< HEAD
           <Drawer.Navigator>
             <Drawer.Screen name={" "} options={{drawerLabel: "Home", headerTransparent: true}} children={this.createHomeStack}/>
           </Drawer.Navigator>
+=======
+          <Stack.Navigator initialRouteName="Home">
+            <Stack.Screen name="Home" component={HomeScreen} />
+            <Stack.Screen name="Room" component={RoomScreen} options={({ route }) => ({ title: route.params.thread.name })} />
+          </Stack.Navigator>
+>>>>>>> devErnesto
         </NavigationContainer>
       </Provider>
     );

package-lock.json

@@ -15,6 +15,7 @@
         "react": "16.13.1",
         "react-dom": "16.13.1",
         "react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",
+        "react-native-gifted-chat": "^0.16.3",
         "react-native-paper": "^4.9.2",
         "react-native-web": "~0.13.12",
         "react-redux": "^7.2.5",
@@ -9304,6 +9305,11 @@
         "react": "16.13.1"
       }
     },
+    "node_modules/react-native-communications": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-native-communications/-/react-native-communications-2.2.1.tgz",
+      "integrity": "sha1-eIO1ayCgAu63kMET+GFuqGksp5U="
+    },
     "node_modules/react-native-gesture-handler": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
@@ -9332,6 +9338,77 @@
         "ua-parser-js": "^0.7.18"
       }
     },
+    "node_modules/react-native-gifted-chat": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/react-native-gifted-chat/-/react-native-gifted-chat-0.16.3.tgz",
+      "integrity": "sha512-7EJKQPzzg1yIbLFNq9n5bGJWZ7Woi2bTeT7M4EVSChmFF/qyNos+gFxEcafPkEihEeIxeOne6hBQlYNKmDABgA==",
+      "dependencies": {
+        "@expo/react-native-action-sheet": "^3.6.0",
+        "dayjs": "^1.8.26",
+        "prop-types": "^15.7.2",
+        "react-native-communications": "^2.2.1",
+        "react-native-iphone-x-helper": "^1.2.1",
+        "react-native-lightbox": "^0.8.1",
+        "react-native-parsed-text": "0.0.22",
+        "react-native-typing-animation": "^0.1.7",
+        "uuid": "3.4.0"
+      },
+      "peerDependencies": {
+        "dayjs": "*",
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-gifted-chat/node_modules/@expo/react-native-action-sheet": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/@expo/react-native-action-sheet/-/react-native-action-sheet-3.12.0.tgz",
+      "integrity": "sha512-tuc8mJmDeCc1q/U2q+IJ9pKeIZL/JJoHYBf34Vor1aabfk8m+/LSDlCCi4MVFIU1fHHwgNQyuDbGhsanYPJFRw==",
+      "dependencies": {
+        "@types/hoist-non-react-statics": "^3.3.1",
+        "hoist-non-react-statics": "^3.3.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/react-native-gifted-chat/node_modules/react-native-iphone-x-helper": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
+      "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==",
+      "peerDependencies": {
+        "react-native": ">=0.42.0"
+      }
+    },
+    "node_modules/react-native-gifted-chat/node_modules/react-native-parsed-text": {
+      "version": "0.0.22",
+      "resolved": "https://registry.npmjs.org/react-native-parsed-text/-/react-native-parsed-text-0.0.22.tgz",
+      "integrity": "sha512-hfD83RDXZf9Fvth3DowR7j65fMnlqM9PpxZBGWkzVcUTFtqe6/yPcIoIAgrJbKn6YmtzkivmhWE2MCE4JKBXrQ==",
+      "dependencies": {
+        "prop-types": "^15.7.x"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-gifted-chat/node_modules/react-native-typing-animation": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/react-native-typing-animation/-/react-native-typing-animation-0.1.7.tgz",
+      "integrity": "sha512-4H3rF9M+I2yAZpYJcY0Mb29TXkn98QK12rrKSY6LZj1BQD9NNmRZuNXzwX4XHapsIz+N/J8M3p27FOQPbfzqeg==",
+      "peerDependencies": {
+        "prop-types": "*",
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-lightbox": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/react-native-lightbox/-/react-native-lightbox-0.8.1.tgz",
+      "integrity": "sha512-TFZA6iKEEHpAUIXjMTRb6vx0/9rHgEKy3ZBiRAy295PwldYg5c8opwnbyURLIl522ykeqhVx9uGdXjSMIowLvA==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      }
+    },
     "node_modules/react-native-paper": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.9.2.tgz",
@@ -19561,6 +19638,11 @@
         }
       }
     },
+    "react-native-communications": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-native-communications/-/react-native-communications-2.2.1.tgz",
+      "integrity": "sha1-eIO1ayCgAu63kMET+GFuqGksp5U="
+    },
     "react-native-gesture-handler": {
       "version": "1.10.3",
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
@@ -19591,6 +19673,61 @@
         }
       }
     },
+    "react-native-gifted-chat": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/react-native-gifted-chat/-/react-native-gifted-chat-0.16.3.tgz",
+      "integrity": "sha512-7EJKQPzzg1yIbLFNq9n5bGJWZ7Woi2bTeT7M4EVSChmFF/qyNos+gFxEcafPkEihEeIxeOne6hBQlYNKmDABgA==",
+      "requires": {
+        "@expo/react-native-action-sheet": "^3.6.0",
+        "dayjs": "^1.8.26",
+        "prop-types": "^15.7.2",
+        "react-native-communications": "^2.2.1",
+        "react-native-iphone-x-helper": "^1.2.1",
+        "react-native-lightbox": "^0.8.1",
+        "react-native-parsed-text": "0.0.22",
+        "react-native-typing-animation": "^0.1.7",
+        "uuid": "3.4.0"
+      },
+      "dependencies": {
+        "@expo/react-native-action-sheet": {
+          "version": "3.12.0",
+          "resolved": "https://registry.npmjs.org/@expo/react-native-action-sheet/-/react-native-action-sheet-3.12.0.tgz",
+          "integrity": "sha512-tuc8mJmDeCc1q/U2q+IJ9pKeIZL/JJoHYBf34Vor1aabfk8m+/LSDlCCi4MVFIU1fHHwgNQyuDbGhsanYPJFRw==",
+          "requires": {
+            "@types/hoist-non-react-statics": "^3.3.1",
+            "hoist-non-react-statics": "^3.3.0"
+          }
+        },
+        "react-native-iphone-x-helper": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
+          "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==",
+          "requires": {}
+        },
+        "react-native-parsed-text": {
+          "version": "0.0.22",
+          "resolved": "https://registry.npmjs.org/react-native-parsed-text/-/react-native-parsed-text-0.0.22.tgz",
+          "integrity": "sha512-hfD83RDXZf9Fvth3DowR7j65fMnlqM9PpxZBGWkzVcUTFtqe6/yPcIoIAgrJbKn6YmtzkivmhWE2MCE4JKBXrQ==",
+          "requires": {
+            "prop-types": "^15.7.x"
+          }
+        },
+        "react-native-typing-animation": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/react-native-typing-animation/-/react-native-typing-animation-0.1.7.tgz",
+          "integrity": "sha512-4H3rF9M+I2yAZpYJcY0Mb29TXkn98QK12rrKSY6LZj1BQD9NNmRZuNXzwX4XHapsIz+N/J8M3p27FOQPbfzqeg==",
+          "requires": {}
+        }
+      }
+    },
+    "react-native-lightbox": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/react-native-lightbox/-/react-native-lightbox-0.8.1.tgz",
+      "integrity": "sha512-TFZA6iKEEHpAUIXjMTRb6vx0/9rHgEKy3ZBiRAy295PwldYg5c8opwnbyURLIl522ykeqhVx9uGdXjSMIowLvA==",
+      "requires": {
+        "prop-types": "^15.7.2"
+      }
+    },
     "react-native-paper": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.9.2.tgz",

package.json

@@ -18,6 +18,7 @@
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",
+    "react-native-gifted-chat": "^0.16.3",
     "react-native-paper": "^4.9.2",
     "react-native-web": "~0.13.12",
     "react-redux": "^7.2.5",

screens/main/Home_page.js

@@ -1,4 +1,3 @@
-
 import React, {useState, useEffect} from 'react'
 import { Button, Text, View, StyleSheet} from 'react-native'
 import {FlatList, ListViewBase } from 'react-native'
@@ -9,12 +8,12 @@ import firebase from 'firebase';
 import { styles } from "../../config/styles";
 import { TextInput, TouchableWithoutFeedback, Keyboard, ImageBackground} from "react-native";
 
-
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux' 
 import { fetchUser } from '../../redux/actions/index'
 
 export function Home_page({navigation}) {
+<<<<<<< HEAD
 
   return (
     <TouchableWithoutFeedback style={styles.stdcontainer} onPress={Keyboard.dismiss} accessible={false}>
@@ -24,12 +23,101 @@ export function Home_page({navigation}) {
     </TouchableWithoutFeedback>
   );
 }
+=======
+  const [threads, setThreads] = useState([]);  
+  const [loading, setLoading] = useState(true);
+  
+  const [roomName, setRoomName] = useState('');
+
+  useEffect(() => {
+
+    const fire = firebase.firestore()
+    .collection('THREADS')
+    .where("members", "array-contains", firebase.auth().currentUser.uid)
+    .onSnapshot(querySnapshot => {
+      const threads = querySnapshot.docs.map(documentSnapshot => {
+        return{
+          _id:documentSnapshot.id,
+          name:'',
+          ...documentSnapshot.data()
+        };
+
+      });
+
+      setThreads(threads);
+
+      if(loading){
+        setLoading(false);
+      }
+
+    });
+
+    return () => fire();
+  }, []);
+  
+  if (loading) {
+    return <Loading />;
+  }
+
+
+  function handleButtonPress() {
+      firebase.firestore()
+        .collection('THREADS')
+        .add({
+          name: 'PedroFecha',
+          members: [
+            firebase.auth().currentUser.uid,
+            '02yOZHxFcGUX4MNwjeEbAlCShdu1'
+          ]
+        })
+        //.then(() => {
+          //navigation.navigate('allChats');
+         //});
+  }
+
+  return (
+      <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
+        <FlatList
+          data={threads}
+          keyExtractor = {item => item._id}
+          ItemSeparatorComponent={() => <Divider />}
+          renderItem = {({item}) => (
+          <TouchableOpacity
+            onPress={() => navigation.navigate('Room', {thread: item})}
+          >
+            <List.Item
+              title={item.name}
+              titleNumberOfLines={1}
+              titleStyle={styles.listTitle}
+              descriptionStyle={styles.listDescription}
+              descriptionNumberOfLines={1}
+            />
+          </TouchableOpacity>
+        )}
+        />
+      <Button
+        title='Calendario'
+        onPress={() => navigation.navigate('Calendar')}
+      />  
+      <Button
+        title='CrearChat'
+        onPress={() => handleButtonPress()}
+      />
+      <Button
+        title ='Hacer Busqueda'
+        onPress= {() => navigation.navigate('Busqueda')}
+      />
+        </ImageBackground>
+    );
+  }
+>>>>>>> devErnesto
 
 const mapStateToProps = (store) => ({
   currentUser: store.userState.currentUser
 })
 const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch);
 
+<<<<<<< HEAD
 export default connect(mapStateToProps, mapDispatchProps)(Home_page);
 const mapStateToProps = (store) => ({
   currentUser: store.userState.currentUser
@@ -40,3 +128,6 @@ export default connect(mapStateToProps, mapDispatchProps)(Home_page);
 
 
 
+=======
+export default connect(mapStateToProps, mapDispatchProps)(Home_page);
+>>>>>>> devErnesto

screens/main/RoomScreen.js

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> devErnesto
 import React, { useState, useEffect, useCallback } from 'react';
 import { GiftedChat } from 'react-native-gifted-chat';
 import firebase from 'firebase';