Skip to content

Commit

Permalink
Fix topbar buttons on Android
Browse files Browse the repository at this point in the history
  • Loading branch information
diegolmello committed Oct 23, 2018
1 parent 0713de9 commit 6a4c009
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
3 changes: 2 additions & 1 deletion app/views/CreateChannelView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down
7 changes: 5 additions & 2 deletions app/views/RoomMembersView/index.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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
}]
}
};
Expand Down
3 changes: 2 additions & 1 deletion app/views/SelectedUsersView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down

0 comments on commit 6a4c009

Please sign in to comment.