pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Remove display of speed in nav panel

Browse source 
Signed-off-by: Gonzalo Pesquero <gpesquero@yahoo.es>
This commit is contained in:
Gonzalo Pesquero 2024-12-26 00:41:59 +01:00
parent 79b4826859
commit 18f7827c83
48 changed files with 143 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
View file

@ -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<String, String> 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()));

BIN
android/app/src/main/res/drawable/route_point_finish.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

69
android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="65sp"
@ -13,9 +14,9 @@
android:layout_height="match_parent"
android:layout_weight="0.5"/>
<!-- Speed -->
<!-- ETA (Estimated Time of Arrival) -->
<LinearLayout
android:id="@+id/speed_view_container"
android:id="@+id/eta_view_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
@ -23,25 +24,57 @@
android:gravity="center"
android:minWidth="@dimen/nav_numbers_side_min_width">
<TextView
android:id="@+id/speed_value"
<!-- ETA value -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
tools:text="999" />
tools:background="#20FF0000">
<!-- Speed -->
<TextView
android:id="@+id/speed_dimen"
<TextView
android:id="@+id/eta_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
tools:text="99:99"/>
<TextView
android:id="@+id/eta_am_pm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.AmPm"
tools:text="AM"/>
</LinearLayout>
<!-- Destination -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
tools:background="#20FF0000"
tools:text="km/h" />
tools:background="#20FF0000">
<ImageView
android:id="@+id/eta_destination_icon"
android:layout_gravity="center"
android:layout_width="@dimen/text_size_nav_menu_dimension"
android:layout_height="@dimen/text_size_nav_menu_dimension"
android:layout_marginEnd="4dp"
app:srcCompat="@drawable/route_point_finish"/>
<TextView
android:id="@+id/eta_destination_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:text="@string/pick_destination"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
tools:background="#20FF0000"/>
</LinearLayout>
</LinearLayout>
<Space
@ -103,14 +136,13 @@
</LinearLayout>
<TextView
android:id="@+id/time_estimate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:lines="1"
android:textAlignment="center"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
tools:text="99:99 AM" />
tools:text="----"/>
</LinearLayout>
<Space
@ -150,4 +182,5 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.5"/>
</LinearLayout>

1
android/app/src/main/res/values-ar/strings.xml
View file

@ -719,6 +719,7 @@
<string name="toll_road">طريق برسوم مرور</string>
<string name="unpaved_road">طريق غير معبد</string>
<string name="ferry_crossing">استخدام عبّارة</string>
<string name="pick_destination">جهة الوصول</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">نعم</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-az/strings.xml
View file

@ -706,6 +706,7 @@
<string name="toll_road">Ücrətli yol</string>
<string name="unpaved_road">Asfaltsız yol</string>
<string name="ferry_crossing">Bərə keçidi</string>
<string name="pick_destination">Hədəf</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Bəli</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-be/strings.xml
View file

@ -701,6 +701,7 @@
<string name="toll_road">Платная дарога</string>
<string name="unpaved_road">Грунтовая дарога</string>
<string name="ferry_crossing">Паромная пераправа</string>
<string name="pick_destination">Пункт прызначэння</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Так</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-ca/strings.xml
View file

@ -709,6 +709,7 @@
<string name="toll_road">Via de peatge</string>
<string name="unpaved_road">Via sense pavimentar</string>
<string name="ferry_crossing">Ferris</string>
<string name="pick_destination">Destinació</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Sí</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-cs/strings.xml
View file

@ -677,6 +677,7 @@
<string name="toll_road">Silnice s mýtným</string>
<string name="unpaved_road">Nezpevněná silnice</string>
<string name="ferry_crossing">Přejezd trajektů</string>
<string name="pick_destination">Destinace</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ano</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-da/strings.xml
View file

@ -667,6 +667,7 @@
<string name="toll_road">Betalingsvej</string>
<string name="unpaved_road">Grusvej</string>
<string name="ferry_crossing">Færgeoverfart</string>
<string name="pick_destination">Destination</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ja</string>
<!-- A generic "No" button in dialogs -->

