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

Clean and update icons

Browse source
This commit is contained in:
vshcherb 2014-03-12 20:59:53 +01:00
parent b83df978b1
commit 7f958ebf27
16 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/button_icon_favorites__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.4 KiB

BIN
OsmAnd/res/drawable-hdpi/button_icon_map__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
OsmAnd/res/drawable-hdpi/button_icon_search__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
OsmAnd/res/drawable-hdpi/button_icon_settings__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
OsmAnd/res/drawable-hdpi/map_btn_cancel_p.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
OsmAnd/res/drawable-large/button_icon_favorites__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.4 KiB

BIN
OsmAnd/res/drawable-large/button_icon_map__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
OsmAnd/res/drawable-large/button_icon_search__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
OsmAnd/res/drawable-large/button_icon_settings__original.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
OsmAnd/res/drawable-large/map_btn_cancel_o.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
OsmAnd/res/drawable-large/map_btn_cancel_p.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

6
OsmAnd/res/drawable/map_btn_cancel.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/map_btn_menu_p" /> <item android:state_pressed="true" android:drawable="@drawable/map_btn_cancel_p" />
<item android:state_enabled="false" android:drawable="@drawable/map_btn_menu_p" /> <item android:state_enabled="false" android:drawable="@drawable/map_btn_cancel_p" />
<item android:drawable="@drawable/map_btn_menu_o" /> <item android:drawable="@drawable/map_btn_cancel_o" />
</selector> </selector>

6
OsmAnd/res/drawable/map_btn_menu.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/map_btn_cancel_p" /> <item android:state_pressed="true" android:drawable="@drawable/map_btn_menu_p" />
<item android:state_enabled="false" android:drawable="@drawable/map_btn_cancel_p" /> <item android:state_enabled="false" android:drawable="@drawable/map_btn_menu_p" />
<item android:drawable="@drawable/map_btn_cancel_o" /> <item android:drawable="@drawable/map_btn_menu_o" />
</selector> </selector>

2
OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java
View file

@ -29,7 +29,7 @@ public class MapCancelControl extends MapControls {
cancelButton.setBackgroundResource(R.drawable.map_btn_cancel); cancelButton.setBackgroundResource(R.drawable.map_btn_cancel);
android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
Gravity.BOTTOM | Gravity.LEFT); Gravity.BOTTOM | Gravity.LEFT);
params.leftMargin = ctx.getResources().getDrawable(R.drawable.map_btn_cancel).getMinimumWidth(); params.leftMargin = ctx.getResources().getDrawable(R.drawable.map_btn_hmenu).getMinimumWidth();
parent.addView(cancelButton, params); parent.addView(cancelButton, params);
cancelButton.setEnabled(true); cancelButton.setEnabled(true);

3
OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
View file

@ -21,12 +21,13 @@ public class SmallMapMenuControls extends MapControls {
super(mapActivity, showUIHandler, scaleCoefficient); super(mapActivity, showUIHandler, scaleCoefficient);
} }
@SuppressWarnings("deprecation")
@Override @Override
public void showControls(FrameLayout parent) { public void showControls(FrameLayout parent) {
Context ctx = mapActivity; Context ctx = mapActivity;
backToMenuButton = new Button(ctx); backToMenuButton = new Button(ctx);
backToMenuButton.setContentDescription(ctx.getString(R.string.backToMenu)); backToMenuButton.setContentDescription(ctx.getString(R.string.backToMenu));
backToMenuButton.setBackgroundResource(R.drawable.map_btn_hmenu); backToMenuButton.setBackgroundDrawable(ctx.getResources().getDrawable(R.drawable.map_btn_hmenu));
android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
Gravity.BOTTOM | Gravity.LEFT); Gravity.BOTTOM | Gravity.LEFT);
parent.addView(backToMenuButton, params); parent.addView(backToMenuButton, params);