diff --git a/src/assets/keep_calm.png b/src/assets/keep_calm.png
new file mode 100755
index 000000000..054ab617e
Binary files /dev/null and b/src/assets/keep_calm.png differ
diff --git a/src/components/basicUIElements/view/noPostView.js b/src/components/basicUIElements/view/noPostView.js
index b4140bcf9..65a42e085 100644
--- a/src/components/basicUIElements/view/noPostView.js
+++ b/src/components/basicUIElements/view/noPostView.js
@@ -3,9 +3,11 @@ import { View, Text, Image } from 'react-native';
import NO_POST from '../../../assets/no_post.png';
import styles from './noPostStyles';
-const NoPost = ({ text, name, defaultText }) => (
-
-
+const NoPost = ({
+ text, name, defaultText, source, imageStyle, style,
+}) => (
+
+
{name ? (
{`@${name} ${text}`}
) : (
diff --git a/src/components/markdownEditor/view/formats/formats.js b/src/components/markdownEditor/view/formats/formats.js
index e5db69689..f52347f7e 100644
--- a/src/components/markdownEditor/view/formats/formats.js
+++ b/src/components/markdownEditor/view/formats/formats.js
@@ -8,7 +8,7 @@ export default [
key: 'B',
title: 'B',
icon: 'bold',
- iconType: 'Feather',
+ iconType: 'FontAwesome',
wrapper: '**',
onPress: applyWrapFormat,
// style: { fontWeight: 'bold' },
@@ -25,7 +25,7 @@ export default [
key: 'L',
title: 'L',
icon: 'list',
- iconType: 'Feather',
+ iconType: 'FontAwesome',
prefix: '-',
onPress: applyListFormat,
},
@@ -40,7 +40,7 @@ export default [
key: 'I',
title: 'I',
icon: 'italic',
- iconType: 'Feather',
+ iconType: 'FontAwesome',
wrapper: '*',
onPress: applyWrapFormat,
},
@@ -48,7 +48,7 @@ export default [
key: 'U',
title: 'U',
icon: 'underline',
- iconType: 'Feather',
+ iconType: 'FontAwesome',
wrapper: '__',
onPress: applyWrapFormat,
},
@@ -67,7 +67,6 @@ export default [
icon: 'ios-quote',
onPress: applyListFormat,
},
-
{
key: 'CC',
title: 'CC',
@@ -75,14 +74,6 @@ export default [
wrapper: '```',
onPress: applyWrapFormatNewLines,
},
-
- {
- key: 'WEB',
- title: 'WEB',
- icon: 'link-2',
- iconType: 'Feather',
- onPress: applyWebLinkFormat,
- },
// {
// key: 'H2',
// title: 'H2',
diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js
index 73fa9fb93..80dcc2831 100644
--- a/src/components/markdownEditor/view/markdownEditorView.js
+++ b/src/components/markdownEditor/view/markdownEditorView.js
@@ -99,8 +99,8 @@ export default class MarkdownEditorView extends Component {
Formats[9].onPress({ getState, setState })}
/>
diff --git a/src/components/notification/view/notificationView.js b/src/components/notification/view/notificationView.js
index 80668a6f3..61c1e19e3 100644
--- a/src/components/notification/view/notificationView.js
+++ b/src/components/notification/view/notificationView.js
@@ -22,44 +22,35 @@ class NotificationView extends Component {
notification: [
{
name: 'esteemapp',
- title: '25% likes your post:',
+ title: 'eSteem Mobile!',
avatar: 'https://steemitimages.com/u/feruz/avatar/small',
- description: 'My own Top 5 eSteem Surfer Featuressasasaasasas',
+ description: 'eSteem app with new ui!',
image: 'https://steemitimages.com/u/feruz/avatar/small',
- date: 'yesterday',
+ // date: 'today',
isNew: true,
},
- {
- name: 'esteemapp',
- title: '25% likes your post:',
- avatar: 'https://steemitimages.com/u/feruz/avatar/small',
- description: 'My own Top 5 eSteem Surfer Features',
- image: 'https://steemitimages.com/u/feruz/avatar/small',
- date: 'yesterday',
- isNew: true,
- },
- {
- name: 'esteemapp',
- title: '25% likes your post:',
- description: 'My own Top 5 eSteem Surfer Features',
- image: 'https://steemitimages.com/u/feruz/avatar/small',
- date: 'yesterday',
- },
- {
- name: 'esteemapp',
- title: '25% likes your post:',
- avatar: 'https://steemitimages.com/u/feruz/avatar/small',
- description: 'My own Top 5 eSteem Surfer Featuresasassasasaasas',
- date: 'yesterday',
- },
- {
- name: 'esteemapp',
- title: '25% likes your post:',
- avatar: 'https://steemitimages.com/u/feruz/avatar/small',
- description: 'My own Top 5 eSteem Surfer Features',
- image: 'https://steemitimages.com/u/feruz/avatar/small',
- date: 'yesterday',
- },
+ // {
+ // name: 'esteemapp',
+ // title: '25% likes your post:',
+ // description: 'My own Top 5 eSteem Surfer Features',
+ // image: 'https://steemitimages.com/u/feruz/avatar/small',
+ // date: 'yesterday',
+ // },
+ // {
+ // name: 'esteemapp',
+ // title: '25% likes your post:',
+ // avatar: 'https://steemitimages.com/u/feruz/avatar/small',
+ // description: 'My own Top 5 eSteem Surfer Featuresasassasasaasas',
+ // date: 'yesterday',
+ // },
+ // {
+ // name: 'esteemapp',
+ // title: '25% likes your post:',
+ // avatar: 'https://steemitimages.com/u/feruz/avatar/small',
+ // description: 'My own Top 5 eSteem Surfer Features',
+ // image: 'https://steemitimages.com/u/feruz/avatar/small',
+ // date: 'yesterday',
+ // },
],
};
}
@@ -75,10 +66,7 @@ class NotificationView extends Component {
_getRenderItem = item => (
{item.image && (
-
+
)}
);
@@ -115,14 +103,7 @@ class NotificationView extends Component {
item.email}
/>
{/* Will remove follow lines */}
-
+ {/*
this._getRenderItem(item)}
keyExtractor={item => item.email}
- />
+ /> */}
);
diff --git a/src/components/postButton/view/postButtonView.js b/src/components/postButton/view/postButtonView.js
index b603ea4ad..bb6faa064 100644
--- a/src/components/postButton/view/postButtonView.js
+++ b/src/components/postButton/view/postButtonView.js
@@ -13,7 +13,7 @@ import { default as ROUTES } from '../../../constants/routeNames';
// Styles
import styles from './postButtonStyles';
-const SIZE = 70;
+const SIZE = 75;
const durationIn = 300;
const durationOut = 200;
diff --git a/src/navigation/baseNavigator.js b/src/navigation/baseNavigator.js
index 01436a925..05ced6fca 100644
--- a/src/navigation/baseNavigator.js
+++ b/src/navigation/baseNavigator.js
@@ -2,7 +2,7 @@ import React from 'react';
import { createBottomTabNavigator } from 'react-navigation';
import Icon from 'react-native-vector-icons/FontAwesome';
import {
- Home, Notification, Profile, RootComponent,
+ Home, Notification, Profile, RootComponent, Messages,
} from '../screens';
import { PostButton } from '../components/postButton';
@@ -27,8 +27,8 @@ const BaseNavigator = createBottomTabNavigator(
tabBarIcon: ,
}),
},
- AuthorProfile: {
- screen: RootComponent()(Profile),
+ Messages: {
+ screen: RootComponent()(Messages),
navigationOptions: () => ({
tabBarIcon: ({ tintColor }) => ,
}),
diff --git a/src/screens/index.js b/src/screens/index.js
index e721f3cd1..53796d1a9 100755
--- a/src/screens/index.js
+++ b/src/screens/index.js
@@ -9,6 +9,7 @@ import { Notification } from './notification';
import { Post } from './post';
import { Profile } from './profile';
import { Voters } from './voters';
+import { Messages } from './messages';
// import Author from './authorProfile';
// import SideMenu from './sideMenuScreen';
@@ -34,6 +35,7 @@ export {
Splash,
SteemConnect,
Voters,
+ Messages,
// Author,
// SideMenu,
// Hot,
diff --git a/src/screens/messages/container/messagesContainer.js b/src/screens/messages/container/messagesContainer.js
new file mode 100644
index 000000000..d6d91f263
--- /dev/null
+++ b/src/screens/messages/container/messagesContainer.js
@@ -0,0 +1,39 @@
+import React, { Component } from 'react';
+// import { connect } from 'react-redux';
+
+// Services and Actions
+
+// Middleware
+
+// Constants
+
+// Utilities
+
+// Component
+import { MessagesScreen } from '..';
+
+/*
+ * Props Name Description Value
+ *@props --> props name here description here Value Type Here
+ *
+ */
+
+class MessagesContainer extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
+
+ // Component Life Cycle Functions
+
+ // Component Functions
+
+ render() {
+ // eslint-disable-next-line
+ //const {} = this.props;
+
+ return ;
+ }
+}
+
+export default MessagesContainer;
diff --git a/src/screens/messages/index.js b/src/screens/messages/index.js
new file mode 100644
index 000000000..d7a614913
--- /dev/null
+++ b/src/screens/messages/index.js
@@ -0,0 +1,5 @@
+import MessagesScreen from './screen/messagesScreen';
+import Messages from './container/messagesContainer';
+
+export { MessagesScreen, Messages };
+export default Messages;
diff --git a/src/screens/messages/screen/messagesScreen.js b/src/screens/messages/screen/messagesScreen.js
new file mode 100644
index 000000000..3f9bb986b
--- /dev/null
+++ b/src/screens/messages/screen/messagesScreen.js
@@ -0,0 +1,43 @@
+import React, { Component, Fragment } from 'react';
+
+// Constants
+
+// Components
+import { Header } from '../../../components/header';
+import { NoPost } from '../../../components/basicUIElements';
+
+// Styles
+import styles from './messagesStyle';
+import MESSAGES_IMAGE from '../../../assets/keep_calm.png';
+
+class MessagesScreen extends Component {
+ /* Props
+ * ------------------------------------------------
+ * @prop { type } name - Description....
+ */
+
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
+
+ // Component Life Cycles
+
+ // Component Functions
+
+ render() {
+ return (
+
+
+
+
+ );
+ }
+}
+
+export default MessagesScreen;
diff --git a/src/screens/messages/screen/messagesStyle.js b/src/screens/messages/screen/messagesStyle.js
new file mode 100644
index 000000000..b76328aa9
--- /dev/null
+++ b/src/screens/messages/screen/messagesStyle.js
@@ -0,0 +1,19 @@
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+ container: {
+ // flexDirection: 'center',
+ // width: 50,
+ justifyContent: 'center',
+ alignContent: 'center',
+ alignItems: 'center',
+ },
+ image: {
+ width: 193,
+ height: 189,
+ },
+ text: {
+ color: '#788187',
+ fontWeight: 'bold',
+ },
+});
diff --git a/src/screens/notification/screen/notificationScreen.js b/src/screens/notification/screen/notificationScreen.js
index c63080af8..66721ab05 100644
--- a/src/screens/notification/screen/notificationScreen.js
+++ b/src/screens/notification/screen/notificationScreen.js
@@ -6,6 +6,11 @@ import { Notification } from '../../../components/notification';
import { Header } from '../../../components/header';
// Styles
import styles from './notificationStyles';
+// Components
+import { NoPost } from '../../../components/basicUIElements';
+
+// Styles
+import MESSAGES_IMAGE from '../../../assets/keep_calm.png';
class NotificationScreen extends PureComponent {
constructor(props) {
@@ -33,7 +38,15 @@ class NotificationScreen extends PureComponent {
- Leaderboard
+