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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-11-22 09:53:42 +01:00
commit 9ad7941b58
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,4 +172,10 @@
<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">#5532C832</color>
<color name="region_updateable">#55FF8F00</color>
<color name="region_selected">#55FFFF00</color>
<color name="region_downloading">#2Acd2c33</color>
</resources> </resources>

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

@ -104,10 +104,14 @@ 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(Color.argb(100, 50, 200, 50));
paintSelected = getPaint(Color.argb(100, 255, 143, 0)); //paintSelected = getPaint(Color.argb(100, 255, 143, 0));
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(Color.argb(100, 0, 128, 255));
paintDownloaded = getPaint(view.getResources().getColor(R.color.region_uptodate));
paintOutdated = getPaint(view.getResources().getColor(R.color.region_updateable));
paintSelected = getPaint(view.getResources().getColor(R.color.region_selected);
paintDownloading = getPaint(view.getResources().getColor(R.color.region_downloading));
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);