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

Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2

Browse source
This commit is contained in:
Victor Shcherb 2015-11-23 10:23:00 +01:00
commit 388b1a9214
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,4 +172,9 @@
<color name="color_dialog_buttons">#2f7af5</color> <color name="color_dialog_buttons">#2f7af5</color>
<color name="dialog_inactive_text_color_dark">#78909c</color> <color name="dialog_inactive_text_color_dark">#78909c</color>
<!-- DownloadedRegionsLayer -->
<color name="region_uptodate">#6632C832</color>
<color name="region_updateable">#66FF8F00</color>
<color name="region_selected">#66FFFF00</color>
</resources> </resources>

14
OsmAnd/src/net/osmand/plus/download/DownloadResources.java
View file

@ -42,12 +42,14 @@ public class DownloadResources extends DownloadResourceGroup {
public IndexItem getWorldBaseMapItem() { public IndexItem getWorldBaseMapItem() {
DownloadResourceGroup worldMaps = getSubGroupById(DownloadResourceGroupType.WORLD_MAPS.getDefaultId()); DownloadResourceGroup worldMaps = getSubGroupById(DownloadResourceGroupType.WORLD_MAPS.getDefaultId());
IndexItem worldMap = null; IndexItem worldMap = null;
List<IndexItem> list = worldMaps.getIndividualResources(); if (worldMaps != null) {
if(list != null) { List<IndexItem> list = worldMaps.getIndividualResources();
for(IndexItem ii : list) { if (list != null) {
if(ii.getBasename().equalsIgnoreCase(WorldRegion.WORLD_BASEMAP)) { for (IndexItem ii : list) {
worldMap = ii; if (ii.getBasename().equalsIgnoreCase(WorldRegion.WORLD_BASEMAP)) {
break; worldMap = ii;
break;
}
} }
} }
} }

6
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -104,10 +104,10 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
rm = app.getResourceManager(); rm = app.getResourceManager();
osmandRegions = rm.getOsmandRegions(); osmandRegions = rm.getOsmandRegions();
paintDownloaded = getPaint(Color.argb(100, 50, 200, 50)); paintDownloaded = getPaint(view.getResources().getColor(R.color.region_uptodate));
paintSelected = getPaint(Color.argb(100, 255, 143, 0)); paintSelected = getPaint(view.getResources().getColor(R.color.region_selected);
paintDownloading = getPaint(Color.argb(40, 50, 200, 50)); paintDownloading = getPaint(Color.argb(40, 50, 200, 50));
paintOutdated = getPaint(Color.argb(100, 0, 128, 255)); paintOutdated = getPaint(view.getResources().getColor(R.color.region_updateable));
textPaint = new TextPaint(); textPaint = new TextPaint();
final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE); final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE);