Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2018-01-10 11:27:47 +01:00
commit 20a241cb22
35 changed files with 303 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/res/layout/bottom_sheet_dialog.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/touch_outside"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<FrameLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"/>
</android.support.design.widget.CoordinatorLayout>

1
OsmAnd/res/layout/menu_obj_selection_fragment.xml
View file

@ -26,6 +26,7 @@
android:dividerHeight="0dp"/>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider"/>

10
OsmAnd/res/values-ar/strings.xml
View file

@ -2856,11 +2856,11 @@
<string name="context_menu_read_full_article">إقرأ المقال كاملا</string>
<string name="context_menu_read_article">قراءة المقال</string>
<string name="context_menu_points_of_group">كافة نقاط المجموعة</string>
<string name="opened_from">مفتوح مِن</string>
<string name="opened_till">مفتوح إلى غاية</string>
<string name="will_be_closed_at">يغلق أبوابه على</string>
<string name="will_be_opened_at">سيفتح الأبواب على</string>
<string name="will_be_opened_on">يفتح أبوابه أيام</string>
<string name="open_from">مفتوح مِن</string>
<string name="open_till">مفتوح إلى غاية</string>
<string name="will_close_at">يغلق أبوابه على</string>
<string name="will_open_at">سيفتح الأبواب على</string>
<string name="will_open_on">يفتح أبوابه أيام</string>
<string name="additional_actions">إجراءات إضافية</string>
<string name="shared_string_actions">الإجراءات</string>
<string name="shared_string_marker">العلامة</string>

4
OsmAnd/res/values-b+hsb/strings.xml
View file

@ -1343,8 +1343,8 @@
<string name="context_menu_read_full_article">Cyły zapisk čitać</string>
<string name="context_menu_read_article">Zapisk čitać</string>
<string name="context_menu_points_of_group">Wšě dypki tuteje skupiny</string>
<string name="opened_from">Wočinjene wot</string>
<string name="opened_till">Wočinjene hač do</string>
<string name="open_from">Wočinjene wot</string>
<string name="open_till">Wočinjene hač do</string>
<string name="additional_actions">Přidatne akcije</string>
<string name="av_locations_selected_desc">GPX-dataja z koordinatami a datami wubranych noticow.</string>
<string name="av_locations_all_desc">GPX-dataja z koordinatami a datami wšěch noticow.</string>

10
OsmAnd/res/values-b+kab/strings.xml
View file

@ -667,11 +667,11 @@
<string name="context_menu_read_full_article">Γer amagrad akk</string>
<string name="context_menu_read_article">Γer amagrad</string>
<string name="context_menu_points_of_group">Akk tinqiḍin n ugraw</string>
<string name="opened_from">Yeldi si</string>
<string name="opened_till">Yeldi si</string>
<string name="will_be_closed_at">Ad imdel γef</string>
<string name="will_be_opened_at">Ad yeldi γef</string>
<string name="will_be_opened_on">Ad yeldi ass</string>
<string name="open_from">Yeldi si</string>
<string name="open_till">Yeldi si</string>
<string name="will_close_at">Ad imdel γef</string>
<string name="will_open_at">Ad yeldi γef</string>
<string name="will_open_on">Ad yeldi ass</string>
<string name="additional_actions">Tiggawin nniḍen</string>
<string name="av_locations_selected_desc">Afaylu GPX igebren adig akked isefka n tezmilin ittwafernen.</string>
<string name="av_locations_all_desc">Afaylu igebren adig akked tizmilin.</string>

10
OsmAnd/res/values-ca/strings.xml
View file

@ -2752,11 +2752,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Llegiu l\'article complet</string>
<string name="context_menu_read_article">Llegiu l\'article</string>
<string name="context_menu_points_of_group">Tots els punts del grup</string>
<string name="opened_from">Obert des de</string>
<string name="opened_till">Obert fins a</string>
<string name="will_be_closed_at">Es tancarà a</string>
<string name="will_be_opened_at">S\'obrirà a</string>
<string name="will_be_opened_on">S\'obrirà el</string>
<string name="open_from">Obert des de</string>
<string name="open_till">Obert fins a</string>
<string name="will_close_at">Es tancarà a</string>
<string name="will_open_at">S\'obrirà a</string>
<string name="will_open_on">S\'obrirà el</string>
<string name="additional_actions">Accions addicionals</string>
<string name="av_locations_selected_desc">Arxiu GPX amb coordenades i dades de les notes seleccionades.</string>
<string name="av_locations_all_desc">Fitxer GPX amb coordenades i dades de totes les notes.</string>

10
OsmAnd/res/values-da/strings.xml
View file

