From 57d148bbf9c142c51405dfc07da4947be5ed8750 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Mon, 19 Aug 2019 19:33:47 +0200 Subject: [PATCH] Android screen right button colors (#3148) --- app/screens/channel_add_members/channel_add_members.js | 1 + app/screens/channel_members/channel_members.js | 1 + app/screens/more_channels/more_channels.js | 1 + app/screens/more_dms/more_dms.js | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/screens/channel_add_members/channel_add_members.js b/app/screens/channel_add_members/channel_add_members.js index 95eb6010a..6c8c9710f 100644 --- a/app/screens/channel_add_members/channel_add_members.js +++ b/app/screens/channel_add_members/channel_add_members.js @@ -72,6 +72,7 @@ export default class ChannelAddMembers extends PureComponent { enalbed: false, id: 'add-members', text: context.intl.formatMessage({id: 'integrations.add', defaultMessage: 'Add'}), + color: props.theme.sidebarHeaderTextColor, showAsAction: 'always', }; diff --git a/app/screens/channel_members/channel_members.js b/app/screens/channel_members/channel_members.js index 9bb29b8da..75d7cce0d 100644 --- a/app/screens/channel_members/channel_members.js +++ b/app/screens/channel_members/channel_members.js @@ -64,6 +64,7 @@ export default class ChannelMembers extends PureComponent { }; this.removeButton = { + color: props.theme.sidebarHeaderTextColor, enabled: false, id: 'remove-members', showAsAction: 'always', diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js index a95b15392..9989eab7e 100644 --- a/app/screens/more_channels/more_channels.js +++ b/app/screens/more_channels/more_channels.js @@ -66,6 +66,7 @@ export default class MoreChannels extends PureComponent { }; this.rightButton = { + color: props.theme.sidebarHeaderTextColor, id: 'create-pub-channel', text: context.intl.formatMessage({id: 'mobile.create_channel', defaultMessage: 'Create'}), showAsAction: 'always', diff --git a/app/screens/more_dms/more_dms.js b/app/screens/more_dms/more_dms.js index 790887545..c06877e66 100644 --- a/app/screens/more_dms/more_dms.js +++ b/app/screens/more_dms/more_dms.js @@ -325,10 +325,11 @@ export default class MoreDirectMessages extends PureComponent { }; updateNavigationButtons = (startEnabled, context = this.context) => { - const {actions, componentId} = this.props; + const {actions, componentId, theme} = this.props; const {formatMessage} = context.intl; actions.setButtons(componentId, { rightButtons: [{ + color: theme.sidebarHeaderTextColor, id: START_BUTTON, text: formatMessage({id: 'mobile.more_dms.start', defaultMessage: 'Start'}), showAsAction: 'always',