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

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into WikipediaInContextMenu

Browse source
This commit is contained in:
Chumva 2018-05-08 18:41:55 +03:00
commit 8da612c1e1
17 changed files with 134 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2029,7 +2029,7 @@ L\'espai disponible és només de {2} MB.</string>
\n
\n i encara més…</string>
<string name="osm_live_subscription">Subscripció a OsmAnd Live</string>
<string name="osm_live_email_desc">Cal proporcionar-vos informació d\'aportacions.</string>
<string name="osm_live_email_desc">Per informar-vos d\'aportacions.</string>
<string name="osm_live_support_region">Zona de suport</string>
<string name="osm_live_thanks">Us agraïm haver-vos subscrit a les actualitzacions en directe</string>
<string name="osm_live_region_desc">Una part del vostre donatiu s\'enviarà als usuaris d\'OSM que enviïn modificacions del mapa a aquesta regió.</string>
@ -2433,7 +2433,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="subscribe_email_desc">Subscriviu-vos a la nostra llista de correu sobre descomptes a la aplicació i aconseguiu 3 baixades de mapa addicionals!</string>
<string name="no_overlay">Sense superposició</string>
<string name="no_underlay">Sense sots-posició</string>
<string name="sea_depth_thanks">Us agraïm la compra de les isòbates</string>
<string name="sea_depth_thanks">Us agraïm la compra d\' \'Isòbates\'</string>
<string name="index_item_depth_contours_osmand_ext">Isòbates</string>
<string name="index_item_depth_points_southern_hemisphere">Fondària marina puntual a l\'hemisferi sud</string>
<string name="index_item_depth_points_northern_hemisphere">Fondària marina puntual a l\'hemisferi nord</string>
@ -2527,7 +2527,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="mapillary_menu_edit_text_hint">Indiqueu el nom d\'usuari</string>
<string name="mapillary_menu_descr_username">Mostra només les imatges afegides per</string>
<string name="mapillary_menu_title_username">Nom d\'usuari</string>
<string name="mapillary_menu_filter_description">Podeu filtrar les imatges per remitent o per data. El filtres només s\'apliquen en apropar-se.</string>
<string name="mapillary_menu_filter_description">Filtreu les imatges per remitent o per data. Només s\'aplicarà en apropar-se.</string>
<string name="shared_string_reset">Restableix</string>
<string name="store_tracks_in_monthly_directories">Emmagatzema les traces enregistrades en carpetes mensuals</string>
<string name="store_tracks_in_monthly_directories_descrp">Emmagatzema les traces enregistrades en sub-carpetes segons el mes d\'enregistrament (tipus 2018-01).</string>
@ -2624,7 +2624,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="date_added">S\'ha afegit la data</string>
<string name="order_by">Ordena segons:</string>
<string name="marker_show_distance_descr">Seleccioneu com indicar la distància i direcció vers els marcadors de mapa a la pantalla del mapa:</string>
<string name="show_guide_line">Mostra les línies guia</string>
<string name="show_guide_line">Mostra les línies de direcció</string>
<string name="show_arrows_on_the_map">Mostra fletxes sobre el mapa</string>
<string name="show_passed">Mostra ja passat</string>
<string name="hide_passed">Amaga ja passat</string>
@ -2707,7 +2707,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="show_guide_line_descr">Mostra línies guia des de la vostra ubicació a les dels marcadors actius.</string>
<string name="show_arrows_descr">Mostra una o dues fletxes indicant la direcció dels marcadors actius.</string>
<string name="distance_indication_descr">Seleccioneu com indicar la distància als marcadors actius.</string>
<string name="active_markers_descr">Trieu quants indicadors de direcció es mostren.</string>
<string name="active_markers_descr">Trieu quants indicadors actius voleu veure.</string>
<string name="shared_string_more_without_dots">Més</string>
<string name="looking_for_tracks_with_waypoints">Recerca de traces amb fites</string>
<string name="empty_state_osm_edits">Crea o modifica objectes OSM</string>
@ -2889,10 +2889,15 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="wikivoyage_offline">Viquiviatges sense connexió</string>
<string name="unlimited_downloads">Baixades il·limitades</string>
<string name="wikipedia_offline">Viquipèdia sense conneió</string>
<string name="wikipedia_offline">Viquipèdia sense connexió</string>
<string name="contour_lines_hillshade_maps">Mapes amb corbes de nivell i ombrejat de relleu</string>
<string name="unlock_all_features">Desbloca totes les funcions de OsmAnd</string>
<string name="shared_string_wikivoyage">"Viquiviatges "</string>
<string name="index_item_world_wikivoyage">Articles de Viquiviatges d\'arreu</string>
<string name="open_wikipedia_link_online">Obre l\'enllaç en línia de Viquipèdia</string>
<string name="open_wikipedia_link_online_description">OsmAnd us portarà al navegador i obrirà l\'enllaç en línia.</string>
<string name="how_to_open_link">Com obrir l\'enllaç?</string>
<string name="read_wikipedia_offline">Consulta la Viquipèdia en local</string>
<string name="download_all">Baixa-ho tot</string>
</resources>

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