5
android/app/src/main/res/values-de/strings.xml
View file

@ -450,7 +450,7 @@
<string name="closed">Geschlossen</string>
<string name="edit_opening_hours">Geschäftszeiten bearbeiten</string>
<string name="no_osm_account">Kein Konto bei OpenStreetMap?</string>
<string name="register_at_openstreetmap">Bei OpenStretMap registrieren</string>
<string name="register_at_openstreetmap">Bei OpenStreetMap registrieren</string>
<string name="login">Bei OpenStreetMap anmelden</string>
<!-- Status message indicating that user did not login to OSM profile yet. -->
<string name="not_signed_in">Nicht angemeldet</string>
@ -550,7 +550,7 @@
<string name="day">d</string>
<string name="placepage_more_button">Mehr</string>
<!-- A referral link on the place page for some hotels -->
<string name="more_on_kayak">Fotos, bewertungen, buchung</string>
<string name="more_on_kayak">Fotos, Bewertungen, Buchung</string>
<!-- An explanation dialog shown when clicking on more_on_kayak link. -->
<string name="dialog_kayak_disclaimer">Der Empfehlungsbonus, den wir für jede Buchung über diesen Link erhalten, fließt in die Entwicklung von Organic Maps.</string>
<!-- A confirmation button text in the explanation dialog that opens hotel details page on Kayak website. -->
@ -706,6 +706,7 @@
<string name="toll_road">Mautstraße</string>
<string name="unpaved_road">Unbefestigte Straße</string>
<string name="ferry_crossing">Fährstelle</string>
<string name="pick_destination">Ziel</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ja</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-el/strings.xml
View file

@ -705,6 +705,7 @@
<string name="toll_road">Δρόμος με διόδια</string>
<string name="unpaved_road">Χωματόδρομος</string>
<string name="ferry_crossing">Πορθμείο</string>
<string name="pick_destination">Προορισμός</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ναι</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-es-rMX/strings.xml
View file

@ -143,6 +143,7 @@
<string name="toll_road">Carretera de peaje</string>
<string name="unpaved_road">Camino de tierra</string>
<string name="ferry_crossing">Cruce de ferri</string>
<string name="pick_destination">Objetivo</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Sí</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-es/strings.xml
View file

@ -704,6 +704,7 @@
<string name="toll_road">Carretera con pago de peaje</string>
<string name="unpaved_road">Camino sin pavimento</string>
<string name="ferry_crossing">Cruce de ferri</string>
<string name="pick_destination">Destino</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Sí</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-et/strings.xml
View file

@ -700,6 +700,7 @@
<string name="toll_road">Tasuline tee</string>
<string name="unpaved_road">Katteta tee</string>
<string name="ferry_crossing">Praamiületus</string>
<string name="pick_destination">Sihtkoht</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Jah</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-eu/strings.xml
View file

@ -704,6 +704,7 @@
<string name="toll_road">Ordainpeko errepidea</string>
<string name="unpaved_road">Asfaltatu gabeko errepidea</string>
<string name="ferry_crossing">Ferry zeharkaldia</string>
<string name="pick_destination">Helmuga</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Bai</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-fa/strings.xml
View file

@ -665,6 +665,7 @@
<string name="toll_road">جاده دارای عوارض</string>
<string name="unpaved_road">جاده آسفالت نشده</string>
<string name="ferry_crossing">گذرگاه جاده‌ای</string>
<string name="pick_destination">مقصد</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">بله</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-fi/strings.xml
View file

@ -705,6 +705,7 @@
<string name="toll_road">Maksullinen tie</string>
<string name="unpaved_road">Päällystämätön tie</string>
<string name="ferry_crossing">Lauttaliikenne</string>
<string name="pick_destination">Määränpää</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Kyllä</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-fr/strings.xml
View file

@ -711,6 +711,7 @@
<string name="toll_road">Route à péage</string>
<string name="unpaved_road">Routes non revêtues</string>
<string name="ferry_crossing">Traversées en ferry</string>
<string name="pick_destination">Point d\'arrivée</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Oui</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-hu/strings.xml
View file