@ -3006,11 +3006,11 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Læs hele artiklen</string>
<string name="context_menu_read_article">Læs artikel</string>
<string name="context_menu_points_of_group">Alle punkter i gruppen</string>
<string name="opened_from">Åben fra</string>
<string name="opened_till">Åben til</string>
<string name="will_be_closed_at">Vil være lukket på</string>
<string name="will_be_opened_at">Vil blive åbnet på</string>
<string name="will_be_opened_on">Der åbnes på</string>
<string name="open_from">Åben fra</string>
<string name="open_till">Åben til</string>
<string name="will_close_at">Vil være lukket på</string>
<string name="will_open_at">Vil blive åbnet på</string>
<string name="will_open_on">Der åbnes på</string>
<string name="additional_actions">Yderligere handlinger</string>
<string name="shared_string_actions">Handlinger</string>
<string name="shared_string_marker">Markør</string>

10
OsmAnd/res/values-de/strings.xml
View file

@ -2938,11 +2938,11 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Ganzen Artikel lesen</string>
<string name="context_menu_read_article">Artikel lesen</string>
<string name="context_menu_points_of_group">Alle Punkte der Gruppe</string>
<string name="opened_from">Geöffnet ab</string>
<string name="opened_till">Geöffnet bis</string>
<string name="will_be_closed_at">Schließt um</string>
<string name="will_be_opened_at">Öffnet um</string>
<string name="will_be_opened_on">Öffnet am</string>
<string name="open_from">Geöffnet ab</string>
<string name="open_till">Geöffnet bis</string>
<string name="will_close_at">Schließt um</string>
<string name="will_open_at">Öffnet um</string>
<string name="will_open_on">Öffnet am</string>
<string name="additional_actions">Zusätzliche Aktionen</string>
<string name="parked_at">geparkt um</string>
<string name="pick_up_till">Abholung bis</string>

10
OsmAnd/res/values-eo/strings.xml
View file

@ -2913,11 +2913,11 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="context_menu_read_full_article">Legi tutan artikolon</string>
<string name="context_menu_read_article">Legi artikolon</string>
<string name="context_menu_points_of_group">Ĉiuj punktoj de la grupo</string>
<string name="opened_from">Malfermita de</string>
<string name="opened_till">Malfermita ĝis</string>
<string name="will_be_closed_at">Estos fermita je</string>
<string name="will_be_opened_at">Estos malfermita je</string>
<string name="will_be_opened_on">Estos malfermita je</string>
<string name="open_from">Malfermita de</string>
<string name="open_till">Malfermita ĝis</string>
<string name="will_close_at">Estos fermita je</string>
<string name="will_open_at">Estos malfermita je</string>
<string name="will_open_on">Estos malfermita je</string>
<string name="additional_actions">Pliaj agoj</string>
<string name="av_locations_selected_desc">GPX-dosiero enhavanta koordinatojn kaj datumojn de elektitaj notoj.</string>
<string name="av_locations_all_desc">GPX-dosiero kun koordinatoj kaj datumoj de ĉiuj notoj.</string>

10
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2879,11 +2879,11 @@ Proporciona un código completo</string>
<string name="context_menu_read_full_article">Leer artículo completo</string>
<string name="context_menu_read_article">Leer artículo</string>
<string name="context_menu_points_of_group">Todos los puntos del grupo</string>
<string name="opened_from">Abierto desde las</string>
<string name="opened_till">Abierto hasta las</string>
<string name="will_be_closed_at">Cerrará a las</string>
<string name="will_be_opened_at">Abrirá a las</string>
<string name="will_be_opened_on">Abrirá sobre las</string>
<string name="open_from">Abierto desde las</string>
<string name="open_till">Abierto hasta las</string>
<string name="will_close_at">Cerrará a las</string>
<string name="will_open_at">Abrirá a las</string>
<string name="will_open_on">Abrirá sobre las</string>
<string name="additional_actions">Acciones adicionales</string>
<string name="shared_string_actions">Acciones</string>
<string name="shared_string_marker">Marcador</string>

10
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -2888,11 +2888,11 @@ Proporciona un código completo</string>
<string name="context_menu_read_full_article">Leer artículo completo</string>
<string name="context_menu_read_article">Leer artículo</string>
<string name="context_menu_points_of_group">Todos los puntos del grupo</string>
<string name="opened_from">Abierto desde las</string>
<string name="opened_till">Abierto hasta las</string>
<string name="will_be_closed_at">Cerrará a las</string>
<string name="will_be_opened_at">Abrirá a las</string>
<string name="will_be_opened_on">Abrirá sobre las</string>
<string name="open_from">Abierto desde las</string>
<string name="open_till">Abierto hasta las</string>
<string name="will_close_at">Cerrará a las</string>
<string name="will_open_at">Abrirá a las</string>
<string name="will_open_on">Abrirá sobre las</string>
<string name="additional_actions">Acciones adicionales</string>
<string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas elegidas.</string>
<string name="av_locations_all_desc">Archivo GPX con coordenadas y datos de todas las notas.</string>