@ -3237,4 +3237,9 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="purchase_cancelled_dialog_descr">Forny abonnement for at fortsætte med at bruge alle funktioner:</string>
<string name="download_all">Hent alt</string>
<string name="open_wikipedia_link_online">Åbn Wikipedia link online</string>
<string name="open_wikipedia_link_online_description">Omdirigering til webbrowser og åbner linket online.</string>
<string name="read_wikipedia_offline_description">Få OsmAnd Live-abonnement til at læse Wikipedia og Wikivoyage artikler offline.</string>
<string name="how_to_open_link">Hvordan linket åbnes?</string>
<string name="read_wikipedia_offline">Læs Wikipedia offline</string>
</resources>

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

@ -3122,7 +3122,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="open_in_browser_wiki">Artikel online öffnen</string>
<string name="open_in_browser_wiki_description">Artikel in einem Webbrowser ansehen.</string>
<string name="download_wiki_region_placeholder">diese Region</string>
<string name="wiki_article_search_text">Suche nach dem benötigten Wiki-Artikel</string>
<string name="wiki_article_search_text">Suche nach dem entsprechenden Wiki-Artikel</string>
<string name="wiki_article_not_found">Artikel nicht gefunden</string>
<string name="paid_app">Bezahlte App</string>
<string name="paid_plugin">Bezahltes Modul</string>
@ -3136,4 +3136,10 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="maps_you_need_descr">Basierend auf den von Ihnen gespeicherten Artikeln empfehlen wir Ihnen, folgende Karten herunterzuladen:</string>
<string name="maps_you_need">Benötigte Karten</string>
<string name="open_wikipedia_link_online">Wikipedia-Link online öffnen</string>
<string name="open_wikipedia_link_online_description">OsmAnd leitet Sie zum Browser weiter und öffnet den Link online.</string>
<string name="read_wikipedia_offline_description">Holen Sie sich das OsmAnd Live Abonnement, um Wikipedia und Wikivoyage Artikel offline zu lesen.</string>
<string name="how_to_open_link">Wie öffnet man einen Link?</string>
<string name="read_wikipedia_offline">Wikipedia offline lesen</string>
<string name="download_all">Alles herunterladen</string>
</resources>

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

@ -3045,7 +3045,7 @@ Lon %2$s</string>
<string name="purchase_cancelled_dialog_descr">Renueva la suscripción para continuar usando todas las funciones:</string>
<string name="open_wikipedia_link_online">Abrir enlace de Wikipedia en línea</string>
<string name="open_wikipedia_link_online_description">OsmAnd abrirá el navegador para el enlace en línea.</string>
<string name="open_wikipedia_link_online_description">OsmAnd abrirá el navegador para ver el enlace en línea.</string>
<string name="read_wikipedia_offline_description">Obtén una suscripción de OsmAnd Live para leer artículos de Wikipedia y Wikiviajes, sin conexión.</string>
<string name="how_to_open_link">¿Cómo abrir un enlace?</string>
<string name="read_wikipedia_offline">Leer la Wikipedia sin conexión</string>

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

