From 6a4c0096df3764eca944a3e482db3f5639ef57d4 Mon Sep 17 00:00:00 2001 From: diegolmello Date: Tue, 23 Oct 2018 16:21:10 -0300 Subject: [PATCH] Fix topbar buttons on Android --- app/views/CreateChannelView.js | 3 ++- app/views/RoomMembersView/index.js | 7 +++++-- app/views/SelectedUsersView.js | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/CreateChannelView.js b/app/views/CreateChannelView.js index df98948648..41f6f76cf6 100644 --- a/app/views/CreateChannelView.js +++ b/app/views/CreateChannelView.js @@ -154,7 +154,8 @@ export default class CreateChannelView extends LoggedView { rightButtons.push({ id: 'create', text: 'Create', - testID: 'create-channel-submit' + testID: 'create-channel-submit', + color: Platform.OS === 'android' ? '#FFF' : undefined }); } Navigation.mergeOptions(componentId, { diff --git a/app/views/RoomMembersView/index.js b/app/views/RoomMembersView/index.js index 819a256b3e..b33d6da0d4 100644 --- a/app/views/RoomMembersView/index.js +++ b/app/views/RoomMembersView/index.js @@ -1,6 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FlatList, View, Vibration } from 'react-native'; +import { + FlatList, View, Vibration, Platform +} from 'react-native'; import ActionSheet from 'react-native-actionsheet'; import { connect } from 'react-redux'; import { Navigation } from 'react-native-navigation'; @@ -31,7 +33,8 @@ export default class RoomMembersView extends LoggedView { rightButtons: [{ id: 'toggleOnline', text: I18n.t('Online'), - testID: 'room-members-view-toggle-status' + testID: 'room-members-view-toggle-status', + color: Platform.OS === 'android' ? '#FFF' : undefined }] } }; diff --git a/app/views/SelectedUsersView.js b/app/views/SelectedUsersView.js index 8bbaa8265b..a70f7be9ee 100644 --- a/app/views/SelectedUsersView.js +++ b/app/views/SelectedUsersView.js @@ -81,7 +81,8 @@ export default class SelectedUsersView extends LoggedView { rightButtons.push({ id: 'create', text: I18n.t('Next'), - testID: 'selected-users-view-submit' + testID: 'selected-users-view-submit', + color: Platform.OS === 'android' ? '#FFF' : undefined }); } Navigation.mergeOptions(componentId, {