From ca40d8a57b1c43c4ef4372b7bdac9d2e3987bc69 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Wed, 18 Nov 2015 10:53:56 +0200 Subject: [PATCH 01/14] Tiny fix --- .../net/osmand/plus/activities/OsmandActionBarActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java index 3e1047a173..0af852d4b5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java @@ -2,6 +2,7 @@ package net.osmand.plus.activities; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; +import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.View; @@ -21,7 +22,7 @@ public class OsmandActionBarActivity extends AppCompatActivity { //should be called after set content view protected void setupHomeButton(){ Drawable back = ((OsmandApplication)getApplication()).getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha); - back.setColorFilter(getResources().getColor(R.color.color_white), PorterDuff.Mode.MULTIPLY); + back.setColorFilter(ContextCompat.getColor(this, R.color.color_white), PorterDuff.Mode.MULTIPLY); final ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setHomeButtonEnabled(true); From 1523c82ecf5acc2f045ddf36dadd7cd91f9afca4 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Wed, 18 Nov 2015 11:58:29 +0200 Subject: [PATCH 02/14] Gradle dependecy replaced with JAR --- OsmAnd/build.gradle | 11 +++++------ OsmAnd/libs/android-support-multidex.jar | Bin 0 -> 21086 bytes .../src/net/osmand/plus/OsmandApplication.java | 2 -- plugins/Osmand-ParkingPlugin/build.gradle | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 OsmAnd/libs/android-support-multidex.jar diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index d668110373..a3de7dbe0a 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -40,7 +40,6 @@ android { defaultConfig { minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14 targetSdkVersion 23 - multiDexEnabled true versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode //versionName already assigned in code //versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName @@ -323,10 +322,10 @@ repositories { } dependencies { - compile project(path: ":OsmAnd-java", configuration: "android") - compile project(":eclipse-compile:design") - compile project(":eclipse-compile:cardview") -// compile project(":eclipse-compile:recyclerview") + compile project(path: ':OsmAnd-java', configuration: 'android') + compile project(':eclipse-compile:design') + compile project(':eclipse-compile:cardview') + // compile project(":eclipse-compile:recyclerview") compile fileTree( dir: "libs", include: ["*.jar"], @@ -344,5 +343,5 @@ dependencies { qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" - compile 'com.android.support:multidex:1.0.0' + compile files('libs/android-support-multidex.jar') } diff --git a/OsmAnd/libs/android-support-multidex.jar b/OsmAnd/libs/android-support-multidex.jar new file mode 100644 index 0000000000000000000000000000000000000000..67b0aa74e99d6b5f971ee0512a235ad99d738b71 GIT binary patch literal 21086 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 Date: Wed, 25 Nov 2015 12:11:25 +0100 Subject: [PATCH 03/14] Fix release issues --- OsmAnd/build.gradle | 19 ++++++++++++++++++- OsmAnd/res/values-ko/strings.xml | 4 ++-- .../plus/activities/MapActivityActions.java | 9 +++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index fcf5a8548e..bdaa91c4b6 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -184,6 +184,22 @@ task updateNoTranslate(type: Copy) { into 'res/values/' } +task validateTranslate { + new java.io.File("res").eachFileRecurse groovy.io.FileType.FILES, { + if(it.name == "strings.xml" || it.name == "phrases.xml") { + it.eachLine { line -> + if( line.contains("\$ s") || line.contains("\$ d") || line.contains("\$ f") || + line.contains(" \$s") || line.contains(" \$d") || line.contains(" \$f") || + line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") || + (line.contains("% \$") || line.contains("% 1") || + line.contains("% 2") || line.contains("% 3") )) { + throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line); + } + } + } + } +} + task collectVoiceAssets(type: Sync) { from "../../resources/voice" into "assets/voice" @@ -265,7 +281,8 @@ collectExternalResources.dependsOn collectVoiceAssets, collectRegionsInfoResources, collectMiscResources, copyStyleIcons, - updateNoTranslate + updateNoTranslate, + validateTranslate // tasks.whenTaskAdded { task -> // if (task.name.startsWith("generate") && task.name.endsWith("Resources")) { // task.dependsOn collectExternalResources diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 27de60094d..c8b2cea3bb 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -1825,7 +1825,7 @@ 대중교통 정류소 음성 안내 오프라인 지도를 다운로드 하시겠습니까? - %1 $s 지도 다운로드됨 + %1$s 지도 다운로드됨 새로운 지도 다운로드 관리 도로 스타일 @@ -2200,7 +2200,7 @@ 즐겨찾기 추가 확실한가요? 저장되지 않은 변경 내용이 손실 됩니다. 계속 하시겠습니까? - %1$ 다운로드 남았습니다 + %1$s 다운로드 남았습니다 경로 다운로드중-%1$d 파일 무료 버전 배너를 표시 diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index d6bb4c270d..f1847179af 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -277,6 +277,11 @@ public class MapActivityActions implements DialogProvider { adapter.item(R.string.context_menu_item_directions_from).iconColor( R.drawable.ic_action_gdirections_dark).reg(); } + if (getMyApplication().getTargetPointsHelper().getPointToNavigate() != null && + (mapActivity.getRoutingHelper().isFollowingMode() || mapActivity.getRoutingHelper().isRoutePlanningMode())) { + adapter.item(R.string.context_menu_item_last_intermediate_point).iconColor( + R.drawable.ic_action_flage_dark).reg(); + } OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj); final AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity); @@ -290,6 +295,10 @@ public class MapActivityActions implements DialogProvider { OnContextMenuClick click = adapter.getClickAdapter(which); if (click != null) { click.onContextMenuClick(listAdapter, standardId, which, false); + } else if (standardId == R.string.context_menu_item_last_intermediate_point) { + getMyApplication().getTargetPointsHelper().navigateToPoint(new LatLon(latitude, longitude), + true, getMyApplication().getTargetPointsHelper().getIntermediatePoints().size(), + mapActivity.getContextMenu().getPointDescription()); } else if (standardId == R.string.context_menu_item_search) { Intent intent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getSearchActivity()); intent.putExtra(SearchActivity.SEARCH_LAT, latitude); From 738c252f5702b8a7c0640a4cc32bab78fc754c54 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 25 Nov 2015 12:17:30 +0100 Subject: [PATCH 04/14] Fix compilation --- .../src/net/osmand/plus/activities/OsmandActionBarActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java index f0345cb5bb..bea8925131 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java @@ -18,7 +18,7 @@ public class OsmandActionBarActivity extends AppCompatActivity { //should be called after set content view protected void setupHomeButton(){ Drawable back = ((OsmandApplication)getApplication()).getIconsCache().getIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha); - back.setColorFilter(ContextCompat.getColor(this, R.color.color_white), PorterDuff.Mode.MULTIPLY); + back.setColorFilter(getResources().getColor(R.color.color_white), PorterDuff.Mode.MULTIPLY); final ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setHomeButtonEnabled(true); From 045b7f28b01bdb62c76e554af75d06a2daa623a5 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 25 Nov 2015 12:23:37 +0100 Subject: [PATCH 05/14] Validate translations --- OsmAnd/build.gradle | 2 ++ .../src/net/osmand/plus/activities/OsmandActionBarActivity.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 5dce302795..ee12f17dec 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -184,6 +184,8 @@ task updateNoTranslate(type: Copy) { } task validateTranslate { + println "Validating translations" + new java.io.File("res").eachFileRecurse groovy.io.FileType.FILES, { if(it.name == "strings.xml" || it.name == "phrases.xml") { it.eachLine { line -> diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java index bea8925131..bab6c2ab42 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/OsmandActionBarActivity.java @@ -5,7 +5,6 @@ import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.View; From 39c94b82a6ca059cdfc5df29ae3cad9351523b1d Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 25 Nov 2015 13:33:51 +0100 Subject: [PATCH 06/14] Update map actions --- .../plus/activities/MapActivityActions.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index f1847179af..f812986f4e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -451,17 +451,18 @@ public class MapActivityActions implements DialogProvider { settings.LAST_ROUTING_APPLICATION_MODE != ApplicationMode.DEFAULT) { mode = settings.LAST_ROUTING_APPLICATION_MODE; } - if (from != null && targets.getPointToNavigate() != null) { - double dist = MapUtils.getDistance(from, targets.getPointToNavigate().getLatitude(), - targets.getPointToNavigate().getLongitude()); - if (dist >= 50000 && mode.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) { - mode = ApplicationMode.CAR; - } else if (dist >= 300000 && mode.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) { - mode = ApplicationMode.CAR; - } else if (dist < 2000 && mode.isDerivedRoutingFrom(ApplicationMode.CAR)) { - mode = ApplicationMode.PEDESTRIAN; - } - } + // didn't provide good results +// if (from != null && targets.getPointToNavigate() != null) { +// double dist = MapUtils.getDistance(from, targets.getPointToNavigate().getLatitude(), +// targets.getPointToNavigate().getLongitude()); +// if (dist >= 50000 && mode.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) { +// mode = ApplicationMode.CAR; +// } else if (dist >= 300000 && mode.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) { +// mode = ApplicationMode.CAR; +// } else if (dist < 2000 && mode.isDerivedRoutingFrom(ApplicationMode.CAR)) { +// mode = ApplicationMode.PEDESTRIAN; +// } +// } } return mode; } From e0b4a1ffae364de0b31947f0099f207cdc7a057f Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 25 Nov 2015 13:38:15 +0100 Subject: [PATCH 07/14] Fix #1929 --- .../plus/mapcontextmenu/MenuTitleController.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java index f1c7da8ac9..a27302e1aa 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java @@ -1,7 +1,6 @@ package net.osmand.plus.mapcontextmenu; import android.graphics.drawable.Drawable; - import net.osmand.Location; import net.osmand.ResultMatcher; import net.osmand.binary.RouteDataObject; @@ -141,9 +140,15 @@ public abstract class MenuTitleController { public boolean publish(RouteDataObject object) { if (object != null) { OsmandSettings settings = getMapActivity().getMyApplication().getSettings(); - streetStr = RoutingHelper.formatStreetName(object.getName(settings.MAP_PREFERRED_LOCALE.get()), - object.getRef(), object.getDestinationName(settings.MAP_PREFERRED_LOCALE.get())); - + String streetName = object.getName(settings.MAP_PREFERRED_LOCALE.get()); + String ref = object.getRef(); + if(Algorithms.isEmpty(streetName)) { + streetName = ""; + } + if(Algorithms.isEmpty(ref)) { + streetName += ", "+ ref; + } + streetStr = streetName; if (!Algorithms.isEmpty(streetStr)) { MenuController menuController = getMenuController(); if (menuController == null || menuController.displayStreetNameInTitle()) { From 7e58af5a67790e2276c01bdf1d88afa3b7855c34 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 25 Nov 2015 13:45:17 +0100 Subject: [PATCH 08/14] Update to release 2.3 --- OsmAnd/no_translate.xml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml index f3881b496b..beaaa856b3 100644 --- a/OsmAnd/no_translate.xml +++ b/OsmAnd/no_translate.xml @@ -1,7 +1,7 @@ OsmAnd~ - 2.2.0 + 2.3.0