@ -3212,7 +3212,7 @@
<string name="open_in_browser_wiki">بازکردن مقالهٔ آنلاین</string>
<string name="open_in_browser_wiki_description">این مقاله را در مرورگر اینترنت مشاهده کنید.</string>
<string name="download_wiki_region_placeholder">این منطقه</string>
<string name="wiki_article_search_text">جست‌وجو به‌دنبال مقالهٔ همخوان</string>
<string name="wiki_article_search_text">جست‌وجو به‌دنبال مقالهٔ همخوان از ویکی</string>
<string name="wiki_article_not_found">مقاله پیدا نشد</string>
<string name="how_to_open_wiki_title">چگونه مقاله‌های ویکی‌پدیا را باز کنیم؟</string>
<string name="popular_destinations">مقصدهای محبوب</string>
@ -3226,4 +3226,6 @@
<string name="purchase_cancelled_dialog_descr">اشتراکتان را تجدید کنید تا از همهٔ قابلیت‌ها بهره‌مند شوید:</string>
<string name="download_all">دانلود همه</string>
<string name="open_wikipedia_link_online">بازکردن آنلاین لینک ویکی‌پدیا</string>
<string name="open_wikipedia_link_online_description">‏OsmAnd شما را به مرورگر می‌فرستد و لینک را آنلاین باز می‌کند.</string>
</resources>

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

@ -3212,7 +3212,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="open_wikipedia_link_online">Ouvrir le lien Wikipedia</string>
<string name="open_wikipedia_link_online_description">Le lien s\'ouvrira dans votre navigateur Internet.</string>
<string name="read_wikipedia_offline_description">Abonnez vous à OsmAnd Live pour consulter les articles Wikipedia et Wikivoyage hors-ligne.</string>
<string name="read_wikipedia_offline_description">Abonnez-vous à OsmAnd Live pour lire les articles Wikipedia et Wikivoyage hors-ligne.</string>
<string name="how_to_open_link">Comment ouvrir ce lien ?</string>
<string name="read_wikipedia_offline">Lisez Wikipedia hors-ligne</string>
<string name="download_all">Télécharger tout</string>

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

@ -3128,4 +3128,10 @@
<string name="purchase_cancelled_dialog_descr">יש לחדש את המינוי כדי להמשיך להשתמש בכל התכונות הבאות:</string>
<string name="download_all">להוריד הכול</string>
<string name="open_wikipedia_link_online">פתיחת הקישור של ויקיפדיה בדפדפן</string>
<string name="open_wikipedia_link_online_description">OsmAnd יפנה אותך לדפדפן ויפתח את הקישור.</string>
<string name="read_wikipedia_offline_description">עליך לערוך מינוי ל־OsmAnd חי כדי לקרוא ערכים מוויקיפדיה ומוויקימסע ללא חיבור לאינטרנט.</string>
<string name="how_to_open_link">כיצד לפתוח קישור?</string>
<string name="read_wikipedia_offline">קריאת ויקיפדיה ללא חיבור לאינטרנט</string>
<string name="edit_tilesource_elliptic_tile">היטל כדורי</string>
</resources>

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

@ -3146,4 +3146,11 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="wiki_article_search_text">Sto cercando il necessario articolo Wiki</string>
<string name="wiki_article_not_found">Articolo non trovato</string>
<string name="how_to_open_wiki_title">Come aprire gli articoli di Wikipedia?</string>
<string name="osmand_plus_extended_description_part2">Navigazione
\n • Funziona online (veloce) o offline (nessuna tariffa di roaming quando sei all\'estero)
\n • Guida vocale svolta-dopo-svolta (voci registrate e sintetizzate)
\n • Guida sulla corsia opzionale, visualizzazione dei nomi delle strade, e tempo di arrivo stimato
\n • Supporto per punti intermedi del tuo itinerario
\n • Rielaborazione del percorso automatico ogni volta che si devia
\n • Ricerca di posti per indirizzo, per tipo (es: ristorante, albergo, stazione di servizio, museo) o per coordinate geografiche</string>
</resources>

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

@ -3191,4 +3191,9 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="purchase_cancelled_dialog_descr">Rinnova s\'abbonamentu tuo pro sighire a impreare totu sas funtzionalidades:</string>
<string name="download_all">Iscàrriga totu</string>
<string name="open_wikipedia_link_online">Aberi su ligàmene de wikipedia in lìnia</string>
<string name="open_wikipedia_link_online_description">OsmAnd at a abèrrere su ligàmene in lìnia in s\'esploradore tuo.</string>
<string name="read_wikipedia_offline_description">Abbona·ti a OsmAnd Live pro lèghere sos artìculos de Wikipedia e Wikivoyage chene connessione.</string>
<string name="how_to_open_link">Comente abèrrere su ligàmene?</string>
<string name="read_wikipedia_offline">Leghe Wikipedia chene connessione</string>
</resources>

18
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -2770,4 +2770,22 @@
<string name="dayly_map_updates">地图更新：每日</string>
<string name="unlimited_downloads">无限下载</string>
<string name="wikipedia_offline">离线维基百科</string>
<string name="open_wikipedia_link_online">在线打开维基百科链接</string>
<string name="open_wikipedia_link_online_description">OsmAnd 会将您重定向至浏览器并在线打开链接。</string>
<string name="read_wikipedia_offline_description">获取 OsmAnd Live 订阅以离线阅读维基百科和 Wikivoyage 文章。</string>
<string name="how_to_open_link">如何打开链接？</string>
<string name="read_wikipedia_offline">离线阅读维基百科</string>
<string name="download_all">下载全部</string>
<string name="shared_string_restart">重新开始</string>
<string name="show_images">显示图像</string>
<string name="purchase_cancelled_dialog_title">您已取消 OsmAnd Live 订阅</string>
<string name="purchase_cancelled_dialog_descr">续订以继续使用以下全部功能：</string>
<string name="maps_you_need_descr">基于您保存的文章，我们推荐您下载下列地图：</string>
<string name="maps_you_need">您需要的地图</string>
<string name="osmand_team">OsmAnd 团队</string>
<string name="popular_destinations">热门目的地</string>
<string name="paid_app">付费应用</string>
<string name="paid_plugin">付费插件</string>
<string name="travel_card_update_descr">新的 Wikivoyage 数据可用，请更新以继续享用。</string>
</resources>

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

@ -3191,4 +3191,10 @@
<string name="maps_you_need_descr">根據您已儲存的文章，我們建議您下載下面的地圖：</string>
<string name="maps_you_need">您需要的地圖</string>
<string name="open_wikipedia_link_online">線上開啟維基百科連結</string>
<string name="open_wikipedia_link_online_description">OsmAnd 會將您重新引導到瀏覽器並在線上打開連結。</string>
<string name="read_wikipedia_offline_description">獲得 OsmAnd Live 訂閱可以離線閱讀維基百科和維基導遊文章。</string>
<string name="how_to_open_link">如何開啟連結？</string>
<string name="read_wikipedia_offline">離線閱讀維基百科</string>
<string name="download_all">全部下載</string>
</resources>

1
OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java
View file

@ -13,6 +13,7 @@ public class BaseBottomSheetItem {
public static final int INVALID_POSITION = -1;
public static final int INVALID_ID = -1;
public static final int INVALID_VALUE = -1;
protected View view;
@LayoutRes

15
OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemTitleWithDescrAndButton.java
View file

@ -34,12 +34,24 @@ public class BottomSheetItemTitleWithDescrAndButton extends BottomSheetItemWithD
@ColorRes int titleColorId,
CharSequence description,
@ColorRes int descriptionColorId,
int descriptionMaxLines,
String buttonTitle,
View.OnClickListener onButtonClickListener,
Drawable leftCompoundDrawable,
Drawable rightCompoundDrawable,
@ColorRes int buttonTextColor) {
super(customView, layoutId, tag, disabled, onClickListener, position, icon, title, titleColorId, description, descriptionColorId);
super(customView,
layoutId,
tag,
disabled,
onClickListener,
position,
icon,
title,
titleColorId,
description,
descriptionColorId,
descriptionMaxLines);
this.buttonTitle = buttonTitle;
this.onButtonClickListener = onButtonClickListener;
this.leftCompoundDrawable = leftCompoundDrawable;
@ -112,6 +124,7 @@ public class BottomSheetItemTitleWithDescrAndButton extends BottomSheetItemWithD
titleColorId,
description,
descriptionColorId,
descriptionMaxLines,
buttonTitle,
onButtonClickListener,
leftCompoundDrawable,

5
OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java
View file

@ -36,6 +36,7 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
@ColorRes int titleColorId,
CharSequence description,
@ColorRes int descriptionColorId,
int descriptionMaxLines,
boolean checked,
ColorStateList buttonTintList,
OnCheckedChangeListener onCheckedChangeListener) {
@ -49,7 +50,8 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
title,
titleColorId,
description,
descriptionColorId);
descriptionColorId,
descriptionMaxLines);
this.checked = checked;
this.buttonTintList = buttonTintList;
this.onCheckedChangeListener = onCheckedChangeListener;
@ -102,6 +104,7 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri
titleColorId,
description,
descriptionColorId,
descriptionMaxLines,
checked,
buttonTintList,
onCheckedChangeListener);