10
OsmAnd/res/values-es/strings.xml
View file

@ -2812,11 +2812,11 @@ Por favor proporciona un código completo</string>
<string name="context_menu_read_full_article">Leer el artículo completo</string>
<string name="context_menu_read_article">Leer artículo</string>
<string name="context_menu_points_of_group">Todos los puntos del grupo</string>
<string name="opened_from">Abierto desde las</string>
<string name="opened_till">Abierto hasta las</string>
<string name="will_be_closed_at">Cerrará a las</string>
<string name="will_be_opened_at">Abrirá a las</string>
<string name="will_be_opened_on">Abrirá sobre las</string>
<string name="open_from">Abierto desde las</string>
<string name="open_till">Abierto hasta las</string>
<string name="will_close_at">Cerrará a las</string>
<string name="will_open_at">Abrirá a las</string>
<string name="will_open_on">Abrirá sobre las</string>
<string name="additional_actions">Acciones adicionales</string>
<string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas seleccionadas.</string>
<string name="av_locations_all_desc">Archivo GPX con las coordenadas y los datos de todas las notas.</string>

10
OsmAnd/res/values-eu/strings.xml
View file

@ -2815,10 +2815,10 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Irakurri artikulu osoa</string>
<string name="context_menu_read_article">Irakurri artikulua</string>
<string name="context_menu_points_of_group">Taldeko puntu guztiak</string>
<string name="opened_from">Irekitze-ordua</string>
<string name="opened_till">Ixte ordua</string>
<string name="will_be_closed_at">Ixte-ordua</string>
<string name="will_be_opened_at">Irekitze-ordua</string>
<string name="will_be_opened_on">Irekitze-ordua</string>
<string name="open_from">Irekitze-ordua</string>
<string name="open_till">Ixte ordua</string>
<string name="will_close_at">Ixte-ordua</string>
<string name="will_open_at">Irekitze-ordua</string>
<string name="will_open_on">Irekitze-ordua</string>
<string name="additional_actions">Ekintza gehigarriak</string>
</resources>

10
OsmAnd/res/values-fa/strings.xml
View file

@ -2993,11 +2993,11 @@
<string name="context_menu_read_full_article">مقالهٔ کامل را بخوانید</string>
<string name="context_menu_read_article">خواندن مقاله</string>
<string name="context_menu_points_of_group">همهٔ نقاط این گروه</string>
<string name="opened_from">ساعت بازشدن</string>
<string name="opened_till">ساعت کاری تا</string>
<string name="will_be_closed_at">ساعت تعطیل‌کردن</string>
<string name="will_be_opened_at">ساعت بازکردن</string>
<string name="will_be_opened_on">روز بازکردن</string>
<string name="open_from">ساعت بازشدن</string>
<string name="open_till">ساعت کاری تا</string>
<string name="will_close_at">ساعت تعطیل‌کردن</string>
<string name="will_open_at">ساعت بازکردن</string>
<string name="will_open_on">روز بازکردن</string>
<string name="additional_actions">عملیات بیشتر</string>
<string name="av_locations_selected_desc">فایل GPX با مختصات و داده‌های یادداشت‌هایی که انتخاب شده است.</string>
<string name="av_locations_all_desc">فایل GPX با مختصات و داده‌های یادداشت‌هایی که انتخاب شده است.</string>

10
OsmAnd/res/values-fr/strings.xml
View file

@ -3055,11 +3055,11 @@ représentant la zone : %1$s x %2$s</string>
<string name="context_menu_read_full_article">Lire l\'article complet</string>
<string name="context_menu_read_article">Lire l\'article</string>
<string name="context_menu_points_of_group">Tous les points du groupe</string>
<string name="opened_from">Ouvert depuis</string>
<string name="opened_till">Ouvert depuis</string>
<string name="will_be_closed_at">Fermera à</string>
<string name="will_be_opened_at">Ouvrira à</string>
<string name="will_be_opened_on">Sera ouvert le</string>
<string name="open_from">Ouvert de</string>
<string name="open_till">Ouvert jusqu\'à</string>
<string name="will_close_at">Fermera à</string>
<string name="will_open_at">Ouvrira à</string>
<string name="will_open_on">Sera ouvert le</string>
<string name="additional_actions">Actions supplémentaires</string>
<string name="shared_string_actions">Actions</string>
<string name="shared_string_marker">Marque</string>

10
OsmAnd/res/values-he/strings.xml
View file

