nat
/
resin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into posts

This commit is contained in:
Nat 2021-03-13 13:28:32 -04:00 committed by GitHub
parent 39d15067c2 a5b916032e
commit db5237295b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.json
View File

@ -7,7 +7,7 @@
"orientation": "portrait",
"icon": "./assets/icon.png",
"splash": {
"image": "./assets/splash.png",
"image": "./assets/test.jpg",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},

6
src/components/navigation/back-bar.js
View File

@ -1,19 +1,19 @@
import React from "react";
import { Image } from "react-native";
import { TouchableWithoutFeedback } from "react-native";
import { TouchableWithoutFeedback, View } from "react-native";
const BackBarJsx = (props) => {
const backIcon = require("assets/eva-icons/back.png");
return (
<nav style = { styles.nav }>
<View style = { styles.nav }>
<TouchableWithoutFeedback
onPress = { () => props.navigation.goBack() }>
<Image
style = { styles.button }
source = { backIcon }/>
</TouchableWithoutFeedback>
</nav>
</View>
);
};

20
src/components/navigation/tray.js
View File

@ -1,7 +1,7 @@
import React from "react";
import { Image } from "react-native";
import { activeOrNot } from "src/interface/interactions"
import { TouchableWithoutFeedback } from "react-native";
import { TouchableWithoutFeedback, View } from "react-native";
const TrayButtonJsx = (props) => {
return (
@ -43,45 +43,35 @@ const TrayJsx = (props) => {
}
return (
<nav style = { styles.tray }>
<ul style = { styles.iconList }>
<li>
<View style = { styles.tray }>
<View style = { styles.iconList }>
<TrayButtonJsx
where = "Feed"
pack = { icons.feed }
active = { props.active }
nav = { nav } />
</li>
<li>
<TrayButtonJsx
where = "Discover"
pack = { icons.discover }
active = { props.active }
nav = { nav } />
</li>
<li>
<TrayButtonJsx
where = "Publish"
pack = { icons.publish }
active = { props.active }
nav = { nav } />
</li>
<li>
<TrayButtonJsx
where = "Direct"
pack = { icons.direct }
active = { props.active }
nav = { nav } />
</li>
<li>
<TrayButtonJsx
where = "Profile"
pack = { icons.profile }
active = { props.active }
nav = { nav } />
</li>
</ul>
</nav>
</View>
</View>
);
};

2
src/components/pages/discover.js
View File

@ -36,7 +36,7 @@ const styles = {
},
searchBar: {
padding: 10,
fontSize: "1.1em",
fontSize: 17,
color: "#888"
},
};

15
src/components/pages/discover/search.js
View File