@ -682,6 +682,7 @@
<string name="toll_road">Díjköteles utak</string>
<string name="unpaved_road">Burkolatlan utak</string>
<string name="ferry_crossing">Kompátkelők</string>
<string name="pick_destination">Cél</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Igen</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-in/strings.xml
View file

@ -671,6 +671,7 @@
<string name="toll_road">Jalan tol</string>
<string name="unpaved_road">Jalan tanah</string>
<string name="ferry_crossing">Penyeberangan kapal feri</string>
<string name="pick_destination">Tujuan</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ya</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-it/strings.xml
View file

@ -693,6 +693,7 @@
<string name="toll_road">Strada a pedaggio</string>
<string name="unpaved_road">Strada non asfaltata</string>
<string name="ferry_crossing">Traghetto</string>
<string name="pick_destination">Destinazione</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Sì</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-iw/strings.xml
View file

@ -701,6 +701,7 @@
<string name="toll_road">כביש אגרה</string>
<string name="unpaved_road">דרך לא סלולה</string>
<string name="ferry_crossing">מעבורת</string>
<string name="pick_destination">יעד</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">כן</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-ja/strings.xml
View file

@ -707,6 +707,7 @@
<string name="toll_road">有料道路</string>
<string name="unpaved_road">未舗装道路</string>
<string name="ferry_crossing">フェリー</string>
<string name="pick_destination">目的地</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">はい</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-ko/strings.xml
View file

@ -669,6 +669,7 @@
<string name="toll_road">유료 도로</string>
<string name="unpaved_road">비포장 도로</string>
<string name="ferry_crossing">여객선 횡단길</string>
<string name="pick_destination">목적지</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">네</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-lv/strings.xml
View file

@ -707,6 +707,7 @@
<string name="toll_road">Maksas ceļš</string>
<string name="unpaved_road">Neasfaltēts ceļš</string>
<string name="ferry_crossing">Prāmja pārceltuve</string>
<string name="pick_destination">Galamērķis</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Jā</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-mr/strings.xml
View file

@ -673,6 +673,7 @@
<string name="toll_road">टोल मार्ग</string>
<string name="unpaved_road">कच्चे मार्ग</string>
<string name="ferry_crossing">जल मार्ग</string>
<string name="pick_destination">इष्टस्थान</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">होय</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-nb/strings.xml
View file

@ -704,6 +704,7 @@
<string name="toll_road">Bompengevei</string>
<string name="unpaved_road">Uasfaltert vei</string>
<string name="ferry_crossing">Fergeovergang</string>
<string name="pick_destination">Destinasjon</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ja</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-nl/strings.xml
View file

@ -704,6 +704,7 @@
<string name="toll_road">Tolweg</string>
<string name="unpaved_road">Onverharde weg</string>
<string name="ferry_crossing">Veerboot</string>
<string name="pick_destination">Bestemming</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ja</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-pl/strings.xml
View file

@ -710,6 +710,7 @@
<string name="toll_road">Droga płatna</string>
<string name="unpaved_road">Droga gruntowa</string>
<string name="ferry_crossing">Przeprawa promowa</string>
<string name="pick_destination">Meta</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Tak</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-pt-rBR/strings.xml
View file

@ -640,6 +640,7 @@
<string name="toll_road">Pedágio</string>
<string name="unpaved_road">Pista não pavimentada</string>
<string name="ferry_crossing">Balsa</string>
<string name="pick_destination">Destino</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Sim</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-pt/strings.xml
View file

@ -682,6 +682,7 @@
<string name="toll_road">Estrada com portagem</string>
<string name="unpaved_road">Estrada não pavimentada</string>
<string name="ferry_crossing">Ferry</string>
<string name="pick_destination">Destino</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Sim</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-ro/strings.xml
View file

@ -692,6 +692,7 @@
<string name="toll_road">Drum cu plată</string>
<string name="unpaved_road">Drum neasfaltat</string>
<string name="ferry_crossing">Trecere cu bac</string>
<string name="pick_destination">Destinație</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Da</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-ru/strings.xml
View file