@ -2509,11 +2509,11 @@
<string name="context_menu_read_full_article">קריאת הכתבה המלאה</string>
<string name="context_menu_read_article">קריאת הכתבה</string>
<string name="context_menu_points_of_group">כל הנקודות בקבוצה</string>
<string name="opened_from">פתיחה בשעה</string>
<string name="opened_till">סגירה בשעה</string>
<string name="will_be_closed_at">סגירה בשעה</string>
<string name="will_be_opened_at">פתיחה בשעה</string>
<string name="will_be_opened_on">פתיחה ביום</string>
<string name="open_from">פתיחה בשעה</string>
<string name="open_till">סגירה בשעה</string>
<string name="will_close_at">סגירה בשעה</string>
<string name="will_open_at">פתיחה בשעה</string>
<string name="will_open_on">פתיחה ביום</string>
<string name="additional_actions">פעולות נוספות</string>
<string name="av_locations_selected_desc">קובץ GPX עם נקודות ציון ונתונים על ההערות הנבחרות.</string>
<string name="av_locations_all_desc">קובץ GPX עם נקודות ציון ונתונים על כל ההערות.</string>

10
OsmAnd/res/values-hu/strings.xml
View file

@ -2962,11 +2962,11 @@ Kérlek adj meg egy teljes kódot</string>
<string name="context_menu_read_full_article">Olvasd el a tejes cikket</string>
<string name="context_menu_read_article">Cikk elolvasása</string>
<string name="context_menu_points_of_group">A csoport összes pontja</string>
<string name="opened_from">Nyitott ekkor:</string>
<string name="opened_till">Nyitva eddig:</string>
<string name="will_be_closed_at">Ekkor fog bezárni:</string>
<string name="will_be_opened_at">Ekkor fog kinyitni:</string>
<string name="will_be_opened_on">Ekkor fog kinyitni:</string>
<string name="open_from">Nyitott ekkor:</string>
<string name="open_till">Nyitva eddig:</string>
<string name="will_close_at">Ekkor fog bezárni:</string>
<string name="will_open_at">Ekkor fog kinyitni:</string>
<string name="will_open_on">Ekkor fog kinyitni:</string>
<string name="additional_actions">További műveletek</string>
<string name="av_locations_selected_desc">"GPX fájl a kiválasztott pont koordinátáival és adataival."</string>
<string name="av_locations_all_desc">"GPX fájl az összes jegyzet koordinátáival és adataival."</string>

10
OsmAnd/res/values-hy/strings.xml
View file

@ -2640,11 +2640,11 @@
<string name="context_menu_read_full_article">Կարդալ ամբողջ հոդվածը</string>
<string name="context_menu_read_article">Կարդալ հոդվածը</string>
<string name="context_menu_points_of_group">Խմբի բոլոր կետերը</string>
<string name="opened_from">Բացվում է</string>
<string name="opened_till">Բաց Է մինև</string>
<string name="will_be_closed_at">Կփակվի</string>
<string name="will_be_opened_at">Կբացվի</string>
<string name="will_be_opened_on">Բացվելու է</string>
<string name="open_from">Բացվում է</string>
<string name="open_till">Բաց Է մինև</string>
<string name="will_close_at">Կփակվի</string>
<string name="will_open_at">Կբացվի</string>
<string name="will_open_on">Բացվելու է</string>
<string name="additional_actions">Լրացուցիչ գործողություններ</string>
<string name="av_locations_selected_desc">GPX ֆայլը կոորդինատներով և ընտրված գրառումների տվյալներով:</string>
<string name="av_locations_all_desc">GPX ֆայլը կոորդինատներով և բոլոր նշումների տվյալները։</string>

10
OsmAnd/res/values-it/strings.xml
View file

@ -3018,11 +3018,11 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Leggi l\'articolo completo</string>
<string name="context_menu_read_article">Leggi l\'articolo</string>
<string name="context_menu_points_of_group">Tutti i punti del gruppo</string>
<string name="opened_from">Aperto da</string>
<string name="opened_till">Aperto sino</string>
<string name="will_be_closed_at">Chiuderà alle</string>
<string name="will_be_opened_at">Aprirà alle</string>
<string name="will_be_opened_on">Sarà aperto in</string>
<string name="open_from">Aperto da</string>
<string name="open_till">Aperto sino</string>
<string name="will_close_at">Chiuderà alle</string>
<string name="will_open_at">Aprirà alle</string>
<string name="will_open_on">Sarà aperto in</string>
<string name="additional_actions">Altre azioni</string>
<string name="av_locations_selected_desc">File GPX con le coordinate e i dati delle note selezionate</string>
<string name="av_locations_all_desc">File GPX con le coordinate e i dati di tutte le note.</string>

10
OsmAnd/res/values-pl/strings.xml
View file

