From 57b6015808b51c8223546d14f38435381b2cfda5 Mon Sep 17 00:00:00 2001
From: u-e <ugurerdal93@gmail.com>
Date: Fri, 21 Dec 2018 12:21:03 +0300
Subject: [PATCH] post button redesign

---
 src/components/icon/view/iconView.js          | 12 ++++++++----
 .../postButton/view/postButtonView.js         | 19 +++++++++++--------
 .../postButton/view/postButtonsForAndroid.js  | 14 ++++++--------
 .../postButton/view/subPostButtonView.js      | 18 +++++++++---------
 4 files changed, 34 insertions(+), 29 deletions(-)

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 <MaterialIcons {...this.props}>{children}</MaterialIcons>;
       case 'MaterialCommunityIcons':
         return (
-          <MaterialCommunityIcons name={name} {...this.props}>
+          <MaterialCommunityIcons name={_name} {...this.props}>
             {children}
           </MaterialCommunityIcons>
         );
       default:
-        return <Ionicons name {...this.props} />;
+        return <Ionicons name={_name} {...this.props} />;
     }
   };
 
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)}
         />
         <SubPostButton
           size={SIZE}
@@ -134,8 +134,8 @@ class PostButtonView extends Component {
             left: secondX,
             top: secondY,
           }}
-          icon="pencil"
-          onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR)}
+          icon="camera-alt"
+          onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
         />
         <SubPostButton
           size={SIZE}
@@ -143,11 +143,14 @@ class PostButtonView extends Component {
             left: thirdX,
             top: thirdY,
           }}
-          icon="camera"
-          onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
+          icon="videocam"
+          onPress={() => handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')}
         />
         <TouchableOpacity
-          onPress={() => (Platform.OS === 'ios' ? this._toggleView() : handleButtonCollapse(null, Platform.OS === 'android'))}
+          onPress={() => (Platform.OS === 'ios'
+            ? this._toggleView()
+            : handleButtonCollapse(null, Platform.OS === 'android'))
+          }
           activeOpacity={1}
         >
           <Animated.View
@@ -161,7 +164,7 @@ class PostButtonView extends Component {
               },
             ]}
           >
-            <Icon name="plus" size={22} iconType="FontAwesome" color="#F8F8F8" />
+            <Icon name="add" size={24} iconType="MaterialIcons" color="#F8F8F8" />
           </Animated.View>
         </TouchableOpacity>
       </View>
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)}
         />
         <SubPostButton
           size={SIZE}
@@ -151,8 +149,8 @@ class PostButtonsForAndroid extends Component {
             top: secondY,
             position: 'relative',
           }}
-          icon="pencil"
-          onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR)}
+          icon="camera-alt"
+          onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
         />
         <SubPostButton
           size={SIZE}
@@ -161,8 +159,8 @@ class PostButtonsForAndroid extends Component {
             top: thirdY,
             position: 'relative',
           }}
-          icon="camera"
-          onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'image')}
+          icon="videocam"
+          onPress={() => this._handleSubButtonPress(ROUTES.SCREENS.EDITOR, 'camera')}
         />
       </View>
     );
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 = ({
         },
       ]}
     >
-      <Icon name={icon} size={14} color="#F8F8F8" />
+      <Icon name={icon} iconType="MaterialIcons" size={16} color="#F8F8F8" />
     </TouchableOpacity>
   </Animated.View>
 );