Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #8725

Browse source
This commit is contained in:
max-klaus 2020-03-28 22:10:27 +03:00
parent 436e642153
commit a47a27ac81
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values/colors.xml
View file

@ -456,6 +456,9 @@
<color name="profile_icon_color_yellow_dark">#F0B400</color>
<color name="profile_icon_color_magenta_dark">#CC0063</color>
<color name="profile_icon_color_outdated_light">#727272</color>
<color name="profile_icon_color_outdated_dark">#727272</color>
<color name="profile_icon_color_inactive">#727272</color>
<color name="switch_button_active">#1A237BFF</color>

5
OsmAnd/src/net/osmand/plus/profiles/ProfileIconColors.java
View file

@ -34,4 +34,9 @@ public enum ProfileIconColors {
public int getColor(boolean nightMode) {
return nightMode ? nightColor : dayColor;
}
public static int getOutdatedLocationColor(boolean nightMode) {
return nightMode ? R.color.profile_icon_color_outdated_dark : R.color.profile_icon_color_outdated_light;
}
}

26
OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
View file

@ -24,6 +24,7 @@ import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.MapViewTrackingUtilities;
import net.osmand.plus.profiles.ProfileIconColors;
import org.apache.commons.logging.Log;
@ -46,8 +47,11 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
private ApplicationMode appMode;
private int colorId;
private LayerDrawable navigationIcon;
private int navigationIconId;
private LayerDrawable locationIcon;
private int locationIconId;
private Bitmap headingIcon;
private int headingIconId;
private OsmAndLocationProvider locationProvider;
private MapViewTrackingUtilities mapViewTrackingUtilities;
private boolean nm;
@ -151,20 +155,28 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
}
private void updateIcons(ApplicationMode appMode, boolean nighMode, boolean locationOutdated) {
int colorId = locationOutdated ? ProfileIconColors.getOutdatedLocationColor(nighMode) : appMode.getIconColorInfo().getColor(nighMode);
int locationIconId = appMode.getLocationIcon().getIconId();
int navigationIconId = appMode.getNavigationIcon().getIconId();
int headingIconId = appMode.getLocationIcon().getHeadingIconId();
if (appMode != this.appMode || this.nm != nighMode || this.locationOutdated != locationOutdated
|| colorId != appMode.getIconColorInfo().getColor(nighMode)
|| locationIcon != view.getResources().getDrawable(appMode.getLocationIcon().getIconId())
|| navigationIcon != view.getResources().getDrawable(appMode.getNavigationIcon().getIconId())) {
|| this.colorId != colorId
|| this.locationIconId != locationIconId
|| this.headingIconId != headingIconId
|| this.navigationIconId != navigationIconId) {
this.appMode = appMode;
this.colorId = appMode.getIconColorInfo().getColor(nighMode);
this.colorId = colorId;
this.nm = nighMode;
this.locationOutdated = locationOutdated;
this.locationIconId = locationIconId;
this.headingIconId = headingIconId;
this.navigationIconId = navigationIconId;
int color = ContextCompat.getColor(view.getContext(), colorId);
navigationIcon = (LayerDrawable) view.getResources().getDrawable(appMode.getNavigationIcon().getIconId());
navigationIcon = (LayerDrawable) view.getResources().getDrawable(navigationIconId);
DrawableCompat.setTint(navigationIcon.getDrawable(1), color);
headingIcon = BitmapFactory.decodeResource(view.getResources(), appMode.getLocationIcon().getHeadingIconId());
headingIcon = BitmapFactory.decodeResource(view.getResources(), headingIconId);
headingPaint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
locationIcon = (LayerDrawable) view.getResources().getDrawable(appMode.getLocationIcon().getIconId());
locationIcon = (LayerDrawable) view.getResources().getDrawable(locationIconId);
DrawableCompat.setTint(DrawableCompat.wrap(locationIcon.getDrawable(1)), color);
area.setColor(UiUtilities.getColorWithAlpha(color, 0.16f));
aroundArea.setColor(color);