22
OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithDescription.java
View file

@ -16,6 +16,7 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
protected CharSequence description;
@ColorRes
private int descriptionColorId = INVALID_ID;
private int descriptionMaxLines = INVALID_VALUE;
private TextView descriptionTv;
@ -29,10 +30,12 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
String title,
@ColorRes int titleColorId,
CharSequence description,
@ColorRes int descriptionColorId) {
@ColorRes int descriptionColorId,
int descriptionMaxLines) {
super(customView, layoutId, tag, disabled, onClickListener, position, icon, title, titleColorId);
this.description = description;
this.descriptionColorId = descriptionColorId;
this.descriptionMaxLines = descriptionMaxLines;
}
protected BottomSheetItemWithDescription() {
@ -44,6 +47,11 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
descriptionTv.setText(description);
}
public void setDescriptionMaxLines(int maxLines) {
this.descriptionMaxLines = maxLines;
descriptionTv.setMaxLines(maxLines);
}
@Override
public void inflate(OsmandApplication app, ViewGroup container, boolean nightMode) {
super.inflate(app, container, nightMode);
@ -53,6 +61,9 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
if (descriptionColorId != INVALID_ID) {
descriptionTv.setTextColor(ContextCompat.getColor(app, descriptionColorId));
}
if (descriptionMaxLines != INVALID_VALUE) {
descriptionTv.setMaxLines(descriptionMaxLines);
}
}
}
@ -61,6 +72,7 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
protected CharSequence description;
@ColorRes
protected int descriptionColorId = INVALID_ID;
protected int descriptionMaxLines = INVALID_POSITION;
public Builder setDescription(CharSequence description) {
this.description = description;
@ -72,6 +84,11 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
return this;
}
public Builder setDescriptionMaxLines(int maxLines) {
this.descriptionMaxLines = maxLines;
return this;
}
public BottomSheetItemWithDescription create() {
return new BottomSheetItemWithDescription(customView,
layoutId,
@ -83,7 +100,8 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
title,
titleColorId,
description,
descriptionColorId);
descriptionColorId,
descriptionMaxLines);
}
}
}

2
OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
View file

@ -133,7 +133,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
}
}
}
items.add(new StartEditingTravelCard(app, nightMode));
items.add(new StartEditingTravelCard(app, getMyActivity(), nightMode));
adapter.setItems(items);
final DownloadIndexesThread downloadThread = app.getDownloadThread();

9
OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java
View file

@ -1,5 +1,7 @@
package net.osmand.plus.wikivoyage.explore.travelcards;
import android.app.Activity;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.customtabs.CustomTabsIntent;
@ -16,8 +18,11 @@ public class StartEditingTravelCard extends BaseTravelCard {
public static final int TYPE = 1;
public StartEditingTravelCard(OsmandApplication app, boolean nightMode) {
private Context context;
public StartEditingTravelCard(OsmandApplication app, Activity context, boolean nightMode) {
super(app, nightMode);
this.context = context;
}
@Override
@ -35,7 +40,7 @@ public class StartEditingTravelCard extends BaseTravelCard {
.setToolbarColor(ContextCompat.getColor(app, nightMode ? R.color.actionbar_dark_color : R.color.actionbar_light_color))
.build();
String text = "https://" + app.getLanguage().toLowerCase() + ".m.wikivoyage.org";
customTabsIntent.launchUrl(app, Uri.parse(text));
customTabsIntent.launchUrl(context, Uri.parse(text));
}
});
}