Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ios] Basic support for CarPlay/phone mode switch #8130

Merged
merged 2 commits into from
May 16, 2024
Merged

[ios] Basic support for CarPlay/phone mode switch #8130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9a14d6
[ios] CarPlay/phone switch prototype
MontakOleg May 8, 2024
5dd02e5
[strings] Regenerate strings
MontakOleg May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions android/app/src/main/java/app/organicmaps/car/screens/MapPlaceholderScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ public MapPlaceholderScreen(@NonNull CarContext carContext)
@Override
public Template onGetTemplate()
{
final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.aa_used_on_the_phone_screen));
final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.car_used_on_the_phone_screen));

final Header.Builder headerBuilder = new Header.Builder();
headerBuilder.setStartHeaderAction(Action.APP_ICON);
headerBuilder.setTitle(getCarContext().getString(R.string.app_name));
builder.setHeader(headerBuilder.build());

builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone_android)).build());
builder.addAction(new Action.Builder().setTitle(getCarContext().getString(R.string.aa_continue_in_the_car))
builder.addAction(new Action.Builder().setTitle(getCarContext().getString(R.string.car_continue_in_the_car))
.setOnClickListener(() -> DisplayManager.from(getCarContext()).changeDisplay(DisplayType.Car)).build());

return builder.build();
Expand Down
6 changes: 3 additions & 3 deletions android/app/src/main/res/layout/activity_map_placeholder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/aa_used_on_the_car_screen"
android:text="@string/car_used_on_the_car_screen"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
</LinearLayout>
Expand All @@ -47,5 +47,5 @@
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:layout_marginTop="24dp"
android:text="@string/aa_continue_on_the_phone" />
</LinearLayout>
android:text="@string/car_continue_on_the_phone" />
</LinearLayout>
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,16 +794,16 @@
<string name="app_tip_08">يمكنك بسهولة إصلاح وتحسين بيانات الخريطة.</string>
<!-- App tip #09 -->
<string name="app_tip_09">هدفنا الرئيسي هو إنشاء خرائط سريعة وسهلة الاستخدام تركز على الخصوصية والتي ستعجبك.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">أنت الآن تستخدم الخرائط العضوية على شاشة الهاتف</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">أنت الآن تستخدم الخرائط العضوية على شاشة الهاتف</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">أنت الآن تستخدم الخرائط العضوية على شاشة السيارة</string>
<string name="car_used_on_the_car_screen">أنت الآن تستخدم الخرائط العضوية على شاشة السيارة</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">أنت متصل بـ Android Auto</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">تواصل على الهاتف</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">إلى شاشة السيارة</string>
<string name="car_continue_on_the_phone">تواصل على الهاتف</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">إلى شاشة السيارة</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">يتطلب هذا التطبيق الوصول إلى موقعك لأغراض التنقل.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-az/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,16 +765,16 @@
<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Tr:About</string>
<!-- App Tip #00 -->
<string name="app_tip_00">İcma tərəfindən yaradılmış xəritələrimizdən istifadə etdiyiniz üçün təşəkkür edirik!</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">İndi telefon ekranında Organic Maps istifadə edirsiniz</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">İndi telefon ekranında Organic Maps istifadə edirsiniz</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Hazırda avtomobil ekranında Organic Maps istifadə edirsiniz</string>
<string name="car_used_on_the_car_screen">Hazırda avtomobil ekranında Organic Maps istifadə edirsiniz</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Siz Android Auto-a qoşulmusunuz</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Telefonda davam edin</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">Avtomobil ekranına</string>
<string name="car_continue_on_the_phone">Telefonda davam edin</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">Avtomobil ekranına</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Bu proqram naviqasiya məqsədləri üçün məkanınıza giriş tələb edir.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-be/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,16 +776,16 @@
<string name="app_tip_08">Вы можаце лёгка выправіць і палепшыць дадзеныя карты.</string>
<!-- App tip #09 -->
<string name="app_tip_09">Наша галоўная мэта - ствараць хуткія, арыентаваныя на прыватнасць і простыя ў выкарыстанні карты, якія вам спадабаюцца.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">Вы выкарыстоўваеце Organic Maps на экране тэлефона</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">Вы выкарыстоўваеце Organic Maps на экране тэлефона</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Вы выкарыстоўваеце Organic Maps на экране аўтамабіля</string>
<string name="car_used_on_the_car_screen">Вы выкарыстоўваеце Organic Maps на экране аўтамабіля</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Вы падключаны да Android Auto</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Працягнуць на тэлефоне</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">На экран аўто</string>
<string name="car_continue_on_the_phone">Працягнуць на тэлефоне</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">На экран аўто</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Гэтаму прылажэнню патрабуецца доступ да вашага месцазнаходжання для навігацыі.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-bg/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,16 +703,16 @@
<string name="app_tip_08">Можете лесно да коригирате и подобрите картографските данни.</string>
<!-- App tip #09 -->
<string name="app_tip_09">Нашата основна цел е да създаваме бързи, фокусирани върху поверителността, лесни за използване карти, които ще харесате.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">Вече използвате Organic Maps на екрана на телефона</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">Вече използвате Organic Maps на екрана на телефона</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Вече използвате Organic Maps на екрана на автомобила</string>
<string name="car_used_on_the_car_screen">Вече използвате Organic Maps на екрана на автомобила</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Свързани сте с Android Auto</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Продължете в телефона</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">Към екрана на автомобила</string>
<string name="car_continue_on_the_phone">Продължете в телефона</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">Към екрана на автомобила</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Това приложение изисква достъп до местоположението ви за целите на навигацията.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-ca/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,16 +780,16 @@
<string name="app_tip_08">Podeu corregir i millorar fàcilment les dades del mapa.</string>
<!-- App tip #09 -->
<string name="app_tip_09">El nostre objectiu principal és crear mapes ràpids, centrats en la privadesa i fàcils d\'utilitzar que us encantaran.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">Ara esteu utilitzant els Organic Maps a la pantalla del telèfon</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">Ara esteu utilitzant els Organic Maps a la pantalla del telèfon</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Ara esteu utilitzant els Organic Maps a la pantalla del cotxe</string>
<string name="car_used_on_the_car_screen">Ara esteu utilitzant els Organic Maps a la pantalla del cotxe</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Us heu connectat a Android Auto</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Continueu al telèfon</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">A la pantalla del cotxe</string>
<string name="car_continue_on_the_phone">Continueu al telèfon</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">A la pantalla del cotxe</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Aquesta aplicació requereix accés a la vostra ubicació per a la navegació.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,16 +747,16 @@
<string name="app_tip_08">Mapová data můžete snadno opravit a vylepšit.</string>
<!-- App tip #09 -->
<string name="app_tip_09">Naším hlavním cílem je vytvářet rychlé, na soukromí zaměřené a snadno použitelné mapy, které si zamilujete.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">Na obrazovce telefonu nyní používáte aplikaci Organic Maps</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">Na obrazovce telefonu nyní používáte aplikaci Organic Maps</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Na obrazovce auta nyní používáte aplikaci Organic Maps</string>
<string name="car_used_on_the_car_screen">Na obrazovce auta nyní používáte aplikaci Organic Maps</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Jste připojeni ke službě Android Auto</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Pokračujte v telefonu</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">Na obrazovku auta</string>
<string name="car_continue_on_the_phone">Pokračujte v telefonu</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">Na obrazovku auta</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Tato aplikace vyžaduje přístup k vaší poloze pro účely navigace.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,16 +737,16 @@
<string name="app_tip_08">Du kan nemt rette og forbedre kortdataene.</string>
<!-- App tip #09 -->
<string name="app_tip_09">Vores hovedmål er at bygge hurtige, privatlivsfokuserede, brugervenlige kort, som du vil elske.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">Du bruger nu Organic Maps på telefonens skærm.</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">Du bruger nu Organic Maps på telefonens skærm.</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Du bruger nu Organic Maps på bilens skærm.</string>
<string name="car_used_on_the_car_screen">Du bruger nu Organic Maps på bilens skærm.</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Du er forbundet til Android Auto</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Fortsæt i telefonen</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">Til bilens skærm</string>
<string name="car_continue_on_the_phone">Fortsæt i telefonen</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">Til bilens skærm</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Denne applikation kræver adgang til din placering til navigationsformål.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,16 +783,16 @@
<string name="app_tip_08">Sie können die Kartendaten einfach korrigieren und verbessern.</string>
<!-- App tip #09 -->
<string name="app_tip_09">Unser Hauptziel ist es, schnelle, datenschutzorientierte und benutzerfreundliche Karten zu erstellen, die Sie lieben werden.</string>
<!-- Text on the Android Auto placeholder screen that maps are displayed on the phone screen -->
<string name="aa_used_on_the_phone_screen">Du verwendest jetzt Organic Maps auf dem Telefondisplay</string>
<!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
<string name="car_used_on_the_phone_screen">Du verwendest jetzt Organic Maps auf dem Telefondisplay</string>
<!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
<string name="aa_used_on_the_car_screen">Du verwendest jetzt Organic Maps auf dem Bildschirm des Autos</string>
<string name="car_used_on_the_car_screen">Du verwendest jetzt Organic Maps auf dem Bildschirm des Autos</string>
<!-- Displayed on the phone screen. Android Auto connected -->
<string name="aa_connected_title">Du bist mit Android Auto verbunden</string>
<!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
<string name="aa_continue_on_the_phone">Weiter am Telefon</string>
<!-- Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="aa_continue_in_the_car">Zum Autobildschirm</string>
<string name="car_continue_on_the_phone">Weiter am Telefon</string>
<!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
<string name="car_continue_in_the_car">Zum Autobildschirm</string>
<!-- Ask user to grant location permissions -->
<string name="aa_location_permissions_request">Diese Anwendung benötigt für die Navigation Zugriff auf deinen Standort.</string>
<!-- Displayed on the Android Auto screen. Grant Permissions button. Must be no more than 18 symbols! -->
Expand Down
Loading