From 18f7827c835f93c83dc14d2a406f087fe7c481ca Mon Sep 17 00:00:00 2001 From: Gonzalo Pesquero Date: Thu, 26 Dec 2024 00:41:59 +0100 Subject: [PATCH] [android] Remove display of speed in nav panel Signed-off-by: Gonzalo Pesquero --- .../app/organicmaps/widget/menu/NavMenu.java | 55 ++++++-------- .../main/res/drawable/route_point_finish.png | Bin 0 -> 7416 bytes .../res/layout/layout_nav_bottom_numbers.xml | 69 +++++++++++++----- .../app/src/main/res/values-ar/strings.xml | 1 + .../app/src/main/res/values-az/strings.xml | 1 + .../app/src/main/res/values-be/strings.xml | 1 + .../app/src/main/res/values-ca/strings.xml | 1 + .../app/src/main/res/values-cs/strings.xml | 1 + .../app/src/main/res/values-da/strings.xml | 1 + .../app/src/main/res/values-de/strings.xml | 5 +- .../app/src/main/res/values-el/strings.xml | 1 + .../src/main/res/values-es-rMX/strings.xml | 1 + .../app/src/main/res/values-es/strings.xml | 1 + .../app/src/main/res/values-et/strings.xml | 1 + .../app/src/main/res/values-eu/strings.xml | 1 + .../app/src/main/res/values-fa/strings.xml | 1 + .../app/src/main/res/values-fi/strings.xml | 1 + .../app/src/main/res/values-fr/strings.xml | 1 + .../app/src/main/res/values-hu/strings.xml | 1 + .../app/src/main/res/values-in/strings.xml | 1 + .../app/src/main/res/values-it/strings.xml | 1 + .../app/src/main/res/values-iw/strings.xml | 1 + .../app/src/main/res/values-ja/strings.xml | 1 + .../app/src/main/res/values-ko/strings.xml | 1 + .../app/src/main/res/values-lv/strings.xml | 1 + .../app/src/main/res/values-mr/strings.xml | 1 + .../app/src/main/res/values-nb/strings.xml | 1 + .../app/src/main/res/values-nl/strings.xml | 1 + .../app/src/main/res/values-pl/strings.xml | 1 + .../src/main/res/values-pt-rBR/strings.xml | 1 + .../app/src/main/res/values-pt/strings.xml | 1 + .../app/src/main/res/values-ro/strings.xml | 1 + .../app/src/main/res/values-ru/strings.xml | 1 + .../app/src/main/res/values-sk/strings.xml | 1 + .../app/src/main/res/values-sr/strings.xml | 1 + .../app/src/main/res/values-sv/strings.xml | 1 + .../app/src/main/res/values-sw/strings.xml | 1 + .../app/src/main/res/values-th/strings.xml | 1 + .../app/src/main/res/values-tr/strings.xml | 19 +++-- .../app/src/main/res/values-uk/strings.xml | 1 + .../app/src/main/res/values-vi/strings.xml | 1 + .../src/main/res/values-zh-rTW/strings.xml | 1 + .../app/src/main/res/values-zh/strings.xml | 1 + android/app/src/main/res/values/strings.xml | 1 + .../app/src/main/res/values/styles-text.xml | 5 ++ data/strings/strings.txt | 2 +- .../de.lproj/Localizable.strings | 4 +- .../tr.lproj/Localizable.strings | 20 ++--- 48 files changed, 143 insertions(+), 75 deletions(-) create mode 100644 android/app/src/main/res/drawable/route_point_finish.png diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java index 9e2b8612b7..070fbe6de0 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java @@ -1,7 +1,5 @@ package app.organicmaps.widget.menu; -import android.location.Location; -import android.util.Pair; import android.view.View; import android.widget.Button; import android.widget.ImageView; @@ -9,16 +7,12 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.ContextCompat; import com.google.android.material.bottomsheet.BottomSheetBehavior; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingInfo; import app.organicmaps.sound.TtsPlayer; import app.organicmaps.util.Graphics; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.UiUtils; import com.google.android.material.progressindicator.LinearProgressIndicator; @@ -33,14 +27,12 @@ public class NavMenu private final View mHeaderFrame; private final ImageView mTts; - private final View mSpeedViewContainer; - private final TextView mSpeedValue; - private final TextView mSpeedUnits; + private final TextView mEtaValue; + private final TextView mEtaAmPm; private final TextView mTimeHourValue; private final TextView mTimeHourUnits; private final TextView mTimeMinuteValue; private final TextView mTimeMinuteUnits; - private final TextView mTimeEstimate; private final TextView mDistanceValue; private final TextView mDistanceUnits; private final LinearProgressIndicator mRouteProgress; @@ -50,7 +42,6 @@ public class NavMenu private int currentPeekHeight = 0; - public interface OnMenuSizeChangedListener { void OnMenuSizeChange(); @@ -95,14 +86,12 @@ public class NavMenu }); // Bottom frame - mSpeedViewContainer = bottomFrame.findViewById(R.id.speed_view_container); - mSpeedValue = bottomFrame.findViewById(R.id.speed_value); - mSpeedUnits = bottomFrame.findViewById(R.id.speed_dimen); + mEtaValue = bottomFrame.findViewById(R.id.eta_value); + mEtaAmPm = bottomFrame.findViewById(R.id.eta_am_pm); mTimeHourValue = bottomFrame.findViewById(R.id.time_hour_value); mTimeHourUnits = bottomFrame.findViewById(R.id.time_hour_dimen); mTimeMinuteValue = bottomFrame.findViewById(R.id.time_minute_value); mTimeMinuteUnits = bottomFrame.findViewById(R.id.time_minute_dimen); - mTimeEstimate = bottomFrame.findViewById(R.id.time_estimate); mDistanceValue = bottomFrame.findViewById(R.id.distance_value); mDistanceUnits = bottomFrame.findViewById(R.id.distance_dimen); mRouteProgress = bottomFrame.findViewById(R.id.navigation_progress); @@ -174,7 +163,6 @@ public class NavMenu : Graphics.tint(mActivity, R.drawable.ic_voice_off)); } - private void updateTime(int seconds) { updateTimeLeft(seconds); @@ -200,38 +188,37 @@ public class NavMenu private void updateTimeEstimate(int seconds) { + /* final String format = android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext()) ? "HH:mm" : "h:mm a"; final LocalTime localTime = LocalTime.now().plusSeconds(seconds); - mTimeEstimate.setText(localTime.format(DateTimeFormatter.ofPattern(format))); - } + mEtaValue.setText(localTime.format(DateTimeFormatter.ofPattern(format))); + */ - private void updateSpeedView(@NonNull RoutingInfo info) - { - final Location last = LocationHelper.from(mActivity).getSavedLocation(); - if (last == null) - return; + final LocalTime localTime = LocalTime.now().plusSeconds(seconds); - Pair speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed()); - mSpeedValue.setText(speedAndUnits.first); + final String etaValueFormat; + final String etaAmPmText; - if (info.speedLimitMps > 0.0 && last.getSpeed() > info.speedLimitMps) + if (android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext())) { - if (info.isSpeedCamLimitExceeded()) - mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary)); - else - mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red)); + // 24 hours time format. + etaValueFormat = "HH:mm"; + etaAmPmText = ""; } else - mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary)); + { + // AM/PM time format. + etaValueFormat = "h:mm"; + etaAmPmText = localTime.format(DateTimeFormatter.ofPattern("a")); + } - mSpeedUnits.setText(speedAndUnits.second); - mSpeedViewContainer.setActivated(info.isSpeedCamLimitExceeded()); + mEtaValue.setText(localTime.format(DateTimeFormatter.ofPattern(etaValueFormat))); + mEtaAmPm.setText(etaAmPmText); } public void update(@NonNull RoutingInfo info) { - updateSpeedView(info); updateTime(info.totalTimeInSeconds); mDistanceValue.setText(info.distToTarget.mDistanceStr); mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext())); diff --git a/android/app/src/main/res/drawable/route_point_finish.png b/android/app/src/main/res/drawable/route_point_finish.png new file mode 100644 index 0000000000000000000000000000000000000000..46b0adf6d63377546bd13cc01de05f1138373263 GIT binary patch literal 7416 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 - + - + + tools:background="#20FF0000"> - - + + + + + + + + tools:background="#20FF0000"> + + + + + + + tools:text="----"/> + diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml index fbdec2b6fb..d1f374ec7e 100644 --- a/android/app/src/main/res/values-ar/strings.xml +++ b/android/app/src/main/res/values-ar/strings.xml @@ -719,6 +719,7 @@ طريق برسوم مرور طريق غير معبد استخدام عبّارة + جهة الوصول نعم diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml index 6fe6f7d133..0af9367916 100644 --- a/android/app/src/main/res/values-az/strings.xml +++ b/android/app/src/main/res/values-az/strings.xml @@ -706,6 +706,7 @@ Ücrətli yol Asfaltsız yol Bərə keçidi + Hədəf Bəli diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml index b4d0756562..86f2dcbe82 100644 --- a/android/app/src/main/res/values-be/strings.xml +++ b/android/app/src/main/res/values-be/strings.xml @@ -701,6 +701,7 @@ Платная дарога Грунтовая дарога Паромная пераправа + Пункт прызначэння Так diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml index e79a23ab49..c2042dd424 100644 --- a/android/app/src/main/res/values-ca/strings.xml +++ b/android/app/src/main/res/values-ca/strings.xml @@ -709,6 +709,7 @@ Via de peatge Via sense pavimentar Ferris + Destinació Sí diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml index af035e4813..7325a88de4 100644 --- a/android/app/src/main/res/values-cs/strings.xml +++ b/android/app/src/main/res/values-cs/strings.xml @@ -677,6 +677,7 @@ Silnice s mýtným Nezpevněná silnice Přejezd trajektů + Destinace Ano diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml index 6a9fa18bbb..4f785d1a74 100644 --- a/android/app/src/main/res/values-da/strings.xml +++ b/android/app/src/main/res/values-da/strings.xml @@ -667,6 +667,7 @@ Betalingsvej Grusvej Færgeoverfart + Destination Ja diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml index 87b91643e7..29ef4e8ce2 100644 --- a/android/app/src/main/res/values-de/strings.xml +++ b/android/app/src/main/res/values-de/strings.xml @@ -450,7 +450,7 @@ Geschlossen Geschäftszeiten bearbeiten Kein Konto bei OpenStreetMap? - Bei OpenStretMap registrieren + Bei OpenStreetMap registrieren Bei OpenStreetMap anmelden Nicht angemeldet @@ -550,7 +550,7 @@ d Mehr - Fotos, bewertungen, buchung + Fotos, Bewertungen, Buchung Der Empfehlungsbonus, den wir für jede Buchung über diesen Link erhalten, fließt in die Entwicklung von Organic Maps. @@ -706,6 +706,7 @@ Mautstraße Unbefestigte Straße Fährstelle + Ziel Ja diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml index 8ed2a5a3e4..68d427df44 100644 --- a/android/app/src/main/res/values-el/strings.xml +++ b/android/app/src/main/res/values-el/strings.xml @@ -705,6 +705,7 @@ Δρόμος με διόδια Χωματόδρομος Πορθμείο + Προορισμός Ναι diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml index 0309931958..0ac875ab83 100644 --- a/android/app/src/main/res/values-es-rMX/strings.xml +++ b/android/app/src/main/res/values-es-rMX/strings.xml @@ -143,6 +143,7 @@ Carretera de peaje Camino de tierra Cruce de ferri + Objetivo Sí diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml index ebe63946ad..1740ad0121 100644 --- a/android/app/src/main/res/values-es/strings.xml +++ b/android/app/src/main/res/values-es/strings.xml @@ -704,6 +704,7 @@ Carretera con pago de peaje Camino sin pavimento Cruce de ferri + Destino Sí diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml index d79357b16b..c3b3fa5dd7 100644 --- a/android/app/src/main/res/values-et/strings.xml +++ b/android/app/src/main/res/values-et/strings.xml @@ -700,6 +700,7 @@ Tasuline tee Katteta tee Praamiületus + Sihtkoht Jah diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml index cdbb44f293..5a98607c5d 100644 --- a/android/app/src/main/res/values-eu/strings.xml +++ b/android/app/src/main/res/values-eu/strings.xml @@ -704,6 +704,7 @@ Ordainpeko errepidea Asfaltatu gabeko errepidea Ferry zeharkaldia + Helmuga Bai diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml index 4138fa291a..b945ddd753 100644 --- a/android/app/src/main/res/values-fa/strings.xml +++ b/android/app/src/main/res/values-fa/strings.xml @@ -665,6 +665,7 @@ جاده دارای عوارض جاده آسفالت نشده گذرگاه جاده‌ای + مقصد بله diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml index d06fa07e50..487844d9e7 100644 --- a/android/app/src/main/res/values-fi/strings.xml +++ b/android/app/src/main/res/values-fi/strings.xml @@ -705,6 +705,7 @@ Maksullinen tie Päällystämätön tie Lauttaliikenne + Määränpää Kyllä diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index 41907a045e..4d863bd442 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -711,6 +711,7 @@ Route à péage Routes non revêtues Traversées en ferry + Point d\'arrivée Oui diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml index a9b7797a2e..6d482ed9fa 100644 --- a/android/app/src/main/res/values-hu/strings.xml +++ b/android/app/src/main/res/values-hu/strings.xml @@ -682,6 +682,7 @@ Díjköteles utak Burkolatlan utak Kompátkelők + Cél Igen diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml index e1f52fa98e..7269db0a32 100644 --- a/android/app/src/main/res/values-in/strings.xml +++ b/android/app/src/main/res/values-in/strings.xml @@ -671,6 +671,7 @@ Jalan tol Jalan tanah Penyeberangan kapal feri + Tujuan Ya diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml index ee792dec02..d9e701dcbe 100644 --- a/android/app/src/main/res/values-it/strings.xml +++ b/android/app/src/main/res/values-it/strings.xml @@ -693,6 +693,7 @@ Strada a pedaggio Strada non asfaltata Traghetto + Destinazione Sì diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml index 4e06d698b2..544adf3ef4 100644 --- a/android/app/src/main/res/values-iw/strings.xml +++ b/android/app/src/main/res/values-iw/strings.xml @@ -701,6 +701,7 @@ כביש אגרה דרך לא סלולה מעבורת + יעד כן diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml index 59756b2447..69d374455f 100644 --- a/android/app/src/main/res/values-ja/strings.xml +++ b/android/app/src/main/res/values-ja/strings.xml @@ -707,6 +707,7 @@ 有料道路 未舗装道路 フェリー + 目的地 はい diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml index eeb28a7dd6..d8eb3557b9 100644 --- a/android/app/src/main/res/values-ko/strings.xml +++ b/android/app/src/main/res/values-ko/strings.xml @@ -669,6 +669,7 @@ 유료 도로 비포장 도로 여객선 횡단길 + 목적지 네 diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml index 7896ad6417..f13c4cc3d8 100644 --- a/android/app/src/main/res/values-lv/strings.xml +++ b/android/app/src/main/res/values-lv/strings.xml @@ -707,6 +707,7 @@ Maksas ceļš Neasfaltēts ceļš Prāmja pārceltuve + Galamērķis Jā diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml index ddf8d91c24..3a6728f9ae 100644 --- a/android/app/src/main/res/values-mr/strings.xml +++ b/android/app/src/main/res/values-mr/strings.xml @@ -673,6 +673,7 @@ टोल मार्ग कच्चे मार्ग जल मार्ग + इष्टस्थान होय diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml index d6b79258ba..df749cb48c 100644 --- a/android/app/src/main/res/values-nb/strings.xml +++ b/android/app/src/main/res/values-nb/strings.xml @@ -704,6 +704,7 @@ Bompengevei Uasfaltert vei Fergeovergang + Destinasjon Ja diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml index 8f0a3ee819..720dc4510c 100644 --- a/android/app/src/main/res/values-nl/strings.xml +++ b/android/app/src/main/res/values-nl/strings.xml @@ -704,6 +704,7 @@ Tolweg Onverharde weg Veerboot + Bestemming Ja diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml index 20ce08d142..9568f38959 100644 --- a/android/app/src/main/res/values-pl/strings.xml +++ b/android/app/src/main/res/values-pl/strings.xml @@ -710,6 +710,7 @@ Droga płatna Droga gruntowa Przeprawa promowa + Meta Tak diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml index a78cbf99c7..15bc95b539 100644 --- a/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/android/app/src/main/res/values-pt-rBR/strings.xml @@ -640,6 +640,7 @@ Pedágio Pista não pavimentada Balsa + Destino Sim diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml index 3635852394..f650380e3e 100644 --- a/android/app/src/main/res/values-pt/strings.xml +++ b/android/app/src/main/res/values-pt/strings.xml @@ -682,6 +682,7 @@ Estrada com portagem Estrada não pavimentada Ferry + Destino Sim diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml index 56aca32923..137bb3e9c6 100644 --- a/android/app/src/main/res/values-ro/strings.xml +++ b/android/app/src/main/res/values-ro/strings.xml @@ -692,6 +692,7 @@ Drum cu plată Drum neasfaltat Trecere cu bac + Destinație Da diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml index 9c8faddc3b..1b93d8e0c9 100644 --- a/android/app/src/main/res/values-ru/strings.xml +++ b/android/app/src/main/res/values-ru/strings.xml @@ -718,6 +718,7 @@ Платная дорога Грунтовая дорога Паромная переправа + Цель Да diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml index 8dce7f3e43..57a343637a 100644 --- a/android/app/src/main/res/values-sk/strings.xml +++ b/android/app/src/main/res/values-sk/strings.xml @@ -704,6 +704,7 @@ Spoplatnená cesta Nespevnená cesta Prechod trajektom + Cieľ Áno diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml index 31e0ce77dd..c2b7ad4cdc 100644 --- a/android/app/src/main/res/values-sr/strings.xml +++ b/android/app/src/main/res/values-sr/strings.xml @@ -704,6 +704,7 @@ Путеви са путаринама Неасфалтирани путеви Линије трајекта + Одредиште Да diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index eb54f4b989..92b343ea27 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -669,6 +669,7 @@ Betalväg Oasfalterad väg Färjetrafik + Destination Ja diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml index ff629fa042..1480b9124f 100644 --- a/android/app/src/main/res/values-sw/strings.xml +++ b/android/app/src/main/res/values-sw/strings.xml @@ -245,6 +245,7 @@ Barabara ya kulipia Barabara ya vumbi Kivuko cha feri + Mahali Ndio diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml index 7f12700306..a65c43f07f 100644 --- a/android/app/src/main/res/values-th/strings.xml +++ b/android/app/src/main/res/values-th/strings.xml @@ -672,6 +672,7 @@ ถนนแบบเสียค่าผ่านทาง ถนนดิน เรือข้ามฟาก + จุดหมาย ใช่ diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml index 43260fd329..cb284c55c3 100644 --- a/android/app/src/main/res/values-tr/strings.xml +++ b/android/app/src/main/res/values-tr/strings.xml @@ -317,7 +317,7 @@ Kayak.com Otel Bağlantıları - Kayak.com\'da listesi olan oteller için fotoğraflar, yorumlar, rezervasyon bağlantıları görüntülenir. Bu bağlantılar aracılığıyla yapılan her rezervasyon için alınan yönlendirme bonusu Organic Maps\'in geliştirilmesine harcanmaktadır. + Kayak.com\'da mevcut olan oteller için fotoğraf, yorum ve rezervasyon bağlantıları gösterilir. Bu bağlantılar aracılığıyla yapılan rezervasyonlardan kazanılan gelir, Organic Maps\'in geliştirilmesi için kullanılır. Rota üzerindeki tüm haritaları indir @@ -534,7 +534,7 @@ Operatör: %s Uygun bir kategori bulamıyor musunuz? - Organik Haritalar yalnızca basit nokta kategorileri eklemeye izin verir, yani kasaba, yol, göl, bina ana hatları vb. yoktur. Lütfen bu tür kategorileri doğrudan OpenStreetMap.org\'a ekleyin. Adım adım ayrıntılı talimatlar için rehberimize göz atın. + Organic Maps yalnızca basit nokta kategorilerini eklemeye izin verir. Yani kasaba, yol, göl, bina vb. çizgi/alan verisi ekleme desteği yoktur. Lütfen bu tür kategorileri doğrudan OpenStreetMap.org üzerinden ekleyin. Adım adım ayrıntılı yönergeler için rehberimize göz atabilirsiniz. Hiç harita indirmediniz Çevrimdışı olarak adres bulmak ve gezinmek için haritaları indirin. Geçerli konum bilinmiyor. @@ -698,7 +698,7 @@ Asfaltsız yollardan kaçın - Feribot geçişlerinden kaçın + Vapurdan kaçın Otobandan kaçın Rota hesaplanamıyor Maalesef, muhtemelen belirlediğiniz seçeneklerden dolayı bir rota bulamadık. Lütfen seçenekleri değiştirin ve tekrar deneyin @@ -706,7 +706,8 @@ Sürüş seçenekleri etkinleştirildi Paralı yol Asfaltsız yol - Feribot geçişi + Vapur geçişi + Hedef Evet @@ -1616,7 +1617,9 @@ Sigorta Acentesi Avukatlık Bürosu STK Binası - Cep Telefonu Operatörü + GSM Operatörü + Organik + Organik Şehir Başkent Şehir @@ -1637,16 +1640,16 @@ Ada Ada Konut - Semt + Arazi Mahalle Okyanus Bölge Deniz Meydan - Eyalet + İl Eyalet Mahalle - Kasaba + İlçe Köy Enerji Jeneratör diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml index 58e0dda4f2..8e6316d3a8 100644 --- a/android/app/src/main/res/values-uk/strings.xml +++ b/android/app/src/main/res/values-uk/strings.xml @@ -713,6 +713,7 @@ Платна дорога Ґрунтова дорога Поромна переправа + Ціль Так diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml index 116e6c737e..2615c22da9 100644 --- a/android/app/src/main/res/values-vi/strings.xml +++ b/android/app/src/main/res/values-vi/strings.xml @@ -670,6 +670,7 @@ Đường trả phí Đường đất Bến phà + Mục đích Có diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml index bfd9bea845..0caa09caaf 100644 --- a/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/android/app/src/main/res/values-zh-rTW/strings.xml @@ -717,6 +717,7 @@ 收費公路 未鋪面道路 渡輪 + 目的地 是 diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml index 20617ce30c..3581f2b0ef 100644 --- a/android/app/src/main/res/values-zh/strings.xml +++ b/android/app/src/main/res/values-zh/strings.xml @@ -717,6 +717,7 @@ 收费公路 未铺砌道路 轮渡 + 目的地 是 diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index c389d18b5b..e4d7ed1dda 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -737,6 +737,7 @@ Toll road Unpaved road Ferry crossing + Destination Yes diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml index ba8d84baeb..c1415a3a4b 100644 --- a/android/app/src/main/res/values/styles-text.xml +++ b/android/app/src/main/res/values/styles-text.xml @@ -145,6 +145,11 @@ ?android:textColorPrimary + +