@ -718,6 +718,7 @@
<string name="toll_road">Платная дорога</string>
<string name="unpaved_road">Грунтовая дорога</string>
<string name="ferry_crossing">Паромная переправа</string>
<string name="pick_destination">Цель</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Да</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-sk/strings.xml
View file

@ -704,6 +704,7 @@
<string name="toll_road">Spoplatnená cesta</string>
<string name="unpaved_road">Nespevnená cesta</string>
<string name="ferry_crossing">Prechod trajektom</string>
<string name="pick_destination">Cieľ</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Áno</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-sr/strings.xml
View file

@ -704,6 +704,7 @@
<string name="toll_road">Путеви са путаринама</string>
<string name="unpaved_road">Неасфалтирани путеви</string>
<string name="ferry_crossing">Линије трајекта</string>
<string name="pick_destination">Одредиште</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Да</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-sv/strings.xml
View file

@ -669,6 +669,7 @@
<string name="toll_road">Betalväg</string>
<string name="unpaved_road">Oasfalterad väg</string>
<string name="ferry_crossing">Färjetrafik</string>
<string name="pick_destination">Destination</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ja</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-sw/strings.xml
View file

@ -245,6 +245,7 @@
<string name="toll_road">Barabara ya kulipia</string>
<string name="unpaved_road">Barabara ya vumbi</string>
<string name="ferry_crossing">Kivuko cha feri</string>
<string name="pick_destination">Mahali</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Ndio</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-th/strings.xml
View file

@ -672,6 +672,7 @@
<string name="toll_road">ถนนแบบเสียค่าผ่านทาง</string>
<string name="unpaved_road">ถนนดิน</string>
<string name="ferry_crossing">เรือข้ามฟาก</string>
<string name="pick_destination">จุดหมาย</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">ใช่</string>
<!-- A generic "No" button in dialogs -->

19
android/app/src/main/res/values-tr/strings.xml
View file

@ -317,7 +317,7 @@
<!-- Preference title -->
<string name="pref_display_kayak_title">Kayak.com Otel Bağlantıları</string>
<!-- Preference description -->
<string name="pref_display_kayak_text">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.</string>
<string name="pref_display_kayak_text">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.</string>
<!-- Text for routing error dialog -->
<string name="routing_download_maps_along">Rota üzerindeki tüm haritaları indir</string>
<!-- Text for routing error dialog -->
@ -534,7 +534,7 @@
<!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
<string name="operator">Operatör: %s</string>
<string name="editor_category_unsuitable_title">Uygun bir kategori bulamıyor musunuz?</string>
<string name="editor_category_unsuitable_text">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 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>\'a ekleyin. Adım adım ayrıntılı talimatlar için <a href="https://organicmaps.app/faq/editing/advanced-map-editing">rehberimize</a> göz atın.</string>
<string name="editor_category_unsuitable_text">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 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> üzerinden ekleyin. Adım adım ayrıntılı yönergeler için <a href="https://organicmaps.app/faq/editing/advanced-map-editing">rehberimize</a> göz atabilirsiniz.</string>
<string name="downloader_no_downloaded_maps_title">Hiç harita indirmediniz</string>
<string name="downloader_no_downloaded_maps_message">Çevrimdışı olarak adres bulmak ve gezinmek için haritaları indirin.</string>
<string name="current_location_unknown_error_title">Geçerli konum bilinmiyor.</string>
@ -698,7 +698,7 @@
<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
<string name="avoid_unpaved">Asfaltsız yollardan kaçın</string>
<!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
<string name="avoid_ferry">Feribot geçişlerinden kaçın</string>
<string name="avoid_ferry">Vapurdan kaçın</string>
<string name="avoid_motorways">Otobandan kaçın</string>
<string name="unable_to_calc_alert_title">Rota hesaplanamıyor</string>
<string name="unable_to_calc_alert_subtitle">Maalesef, muhtemelen belirlediğiniz seçeneklerden dolayı bir rota bulamadık. Lütfen seçenekleri değiştirin ve tekrar deneyin</string>
@ -706,7 +706,8 @@
<string name="change_driving_options_btn">Sürüş seçenekleri etkinleştirildi</string>
<string name="toll_road">Paralı yol</string>
<string name="unpaved_road">Asfaltsız yol</string>
<string name="ferry_crossing">Feribot geçişi</string>
<string name="ferry_crossing">Vapur geçişi</string>
<string name="pick_destination">Hedef</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Evet</string>
<!-- A generic "No" button in dialogs -->
@ -1616,7 +1617,9 @@
<string name="type.office.insurance">Sigorta Acentesi</string>
<string name="type.office.lawyer">Avukatlık Bürosu</string>
<string name="type.office.ngo">STK Binası</string>
<string name="type.office.telecommunication">Cep Telefonu Operatörü</string>
<string name="type.office.telecommunication">GSM Operatörü</string>
<string name="type.organic.only">Organik</string>
<string name="type.organic.yes">Organik</string>
<string name="type.place.city">Şehir</string>
<string name="type.place.city.capital">Başkent</string>
<string name="type.place.city.capital.10">Şehir</string>
@ -1637,16 +1640,16 @@
<string name="type.place.island">Ada</string>
<string name="type.place.islet">Ada</string>
<string name="type.place.isolated_dwelling">Konut</string>
<string name="type.place.locality">Semt</string>
<string name="type.place.locality">Arazi</string>
<string name="type.place.neighbourhood">Mahalle</string>
<string name="type.place.ocean">Okyanus</string>
<string name="type.place.region">Bölge</string>
<string name="type.place.sea">Deniz</string>
<string name="type.place.square">Meydan</string>
<string name="type.place.state">Eyalet</string>
<string name="type.place.state">İl</string>
<string name="type.place.state.USA">Eyalet</string>
<string name="type.place.suburb">Mahalle</string>
<string name="type.place.town">Kasaba</string>
<string name="type.place.town">İlçe</string>
<string name="type.place.village">Köy</string>
<string name="type.power">Enerji</string>
<string name="type.power.generator">Jeneratör</string>

