Merge pull request #7544 from osmandapp/RefactorColors

fix start button text and icon color while route calculated
This commit is contained in:
max-klaus 2019-09-13 12:09:19 +03:00 committed by GitHub
commit 30bdb55f74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -966,10 +966,10 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
color2 = color1; color2 = color1;
} }
} else { } else {
color1 = nightMode ? R.color.active_buttons_and_links_text_disabled_dark : R.color.active_buttons_and_links_text_light; color1 = nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light;
if (routeCalculated) { if (routeCalculated) {
AndroidUtils.setBackground(app, startButton, nightMode, R.color.active_color_primary_light, R.color.active_color_primary_dark); AndroidUtils.setBackground(app, startButton, nightMode, R.color.active_color_primary_light, R.color.active_color_primary_dark);
color2 = nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light; color2 = color1;
} else { } else {
AndroidUtils.setBackground(app, startButton, nightMode, R.color.activity_background_light, R.color.activity_background_dark); AndroidUtils.setBackground(app, startButton, nightMode, R.color.activity_background_light, R.color.activity_background_dark);
color2 = R.color.description_font_and_bottom_sheet_icons; color2 = R.color.description_font_and_bottom_sheet_icons;