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

mattermost · Aug 17, 2019 · 51050e3 · 51050e3
1 parent 9c00f51
commit 51050e3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/app/screens/create_channel/create_channel.js b/app/screens/create_channel/create_channel.js
@@ -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};

diff --git a/app/screens/edit_channel/edit_channel.js b/app/screens/edit_channel/edit_channel.js
@@ -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 = {

diff --git a/app/screens/edit_post/edit_post.js b/app/screens/edit_post/edit_post.js
@@ -51,6 +51,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, {

diff --git a/app/screens/edit_profile/edit_profile.js b/app/screens/edit_profile/edit_profile.js
@@ -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);

diff --git a/app/screens/terms_of_service/terms_of_service.js b/app/screens/terms_of_service/terms_of_service.js
@@ -74,6 +74,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);

diff --git a/app/screens/user_profile/user_profile.js b/app/screens/user_profile/user_profile.js
@@ -65,6 +65,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 = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 = {
@@ Expand Down @@