@ -2935,8 +2935,11 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="shared_string_added">Dodane</string>
<string name="empty_state_osm_edits">Tworzenie lub modyfikowanie obiektów OSM</string>
<string name="rename_marker">Zmień nazwę znacznika</string>
<string name="opened_from">Otwarte od</string>
<string name="opened_till">Otwarte do</string>
<string name="open_from">Otwarte od</string>
<string name="open_till">Otwarte do</string>
<string name="will_close_at">Zostanie zamknięty o</string>
<string name="will_open_at">Zostanie otwarty o</string>
<string name="will_open_on">Zostanie otwarty w</string>
<string name="additional_actions">Dodatkowe czynności</string>
<string name="release_3_0">• Wykrywanie znaków stop uwzględnia teraz kierunek jazdy,
\n
@ -2950,9 +2953,6 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="marker_activated">Uaktywniono znacznik %s.</string>
<string name="by_date">Według daty</string>
<string name="by_type">Według rodzaju</string>
<string name="will_be_closed_at">Zostanie zamknięte o</string>
<string name="will_be_opened_at">Zostanie otwarte o</string>
<string name="will_be_opened_on">Zostanie otwarte w</string>
<string name="parked_at">zaparkowano o</string>
<string name="without_time_limit">Bez ograniczenia czasu</string>
<string name="context_menu_points_of_group">Wszystkie punkty w grupie</string>

10
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -2508,11 +2508,11 @@ Pôr do Sol: %2$s</string>
<string name="context_menu_read_full_article">Leia o artigo completo</string>
<string name="context_menu_read_article">Leia o artigo</string>
<string name="context_menu_points_of_group">Todos os pontos do grupo</string>
<string name="opened_from">Aberto a partir de</string>
<string name="opened_till">Aberto até</string>
<string name="will_be_closed_at">Fechará às</string>
<string name="will_be_opened_at">Abrirá às</string>
<string name="will_be_opened_on">Ficará aberto aos/às</string>
<string name="open_from">Aberto a partir de</string>
<string name="open_till">Aberto até</string>
<string name="will_close_at">Fechará às</string>
<string name="will_open_at">Abrirá às</string>
<string name="will_open_on">Ficará aberto aos/às</string>
<string name="additional_actions">Ações adicionais</string>
<string name="av_locations_selected_desc">Arquivo GPX com coordenadas e dados das notas selecionadas.</string>
<string name="shared_string_actions">Ações</string>

10
OsmAnd/res/values-ru/strings.xml
View file

@ -2799,11 +2799,11 @@
<string name="context_menu_read_full_article">Читать статью целиком</string>
<string name="context_menu_read_article">Читать статью</string>
<string name="context_menu_points_of_group">Все точки группы</string>
<string name="opened_from">Открыто с</string>
<string name="opened_till">Открыто до</string>
<string name="will_be_closed_at">Закроется в</string>
<string name="will_be_opened_at">Откроется в</string>
<string name="will_be_opened_on">Откроется</string>
<string name="open_from">Открыто с</string>
<string name="open_till">Открыто до</string>
<string name="will_close_at">Закроется в</string>
<string name="will_open_at">Откроется в</string>
<string name="will_open_on">Откроется</string>
<string name="additional_actions">Дополнительные действия</string>
<string name="shared_string_actions">Действия</string>
<string name="shared_string_marker">Маркер</string>

10
OsmAnd/res/values-sc/strings.xml
View file

@ -2899,11 +2899,11 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="context_menu_read_full_article">Leghe s\'artìculu intreu</string>
<string name="context_menu_read_article">Leghe s\'artìculu</string>
<string name="context_menu_points_of_group">Totu sos puntos de su grupu</string>
<string name="opened_from">Abertu dae sas</string>
<string name="opened_till">Abertu finas a sas</string>
<string name="will_be_closed_at">At a serrare a sas</string>
<string name="will_be_opened_at">At a abèrrere a sas</string>
<string name="will_be_opened_on">At a èssere abertu</string>
<string name="open_from">Abertu dae sas</string>
<string name="open_till">Abertu finas a sas</string>
<string name="will_close_at">At a serrare a sas</string>
<string name="will_open_at">At a abèrrere a sas</string>
<string name="will_open_on">At a èssere abertu</string>
<string name="additional_actions">Atziones additzionales</string>
<string name="av_locations_selected_desc">Documentu GPX cun coordinatas e datos de sas notas ichertadas.</string>
<string name="av_locations_all_desc">Documentu GPX cun coordinatas e datos de totu sas notas.</string>

10
OsmAnd/res/values-sk/strings.xml
View file

@ -2996,11 +2996,11 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Prečítať celý článok</string>
<string name="context_menu_read_article">Prečítať článok</string>
<string name="context_menu_points_of_group">Všetky body skupiny</string>
<string name="opened_from">Otvorené od</string>
<string name="opened_till">Otvorené do</string>
<string name="will_be_closed_at">Bude zatvorené o</string>
<string name="will_be_opened_at">Bude otvorené o</string>
<string name="will_be_opened_on">Bude otvorené v</string>
<string name="open_from">Otvorené od</string>
<string name="open_till">Otvorené do</string>
<string name="will_close_at">Bude zatvorené o</string>
<string name="will_open_at">Bude otvorené o</string>
<string name="will_open_on">Bude otvorené v</string>
<string name="additional_actions">Ďalšie akcie</string>
<string name="av_locations_selected_desc">Súbor GPX so súradnicami a údajmi vybraných poznámok.</string>
<string name="av_locations_all_desc">Súbor GPX so súradnicami a údajmi všetkých poznámok.</string>

