Complete notifications.js to list notifications

src/components/pages/profile.js

@@ -149,19 +149,22 @@ const ProfileDisplayJsx = ({navigation}) => {
         inactive: require("assets/eva-icons/bell-black.png")
     }
 
-    useEffect(async () => {
+    useEffect(() => {
-        const profile = JSON.parse(await AsyncStorage.getItem("@user_profile"));
+        AsyncStorage.multiGet(["@user_profile", "@user_notifications"])
-        const notifications = JSON.parse(
+            .then(values => {
-            await AsyncStorage.getItem("@user_notifications")
+                const [profileJSON, notificationsJSON] = values;
-        );
 
-        setState({
+                const profile = JSON.parse(profileJSON[1]);
-            profile: profile,
+                const notifications = JSON.parse(notificationsJSON[1]);
-            unreadNotifications: notifications.unread,
+                console.log(notifications);
-            mutuals: getMutuals(TEST_YOUR_FOLLOWERS, TEST_THEIR_FOLLOWERS),
+                setState({
-            own: true,
+                    profile: profile,
-            loaded: true,
+                    unreadNotifications: notifications.unread,
-        });
+                    mutuals: getMutuals(TEST_YOUR_FOLLOWERS, TEST_THEIR_FOLLOWERS),
+                    own: true,
+                    loaded: true,
+                });
+            });
     }, []);
 
     let profileButton;
@@ -209,7 +212,12 @@ const ProfileDisplayJsx = ({navigation}) => {
                             {
                                 state.own ?
                                     <View style = { styles.profileContextContainer }>
-                                        <TouchableOpacity>
+                                        <TouchableOpacity
+                                              onPress = {
+                                                () => {
+                                                    navigation.navigate("Notifications");
+                                                }
+                                              }>
                                             <Image
                                                 source = {
                                                     activeOrNot(

src/components/pages/profile/notifications.js

@@ -1,14 +1,439 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
-import { ScreenWithTrayJsx } from "src/components/navigation/navigators";
+
+import {
+    Dimensions,
+    View,
+    TouchableOpacity,
+    Image,
+    Text,
+} from "react-native";
+
+import AsyncStorage from "@react-native-async-storage/async-storage";
+
+import { ScreenWithBackBarJsx } from "src/components/navigation/navigators";
+
+const TEST_IMAGE = "https://cache.desktopnexus.com/thumbseg/2255/2255124-bigthumbnail.jpg";
+const TEST_NOTIFICATIONS = [
+    {
+        id: 1,
+        type: "follow",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+    },
+    {
+        id: 2,
+        type: "follow_request",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+    },
+    {
+        id: 3,
+        type: "mention",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+        status: {
+            id: 1,
+            media_attachments: [],
+            content: "This is a message",
+        }
+    },
+    {
+        id: 4,
+        type: "mention",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+        status: {
+            id: 1,
+            media_attachments: [
+                { url: TEST_IMAGE }
+            ],
+            content: "This is a message",
+        }
+    },
+    {
+        id: 5,
+        type: "mention",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+        status: {
+            id: 1,
+            media_attachments: [
+                { url: TEST_IMAGE }
+            ],
+            content: "This is a really really really really really really"
+                + " really really really really really really long message",
+        }
+    },
+    {
+        id: 6,
+        type: "reblog",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+        status: {
+            id: 1,
+            media_attachments: [
+                { url: TEST_IMAGE }
+            ],
+        }
+    },
+    {
+        id: 7,
+        type: "favourite",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+        status: {
+            id: 1,
+            media_attachments: [
+                { url: TEST_IMAGE }
+            ],
+        }
+    },
+    {
+        id: 8,
+        type: "status",
+        account: {
+            acct: "njms",
+            avatar: TEST_IMAGE,
+        },
+        status: {
+            id: 1,
+            media_attachments: [
+                { url: TEST_IMAGE }
+            ],
+        }
+    },
+]
+
+function navigateProfileFactory(nav, acct) {
+    return () => {
+        nav.navigate("ViewProfile", {
+            acct: acct,
+        });
+    };
+}
+
+function navigatePostFactory(nav, id) {
+    return () => {
+        nav.navigate("ViewPost", {
+            originTab: "Profile",
+            id: id,
+        });
+    }
+}
+
+function renderNotification(notif, navigation) {
+    switch(notif.type) {
+        case "follow":
+            return <FollowJsx
+                data = { notif }
+                key = { notif.id }
+                navigation = { navigation } />
+        case "follow_request":
+            return <FollowRequestJsx
+                data = { notif }
+                key = { notif.id }
+                navigation = { navigation } />
+        case "mention":
+            return <MentionJsx
+                data = { notif }
+                key = { notif.id }
+                navigation = { navigation } />
+        case "reblog":
+            return <ReblogJsx
+                data = { notif }
+                key = { notif.id }
+                navigation = { navigation } />
+        case "favourite":
+            return <FavouriteJsx
+                data = { notif }
+                key = { notif.id }
+                navigation = { navigation } />
+        case "status":
+            return <StatusJsx
+                data = { notif }
+                key = { notif.id }
+                navigation = { navigation } />
+        default:
+            // We're not expecting polls to be super popular on Pixelfed
+            return <></>
+    }
+}
+
+const UserTextJsx = (props) => {
+    return (
+        <Text
+              style = { styles.bold }
+              onPress = {
+                () => {
+                    props.navigation.navigate("ViewProfile", {
+                        acct: props.acct
+                    });
+                }
+              }>
+            { props.acct }&nbsp;
+        </Text>
+    );
+};
+
+const NotificationJsx = (props) => {
+    return (
+        <View style = { styles.notif.container }>
+            <View style = { styles.notif.thumbnailContainer }>
+                <TouchableOpacity
+                      onPress = { props.thumbnailPressCallback }>
+                    <Image
+                        style = {
+                            [
+                                styles.notif.thumbnail,
+                                props.thumbnailStyles
+                            ]
+                        }
+                        source = { { uri: props.thumbnail } } />
+                </TouchableOpacity>
+            </View>
+            <View style = { styles.notif.contentContainer }>
+                { props.children }
+            </View>
+            { props.button ?
+                <View style = { styles.notif.buttonContainer }>
+                   <TouchableOpacity
+                          style = { styles.notif.button }
+                          onPress = { props.buttonCallback }>
+                        <Text>{ props.buttonLabel }</Text>
+                    </TouchableOpacity>
+                </View>
+                : <></>
+            }
+        </View>
+    );
+};
+
+const FollowJsx = (props) => {
+    return (
+        <NotificationJsx
+              thumbnail = { props.data.account.avatar }
+              thumbnailStyles = { styles.notif.circularThumbnail }
+              thumbnailPressCallback = {
+                navigateProfileFactory(props.navigation, props.data.account.acct)
+              }>
+            <Text style = { styles.notif.content }>
+                <UserTextJsx acct = { props.data.account.acct } />
+                has followed you.
+            </Text>
+        </NotificationJsx>
+    );
+};
+
+const FollowRequestJsx = (props) => {
+    return (
+        <NotificationJsx
+              thumbnail = { props.data.account.avatar }
+              thumbnailStyles = { styles.notif.circularThumbnail }
+              thumbnailPressCallback = {
+                navigateProfileFactory(props.navigation, props.data.account.acct)
+              }
+              button = { true }
+              buttonLabel = { "Accept" }
+              buttonCallback = { () => console.log("Request accepted") }>
+            <Text style = { styles.notif.content }>
+                <UserTextJsx acct = { props.data.account.acct } />
+                has requested to follow you.
+            </Text>
+        </NotificationJsx>
+    );
+};
+
+const MentionJsx = (props) => {
+    let uri;
+    let imageStyle;
+    let thumbnailCallback;
+
+    if (props.data.status.media_attachments.length > 0) {
+        // If it's a comment...
+        uri = props.data.status.media_attachments[0].url;
+        imageStyle = {};
+        thumbnailCallback = navigatePostFactory(
+            props.navigation,
+            props.data.status.id
+        );
+    } else {
+        // If it's a reply to your comment...
+        uri = props.data.account.avatar;
+        imageStyle = styles.notif.circularThumbnail;
+        thumbnailCallback = navigateProfileFactory(
+            props.navigation,
+            props.data.account.acct
+        );
+    }
+
+    return (
+        <NotificationJsx
+              thumbnail = { uri }
+              thumbnailStyles = { imageStyle }i
+              thumbnailPressCallback = { thumbnailCallback }>
+            <Text style = { styles.notif.content }>
+                <UserTextJsx acct = { props.data.account.acct } />
+                mentioned you:
+                <Text style = { styles.notif.status }>
+                   "{ props.data.status.content }"
+                </Text>
+            </Text>
+        </NotificationJsx>
+    );
+};
+
+const ReblogJsx = (props) => {
+    return (
+        <NotificationJsx
+              thumbnail = { props.data.status.media_attachments[0].url }
+              thumbnailPressCallback = {
+                navigatePostFactory(props.navigation, props.data.status.id)
+              }>
+            <Image
+                style = { styles.notif.inlineIcon }
+                source = { require("assets/eva-icons/post-actions/boost-full.png") } />
+            <Text style = { styles.notif.content }>
+                <UserTextJsx acct = { props.data.account.acct } />
+                shared your post.
+            </Text>
+        </NotificationJsx>
+    );
+};
+
+const FavouriteJsx = (props) => {
+    return (
+        <NotificationJsx
+              thumbnail = { props.data.status.media_attachments[0].url }
+              thumbnailPressCallback = {
+                navigatePostFactory(props.navigation, props.data.status.id)
+              }>
+            <Image
+                style = { styles.notif.inlineIcon }
+                source = { require("assets/eva-icons/post-actions/heart-active.png") } />
+            <Text style = { styles.notif.content }>
+                <UserTextJsx acct = { props.data.account.acct } />
+                liked your post.
+            </Text>
+        </NotificationJsx>
+    );
+};
+
+const StatusJsx = (props) => {
+    return (
+        <NotificationJsx
+              thumbnail = { props.data.status.media_attachments[0].url }
+              thumbnailPressCallback = {
+                navigatePostFactory(props.navigation, props.data.status.id)
+              }>
+            <Text style = { styles.notif.content }>
+                <UserTextJsx acct = { props.data.account.acct } />
+                just posted.
+            </Text>
+        </NotificationJsx>
+    );
+};
 
 const NotificationsJsx = ({navigation}) => {
+    const [state, setState] = useState({
+        loaded: false,
+    });
+
+    useEffect(() => {
+        const read = JSON.stringify({
+            unread: false,
+            memory: [
+                { id: 1 },
+                { id: 2 },
+                { id: 3 },
+            ]
+        });
+
+        AsyncStorage.mergeItem("@user_notifications", read)
+            .then(() => {
+                setState({...state,
+                    notifications: TEST_NOTIFICATIONS,
+                    loaded: true
+                })
+            });
+
+    }, []);
+
     return (
-        <ScreenWithTrayJsx
+        <ScreenWithBackBarJsx
-             active = "Notifications"
+              navigation = { navigation }>
-             navigation = { navigation }>
+            { state.loaded ?
-            
+                <View>
-        </ScreenWithTrayJsx>
+                    {
+                        state.notifications.map(notif =>
+                            renderNotification(notif, navigation)
+                        )
+                    }
+                </View>
+                : <></>
+            }
+        </ScreenWithBackBarJsx>
     );
 }
 
-export default NotificationsJsx;
+const SCREEN_WIDTH = Dimensions.get("window").width;
+
+const styles = {
+    notif: {
+        container: {
+            flexDirection: "row",
+            alignItems: "center",
+            paddingLeft: 20,
+            marginTop: 10,
+            marginBottom: 10,
+        },
+
+        circularThumbnail: { borderRadius: SCREEN_WIDTH / 16 },
+        thumbnailContainer: {
+            marginRight: 10,
+        },
+        thumbnail: {
+            width: SCREEN_WIDTH / 8,
+            height: SCREEN_WIDTH / 8,
+        },
+
+        contentContainer: {
+            flexShrink: 1,
+            flexDirection: "row",
+            alignItems: "center",
+        },
+        inlineIcon: {
+            width: 20,
+            height: 20,
+            marginRight: 10,
+        },
+        status: { fontStyle: "italic" },
+
+        buttonContainer: {
+            marginLeft: "auto",
+            marginRight: 10,
+        },
+        button: {
+            borderWidth: 1,
+            borderColor: "#888",
+            borderRadius: 10,
+            padding: 10,
+        },
+    },
+    bold: { fontWeight: "bold" },
+};
+
+export default NotificationsJsx;

src/components/pages/view-post.js

@@ -3,14 +3,20 @@ import React from "react";
 import { ScreenWithFullNavigationJsx } from "src/components/navigation/navigators";
 import { PostByIdJsx } from "src/components/posts/post";
 
-const ViewPostJsx = (props) => {
+const ViewPostJsx = ({navigation}) => {
+    const id = navigation.getParam("id", undefined);
+
+    if (id == undefined) {
+        throw Error("ID not specified when navigating to ViewPost!");
+    }
+
     return (
         <ScreenWithFullNavigationJsx
-            active = { props.navigation.getParam("originTab", "Timeline") }
+            active = { navigation.getParam("originTab", "Timeline") }
-            navigation = { props.navigation }>
+            navigation = { navigation }>
             <PostByIdJsx
-                navigation = { props.navigation }
+                navigation = { navigation }
-                id = { props.id } />
+                id = { id } />
         </ScreenWithFullNavigationJsx>
     );
 }

src/requests.js

@@ -17,9 +17,6 @@ export async function checkUnreadNotifications() {
 
         const isUnread = JSON.stringify(newNotifs) != JSON.stringify(notifications.memory);
 
-        console.log(JSON.stringify(newNotifs));
-        console.log(JSON.stringify(notifications.memory));
-
         // Update stored notifications
         await AsyncStorage.setItem(
             "@user_notifications",