From f889540ba51aef8d8ef59d985108580ca8b9f2b1 Mon Sep 17 00:00:00 2001
From: natjms <natjms@njms.ca>
Date: Tue, 17 May 2022 06:07:52 -0700
Subject: [PATCH] Finish wrapping pages

---
 src/components/pages/direct.js              |   5 +-
 src/components/pages/direct/conversation.js |   2 +-
 src/components/pages/feed/older-posts.js    |   5 +-
 src/components/pages/publish.js             | 104 ++++++++++----------
 src/components/pages/user-list.js           |  11 ++-
 5 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/src/components/pages/direct.js b/src/components/pages/direct.js
index 5248486..ebd26dd 100644
--- a/src/components/pages/direct.js
+++ b/src/components/pages/direct.js
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
 import {
+    ScrollView,
     View,
     Text,
     TouchableOpacity,
@@ -142,7 +143,7 @@ const Direct = ({ navigation }) => {
     return (
         <>
             { state.loaded
-                ? <>
+                ? <ScrollView>
                     <View style = { [ styles.row, styles.form.container ] }>
                         <TextInput
                             placeholder = "Search..."
@@ -182,7 +183,7 @@ const Direct = ({ navigation }) => {
                             : <></>
                         }
                     </>
-                </>
+                </ScrollView>
                 : <></>
             }
         </>
diff --git a/src/components/pages/direct/conversation.js b/src/components/pages/direct/conversation.js
index a128620..d27c23d 100644
--- a/src/components/pages/direct/conversation.js
+++ b/src/components/pages/direct/conversation.js
@@ -110,7 +110,7 @@ const Compose = ({ navigation }) => {
 };
 
 const Conversation = ({ navigation }) => {
-    const conversation = navigation.getParam("conversation", {});
+    const conversation = route.params.conversation
     const [state, setState] = useState({
         loaded: false,
         newMessage: "",
diff --git a/src/components/pages/feed/older-posts.js b/src/components/pages/feed/older-posts.js
index 8235483..5fbd001 100644
--- a/src/components/pages/feed/older-posts.js
+++ b/src/components/pages/feed/older-posts.js
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { ScrollView } from "react-native";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 
 import * as requests from "src/requests";
@@ -56,7 +57,7 @@ const OlderPosts = (props) => {
     };
 
     return (
-        <>
+        <ScrollView>
             { state.loaded
                 ? <>
                     <PagedGrid
@@ -66,7 +67,7 @@ const OlderPosts = (props) => {
                 </>
                 : <></>
             }
-        </>
+        </ScrollView>
     );
 };
 
diff --git a/src/components/pages/publish.js b/src/components/pages/publish.js
index 689bc64..84db5be 100644
--- a/src/components/pages/publish.js
+++ b/src/components/pages/publish.js
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
 import {
+    ScrollView,
     Dimensions,
     View,
     Image,
@@ -126,62 +127,57 @@ const Publish = ({ navigation }) => {
         );
     };
 
-    return (
-        <>
-            { state.loaded
-                ? <>
-                    <View style = { styles.preview.container }>
-                        <Image
-                            style = {[
-                                styles.preview.image,
-                                {
-                                    width: state.image.width,
-                                    height: state.image.height,
-                                },
-                            ]}
-                            source = { { uri: state.image.data.uri } } />
-                    </View>
-                    <View style = { styles.form.container }>
-                        <TextInput
-                            placeholder = "Caption this post..."
-                            value = { state.caption }
-                            multiline
-                            autoFocus
-                            onChangeText = {
-                                caption => setState({ ...state, caption })
-                            }
-                            style = { [ styles.form.input, { height: 100, } ] } />
+    return state.loaded
+        ? <ScrollView>
+            <View style = { styles.preview.container }>
+                <Image
+                    style = {[
+                        styles.preview.image,
+                        {
+                            width: state.image.width,
+                            height: state.image.height,
+                        },
+                    ]}
+                    source = { { uri: state.image.data.uri } } />
+            </View>
+            <View style = { styles.form.container }>
+                <TextInput
+                    placeholder = "Caption this post..."
+                    value = { state.caption }
+                    multiline
+                    autoFocus
+                    onChangeText = {
+                        caption => setState({ ...state, caption })
+                    }
+                    style = { [ styles.form.input, { height: 100, } ] } />
 
-                        <Text style = { styles.form.label }>Visibility</Text>
-                        <Selector
-                            visibility = "public"
-                            active = { state.visibility }
-                            icon = "globe-outline"
-                            message = "Anyone can see this post" />
-                        <Selector
-                            visibility = "unlisted"
-                            active = { state.visibility }
-                            icon = "lock-open-outline"
-                            message = "Keep this post off public timelines" />
-                        <Selector
-                            visibility = "private"
-                            active = { state.visibility }
-                            icon = "lock-closed-outline"
-                            message = "Only share this with my followers" />
+                <Text style = { styles.form.label }>Visibility</Text>
+                <Selector
+                    visibility = "public"
+                    active = { state.visibility }
+                    icon = "globe-outline"
+                    message = "Anyone can see this post" />
+                <Selector
+                    visibility = "unlisted"
+                    active = { state.visibility }
+                    icon = "lock-open-outline"
+                    message = "Keep this post off public timelines" />
+                <Selector
+                    visibility = "private"
+                    active = { state.visibility }
+                    icon = "lock-closed-outline"
+                    message = "Only share this with my followers" />
 
-                        <TouchableOpacity
-                              onPress = { _handlePublish }
-                              style = { styles.form.button.container }>
-                            <Text style = { styles.form.button.label }>
-                                Publish
-                            </Text>
-                        </TouchableOpacity>
-                    </View>
-                </>
-                : <></>
-            }
-        </>
-    );
+                <TouchableOpacity
+                      onPress = { _handlePublish }
+                      style = { styles.form.button.container }>
+                    <Text style = { styles.form.button.label }>
+                        Publish
+                    </Text>
+                </TouchableOpacity>
+            </View>
+        </ScrollView>
+        : <></>;
 };
 
 const SCREEN_WIDTH = Dimensions.get("window").width;
diff --git a/src/components/pages/user-list.js b/src/components/pages/user-list.js
index 519e814..94d11fb 100644
--- a/src/components/pages/user-list.js
+++ b/src/components/pages/user-list.js
@@ -1,5 +1,6 @@
 import React from "react";
 import {
+    ScrollView,
     SafeAreaView,
     View,
     Image,
@@ -10,12 +11,12 @@ import {
 
 import ModerateMenu from "src/components/moderate-menu.js";
 
-const UserList = ({navigation}) => {
-    const data = navigation.getParam("data", [])
-    const context = navigation.getParam("context", "");
+const UserList = ({ navigation, route}) => {
+    const data = route.params.data;
+    const context = route.params.context;
 
     return (
-        <>
+        <ScrollView>
             {
                 context ?
                     <Text style = { styles.context }>
@@ -55,7 +56,7 @@ const UserList = ({navigation}) => {
                     </View>
                 )
             }
-        </>
+        </ScrollView>
     );
 };