10
OsmAnd/res/values-sl/strings.xml
View file

@ -2984,11 +2984,11 @@ Koda predstavlja območje: %1$s x %2$s</string>
<string name="context_menu_read_full_article">Preberi celotno objavo</string>
<string name="context_menu_read_article">Preberi objavo</string>
<string name="context_menu_points_of_group">Vse točke skupine</string>
<string name="opened_from">Odprto od</string>
<string name="opened_till">Odprto do</string>
<string name="will_be_closed_at">Zapre se ob</string>
<string name="will_be_opened_at">Odpre se ob</string>
<string name="will_be_opened_on">Odprto bo na</string>
<string name="open_from">Odprto od</string>
<string name="open_till">Odprto do</string>
<string name="will_close_at">Zapre se ob</string>
<string name="will_open_at">Odpre se ob</string>
<string name="will_open_on">Odprto bo na</string>
<string name="additional_actions">Dodatna dejanja</string>
<string name="av_locations_selected_desc">Datoteka GPX s koordinatami in podatki izbranih sporočil.</string>
<string name="av_locations_all_desc">Datoteka GPX s koordinatami in podatki vseh sporočil.</string>

10
OsmAnd/res/values-sr/strings.xml
View file

@ -1503,11 +1503,11 @@
<string name="context_menu_read_full_article">Читати цео чланак</string>
<string name="context_menu_read_article">Читати чланак</string>
<string name="context_menu_points_of_group">Све тачке групе</string>
<string name="opened_from">Отворено од</string>
<string name="opened_till">Отворено до</string>
<string name="will_be_closed_at">Биће затворено у</string>
<string name="will_be_opened_at">Биће отворено у</string>
<string name="will_be_opened_on">Биће отворено у</string>
<string name="open_from">Отворено од</string>
<string name="open_till">Отворено до</string>
<string name="will_close_at">Биће затворено у</string>
<string name="will_open_at">Биће отворено у</string>
<string name="will_open_on">Биће отворено у</string>
<string name="additional_actions">Додатне радње</string>
<string name="av_locations_selected_desc">Датотека ГПИкс-а са координатама и подацима изабране белешке.</string>
<string name="av_locations_all_desc">Датотека ГПИкс-а са координатама и подацима свих бележака.</string>

10
OsmAnd/res/values-uk/strings.xml
View file

@ -3144,11 +3144,11 @@
<string name="context_menu_read_full_article">Читайте повну статтю</string>
<string name="context_menu_read_article">Читати статтю</string>
<string name="context_menu_points_of_group">Всі пункти групи</string>
<string name="opened_from">Відкрито з</string>
<string name="opened_till">Відкрито до</string>
<string name="will_be_closed_at">Буде закрито в</string>
<string name="will_be_opened_at">Буде відкрито в</string>
<string name="will_be_opened_on">Буде відкрито</string>
<string name="open_from">Відкрито з</string>
<string name="open_till">Відкрито до</string>
<string name="will_close_at">Буде закрито в</string>
<string name="will_open_at">Буде відкрито в</string>
<string name="will_open_on">Буде відкрито</string>
<string name="additional_actions">Додаткові дії</string>
<string name="av_locations_selected_desc">Файл GPX з координатами та даними вибраних нотаток.</string>
<string name="av_locations_all_desc">Файл GPX з координатами та даними всіх нотаток.</string>

10
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2986,13 +2986,13 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
<string name="context_menu_read_full_article">閱讀全文</string>
<string name="context_menu_read_article">閱讀文章</string>
<string name="context_menu_points_of_group">群組的全部標點</string>
<string name="opened_from">已開啟自</string>
<string name="opened_till">已開啟直到</string>
<string name="will_be_closed_at">將關閉于</string>
<string name="will_be_opened_at">將開啟于</string>
<string name="open_from">已開啟自</string>
<string name="open_till">已開啟直到</string>
<string name="will_close_at">將關閉于</string>
<string name="will_open_at">將開啟于</string>
<string name="will_open_on">將被開啟</string>
<string name="what_is_here">這裡的內容：</string>
<string name="pick_up_till">取得直到</string>
<string name="will_be_opened_on">將被開啟</string>
<string name="additional_actions">輔助的操作</string>
<string name="shared_string_actions">操作</string>
<string name="shared_string_marker">標記</string>

10
OsmAnd/res/values/strings.xml
View file

