Merge pull request #8 from Airbitz/fix/close-side-menu

Close side menu when pressing settings

Author: paullinator

src/modules/UI/components/ControlPanel/Component/Main.android.js

@@ -17,7 +17,7 @@ const SETTINGS_TEXT = sprintf(strings.enUS['settings_title'])
 
 export default class Main extends Component {
   onLogout = () => {
-    // console.log('logout')
+    this.props.onPressOption()
     this.props.logout()
   }
 
@@ -58,6 +58,7 @@ export default class Main extends Component {
   }
 
   _handleOnPressRouting = (route) => () => {
+    this.props.onPressOption()
     switch (route) {
     case 'settingsOverview':
       return Actions.settingsOverview({type: 'reset'})

src/modules/UI/components/ControlPanel/Component/Main.ios.js

@@ -59,6 +59,7 @@ export default class Main extends Component {
   }
 
   _handleOnPressRouting = (route) => () => {
+    this.props.onPressOption()
     switch (route) {
     case 'settingsOverview':
       return Actions.settingsOverview({type: 'reset'})

src/modules/UI/components/ControlPanel/Component/MainConnector.js

@@ -1,12 +1,14 @@
 import {connect} from 'react-redux'
-import {logoutRequest} from '../../../../Login/action'
 import Main from './Main'
+import {logoutRequest} from '../../../../Login/action'
+import {closeSideMenu} from '../../SideMenu/action'
 
 const mapStateToProps = (state) => ({
   usersView: state.ui.scenes.controlPanel.usersView
 })
 const mapDispatchToProps = (dispatch) => ({
-  logout: () => dispatch(logoutRequest())
+  onPressOption: () => dispatch(closeSideMenu()),
+  logout:        () => dispatch(logoutRequest())
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(Main)

src/modules/UI/components/ControlPanel/action.js

@@ -1,8 +1,8 @@
 export const OPEN_SELECT_USER = 'OPEN_SELECT_USER'
 export const CLOSE_SELECT_USER = 'CLOSE_SELECT_USER'
-export const LIST_USERS_SIDEBAR = 'LIST_USER_USER_SIDEBAR'
-export const SELECT_USERS_SIDEBAR = 'SELECT_USERS_SIDEBAR'
-export const REMOVE_USERS_SIDEBAR = 'REMOVE_USERS_SIDEBAR'
+export const LIST_USERS_SIDE_MENU = 'LIST_USER_USER_SIDE_MENU'
+export const SELECT_USERS_SIDE_MENU = 'SELECT_USERS_SIDE_MENU'
+export const REMOVE_USERS_SIDE_MENU = 'REMOVE_USERS_SIDE_MENU'
 
 export const openSelectUser = () => ({
   type: OPEN_SELECT_USER
@@ -13,11 +13,11 @@ export const closeSelectUser = () => ({
 })
 
 export const selectUsersList = (name) => ({
-  type: SELECT_USERS_SIDEBAR,
+  type: SELECT_USERS_SIDE_MENU,
   name
 })
 
 export const removeUsersList = (name) => ({
-  type: REMOVE_USERS_SIDEBAR,
+  type: REMOVE_USERS_SIDE_MENU,
   name
 })

src/modules/UI/components/ControlPanel/reducer.js

@@ -14,9 +14,9 @@ const usersView = (state = false, action) => {
 
 const selectedUser = (state = null, action) => {
   switch (action.type) {
-  case ACTION.LIST_USERS_SIDEBAR :
+  case ACTION.LIST_USERS_SIDE_MENU :
     return action.data[0]
-  case ACTION.SELECT_USERS_SIDEBAR :
+  case ACTION.SELECT_USERS_SIDE_MENU :
     return action.id
   default:
     return state

src/modules/UI/components/SideMenu/SideMenuConnector.js

@@ -1,12 +1,12 @@
 import {connect} from 'react-redux'
 import SideMenu from './SideMenu.ui'
-import {openSidebar, closeSidebar} from './action'
+import {openSideMenu, closeSideMenu} from './action'
 
 const mapStateToProps = (state) => ({
   view: state.ui.scenes.sideMenu.view
 })
 const mapDispatchToProps = (dispatch) => ({
-  open: () => dispatch(openSidebar()),
-  close: () => dispatch(closeSidebar())
+  open: () => dispatch(openSideMenu()),
+  close: () => dispatch(closeSideMenu())
 })
 export default connect(mapStateToProps, mapDispatchToProps)(SideMenu)

src/modules/UI/components/SideMenu/action.js

@@ -1,14 +1,14 @@
-export const OPEN_SIDEBAR = 'OPEN_SIDEBAR'
-export const CLOSE_SIDEBAR = 'CLOSE_SIDEBAR'
+export const OPEN_SIDE_MENU = 'OPEN_SIDE_MENU'
+export const CLOSE_SIDE_MENU = 'CLOSE_SIDE_MENU'
 
-export function openSidebar () {
+export function openSideMenu () {
   return {
-    type: OPEN_SIDEBAR
+    type: OPEN_SIDE_MENU
   }
 }
 
-export function closeSidebar () {
+export function closeSideMenu () {
   return {
-    type: CLOSE_SIDEBAR
+    type: CLOSE_SIDE_MENU
   }
 }

src/modules/UI/components/SideMenu/reducer.js

@@ -3,9 +3,9 @@ import {combineReducers} from 'redux'
 
 const view = (state = false, action) => {
   switch (action.type) {
-  case ACTION.OPEN_SIDEBAR :
+  case ACTION.OPEN_SIDE_MENU :
     return true
-  case ACTION.CLOSE_SIDEBAR :
+  case ACTION.CLOSE_SIDE_MENU :
     return false
   default:
     return state

src/modules/UI/components/TabBar/TabBar.ui.js

@@ -6,7 +6,7 @@ import {Actions} from 'react-native-router-flux'
 import {Footer, FooterTab, Button} from 'native-base'
 import Gradient from '../Gradient/Gradient.ui'
 import {setTabBarHeight} from '../../dimensions/action'
-import {openSidebar, closeSidebar} from '../SideMenu/action'
+import {openSideMenu, closeSideMenu} from '../SideMenu/action'
 import T from '../FormattedText'
 import wallet from '../../../../assets/images/tabbar/wallets.png'
 import walletSelected from '../../../../assets/images/tabbar/wallets_selected.png'
@@ -22,12 +22,12 @@ import styles from './styles.js'
 
 export default class TabBar extends Component {
 
-  _handleToggleSideBar = () => {
+  _handleToggleSideMenu = () => {
     if (!this.props.sidemenu) {
-      this.props.dispatch(openSidebar())
+      this.props.dispatch(openSideMenu())
     }
     if (this.props.sidemenu) {
-      this.props.dispatch(closeSidebar())
+      this.props.dispatch(closeSideMenu())
     }
   }
 
@@ -87,7 +87,7 @@ export default class TabBar extends Component {
             </Button>
 
             <Button
-              onPress={this._handleToggleSideBar}
+              onPress={this._handleToggleSideMenu}
               active={this.props.sidemenu}>
               <Image
                 style={[{width: 25, height: 25, marginTop: 3}]}

src/theme/variables/commonColor.js

@@ -117,7 +117,7 @@ export default {
   brandSuccess: '#5cb85c',
   brandDanger: '#d9534f',
   brandWarning: '#f0ad4e',
-  brandSidebar: '#252932',
+  brandSideMenu: '#252932',
 
 
     // Font