diff --git a/src/App.js b/src/App.js
index 80ccf0e..95c7949 100644
--- a/src/App.js
+++ b/src/App.js
@@ -16,7 +16,7 @@ import DiscoverJsx from 'src/components/pages/discover';
import SearchJsx from 'src/components/pages/discover/search';
import ViewHashtagJsx from 'src/components/pages/discover/view-hashtag';
import DirectJsx from "src/components/pages/direct";
-import ConversationJsx from "src/components/pages/direct/conversation";
+import ConversationJsx, { ComposeJsx } from "src/components/pages/direct/conversation";
import NotificationsJsx from 'src/components/pages/profile/notifications';
import UserListJsx from "src/components/pages/user-list.js";
import SettingsJsx from "src/components/pages/profile/settings.js";
@@ -26,6 +26,7 @@ const Stack = createStackNavigator({
Feed: { screen: FeedJsx, },
Discover: { screen: DiscoverJsx },
Direct: { screen: DirectJsx },
+ Compose: { screen: ComposeJsx },
Conversation: { screen: ConversationJsx },
Notifications: { screen: NotificationsJsx },
Profile: { screen: ProfileJsx, },
diff --git a/src/components/navigation/back-bar.js b/src/components/navigation/back-bar.js
index 556ebd6..9faa4b6 100644
--- a/src/components/navigation/back-bar.js
+++ b/src/components/navigation/back-bar.js
@@ -28,6 +28,8 @@ const styles = {
flexDirection: "row",
alignItems: "center",
+ paddingLeft: 10,
+ paddingRight: 10,
},
rest: {
flexGrow: 1,
@@ -37,7 +39,9 @@ const styles = {
height: 30,
},
button: {
- padding: 10,
+ paddingRight: 10,
+ paddingTop: 10,
+ paddingBottom: 10,
},
}
diff --git a/src/components/pages/direct.js b/src/components/pages/direct.js
index 60a5488..e50e1ed 100644
--- a/src/components/pages/direct.js
+++ b/src/components/pages/direct.js
@@ -123,7 +123,8 @@ const DirectJsx = ({ navigation }) => {
}
}/>
+ style = { styles.form.compose }
+ onPress = { () => { navigation.navigate("Compose") } }>
diff --git a/src/components/pages/direct/conversation.js b/src/components/pages/direct/conversation.js
index 909931e..d97c0ec 100644
--- a/src/components/pages/direct/conversation.js
+++ b/src/components/pages/direct/conversation.js
@@ -48,6 +48,71 @@ const TEST_MESSAGES = [
{ ...TEST_STATUS, id: 5 },
];
+const ConversationContainerJsx = (props) => (
+
+
+
+ { props.renderBackBar() }
+
+
+ { props.children }
+
+
+ {
+ props.setState({...props.state,
+ newMessage: value,
+ });
+ }
+ }/>
+
+
+
+
+
+
+);
+
+const ComposeJsx = ({ navigation }) => {
+ const [state, setState] = useState({
+ accts: [],
+ newMessage: "",
+ });
+ const renderBackBar = () => (
+ {
+ setState({...state,
+ accts: value.split(",").map(acct => acct.trim())
+ });
+ }
+ }/>
+ );
+
+ return {
+ // Create the conversation, navigate to conversation.js
+ }
+ }/>;
+};
+
const ConversationJsx = ({ navigation }) => {
const conversation = navigation.getParam("conversation", {});
const [state, setState] = useState({
@@ -165,42 +230,19 @@ const ConversationJsx = ({ navigation }) => {
};
return (
-
-
-
- { renderBackBar() }
-
-
- { state.loaded
- ? item.id }/>
- : <>>
- }
-
-
- {
- setState({...state,
- newMessage: value,
- });
- }
- }/>
-
-
-
-
-
-
+
+ { state.loaded
+ ? item.id }/>
+ : <>>
+ }
+
);
};
@@ -276,19 +318,19 @@ const styles = {
marginBottom: 10,
marginLeft: 10,
},
- input: {
- padding: 10,
- borderWidth: 1,
- borderColor: "#888",
- borderRadius: 5,
- flexGrow: 1,
- },
button: {
marginLeft: 10,
marginRight: 10,
}
},
bold: { fontWeight: "bold", },
+ input: {
+ padding: 10,
+ borderWidth: 1,
+ borderColor: "#888",
+ borderRadius: 5,
+ flexGrow: 1,
+ },
};
-export { ConversationJsx as default };
+export { ConversationJsx as default, ComposeJsx, };