From 29b74133d4c06123244a1f98995ba69182d47480 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Mon, 29 Oct 2018 10:54:23 -0300 Subject: [PATCH] Fix iOS pop gesture and open sidemenu gesture (#511) --- app/views/ProfileView/index.js | 3 +++ app/views/RoomView/index.js | 6 ++++-- app/views/RoomsListView/index.js | 7 ++++++- app/views/SettingsView/index.js | 3 +++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/views/ProfileView/index.js b/app/views/ProfileView/index.js index 7170714a3..9d07dec19 100644 --- a/app/views/ProfileView/index.js +++ b/app/views/ProfileView/index.js @@ -55,6 +55,9 @@ export default class ProfileView extends LoggedView { sideMenu: { left: { enabled: true + }, + right: { + enabled: true } } }; diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js index 05dbd087f..3ef12f9ad 100644 --- a/app/views/RoomView/index.js +++ b/app/views/RoomView/index.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { - Text, View, LayoutAnimation, ActivityIndicator + Text, View, LayoutAnimation, ActivityIndicator, Platform } from 'react-native'; import { connect, Provider } from 'react-redux'; import { RectButton } from 'react-native-gesture-handler'; @@ -188,7 +188,9 @@ export default class RoomView extends LoggedView { }; internalSetState = (...args) => { - LayoutAnimation.easeInEaseOut(); + if (Platform.OS === 'ios') { + LayoutAnimation.easeInEaseOut(); + } this.setState(...args); } diff --git a/app/views/RoomsListView/index.js b/app/views/RoomsListView/index.js index ac8cb4251..b1838a8fb 100644 --- a/app/views/RoomsListView/index.js +++ b/app/views/RoomsListView/index.js @@ -86,6 +86,9 @@ export default class RoomsListView extends LoggedView { sideMenu: { left: { enabled: true + }, + right: { + enabled: true } } }; @@ -214,7 +217,9 @@ export default class RoomsListView extends LoggedView { } internalSetState = (...args) => { - LayoutAnimation.easeInEaseOut(); + if (Platform.OS === 'ios') { + LayoutAnimation.easeInEaseOut(); + } this.setState(...args); } diff --git a/app/views/SettingsView/index.js b/app/views/SettingsView/index.js index 33336d907..1a1336ec8 100644 --- a/app/views/SettingsView/index.js +++ b/app/views/SettingsView/index.js @@ -42,6 +42,9 @@ export default class SettingsView extends LoggedView { sideMenu: { left: { enabled: true + }, + right: { + enabled: true } } };