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

Fix direction arrow

Browse source
This commit is contained in:
Alexey Kulish 2016-08-03 12:10:29 +03:00
parent d47aec85c0
commit a6c0dc2b08
13 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/layout/dash_osmo_item.xml
View file

@ -60,9 +60,10 @@
<ImageView
android:id="@+id/direction_icon"
android:layout_gravity="center_vertical"
android:layout_width="@dimen/dashFavDirectionSize"
android:layout_height="@dimen/dashFavDirectionSize"
tools:src="@drawable/ic_action_start_navigation"/>
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_marginTop="1sp"
tools:src="@drawable/ic_direction_arrow"/>
<TextView
android:id="@+id/distance"

2
OsmAnd/res/layout/favorites_list_item.xml
View file

@ -65,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_destination_arrow_white"/>
android:src="@drawable/ic_direction_arrow"/>
<TextView
android:id="@+id/distance"

5
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -138,8 +138,9 @@
<ImageView
android:id="@+id/direction"
android:layout_width="@dimen/dashFavDirectionSize"
android:layout_height="@dimen/dashFavDirectionSize"
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_marginTop="1sp"
android:layout_gravity="center_vertical"/>
<TextView

2
OsmAnd/res/layout/map_marker_item.xml
View file

@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="4dp"
android:src="@drawable/ic_destination_arrow_white"
android:src="@drawable/ic_direction_arrow"
android:visibility="gone"/>
<TextView

5
OsmAnd/res/layout/search_history_list_item.xml
View file

@ -52,8 +52,9 @@
<ImageView
android:id="@+id/direction"
android:layout_width="@dimen/dashFavDirectionSize"
android:layout_height="@dimen/dashFavDirectionSize"
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_marginTop="1sp"
android:layout_gravity="center_vertical" />
<TextView

5
OsmAnd/res/layout/search_list_item.xml
View file

@ -64,8 +64,9 @@
<ImageView
android:id="@+id/direction"
android:layout_width="@dimen/dashFavDirectionSize"
android:layout_height="@dimen/dashFavDirectionSize"
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_marginTop="1sp"
android:layout_gravity="center_vertical"/>
<TextView

7
OsmAnd/res/layout/searchpoi_list.xml
View file

@ -46,10 +46,11 @@
<ImageView
android:id="@+id/poi_direction"
android:layout_width="@dimen/dashFavDirectionSize"
android:layout_height="@dimen/dashFavDirectionSize"
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_marginTop="1sp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_destination_arrow_white"
android:src="@drawable/ic_direction_arrow"
tools:visiblity="visible" />
<TextView

1
OsmAnd/res/values/sizes.xml
View file

@ -17,6 +17,7 @@
<dimen name="dashFavIconSize">28dp</dimen>
<dimen name="dashFavIconMargin">12dp</dimen>
<dimen name="dashFavDirectionSize">10dp</dimen>
<dimen name="directionIconSize">14dp</dimen>
<dimen name="dashNoteIconSize">28dp</dimen>
<dimen name="dashPluginPadding">4dp</dimen>

2
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -98,7 +98,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
setAdapter(favouritesAdapter);
boolean light = getMyApplication().getSettings().isLightContent();
arrowImage = ContextCompat.getDrawable(context, R.drawable.ic_destination_arrow_white);
arrowImage = ContextCompat.getDrawable(context, R.drawable.ic_direction_arrow);
arrowImage.mutate();
if (light) {
arrowImage.setColorFilter(ContextCompat.getColor(context, R.color.color_distance), PorterDuff.Mode.MULTIPLY);

2
OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
View file

@ -258,7 +258,7 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA
TextView distanceText = (TextView) row.findViewById(R.id.distance);
ImageView direction = (ImageView) row.findViewById(R.id.direction);
IconsCache ic = app.getIconsCache();
direction.setImageDrawable(ic.getIcon(R.drawable.ic_destination_arrow_white, R.color.color_distance));
direction.setImageDrawable(ic.getIcon(R.drawable.ic_direction_arrow, R.color.color_distance));
String distance = "";
if (location != null) {
int dist = (int) (MapUtils.getDistance(location, historyEntry.getLat(), historyEntry.getLon()));

2
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -783,7 +783,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
draw = (DirectionDrawable) dd;
} else {
draw = new DirectionDrawable(SearchPOIActivity.this, 24, 24,
R.drawable.ic_destination_arrow_white, R.color.color_distance);
R.drawable.ic_direction_arrow, R.color.color_distance);
direction.setImageDrawable(draw);
}
net.osmand.Location loc = location;

2
OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
View file

@ -127,7 +127,7 @@ public abstract class DashLocationFragment extends DashBaseFragment {
if (arrow != null) {
boolean newImage = false;
if (arrowResId == 0) {
arrowResId = R.drawable.ic_destination_arrow_white;
arrowResId = R.drawable.ic_direction_arrow;
}
DirectionDrawable dd;
if(!(arrow.getDrawable() instanceof DirectionDrawable)) {

4
OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
View file

@ -488,7 +488,7 @@ public class MapMarkerDialogHelper {
Location.distanceBetween(marker.getLatitude(), marker.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
}
boolean newImage = false;
int arrowResId = R.drawable.ic_destination_arrow_white;
int arrowResId = R.drawable.ic_direction_arrow;
DirectionDrawable dd;
if (!(arrow.getDrawable() instanceof DirectionDrawable)) {
newImage = true;
@ -596,7 +596,7 @@ public class MapMarkerDialogHelper {
Location.distanceBetween(marker.getLatitude(), marker.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes);
}
boolean newImage = false;
int arrowResId = R.drawable.ic_destination_arrow_white;
int arrowResId = R.drawable.ic_direction_arrow;
DirectionDrawable dd;
if (!(arrow.getDrawable() instanceof DirectionDrawable)) {
newImage = true;