diff --git a/src/components/navigation/back-bar.js b/src/components/navigation/back-bar.js index 9faa4b6..7777e27 100644 --- a/src/components/navigation/back-bar.js +++ b/src/components/navigation/back-bar.js @@ -23,7 +23,8 @@ const BackBarJsx = (props) => { const styles = { nav: { - borderBottom: "2px solid #CCC", + borderBottomWidth: 1, + borderBottomColor: "#CCC", backgroundColor: "white", flexDirection: "row", diff --git a/src/components/navigation/tray.js b/src/components/navigation/tray.js index 831862e..34351bf 100644 --- a/src/components/navigation/tray.js +++ b/src/components/navigation/tray.js @@ -1,5 +1,8 @@ import React, { useState, useEffect } from "react"; -import { Image } from "react-native"; +import { + Image, + Dimensions, +} from "react-native"; import { checkUnreadNotifications } from "src/requests"; @@ -101,25 +104,24 @@ const TrayJsx = (props) => { const iconSize = 30; +const SCREEN_WIDTH = Dimensions.get("window").width; const styles = { tray: { - width: "100%", + width: SCREEN_WIDTH, paddingTop: iconSize / 2, paddingBottom: iconSize / 2, - borderTop: "2px solid #CCC", + borderTopWidth: 2, + borderTopColor: "#CCC", backgroundColor: "white" }, iconList: { - display: "flex", flexDirection: "row", justifyContent: "space-evenly", alignItems: "center", margin: 0, paddingLeft: 0, - - listStyle: "none", }, icon: { width: iconSize, diff --git a/src/components/pages/discover.js b/src/components/pages/discover.js index 097862c..ab2cffe 100644 --- a/src/components/pages/discover.js +++ b/src/components/pages/discover.js @@ -83,7 +83,6 @@ const DiscoverJsx = (props) => { const SCREEN_WIDTH = Dimensions.get("window").width; const styles = { form: { - display: "flex", justifyContent: "center", backgroundColor: "white", padding: 20 diff --git a/src/components/pages/discover/search.js b/src/components/pages/discover/search.js index c589c36..2eb599d 100644 --- a/src/components/pages/discover/search.js +++ b/src/components/pages/discover/search.js @@ -176,7 +176,7 @@ const styles = { thumbnail: { width: 50, height: 50, - borderRadius: "100%", + borderRadius: 25, marginRight: 10, } } diff --git a/src/components/pages/discover/view-hashtag.js b/src/components/pages/discover/view-hashtag.js index d095133..de478f7 100644 --- a/src/components/pages/discover/view-hashtag.js +++ b/src/components/pages/discover/view-hashtag.js @@ -78,7 +78,7 @@ const styles = { height: screen_width / 3, borderWidth: 1, borderColor: "#888", - borderRadius: "100%", + borderRadius: screen_width / 6, marginRight: 20, }, hashtag: { diff --git a/src/components/pages/feed.js b/src/components/pages/feed.js index e507703..02d017c 100644 --- a/src/components/pages/feed.js +++ b/src/components/pages/feed.js @@ -79,13 +79,13 @@ const styles = { height: screen_height - (screen_height / 12) }, interruptionOuter: { - borderTop: "2px solid #CCC", + borderTopWidth: 1, + borderTopColor: "#CCC", }, interruption: { marginTop: 10, marginBottom: 10, - flex: 1, justifyContent: "center", alignItems: "center", }, @@ -97,7 +97,8 @@ const styles = { height: screen_width * 0.3 }, buttonOlder: { - border: "2px solid black", + borderWidth: 1, + borderColor: "#888", borderRadius: 5, margin: 30, diff --git a/src/components/pages/profile.js b/src/components/pages/profile.js index a671a8f..580f3a1 100644 --- a/src/components/pages/profile.js +++ b/src/components/pages/profile.js @@ -304,10 +304,9 @@ const styles = { padding: screen_width / 20, }, profileHeader: { - display: "flex", flexDirection: "row", alignItems: "center", - marginBottom: screen_width / 20 + marginBottom: screen_width / 20, }, displayName: { fontSize: 24 @@ -316,8 +315,8 @@ const styles = { width: screen_width / 5, height: screen_width / 5, - borderRadius: "100%", - marginRight: screen_width / 20 + borderRadius: screen_width / 10, + marginRight: screen_width / 20, }, profileHeaderIcon: { width: screen_width / 12, @@ -325,7 +324,7 @@ const styles = { }, profileContextContainer: { marginLeft: "auto", - marginRight: screen_width / 15 + marginRight: screen_width / 15, }, accountStats: { fontSize: 14, @@ -343,10 +342,10 @@ const styles = { padding: 10 }, rowName: { - width: "33%", + width: screen_width / 3, textAlign: "center" }, - rowValue: { width: "67%" }, + rowValue: { width: (screen_width / 3) * 2 }, anchor: { color: "#888", textDecoration: "underline" @@ -354,7 +353,6 @@ const styles = { button: { borderWidth: 1, - borderStyle: "solid", borderColor: "#888", borderRadius: 5, diff --git a/src/components/pages/view-comments.js b/src/components/pages/view-comments.js index 9bccb75..0814476 100644 --- a/src/components/pages/view-comments.js +++ b/src/components/pages/view-comments.js @@ -178,7 +178,7 @@ const CommentJsx = (props) => { style = { styles.avatar } /> - { props.data.username }  + { props.data.username }  { props.data.content } @@ -229,37 +229,40 @@ const ViewCommentsJsx = (props) => { - - - + { state.loaded + ? + + + + + { + state.descendants.map((thread, i) => { + const comment = thread[0]; + const subs = thread.slice(1); + return ( + + + { + subs.map((sub, j) => { + return ( + + + + ) + }) + } + + ); + }) + } + - - { - state.descendants.map((thread, i) => { - const comment = thread[0]; - const subs = thread.slice(1); - return ( - - - { - subs.map((sub, j) => { - return ( - - - - ) - }) - } - - ); - }) - } - - + : <> + } { const styles = { buttonContainer: { - display: "flex", justifyContent: "center", alignItems: "center" }, diff --git a/src/components/posts/post-action-bar.js b/src/components/posts/post-action-bar.js index e9d085f..ac5c5c4 100644 --- a/src/components/posts/post-action-bar.js +++ b/src/components/posts/post-action-bar.js @@ -87,7 +87,6 @@ const PostActionBarJsx = (props) => { const SCREEN_WIDTH = Dimensions.get("window").width; const styles = { flexContainer: { - display: "flex", flexDirection: "row", padding: SCREEN_WIDTH / 40 },