@ -16,11 +16,11 @@
<string name="context_menu_read_full_article">Read full article</string>
<string name="context_menu_read_article">Read article</string>
<string name="context_menu_points_of_group">All points of the group</string>
<string name="opened_from">Opened from</string>
<string name="opened_till">Opened till</string>
<string name="will_be_closed_at">Will be closed at</string>
<string name="will_be_opened_at">Will be opened at</string>
<string name="will_be_opened_on">Will be opened on</string>
<string name="open_from">Open from</string>
<string name="open_till">Open till</string>
<string name="will_close_at">Will close at</string>
<string name="will_open_at">Will open at</string>
<string name="will_open_on">Will open on</string>
<string name="additional_actions">Additional actions</string>
<string name="av_locations_selected_desc">GPX file with coordinates and data of the selected notes.</string>
<string name="av_locations_all_desc">GPX file with coordinates and data of all notes.</string>

2
OsmAnd/res/values/styles.xml
View file

@ -256,6 +256,7 @@
</style>
<style name="OsmandLightTheme.BottomSheet">
<item name="android:windowIsFloating">true</item>
<item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
<item name="android:windowBackground">@color/color_transparent</item>
<item name="android:backgroundDimAmount">0.3</item>
@ -263,6 +264,7 @@
</style>
<style name="OsmandDarkTheme.BottomSheet">
<item name="android:windowIsFloating">true</item>
<item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
<item name="android:windowBackground">@color/color_transparent</item>
<item name="android:backgroundDimAmount">0.3</item>

127
OsmAnd/src/net/osmand/plus/base/BottomSheetDialog.java Normal file
View file

@ -0,0 +1,127 @@
package net.osmand.plus.base;
import android.app.Dialog;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import net.osmand.plus.R;
public class BottomSheetDialog extends Dialog {
private boolean cancelable = true;
private boolean canceledOnTouchOutside = true;
private boolean canceledOnTouchOutsideSet;
public BottomSheetDialog(@NonNull Context context) {
this(context, 0);
}
public BottomSheetDialog(@NonNull Context context, int themeResId) {
super(context, themeResId);
requestWindowFeature(Window.FEATURE_NO_TITLE);
}
protected BottomSheetDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
super(context, cancelable, cancelListener);
requestWindowFeature(Window.FEATURE_NO_TITLE);
this.cancelable = cancelable;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Window window = getWindow();
if (window != null) {
if (Build.VERSION.SDK_INT >= 21) {
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
}
window.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
}
}
@Override
public void setContentView(int layoutResID) {
super.setContentView(wrapInContainer(layoutResID, null, null));
}
@Override
public void setContentView(@NonNull View view) {
super.setContentView(wrapInContainer(0, view, null));
}
@Override
public void setContentView(@NonNull View view, @Nullable LayoutParams params) {
super.setContentView(wrapInContainer(0, view, params));
}
@Override
public void setCancelable(boolean flag) {
super.setCancelable(flag);
cancelable = flag;
}
@Override
public void setCanceledOnTouchOutside(boolean cancel) {
super.setCanceledOnTouchOutside(cancel);
if (cancel && !cancelable) {
cancelable = true;
}
canceledOnTouchOutside = cancel;
canceledOnTouchOutsideSet = true;
}
@NonNull
private View wrapInContainer(int layoutResId, View view, LayoutParams params) {
final View res = View.inflate(getContext(), R.layout.bottom_sheet_dialog, null);
final FrameLayout container = (FrameLayout) res.findViewById(R.id.content_container);
if (layoutResId != 0 && view == null) {
view = getLayoutInflater().inflate(layoutResId, container, false);
}
if (params == null) {
container.addView(view);
} else {
container.addView(view, params);
}
res.findViewById(R.id.touch_outside).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (cancelable && isShowing() && shouldWindowCloseOnTouchOutside()) {
cancel();
}
}
});
container.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
// Consume the event and prevent it from falling through
return true;
}
});
return res;
}
private boolean shouldWindowCloseOnTouchOutside() {
if (!canceledOnTouchOutsideSet) {
TypedArray a = getContext().obtainStyledAttributes(new int[]{android.R.attr.windowCloseOnTouchOutside});
canceledOnTouchOutside = a.getBoolean(0, true);
a.recycle();
canceledOnTouchOutsideSet = true;
}
return canceledOnTouchOutside;
}
}

38
OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
View file

