From 7245c448d4b77986eddab9e3fbb9b1b3599b3ca6 Mon Sep 17 00:00:00 2001
From: aeroreyna <adolforeyna@gmail.com>
Date: Fri, 11 Mar 2022 22:00:56 -0800
Subject: [PATCH] Double Navigation Stacks

---
 App.js             | 29 +++++++++++++++++------------
 Views/Feed.js      |  2 ++
 components/Post.js | 25 ++++++++++++++++---------
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/App.js b/App.js
index 810b5ad..fbb6a80 100644
--- a/App.js
+++ b/App.js
@@ -16,9 +16,8 @@ const Tab = createMaterialBottomTabNavigator();
 
 const Stack = createNativeStackNavigator();
 
-export default function App() {
+const MainNavigation = () => {
     return (
-        <NavigationContainer>
             <Tab.Navigator initialRouteName="Home"
                 activeColor="#0d6efd"
                 inactiveColor="#FFFFFF"
@@ -39,19 +38,25 @@ export default function App() {
                         },
                     })}
                 />
-                <Tab.Screen 
-                    name="Profile" 
-                    component={Profile} 
+                
+                <Tab.Screen name="Logout" component={Login} />
+            </Tab.Navigator>
+    )
+}
+
+export default function App() {
+    return (
+        <NavigationContainer>
+            <Stack.Navigator>
+                <Stack.Screen name="Home" component={MainNavigation} options={{headerShown:false}} />
+                <Stack.Screen
+                    name="Profile"
+                    component={Profile}
                     options={{
-                        tabBarLabel: 'Profile',
-                        tabBarIcon: ({ color }) => (
-                            <MaterialIcons name="person" color={color} size={26} />
-                        ),
-                        tabBarBadge: false
+                        tabBarLabel: 'Profile'
                     }}
                 />
-                <Tab.Screen name="Logou" component={Login} />
-            </Tab.Navigator>
+            </Stack.Navigator>
         </NavigationContainer>
     );
 }
diff --git a/Views/Feed.js b/Views/Feed.js
index 58d6d88..9103a8b 100644
--- a/Views/Feed.js
+++ b/Views/Feed.js
@@ -36,6 +36,8 @@ let Feed = ({ navigation, route }) => {
         //console.log(posts)
     }, [route.params]);
     const renderPost = (({ item }) => {
+        if(item.nonOrganicType === 'PopularUsers' || item.nonOrganicType === 'PopularGroups')
+            return (<></>);
         return (<Post post={item} viewer={Me} />);
     });
 
diff --git a/components/Post.js b/components/Post.js
index 6b1d5fc..29dcf42 100644
--- a/components/Post.js
+++ b/components/Post.js
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Text, ScrollView, FlatList, StyleSheet } from 'react-native';
-import { Avatar, Button, Card, Title, Paragraph } from 'react-native-paper';
+import { Text, ScrollView, FlatList, StyleSheet, View } from 'react-native';
+import { Avatar, Button, Card, Title, Chip } from 'react-native-paper';
 import API from './../API.js';
 import UserName from './UserName.js';
 import Media from './Media.js';
@@ -53,13 +53,20 @@ let Post = (props) => {
     return (
         <Card style={styles.card}>
             <Card.Content>
-                <Text style={styles.userName}>
-                    <UserName profileid={post.profileid} />
-                    {toProfileText}
-                </Text>
-                <Text style={{ fontSize: 18 }}>{cleanContent}</Text>
-                <Media content={post.content} />
-
+                {!post.nonOrganicType ?
+                    <View>
+                        <Text style={styles.userName}>
+                            <UserName profileid={post.profileid} />
+                            {toProfileText}
+                        </Text>
+                        <Text style={{ fontSize: 18 }}>{cleanContent}</Text>
+                        <Media content={post.content} />
+                    </View> :
+                    <View>
+                        <Chip icon="new-releases" style={{width:100}} >News</Chip>
+                        <Text style={{ fontSize: 18 }}>{cleanContent}</Text>
+                    </View>
+                }
             </Card.Content>
             <Card.Actions style={{ flexDirection: "row", flow: 4, justifyContent: 'space-evenly', fontSize: 18 }}>
                 <Button