diff --git a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png index 35f70a5e91..af00c575b6 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png index 70d4377c56..ecf98bb9d3 100644 Binary files a/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-hdpi/map_white_orange_poi_shield_small.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png index db587a24bb..895ec33812 100644 Binary files a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png index 1854848e90..5ef3e6fe02 100644 Binary files a/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-mdpi/map_white_orange_poi_shield_small.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png index 8aa24da9b8..87f6719586 100644 Binary files a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png index 6b44590dcb..7d803835a9 100644 Binary files a/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-xhdpi/map_white_orange_poi_shield_small.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png index 493063df60..fd3701096c 100644 Binary files a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png and b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png index c4a49542e7..b3ce77f9e1 100644 Binary files a/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png and b/OsmAnd/res/drawable-xxhdpi/map_white_orange_poi_shield_small.png differ diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index d6ee390265..fa4dc82253 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -1054,4 +1054,6 @@ Instagram VKontakte Google+ + Perfumeria + diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 6cc744c1fd..5347500c02 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -1066,6 +1066,6 @@ Instagram VKontakte Google+ - Parfume butik + Parfumeri diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 42d8b7f24d..547d74f851 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2149,5 +2149,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Componenti aggiuntivi Evita i treni navetta Evita i treni navetta - Sottoponi PDI + Contribuisci il/i PDI diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 201a6a0973..05a6689fa8 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -2321,4 +2321,29 @@ 보라색 반투명 보라색 변화를 완전히 적용 하려면, 수동으로 응용 프로그램을 다시 시작해야 합니다. - + 플러그인 + 셔틀 열차 피하기 + 셔틀 열차 피하기 + 위험 + 큰 선 + 사용 가능한 업데이트 없음 + 라이브 업데이트 + OsmAnd를 좋아 합니까? + 의견에 대한 많은 관심 부탁드립니다 그리고 우리가 당신의 의견을 듣는 것이 중요합니다. + 이 앱 평점매기기 + 구글 플레이에 OsmAnd을 평가해 주세요 + 우리에게 이유를 가르쳐 쥬세요. + 우리가 이 응용 프로그램에서 무엇을 변경 해야 하는 지 알려 주세요. + 업로드 하지 못했습니다. + 변경을 삭제합니다 + 성공적으로 업로드 {0}/{1} + 다시 시도하십시오. + 오류: {0} + 대시보드 옵션 + 카드는 숨겨졌습니다 + 실행 취소 + 건너뛰기 + OsmAnd + 오프 라인 지도 및 내비게이션 + POI 커밋 + diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java index 2de395530f..b93c8367aa 100644 --- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java +++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java @@ -477,13 +477,17 @@ public class FavouritesDbHelper { String s2 = o2.getName(); int i1 = Algorithms.extractIntegerNumber(s1); int i2 = Algorithms.extractIntegerNumber(s2); - if(i1 == i2) { - String ot1 = Algorithms.extractIntegerPrefix(s1); - String ot2 = Algorithms.extractIntegerPrefix(s2); - return collator.compare(ot1, ot2); + String ot1 = Algorithms.extractIntegerPrefix(s1); + String ot2 = Algorithms.extractIntegerPrefix(s2); + int res = collator.compare(ot1, ot2); + if (res == 0) { + res = i1 - i2; } - - return i1 - i2; + if (res == 0) { + res = collator.compare(s1, s2); + } + return res; + } }; return favoritesComparator; diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java index 93518e91a0..bc01aa4ba4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java @@ -54,7 +54,7 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA settings = getApplication().getSettings(); OsmandApplication app = getApplication(); favouritesAdapter = new FavouritesAdapter(activity, app.getFavorites().getFavouritePoints(), - !selectFavoriteMode); + false); setListAdapter(favouritesAdapter); setHasOptionsMenu(true); diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java index a1c7299300..28e8bbbcfc 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java @@ -1,5 +1,37 @@ package net.osmand.plus.activities; +import gnu.trove.list.array.TIntArrayList; + +import java.io.File; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.osmand.access.AccessibleToast; +import net.osmand.data.FavouritePoint; +import net.osmand.data.LatLon; +import net.osmand.data.PointDescription; +import net.osmand.plus.FavouritesDbHelper; +import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; +import net.osmand.plus.GPXUtilities; +import net.osmand.plus.GPXUtilities.GPXFile; +import net.osmand.plus.IconsCache; +import net.osmand.plus.OsmAndFormatter; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.TargetPointsHelper; +import net.osmand.plus.base.FavoriteImageDrawable; +import net.osmand.plus.dialogs.DirectionsDialogs; +import net.osmand.plus.helpers.AndroidUiHelper; +import net.osmand.plus.helpers.ColorDialogs; +import net.osmand.plus.myplaces.FavoritesActivity; +import net.osmand.util.MapUtils; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; @@ -37,39 +69,6 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -import net.osmand.access.AccessibleToast; -import net.osmand.data.FavouritePoint; -import net.osmand.data.LatLon; -import net.osmand.data.PointDescription; -import net.osmand.plus.FavouritesDbHelper; -import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; -import net.osmand.plus.GPXUtilities; -import net.osmand.plus.GPXUtilities.GPXFile; -import net.osmand.plus.IconsCache; -import net.osmand.plus.OsmAndFormatter; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.TargetPointsHelper; -import net.osmand.plus.base.FavoriteImageDrawable; -import net.osmand.plus.dialogs.DirectionsDialogs; -import net.osmand.plus.helpers.AndroidUiHelper; -import net.osmand.plus.helpers.ColorDialogs; -import net.osmand.plus.myplaces.FavoritesActivity; -import net.osmand.util.MapUtils; - -import java.io.File; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import gnu.trove.list.array.TIntArrayList; - public class FavoritesTreeFragment extends OsmandExpandableListFragment { @@ -605,6 +604,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { class FavouritesAdapter extends OsmandBaseExpandableListAdapter implements Filterable { + private static final boolean showOptionsButton = false; Map> favoriteGroups = new LinkedHashMap>(); List groups = new ArrayList(); Filter myFilter; @@ -760,19 +760,23 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { TextView name = (TextView) row.findViewById(R.id.favourite_label); TextView distanceText = (TextView) row.findViewById(R.id.distance); ImageView icon = (ImageView) row.findViewById(R.id.favourite_icon); - ImageView options = (ImageView) row.findViewById(R.id.options); - options.setFocusable(false); - options.setImageDrawable(getMyApplication().getIconsCache() - .getContentIcon(R.drawable.ic_overflow_menu_white)); - options.setVisibility(View.VISIBLE); + final FavouritePoint model = (FavouritePoint) getChild(groupPosition, childPosition); row.setTag(model); - options.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showItemPopupOptionsMenu(model, v); - } - }); + + if (showOptionsButton) { + ImageView options = (ImageView) row.findViewById(R.id.options); + options.setFocusable(false); + options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon( + R.drawable.ic_overflow_menu_white)); + options.setVisibility(View.VISIBLE); + options.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showItemPopupOptionsMenu(model, v); + } + }); + } icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), model.getColor(), 0)); LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation(); int dist = (int) (MapUtils.getDistance(model.getLatitude(), model.getLongitude(),