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 2016-04-05 10:02:58 +02:00
commit 7f72ed8375
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/IconsCache.java
View file

@ -84,10 +84,6 @@ public class IconsCache {
return getDrawable(id, colorId);
}
@Deprecated
public Drawable getIcon(@DrawableRes int id, @ColorRes int colorId, float scale) {
return getDrawable(id, colorId, scale);
}
@Deprecated
public Drawable getIcon(@DrawableRes int backgroundId, @DrawableRes int id, @ColorRes int colorId) {

1
OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
View file

@ -27,6 +27,7 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
int themeId = isLightTheme ? R.style.OsmandLightTheme_BottomSheet
: R.style.OsmandDarkTheme_BottomSheet;
final Dialog dialog = new Dialog(getActivity(), themeId);
dialog.setCanceledOnTouchOutside(true);
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
dialog.setCanceledOnTouchOutside(true);

6
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -703,12 +703,12 @@ public class WaypointHelper {
ApplicationMode appMode = app.getSettings().getApplicationMode();
return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay());
} else {
return iconsCache.getIcon(R.drawable.list_startpoint, 0, 0f);
return iconsCache.getIcon(R.drawable.list_startpoint, 0);
}
} else if (((TargetPoint) point).intermediate) {
return iconsCache.getIcon(R.drawable.list_intermediate, 0, 0f);
return iconsCache.getIcon(R.drawable.list_intermediate, 0);
} else {
return iconsCache.getIcon(R.drawable.list_destination, 0, 0f);
return iconsCache.getIcon(R.drawable.list_destination, 0);
}
} else if (type == FAVORITES || type == WAYPOINTS) {

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/BaseMenuController.java
View file

@ -74,7 +74,7 @@ public abstract class BaseMenuController {
protected Drawable getIconOrig(int iconId) {
IconsCache iconsCache = getMapActivity().getMyApplication().getIconsCache();
return iconsCache.getIcon(iconId, 0, 0f);
return iconsCache.getIcon(iconId, 0);
}
protected Drawable getIcon(int iconId) {

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
View file

@ -411,7 +411,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
} else {
fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.list_startpoint, 0, 0f));
fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.list_startpoint, 0));
}
}
@ -475,7 +475,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
private Drawable getIconOrig(int iconId) {
IconsCache iconsCache = mapActivity.getMyApplication().getIconsCache();
return iconsCache.getIcon(iconId, 0, 0f);
return iconsCache.getIcon(iconId, 0);
}
private OnItemClickListener getOnFavoriteClickListener(final boolean target, final FavouritesAdapter favouritesAdapter,