Update icons
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 886 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
OsmAnd/res/drawable-hdpi/ic_action_volume_off.png
Normal file
After Width: | Height: | Size: 532 B |
BIN
OsmAnd/res/drawable-hdpi/ic_action_volume_up.png
Normal file
After Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 554 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
BIN
OsmAnd/res/drawable-mdpi/ic_action_volume_off.png
Normal file
After Width: | Height: | Size: 402 B |
BIN
OsmAnd/res/drawable-mdpi/ic_action_volume_up.png
Normal file
After Width: | Height: | Size: 358 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
OsmAnd/res/drawable-xhdpi/ic_action_volume_off.png
Normal file
After Width: | Height: | Size: 650 B |
BIN
OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png
Normal file
After Width: | Height: | Size: 545 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
OsmAnd/res/drawable-xxhdpi/ic_action_volume_off.png
Normal file
After Width: | Height: | Size: 911 B |
BIN
OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png
Normal file
After Width: | Height: | Size: 836 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB |
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_download_cancel_tap" android:state_selected="true"/>
|
||||
<item android:drawable="@drawable/ic_download_cancel_tap" android:state_pressed="true"/>
|
||||
<item android:drawable="@drawable/ic_download_cancel_normal" android:state_selected="false"/>
|
||||
<item android:drawable="@drawable/ic_download_cancel_normal" android:state_pressed="false"/>
|
||||
</selector>
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_download_tap" android:state_selected="true"/>
|
||||
<item android:drawable="@drawable/ic_download_tap" android:state_pressed="true"/>
|
||||
<item android:drawable="@drawable/ic_download_normal" android:state_selected="false"/>
|
||||
<item android:drawable="@drawable/ic_download_normal" android:state_pressed="false"/>
|
||||
</selector>
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_download_cancel_tap" />
|
||||
</selector>
|
|
@ -54,7 +54,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top|center"
|
||||
android:layout_marginTop="3dp"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_app_mode_text"
|
||||
|
@ -79,7 +79,7 @@
|
|||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_round"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_route_info_button"
|
||||
|
@ -87,7 +87,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_marginLeft="@dimen/map_button_spacing_land"
|
||||
android:background="@drawable/btn_round"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
|
@ -162,7 +162,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_waypoints_route_button"
|
||||
|
@ -170,7 +170,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_options_route_button"
|
||||
|
@ -178,7 +178,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_go_route_button"
|
||||
|
@ -186,7 +186,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:drawableLeft="@drawable/ic_action_remove_light"
|
||||
android:drawableLeft="@drawable/ic_action_test_light"
|
||||
android:drawablePadding="4dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="12dp"
|
||||
|
@ -216,14 +216,14 @@
|
|||
android:layout_height="@dimen/map_address_height"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:layout_width="@dimen/map_address_height"
|
||||
android:layout_height="@dimen/map_address_height"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
|
@ -243,7 +243,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@drawable/btn_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -257,7 +257,7 @@
|
|||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_zoom_out_button"
|
||||
|
@ -265,7 +265,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_marginTop="@dimen/map_button_spacing_land"
|
||||
android:background="@drawable/btn_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/map_button_margin"
|
||||
android:layout_marginRight="@dimen/map_button_margin"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/waypoint_dist"
|
||||
|
@ -108,7 +108,7 @@
|
|||
android:layout_width="@dimen/map_address_height"
|
||||
android:layout_height="@dimen/map_address_height"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
|
@ -168,14 +168,14 @@
|
|||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_inset_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_compass_button"
|
||||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_inset_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
@ -211,7 +211,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_gravity="top|center_horizontal"
|
||||
android:background="@drawable/btn_inset_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageButton
|
||||
<ImageView
|
||||
android:id="@+id/btn_download"
|
||||
android:layout_width="@dimen/dashListItemHeight"
|
||||
android:layout_height="@dimen/dashListItemHeight"
|
||||
|
|
|
@ -102,7 +102,7 @@
|
|||
android:visibility="invisible"
|
||||
android:layout_marginLeft="@dimen/dashFavIconMargin"
|
||||
android:background="?attr/dashboard_button"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
<ImageButton
|
||||
android:id="@+id/options"
|
||||
android:layout_width="@dimen/dashListItemHeight"
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top|center"
|
||||
android:layout_marginTop="3dp"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_app_mode_text"
|
||||
|
@ -94,7 +94,7 @@
|
|||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_round"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_route_info_button"
|
||||
|
@ -102,7 +102,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_marginLeft="@dimen/map_button_spacing"
|
||||
android:background="@drawable/btn_round"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/map_ruler_layout"
|
||||
|
@ -143,7 +143,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@drawable/btn_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -157,7 +157,7 @@
|
|||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_zoom_out_button"
|
||||
|
@ -165,7 +165,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_marginTop="@dimen/map_button_spacing"
|
||||
android:background="@drawable/btn_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
@ -186,7 +186,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_waypoints_route_button"
|
||||
|
@ -194,7 +194,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_options_route_button"
|
||||
|
@ -202,7 +202,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_go_route_button"
|
||||
|
@ -210,7 +210,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_flat"
|
||||
android:drawableLeft="@drawable/ic_action_remove_light"
|
||||
android:drawableLeft="@drawable/ic_action_test_light"
|
||||
android:drawablePadding="4dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="12dp"
|
||||
|
@ -239,14 +239,14 @@
|
|||
android:layout_height="@dimen/map_address_height"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:layout_width="@dimen/map_address_height"
|
||||
android:layout_height="@dimen/map_address_height"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/map_button_margin"
|
||||
android:layout_marginRight="@dimen/map_button_margin"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/waypoint_dist"
|
||||
|
@ -79,7 +79,7 @@
|
|||
android:layout_width="@dimen/map_address_height"
|
||||
android:layout_height="@dimen/map_address_height"
|
||||
android:background="@drawable/btn_circle_transparent"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
<!-- Widgets -->
|
||||
|
@ -128,14 +128,14 @@
|
|||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_inset_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/map_compass_button"
|
||||
android:layout_width="@dimen/map_button_size"
|
||||
android:layout_height="@dimen/map_button_size"
|
||||
android:background="@drawable/btn_inset_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<!-- empty block to not let widgets grow more than 40% -->
|
||||
|
@ -230,7 +230,7 @@
|
|||
android:layout_height="@dimen/map_button_size"
|
||||
android:layout_gravity="top|center_horizontal"
|
||||
android:background="@drawable/btn_inset_circle"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
android:layout_width="@dimen/map_widget_image"
|
||||
android:layout_height="@dimen/map_widget_image"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_action_remove_light"
|
||||
android:src="@drawable/ic_action_test_light"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
</FrameLayout>
|
||||
|
@ -40,7 +40,7 @@
|
|||
android:layout_height="@dimen/map_widget_icon"
|
||||
android:layout_gravity="left|center_vertical"
|
||||
android:gravity="center"
|
||||
android:src="@drawable/ic_action_remove_light" />
|
||||
android:src="@drawable/ic_action_test_light" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_text"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
android:layout_height="@dimen/dashListItemHeight"
|
||||
android:background="@drawable/dashboard_button_light"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/a_10_device_access_volume_muted_dark" />
|
||||
android:src="@drawable/ic_action_volume_off" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
@ -100,7 +100,7 @@
|
|||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/dashFavIconMargin"
|
||||
android:background="?attr/dashboard_button"
|
||||
android:src="@drawable/ic_action_remove_light"
|
||||
android:src="@drawable/ic_action_test_light"
|
||||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ import android.view.View;
|
|||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
@ -123,9 +124,11 @@ public class DashUpdatesFragment extends DashBaseFragment {
|
|||
public void onClick(View view) {
|
||||
if (getDownloadActivity().isInQueue(item)) {
|
||||
getDownloadActivity().removeFromQueue(item);
|
||||
((ImageButton) view).setImageResource(R.drawable.download_button);
|
||||
((ImageView) view).setImageDrawable(
|
||||
getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_import));
|
||||
} else if (!getDownloadActivity().startDownload(item)) {
|
||||
((ImageButton) view).setImageResource(R.drawable.cancel_button);
|
||||
((ImageView) view).setImageDrawable(
|
||||
getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -163,7 +166,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
|
|||
if (!visible) {
|
||||
return;
|
||||
}
|
||||
cancelButton.setImageResource(R.drawable.cancel_button);
|
||||
cancelButton.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
|
||||
View view = (View) cancelButton.getParent();
|
||||
if (view != null && view.findViewById(R.id.map_descr) != null) {
|
||||
view.findViewById(R.id.map_descr).setVisibility(View.GONE);
|
||||
|
|
|
@ -345,9 +345,9 @@ public class MapRoutePreferencesControl {
|
|||
int t = mute ? R.string.menu_mute_on : R.string.menu_mute_off;
|
||||
int icon;
|
||||
if(mute) {
|
||||
icon = R.drawable.a_10_device_access_volume_muted_dark;
|
||||
icon = R.drawable.ic_action_volume_off;
|
||||
} else{
|
||||
icon = R.drawable.a_10_device_access_volume_on_dark;
|
||||
icon = R.drawable.ic_action_volume_up;
|
||||
}
|
||||
muteBtn.setContentDescription(mapActivity.getString(t));
|
||||
muteBtn.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(icon, R.color.icon_color_light));
|
||||
|
|