diff --git a/src/components/icon/view/iconView.js b/src/components/icon/view/iconView.js
index 7ffad3b69..221faae28 100644
--- a/src/components/icon/view/iconView.js
+++ b/src/components/icon/view/iconView.js
@@ -36,8 +36,12 @@ class IconView extends PureComponent {
};
_getIcon = () => {
- const { iconType, children } = this.props;
- const name = this._getIconName();
+ const { iconType, children, name } = this.props;
+ let _name = name;
+
+ if (iconType !== 'MaterialIcons') {
+ _name = this._getIconName();
+ }
switch (iconType) {
case 'Feather':
@@ -52,12 +56,12 @@ class IconView extends PureComponent {
return {children};
case 'MaterialCommunityIcons':
return (
-
+
{children}
);
default:
- return ;
+ return ;
}
};
diff --git a/src/components/postButton/view/postButtonView.js b/src/components/postButton/view/postButtonView.js
index dc8a2a1c5..adf4d2da9 100644
--- a/src/components/postButton/view/postButtonView.js
+++ b/src/components/postButton/view/postButtonView.js
@@ -125,8 +125,8 @@ class PostButtonView extends Component {
left: firstX,
top: firstY,
}}
- icon="video-camera"
- onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')}
+ icon="create"
+ onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR)}
/>
handleSubButtonPress(ROUTES.SCREENS.EDITOR)}
+ icon="camera-alt"
+ onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
/>
handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
+ icon="videocam"
+ onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')}
/>
(Platform.OS === 'ios' ? this._toggleView() : handleButtonCollapse(null, Platform.OS === 'android'))}
+ onPress={() => (Platform.OS === 'ios'
+ ? this._toggleView()
+ : handleButtonCollapse(null, Platform.OS === 'android'))
+ }
activeOpacity={1}
>
-
+
diff --git a/src/components/postButton/view/postButtonsForAndroid.js b/src/components/postButton/view/postButtonsForAndroid.js
index 793b42081..f88d433ae 100644
--- a/src/components/postButton/view/postButtonsForAndroid.js
+++ b/src/components/postButton/view/postButtonsForAndroid.js
@@ -98,8 +98,6 @@ class PostButtonsForAndroid extends Component {
action,
},
});
-
- // navigation.navigate(route);
};
render() {
@@ -141,8 +139,8 @@ class PostButtonsForAndroid extends Component {
top: firstY,
position: 'relative',
}}
- icon="video-camera"
- onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')}
+ icon="create"
+ onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR)}
/>
this._handleSubButtonPress(ROUTES.SCREENS.EDITOR)}
+ icon="camera-alt"
+ onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
/>
this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
+ icon="videocam"
+ onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')}
/>
);
diff --git a/src/components/postButton/view/subPostButtonView.js b/src/components/postButton/view/subPostButtonView.js
index c7ac88b66..85eb41943 100644
--- a/src/components/postButton/view/subPostButtonView.js
+++ b/src/components/postButton/view/subPostButtonView.js
@@ -1,18 +1,18 @@
import React from 'react';
import { Animated, TouchableOpacity } from 'react-native';
-import Icon from 'react-native-vector-icons/FontAwesome';
+import { Icon } from '../../icon';
// Styles
import styles from './postButtonStyles';
/* Props
- * ------------------------------------------------
- * @prop { type } size - Description....
- * @prop { type } onPress - Description....
- * @prop { type } style - Description....
- * @prop { type } icon - Description....
- *
- */
+ * ------------------------------------------------
+ * @prop { type } size - Description....
+ * @prop { type } onPress - Description....
+ * @prop { type } style - Description....
+ * @prop { type } icon - Description....
+ *
+ */
const SubPostButton = ({
style, icon, onPress, size,
@@ -36,7 +36,7 @@ const SubPostButton = ({
},
]}
>
-
+
);