@ -5,14 +5,13 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
@ -20,19 +19,18 @@ import net.osmand.plus.R;
public abstract class BottomSheetDialogFragment extends DialogFragment {
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
boolean isLightTheme = getMyApplication()
.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
int themeId = isLightTheme ? R.style.OsmandLightTheme_BottomSheet
: R.style.OsmandDarkTheme_BottomSheet;
final Dialog dialog = new Dialog(getActivity(), themeId);
dialog.setCanceledOnTouchOutside(true);
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
OsmandSettings settings = getMyApplication().getSettings();
int themeId = settings.isLightContent() ? R.style.OsmandLightTheme_BottomSheet : R.style.OsmandDarkTheme_BottomSheet;
BottomSheetDialog dialog = new BottomSheetDialog(getContext(), themeId);
Window window = dialog.getWindow();
if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get() && window != null) {
window.getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
}
dialog.setCanceledOnTouchOutside(true);
return dialog;
}
@ -40,21 +38,6 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
@Override
public abstract View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
@Override
public void onStart() {
super.onStart();
if (getDialog() != null) {
final Window window = getDialog().getWindow();
WindowManager.LayoutParams params = window.getAttributes();
params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
params.gravity = Gravity.BOTTOM;
params.width = ViewGroup.LayoutParams.MATCH_PARENT;
window.setAttributes(params);
}
}
protected OsmandApplication getMyApplication() {
return (OsmandApplication) getActivity().getApplication();
}
@ -66,5 +49,4 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
protected Drawable getContentIcon(@DrawableRes int drawableRes) {
return getMyApplication().getIconsCache().getThemedIcon(drawableRes);
}
}

10
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -1141,15 +1141,15 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
if (openingHoursInfo.isOpened24_7()) {
timeInfo = getString(R.string.shared_string_is_open_24_7);
} else if (!Algorithms.isEmpty(openingHoursInfo.getNearToOpeningTime())) {
timeInfo = getString(R.string.will_be_opened_at) + " " + openingHoursInfo.getNearToOpeningTime();
timeInfo = getString(R.string.will_open_at) + " " + openingHoursInfo.getNearToOpeningTime();
} else if (!Algorithms.isEmpty(openingHoursInfo.getOpeningTime())) {
timeInfo = getString(R.string.opened_from) + " " + openingHoursInfo.getOpeningTime();
timeInfo = getString(R.string.open_from) + " " + openingHoursInfo.getOpeningTime();
} else if (!Algorithms.isEmpty(openingHoursInfo.getNearToClosingTime())) {
timeInfo = getString(R.string.will_be_closed_at) + " " + openingHoursInfo.getNearToClosingTime();
timeInfo = getString(R.string.will_close_at) + " " + openingHoursInfo.getNearToClosingTime();
} else if (!Algorithms.isEmpty(openingHoursInfo.getClosingTime())) {
timeInfo = getString(R.string.opened_till) + " " + openingHoursInfo.getClosingTime();
timeInfo = getString(R.string.open_till) + " " + openingHoursInfo.getClosingTime();
} else if (!Algorithms.isEmpty(openingHoursInfo.getOpeningDay())) {
timeInfo = getString(R.string.will_be_opened_on) + " " + openingHoursInfo.getOpeningDay() + ".";
timeInfo = getString(R.string.will_open_on) + " " + openingHoursInfo.getOpeningDay() + ".";
}
} else {
timeInfo = additionalTypeStr;

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
View file

@ -9,6 +9,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.ListView;
import android.widget.TextView;
import net.osmand.AndroidUtils;
import net.osmand.plus.R;
@ -50,6 +51,8 @@ public class MapMultiSelectionMenuFragment extends Fragment implements MultiSele
View headerView = inflater.inflate(R.layout.menu_obj_selection_header, listView, false);
if (!menu.isLight()) {
((TextViewEx) headerView.findViewById(R.id.header_title)).setTextColor(getResources().getColor(R.color.ctx_menu_info_text_dark));
((TextView) view.findViewById(R.id.cancel_row_text)).setTextColor(getResources().getColor(R.color.color_dialog_buttons_dark));
view.findViewById(R.id.divider).setBackgroundResource(R.color.dashboard_divider_dark);
}
headerView.setOnClickListener(null);
listView.addHeaderView(headerView);

6
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MultiSelectionArrayAdapter.java
View file

@ -38,7 +38,8 @@ public class MultiSelectionArrayAdapter extends ArrayAdapter<MapMultiSelectionMe
}
final MapMultiSelectionMenu.MenuObject item = getItem(position);
if (item != null) {
AndroidUtils.setBackground(menu.getMapActivity(), convertView, !menu.isLight(), R.drawable.expandable_list_item_background_light, R.drawable.expandable_list_item_background_dark);
convertView.findViewById(R.id.content).setBackgroundResource(menu.isLight()
? R.drawable.expandable_list_item_background_light : R.drawable.expandable_list_item_background_dark);
convertView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -79,6 +80,9 @@ public class MultiSelectionArrayAdapter extends ArrayAdapter<MapMultiSelectionMe
// Divider
View divider = convertView.findViewById(R.id.divider);
if (!menu.isLight()) {
divider.setBackgroundResource(R.color.dashboard_divider_dark);
}
divider.setVisibility(position != getCount() - 1 ? View.VISIBLE : View.GONE);
}