1
android/app/src/main/res/values-uk/strings.xml
View file

@ -713,6 +713,7 @@
<string name="toll_road">Платна дорога</string>
<string name="unpaved_road">Ґрунтова дорога</string>
<string name="ferry_crossing">Поромна переправа</string>
<string name="pick_destination">Ціль</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Так</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-vi/strings.xml
View file

@ -670,6 +670,7 @@
<string name="toll_road">Đường trả phí</string>
<string name="unpaved_road">Đường đất</string>
<string name="ferry_crossing">Bến phà</string>
<string name="pick_destination">Mục đích</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Có</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-zh-rTW/strings.xml
View file

@ -717,6 +717,7 @@
<string name="toll_road">收費公路</string>
<string name="unpaved_road">未鋪面道路</string>
<string name="ferry_crossing">渡輪</string>
<string name="pick_destination">目的地</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">是</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values-zh/strings.xml
View file

@ -717,6 +717,7 @@
<string name="toll_road">收费公路</string>
<string name="unpaved_road">未铺砌道路</string>
<string name="ferry_crossing">轮渡</string>
<string name="pick_destination">目的地</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">是</string>
<!-- A generic "No" button in dialogs -->

1
android/app/src/main/res/values/strings.xml
View file

@ -737,6 +737,7 @@
<string name="toll_road">Toll road</string>
<string name="unpaved_road">Unpaved road</string>
<string name="ferry_crossing">Ferry crossing</string>
<string name="pick_destination">Destination</string>
<!-- A generic "Yes" button in dialogs -->
<string name="yes">Yes</string>
<!-- A generic "No" button in dialogs -->

5
android/app/src/main/res/values/styles-text.xml
View file

@ -145,6 +145,11 @@
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="MwmTextAppearance.NavMenu.AmPm">
<item name="android:textSize">@dimen/text_size_nav_menu_dimension</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="MwmTextAppearance.NavMenu.Number.Dimension">
<item name="android:textSize">@dimen/text_size_nav_menu_dimension</item>
<item name="android:textColor">?android:textColorSecondary</item>

