toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Regression right buttons color on Android navbar when enable (#3138)

Browse source
This commit is contained in:
Elias Nahum 2019-08-17 12:03:15 -04:00 committed by Miguel Alatzar
parent fca9a6e609
commit 9a16e05c54
6 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/screens/create_channel/create_channel.js
View file

@ -63,6 +63,7 @@ export default class CreateChannel extends PureComponent {
};
this.rightButton.text = context.intl.formatMessage({id: 'mobile.create_channel', defaultMessage: 'Create'});
this.rightButton.color = props.theme.sidebarHeaderTextColor;
if (props.closeButton) {
this.left = {...this.leftButton, icon: props.closeButton};

1
app/screens/edit_channel/edit_channel.js
View file

@ -99,6 +99,7 @@ export default class EditChannel extends PureComponent {
header,
};
this.rightButton.color = props.theme.sidebarHeaderTextColor;
this.rightButton.text = context.intl.formatMessage({id: 'mobile.edit_channel', defaultMessage: 'Save'});
const buttons = {

1
app/screens/edit_post/edit_post.js
View file

@ -53,6 +53,7 @@ export default class EditPost extends PureComponent {
super(props);
this.state = {message: props.post.message};
this.rightButton.color = props.theme.sidebarHeaderTextColor;
this.rightButton.text = context.intl.formatMessage({id: 'edit_post.save', defaultMessage: 'Save'});
props.actions.setButtons(props.componentId, {

1
app/screens/edit_profile/edit_profile.js
View file

@ -119,6 +119,7 @@ export default class EditProfile extends PureComponent {
const buttons = {
rightButtons: [this.rightButton],
};
this.rightButton.color = props.theme.sidebarHeaderTextColor;
this.rightButton.text = context.intl.formatMessage({id: t('mobile.account.settings.save'), defaultMessage: 'Save'});
props.actions.setButtons(props.componentId, buttons);

1
app/screens/terms_of_service/terms_of_service.js
View file

@ -63,6 +63,7 @@ export default class TermsOfService extends PureComponent {
};
this.rightButton.text = context.intl.formatMessage({id: 'terms_of_service.agreeButton', defaultMessage: 'I Agree'});
this.rightButton.color = props.theme.sidebarHeaderTextColor;
this.leftButton.icon = props.closeButton;
this.setNavigatorButtons(false);

1
app/screens/user_profile/user_profile.js
View file

@ -67,6 +67,7 @@ export default class UserProfile extends PureComponent {
super(props);
if (props.isMyUser) {
this.rightButton.color = props.theme.sidebarHeaderTextColor;
this.rightButton.text = context.intl.formatMessage({id: 'mobile.routes.user_profile.edit', defaultMessage: 'Edit'});
const buttons = {