@ -85,21 +85,21 @@ const SearchItemJsx = (props) => {
return (
<TouchableWithoutFeedback
onPress = { () => props.callback(props.params) }>
<li style = { styles.searchResultContainer }>
<View style = { styles.searchResultContainer }>
<Image
style = { styles.thumbnail }
source = { props.thumbnail } />
<View style = { styles.queried }>
{ props.children }
</View>
</li>
</View>
</TouchableWithoutFeedback>
);
};
const AccountsListJsx = (props) => {
return (
<ul style = { styles.searchList }>
<View style = { styles.searchList }>
{
props.data.map(item => {
return (
@ -118,13 +118,13 @@ const AccountsListJsx = (props) => {
);
})
}
</ul>
</View>
);
};
const HashtagListJsx = (props) => {
return (
<ul style = { styles.searchList }>
<View style = { styles.searchList }>
{
props.data.map(item => {
return (
@ -140,7 +140,7 @@ const HashtagListJsx = (props) => {
);
})
}
</ul>
</View>
);
}
@ -153,10 +153,9 @@ const styles = {
},
searchBar: {
padding: 10,
fontSize: "1.1em",
fontSize: 17,
color: "#888"
},
searchList: { padding: 0 },
searchResultContainer: {
display: "flex",

7
src/components/pages/discover/view-hashtag.js
View File

@ -46,7 +46,7 @@ const ViewHashtagJsx = ({navigation}) => {
#{ state.name }
</Text>
<Text>
<strong>{ state.nPosts }</strong> posts
<Text style = { styles.strong}>{ state.nPosts }</Text> posts
</Text>
<FollowHashtagButtonJsx
@ -84,7 +84,7 @@ const styles = {
},
hashtag: {
fontWeight: "bold",
fontSize: "1.2em"
fontSize: 20
},
button: {
border: "2px solid black",
@ -94,6 +94,9 @@ const styles = {
paddingRight: 30,
marginTop: 10
},
strong: {
fontWeight: "bold"
},
}
export default ViewHashtagJsx;

9
src/components/pages/feed.js
View File

@ -45,10 +45,12 @@ const FeedJsx = (props) => {
<ScreenWithTrayJsx
active = "Feed"
navigation = { props.navigation }>
<TimelineViewJsx
navigation = { props.navigation }
posts = { TEST_POSTS } />
<div style = { styles.interruptionOuter }>
<View style = { styles.interruptionOuter }>
<View style = { styles.interruption }>
<Image
source = { checkmark }
@ -57,7 +59,6 @@ const FeedJsx = (props) => {
<Text style = { styles.interruptionHeader }>
You're all caught up.
</Text>
<br />
<Text> Wow, it sure is a lovely day outside 🌳 </Text>
<TouchableWithoutFeedback
@ -65,7 +66,7 @@ const FeedJsx = (props) => {
<Text> See older posts </Text>
</TouchableWithoutFeedback>
</View>
</div>
</View>
</ScreenWithTrayJsx>
);
@ -89,7 +90,7 @@ const styles = {
alignItems: "center",
},
interruptionHeader: {
fontSize: "1.3em"
fontSize: 21
},
checkmark: {
width: screen_width * 0.3,

13
src/components/pages/profile.js
View File

@ -127,7 +127,7 @@ const ProfileDisplayJsx = ({navigation}) => {
style = { styles.displayName }>
{state.displayName}
</Text>
<Text><strong> @{state.username} </strong></Text>
<Text><Text style={ styles.strong}> @{state.username} </Text></Text>
</View>
<TouchableWithoutFeedback>
<Image
@ -175,7 +175,7 @@ const styles = {
marginBottom: screen_width / 20
},
displayName: {
fontSize: "1.5em"
fontSize: 24
},
avatar: {
width: screen_width / 5,
@ -192,11 +192,11 @@ const styles = {
marginRight: screen_width / 15
},
accountStats: {
fontSize: "0.8em",
fontSize: 14,
fontWeight: "bold"
},
note: {
fontSize: "1em",
fontSize: 16,
marginTop: 10,
},
button: {
@ -210,7 +210,10 @@ const styles = {
},
buttonText: {
textAlign: "center"
}
},
strong: {
fontWeight: "bold",
},
};
export { ViewProfileJsx, ProfileDisplayJsx };

8
src/components/posts/grid-view.js
View File

@ -20,7 +20,7 @@ const GridViewJsx = (props) => {
{
rows.map((row, i) => {
return (
<ul style = { styles.gridRow }
<View style = { styles.gridRow }
key = { i }>
{
row.map((post) => {
@ -29,7 +29,7 @@ const GridViewJsx = (props) => {
.preview_url;
return (
<li key = { post.id }>
<View key = { post.id }>
<GridPostJsx
id = { post.id }
previewUrl = { post_url }
@ -37,11 +37,11 @@ const GridViewJsx = (props) => {
(id) => props.openPostCallback(id)
}
/>
</li>
</View>
);
})
}
</ul>
</View>
)
})
}

13
src/components/posts/post.js
View File

@ -134,7 +134,7 @@ export const RawPostJsx = (props) => {
reblogged = { props.data.reblogged } />
<View style = { styles.caption }>
<Text>
<strong>{ props.data.username }</strong>&nbsp;{ props.data.content }
<Text style = { styles.strong }>{ props.data.username }</Text>&nbsp;{ props.data.content }
</Text>
<TouchableWithoutFeedback
onPress = {
@ -250,8 +250,9 @@ const styles = {
marginRight: SCREEN_WIDTH / 36
},
postHeaderName: {
fontSize: "1em",
fontSize: 16,
fontWeight: "bold",
color: "#000",
marginTop: -2
},
menu: {
@ -262,7 +263,7 @@ const styles = {
width: SCREEN_WIDTH / 10,
height: SCREEN_WIDTH / 10,
marginRight: SCREEN_WIDTH / 28,
borderRadius: "100%"
borderRadius: 50
},
ellipsis: {
width: SCREEN_WIDTH / 15,
@ -287,8 +288,12 @@ const styles = {
color: "#666",
},
captionDate: {
fontSize: "0.8em",
fontSize: 0.8,
color: "#666",
paddingTop: 10
},
strong: {
fontWeight: 'bold',
}
};