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

Update location icons

Browse source
This commit is contained in:
Victor Shcherb 2013-04-21 20:56:03 +02:00
parent dce85cd9dd
commit 391ed634ed
11 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
OsmAnd/res/drawable-hdpi/list_activities_backtoloc_disabled.png → OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

0
OsmAnd/res/drawable-hdpi/list_activities_backtoloc_disabled_white.png → OsmAnd/res/drawable-hdpi/la_backtoloc_disabled_white.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OsmAnd/res/drawable-hdpi/list_activities_backtoloc_enabled_white.png → OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
OsmAnd/res/drawable-hdpi/list_activities_backtoloc_enabled.png → OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
OsmAnd/res/drawable-hdpi/la_backtoloc_tracked_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

8
OsmAnd/res/drawable/back_to_loc.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/list_activities_backtoloc_disabled" />
<item android:state_pressed="true" android:drawable="@drawable/list_activities_backtoloc_disabled" />
<item android:state_focused="true" android:drawable="@drawable/list_activities_backtoloc_disabled" />
<item android:drawable="@drawable/list_activities_backtoloc_enabled" />
<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled" />
<item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled" />
<item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled" />
<item android:drawable="@drawable/la_backtoloc_enabled" />
</selector>

7
OsmAnd/res/drawable/back_to_loc_tracked.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled" />
<item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled" />
<item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled" />
<item android:drawable="@drawable/la_backtoloc_tracked" />
</selector>

7
OsmAnd/res/drawable/back_to_loc_tracked_white.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled_white" />
<item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
<item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
<item android:drawable="@drawable/la_backtoloc_tracked_white" />
</selector>

8
OsmAnd/res/drawable/back_to_loc_white.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/list_activities_backtoloc_disabled_white" />
<item android:state_pressed="true" android:drawable="@drawable/list_activities_backtoloc_disabled_white" />
<item android:state_focused="true" android:drawable="@drawable/list_activities_backtoloc_disabled_white" />
<item android:drawable="@drawable/list_activities_backtoloc_enabled_white" />
<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled_white" />
<item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
<item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
<item android:drawable="@drawable/la_backtoloc_enabled_white" />
</selector>

25
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -102,19 +102,30 @@ public class MapInfoWidgetsFactory {
public ImageView createBackToLocation(final MapActivity map){
final Drawable backToLoc = map.getResources().getDrawable(R.drawable.back_to_loc);
final Drawable backToLocWhite = map.getResources().getDrawable(R.drawable.back_to_loc_white);
final Drawable backToLocDisabled = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled);
final Drawable backToLocDisabledWhite = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled_white);
final Drawable backToLocTracked = map.getResources().getDrawable(R.drawable.back_to_loc_tracked);
final Drawable backToLocTrackedWhite = map.getResources().getDrawable(R.drawable.back_to_loc_tracked_white);
ImageView backToLocation = new ImageViewWidget(map) {
private boolean nightM;
Drawable lastDrawable = null;
@Override
public boolean updateInfo(DrawSettings drawSettings) {
boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
if(nightM != nightMode) {
nightM = nightMode;
setImageDrawable(nightM ? backToLocWhite : backToLoc);
}
boolean enabled = map.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
enabled = enabled && !map.getMapViewTrackingUtilities().isMapLinkedToLocation();
setEnabled(enabled);
boolean tracked = map.getMapViewTrackingUtilities().isMapLinkedToLocation();
Drawable d;
if(!enabled) {
d = nightMode ? backToLocDisabledWhite : backToLocDisabled;
} else if(tracked) {
d = nightMode ? backToLocTrackedWhite : backToLocTracked;
} else {
d = nightMode ? backToLocWhite : backToLoc;
}
if(d != lastDrawable) {
lastDrawable = d;
setImageDrawable(d);
}
return true;
}
};