diff --git a/assets/eva-icons/back.png b/assets/eva-icons/back.png deleted file mode 100644 index 8bb4a12..0000000 Binary files a/assets/eva-icons/back.png and /dev/null differ diff --git a/assets/eva-icons/bell-black.png b/assets/eva-icons/bell-black.png deleted file mode 100644 index a58b124..0000000 Binary files a/assets/eva-icons/bell-black.png and /dev/null differ diff --git a/assets/eva-icons/bell-grey.png b/assets/eva-icons/bell-grey.png deleted file mode 100644 index 2376fa3..0000000 Binary files a/assets/eva-icons/bell-grey.png and /dev/null differ diff --git a/assets/eva-icons/bell-unread.png b/assets/eva-icons/bell-unread.png deleted file mode 100644 index f662c6b..0000000 Binary files a/assets/eva-icons/bell-unread.png and /dev/null differ diff --git a/assets/eva-icons/bell-white.png b/assets/eva-icons/bell-white.png deleted file mode 100644 index a798b3c..0000000 Binary files a/assets/eva-icons/bell-white.png and /dev/null differ diff --git a/assets/eva-icons/camera-black.png b/assets/eva-icons/camera-black.png deleted file mode 100644 index a9087dc..0000000 Binary files a/assets/eva-icons/camera-black.png and /dev/null differ diff --git a/assets/eva-icons/camera-grey.png b/assets/eva-icons/camera-grey.png deleted file mode 100644 index 73f6790..0000000 Binary files a/assets/eva-icons/camera-grey.png and /dev/null differ diff --git a/assets/eva-icons/camera-outline.png b/assets/eva-icons/camera-outline.png deleted file mode 100644 index d82f5b0..0000000 Binary files a/assets/eva-icons/camera-outline.png and /dev/null differ diff --git a/assets/eva-icons/camera-white.png b/assets/eva-icons/camera-white.png deleted file mode 100644 index 47da7d5..0000000 Binary files a/assets/eva-icons/camera-white.png and /dev/null differ diff --git a/assets/eva-icons/checkmark-circle-large.png b/assets/eva-icons/checkmark-circle-large.png deleted file mode 100644 index e879b70..0000000 Binary files a/assets/eva-icons/checkmark-circle-large.png and /dev/null differ diff --git a/assets/eva-icons/checkmark-circle.png b/assets/eva-icons/checkmark-circle.png deleted file mode 100644 index c4b181a..0000000 Binary files a/assets/eva-icons/checkmark-circle.png and /dev/null differ diff --git a/assets/eva-icons/close.png b/assets/eva-icons/close.png deleted file mode 100644 index e85d20a..0000000 Binary files a/assets/eva-icons/close.png and /dev/null differ diff --git a/assets/eva-icons/ellipsis.png b/assets/eva-icons/ellipsis.png deleted file mode 100644 index 7bce4cf..0000000 Binary files a/assets/eva-icons/ellipsis.png and /dev/null differ diff --git a/assets/eva-icons/email-black.png b/assets/eva-icons/email-black.png deleted file mode 100644 index d86f930..0000000 Binary files a/assets/eva-icons/email-black.png and /dev/null differ diff --git a/assets/eva-icons/email-grey.png b/assets/eva-icons/email-grey.png deleted file mode 100644 index f2f3c65..0000000 Binary files a/assets/eva-icons/email-grey.png and /dev/null differ diff --git a/assets/eva-icons/heart-outline.png b/assets/eva-icons/heart-outline.png deleted file mode 100644 index 7ee2bbc..0000000 Binary files a/assets/eva-icons/heart-outline.png and /dev/null differ diff --git a/assets/eva-icons/home-black.png b/assets/eva-icons/home-black.png deleted file mode 100644 index cb4a6d7..0000000 Binary files a/assets/eva-icons/home-black.png and /dev/null differ diff --git a/assets/eva-icons/home-grey.png b/assets/eva-icons/home-grey.png deleted file mode 100644 index 2a420b2..0000000 Binary files a/assets/eva-icons/home-grey.png and /dev/null differ diff --git a/assets/eva-icons/home-outline.png b/assets/eva-icons/home-outline.png deleted file mode 100644 index e8296e0..0000000 Binary files a/assets/eva-icons/home-outline.png and /dev/null differ diff --git a/assets/eva-icons/home-outline.svg b/assets/eva-icons/home-outline.svg deleted file mode 100644 index a744e8b..0000000 --- a/assets/eva-icons/home-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/eva-icons/home-white.png b/assets/eva-icons/home-white.png deleted file mode 100644 index e0d5ad6..0000000 Binary files a/assets/eva-icons/home-white.png and /dev/null differ diff --git a/assets/eva-icons/paper-plane.png b/assets/eva-icons/paper-plane.png deleted file mode 100644 index 1432e16..0000000 Binary files a/assets/eva-icons/paper-plane.png and /dev/null differ diff --git a/assets/eva-icons/person-black-notif.png b/assets/eva-icons/person-black-notif.png deleted file mode 100644 index 95af55d..0000000 Binary files a/assets/eva-icons/person-black-notif.png and /dev/null differ diff --git a/assets/eva-icons/person-black.png b/assets/eva-icons/person-black.png deleted file mode 100644 index 44f5753..0000000 Binary files a/assets/eva-icons/person-black.png and /dev/null differ diff --git a/assets/eva-icons/person-grey-notif.png b/assets/eva-icons/person-grey-notif.png deleted file mode 100644 index 755b41e..0000000 Binary files a/assets/eva-icons/person-grey-notif.png and /dev/null differ diff --git a/assets/eva-icons/person-grey.png b/assets/eva-icons/person-grey.png deleted file mode 100644 index ee82deb..0000000 Binary files a/assets/eva-icons/person-grey.png and /dev/null differ diff --git a/assets/eva-icons/person-outline.png b/assets/eva-icons/person-outline.png deleted file mode 100644 index 5a1a65a..0000000 Binary files a/assets/eva-icons/person-outline.png and /dev/null differ diff --git a/assets/eva-icons/person-white.png b/assets/eva-icons/person-white.png deleted file mode 100644 index f0295f5..0000000 Binary files a/assets/eva-icons/person-white.png and /dev/null differ diff --git a/assets/eva-icons/plus.png b/assets/eva-icons/plus.png deleted file mode 100644 index 3a7e147..0000000 Binary files a/assets/eva-icons/plus.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/bookmark-active.png b/assets/eva-icons/post-actions/bookmark-active.png deleted file mode 100644 index 123d321..0000000 Binary files a/assets/eva-icons/post-actions/bookmark-active.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/bookmark-inactive.png b/assets/eva-icons/post-actions/bookmark-inactive.png deleted file mode 100644 index 142f644..0000000 Binary files a/assets/eva-icons/post-actions/bookmark-inactive.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/boost-empty.png b/assets/eva-icons/post-actions/boost-empty.png deleted file mode 100644 index b8ec913..0000000 Binary files a/assets/eva-icons/post-actions/boost-empty.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/boost-full.png b/assets/eva-icons/post-actions/boost-full.png deleted file mode 100644 index 8007dac..0000000 Binary files a/assets/eva-icons/post-actions/boost-full.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/download-active.png b/assets/eva-icons/post-actions/download-active.png deleted file mode 100644 index 6611ee6..0000000 Binary files a/assets/eva-icons/post-actions/download-active.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/download-empty.png b/assets/eva-icons/post-actions/download-empty.png deleted file mode 100644 index 6c64d1b..0000000 Binary files a/assets/eva-icons/post-actions/download-empty.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/download-full.png b/assets/eva-icons/post-actions/download-full.png deleted file mode 100644 index 1939aa8..0000000 Binary files a/assets/eva-icons/post-actions/download-full.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/download-inactive.png b/assets/eva-icons/post-actions/download-inactive.png deleted file mode 100644 index 72dee71..0000000 Binary files a/assets/eva-icons/post-actions/download-inactive.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/heart-active.png b/assets/eva-icons/post-actions/heart-active.png deleted file mode 100644 index 7f0d8b3..0000000 Binary files a/assets/eva-icons/post-actions/heart-active.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/heart-inactive.png b/assets/eva-icons/post-actions/heart-inactive.png deleted file mode 100644 index 3bae4bf..0000000 Binary files a/assets/eva-icons/post-actions/heart-inactive.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/reblog-active.png b/assets/eva-icons/post-actions/reblog-active.png deleted file mode 100644 index 30292c8..0000000 Binary files a/assets/eva-icons/post-actions/reblog-active.png and /dev/null differ diff --git a/assets/eva-icons/post-actions/reblog-inactive.png b/assets/eva-icons/post-actions/reblog-inactive.png deleted file mode 100644 index 11d44e9..0000000 Binary files a/assets/eva-icons/post-actions/reblog-inactive.png and /dev/null differ diff --git a/assets/eva-icons/search-black.png b/assets/eva-icons/search-black.png deleted file mode 100644 index ec3f03e..0000000 Binary files a/assets/eva-icons/search-black.png and /dev/null differ diff --git a/assets/eva-icons/search-grey.png b/assets/eva-icons/search-grey.png deleted file mode 100644 index d9f7b41..0000000 Binary files a/assets/eva-icons/search-grey.png and /dev/null differ diff --git a/assets/eva-icons/search-outline.png b/assets/eva-icons/search-outline.png deleted file mode 100644 index bb32420..0000000 Binary files a/assets/eva-icons/search-outline.png and /dev/null differ diff --git a/assets/eva-icons/search-white.png b/assets/eva-icons/search-white.png deleted file mode 100644 index b197889..0000000 Binary files a/assets/eva-icons/search-white.png and /dev/null differ diff --git a/src/components/context-menu.js b/src/components/context-menu.js index 22418f2..a992538 100644 --- a/src/components/context-menu.js +++ b/src/components/context-menu.js @@ -1,6 +1,6 @@ import React from "react"; import { Dimensions, View, Image } from "react-native"; -import { FontAwesome } from '@expo/vector-icons'; +import { Ionicons } from '@expo/vector-icons'; import { Menu, MenuOptions, @@ -34,8 +34,8 @@ const ContextMenuJsx = (props) => { - diff --git a/src/components/moderate-menu.js b/src/components/moderate-menu.js index 21987ee..90b5d5d 100644 --- a/src/components/moderate-menu.js +++ b/src/components/moderate-menu.js @@ -7,6 +7,7 @@ import { MenuTrigger, renderers } from "react-native-popup-menu"; +import { Ionicons } from "@expo/vector-icons"; const { SlideInMenu } = renderers; @@ -33,8 +34,9 @@ const ModerateMenuJsx = (props) => { - diff --git a/src/components/navigation/back-bar.js b/src/components/navigation/back-bar.js index 7777e27..1a5e09a 100644 --- a/src/components/navigation/back-bar.js +++ b/src/components/navigation/back-bar.js @@ -1,18 +1,19 @@ import React from "react"; import { Image } from "react-native"; import { TouchableOpacity, View } from "react-native"; +import { Ionicons } from "@expo/vector-icons"; const BackBarJsx = (props) => { - const backIcon = require("assets/eva-icons/back.png"); return ( props.navigation.goBack() } style = { styles.button }> - + { props.children } diff --git a/src/components/navigation/tray.js b/src/components/navigation/tray.js index 34351bf..8745468 100644 --- a/src/components/navigation/tray.js +++ b/src/components/navigation/tray.js @@ -3,6 +3,7 @@ import { Image, Dimensions, } from "react-native"; +import { Ionicons } from "@expo/vector-icons"; import { checkUnreadNotifications } from "src/requests"; @@ -13,11 +14,14 @@ const TrayButtonJsx = (props) => { return ( props.nav.navigate(props.where, {}) }> - + size = { 30 } /> ); } @@ -37,64 +41,32 @@ const TrayJsx = (props) => { }); }, []); - - const icons = { - feed: { - active: require("assets/eva-icons/home-black.png"), - inactive: require("assets/eva-icons/home-grey.png") - }, - discover: { - active: require("assets/eva-icons/search-black.png"), - inactive: require("assets/eva-icons/search-grey.png") - }, - publish: { - active: require("assets/eva-icons/camera-black.png"), - inactive: require("assets/eva-icons/camera-grey.png") - }, - direct: { - active: require("assets/eva-icons/email-black.png"), - inactive: require("assets/eva-icons/email-grey.png") - }, - profile: { - active: require("assets/eva-icons/person-black.png"), - inactive: require("assets/eva-icons/person-grey.png") - }, - profileNotif: { - active: require("assets/eva-icons/person-black-notif.png"), - inactive: require("assets/eva-icons/person-grey-notif.png") - }, - } - return ( @@ -102,14 +74,12 @@ const TrayJsx = (props) => { ); }; -const iconSize = 30; - const SCREEN_WIDTH = Dimensions.get("window").width; const styles = { tray: { width: SCREEN_WIDTH, - paddingTop: iconSize / 2, - paddingBottom: iconSize / 2, + paddingTop: 15, + paddingBottom: 15, borderTopWidth: 2, borderTopColor: "#CCC", @@ -123,10 +93,6 @@ const styles = { margin: 0, paddingLeft: 0, }, - icon: { - width: iconSize, - height: iconSize - } }; export default TrayJsx; diff --git a/src/components/pages/direct/conversation.js b/src/components/pages/direct/conversation.js index 37bc281..e228ff8 100644 --- a/src/components/pages/direct/conversation.js +++ b/src/components/pages/direct/conversation.js @@ -72,7 +72,7 @@ const ConversationContainerJsx = (props) => ( style = { styles.send.button } onPress = { props.onSubmit }> diff --git a/src/components/pages/feed.js b/src/components/pages/feed.js index 968fc01..6b2ea59 100644 --- a/src/components/pages/feed.js +++ b/src/components/pages/feed.js @@ -11,7 +11,6 @@ import AsyncStorage from "@react-native-async-storage/async-storage"; import * as requests from "src/requests"; const FeedJsx = (props) => { - const checkmark = require("assets/eva-icons/checkmark-circle-large.png"); const [state, setState] = useState({ loaded: false, }); diff --git a/src/components/pages/profile.js b/src/components/pages/profile.js index c62ca9f..17a99a2 100644 --- a/src/components/pages/profile.js +++ b/src/components/pages/profile.js @@ -248,13 +248,6 @@ const ProfileJsx = ({ navigation }) => { }; const RawProfileJsx = (props) => { - const notif_pack = { - active: require("assets/eva-icons/bell-unread.png"), - inactive: require("assets/eva-icons/bell-black.png") - } - - const _handleFollow = () => {}; - let profileButton; if (props.own) { profileButton = ( @@ -307,25 +300,8 @@ const RawProfileJsx = (props) => { { - props.own ? - - { - props.navigation.navigate("Notifications"); - } - }> - - - - : @@ -339,6 +315,7 @@ const RawProfileJsx = (props) => { onSelect = { props.onBlock } text = "Block" /> + : <> } diff --git a/src/components/pages/profile/notifications.js b/src/components/pages/profile/notifications.js index 42bd3bb..31d1d7c 100644 --- a/src/components/pages/profile/notifications.js +++ b/src/components/pages/profile/notifications.js @@ -7,6 +7,7 @@ import { Image, Text, } from "react-native"; +import { FontAwesome } from "@expo/vector-icons"; import AsyncStorage from "@react-native-async-storage/async-storage"; @@ -303,9 +304,11 @@ const ReblogJsx = (props) => { thumbnailPressCallback = { navigatePostFactory(props.navigation, props.data.status.id) }> - + shared your post. @@ -321,9 +324,11 @@ const FavouriteJsx = (props) => { thumbnailPressCallback = { navigatePostFactory(props.navigation, props.data.status.id) }> - + liked your post. @@ -416,8 +421,6 @@ const styles = { alignItems: "center", }, inlineIcon: { - width: 20, - height: 20, marginRight: 10, }, status: { fontStyle: "italic" }, diff --git a/src/components/pages/view-comments.js b/src/components/pages/view-comments.js index ad84658..d42612a 100644 --- a/src/components/pages/view-comments.js +++ b/src/components/pages/view-comments.js @@ -7,7 +7,7 @@ import { TextInput, Text } from "react-native"; -import { FontAwesome } from '@expo/vector-icons'; +import { Ionicons } from '@expo/vector-icons'; import { ScrollView } from "react-native-gesture-handler"; import AsyncStorage from "@react-native-async-storage/async-storage"; @@ -138,8 +138,8 @@ const CommentJsx = (props) => { const packs = { favourited: { - active: require("assets/eva-icons/post-actions/heart-active.png"), - inactive: require("assets/eva-icons/post-actions/heart-inactive.png") + active: "heart", + inactive: "heart-outline", } }; @@ -179,14 +179,18 @@ const CommentJsx = (props) => { - + - + { props.profile.acct == props.data.account.acct @@ -409,7 +413,7 @@ const ViewCommentsJsx = (props) => { { state.inReplyTo.id != state.postData.id ? - +  Replying to  @@ -433,9 +437,10 @@ const ViewCommentsJsx = (props) => { onChangeText = { c => setState({...state, reply: c }) }/> - + diff --git a/src/components/posts/post-action-bar.js b/src/components/posts/post-action-bar.js index f47c8bc..85be2ad 100644 --- a/src/components/posts/post-action-bar.js +++ b/src/components/posts/post-action-bar.js @@ -6,22 +6,24 @@ import { Dimensions, TouchableOpacity } from "react-native"; +import { FontAwesome } from "@expo/vector-icons"; import { activeOrNot } from "src/interface/interactions"; const PostActionJsx = (props) => { return ( - + onPress = { props.onPress }> + + + ) } @@ -29,16 +31,16 @@ const PostActionJsx = (props) => { const PostActionBarJsx = (props) => { const icons = { heart: { - active: require("assets/eva-icons/post-actions/heart-active.png"), - inactive: require("assets/eva-icons/post-actions/heart-inactive.png") + active: "heart", + inactive: "heart-o", }, reblog: { - active: require("assets/eva-icons/post-actions/reblog-active.png"), - inactive: require("assets/eva-icons/post-actions/reblog-inactive.png") + active: "retweet", + inactive: "retweet", }, bookmark: { - active: require("assets/eva-icons/post-actions/bookmark-active.png"), - inactive: require("assets/eva-icons/post-actions/bookmark-inactive.png") + active: "bookmark", + inactive: "bookmark-o", } } return ( @@ -55,7 +57,6 @@ const PostActionBarJsx = (props) => { @@ -68,14 +69,6 @@ const styles = { flexDirection: "row", padding: SCREEN_WIDTH / 40 }, - icon: { - width: 30, - height: 30, - marginRight: SCREEN_WIDTH / 20 - }, - lastIcon: { - marginLeft: "auto" - } } export default PostActionBarJsx;