2
data/strings/strings.txt
View file

@ -26067,7 +26067,7 @@
zh-Hant = 出發
[pick_destination]
tags = ios
tags = android,ios
en = Destination
af = Bestemming
ar = جهة الوصول

4
iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
View file

@ -613,7 +613,7 @@
"no_osm_account" = "Kein Konto bei OpenStreetMap?";
"register_at_openstreetmap" = "Bei OpenStretMap registrieren";
"register_at_openstreetmap" = "Bei OpenStreetMap registrieren";
"password_8_chars_min" = "Passwort (mindestens 8 Zeichen)";
@ -812,7 +812,7 @@
"book_button" = "Buchen";
/* A referral link on the place page for some hotels */
"more_on_kayak" = "Fotos, bewertungen, buchung";
"more_on_kayak" = "Fotos, Bewertungen, Buchung";
/* An explanation dialog shown when clicking on more_on_kayak link. */
"dialog_kayak_disclaimer" = "Der Empfehlungsbonus, den wir für jede Buchung über diesen Link erhalten, fließt in die Entwicklung von Organic Maps.";

20
iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
View file

@ -755,7 +755,7 @@
"editor_category_unsuitable_title" = "Uygun bir kategori bulamıyor musunuz?";
"editor_category_unsuitable_text" = "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 <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a>'a ekleyin. Adım adım ayrıntılı talimatlar için <a href=\"https://organicmaps.app/faq/editing/advanced-map-editing\">rehberimize</a> göz atın.";
"editor_category_unsuitable_text" = "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 <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a> üzerinden ekleyin. Adım adım ayrıntılı yönergeler için <a href=\"https://organicmaps.app/faq/editing/advanced-map-editing\">rehberimize</a> göz atabilirsiniz.";
"downloader_no_downloaded_maps_title" = "Hiç harita indirmediniz";
@ -1061,7 +1061,7 @@
"avoid_unpaved" = "Asfaltsız yollardan kaçın";
/* Recommended length for CarPlay and Android Auto is around 25-27 characters */
"avoid_ferry" = "Feribot geçişlerinden kaçın";
"avoid_ferry" = "Vapurdan kaçın";
"avoid_motorways" = "Otobandan kaçın";
@ -1077,7 +1077,7 @@
"unpaved_road" = "Asfaltsız yol";
"ferry_crossing" = "Feribot geçişi";
"ferry_crossing" = "Vapur geçişi";
"trip_start" = "Hadi gidelim";
@ -1258,7 +1258,7 @@
"placepage_delete_track_button" = "Kaydı Sil";
/* The track deletion confirmaion alert message. */
"placepage_delete_track_confirmation_alert_message" = "Bu parçayı silmek istediğinizden emin misiniz?";
"placepage_delete_track_confirmation_alert_message" = "Bu GPS izi kaydını silmek istediğinizden emin misiniz?";
/* Placeholder for track name input on track edit screen */
"placepage_track_name_hint" = "GPS İzi Kaydı Adı";
@ -2853,11 +2853,11 @@
"type.office.ngo" = "STK Binası";
"type.office.telecommunication" = "Cep Telefonu Operatörü";
"type.office.telecommunication" = "GSM Operatörü";
"type.organic.only" = "Organic";
"type.organic.only" = "Organik";
"type.organic.yes" = "Organic";
"type.organic.yes" = "Organik";
"type.place.city" = "Şehir";
@ -2899,7 +2899,7 @@
"type.place.isolated_dwelling" = "Konut";
"type.place.locality" = "Semt";
"type.place.locality" = "Arazi";
"type.place.neighbourhood" = "Mahalle";
@ -2911,13 +2911,13 @@
"type.place.square" = "Meydan";
"type.place.state" = "Eyalet";
"type.place.state" = "İl";
"type.place.state.USA" = "Eyalet";
"type.place.suburb" = "Mahalle";
"type.place.town" = "Kasaba";
"type.place.town" = "İlçe";
"type.place.village" = "Köy";