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

Merge branch 'master' into gpx_parameters_fixes

Browse source
This commit is contained in:
Vitaliy 2020-09-08 16:46:26 +03:00
commit 5c4c347e4c
9 changed files with 72 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-be/phrases.xml
View file

@ -894,7 +894,7 @@
<string name="poi_monitoring_station">Станцыя назірання</string>
<string name="poi_email">Эл. пошта</string>
<string name="poi_fax">Факс</string>
<string name="facebook">Фэйсбук</string>
<string name="facebook">Facebook</string>
<string name="poi_mobile">Мабільны тэлефон</string>
<string name="poi_animal_shelter_dog">Сабакі</string>
<string name="poi_animal_shelter_cat">Каты</string>

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

@ -1431,7 +1431,7 @@
<string name="shared_string_dismiss">Адхіліць</string>
<string name="shared_string_yes">Так</string>
<string name="shared_string_no">Не</string>
<string name="shared_string_on">Уключыць</string>
<string name="shared_string_on">Укл</string>
<string name="shared_string_off">Выкл</string>
<string name="shared_string_previous">Папярэдні</string>
<string name="shared_string_next">Далей</string>
@ -1507,7 +1507,7 @@
<string name="tips_and_tricks_descr">Пытанні і адказы, апошнія змены і іншае.</string>
<string name="routing_settings_2">Налады навігацыі</string>
<string name="general_settings_2">Агульныя налады</string>
<string name="shared_string_clear_all">Ачысціць ўсё</string>
<string name="shared_string_clear_all">Ачысціць усё</string>
<string name="shared_string_collapse">Згарнуць</string>
<string name="shared_string_my_location">Маё месцазнаходжанне</string>
<string name="shared_string_tracks">Сляды</string>
@ -2041,7 +2041,7 @@
<string name="skip_map_downloading_desc">У вас адсутнічаюць мапы. Вы можаце абраць мапу са спіса альбо спампаваць яе пазней праз \"Меню - %1$s\".</string>
<string name="search_another_country">Абраць іншы рэгіён</string>
<string name="search_map">Пошук мапаў…</string>
<string name="first_usage_wizard_desc">OsmAnd вызначыць вашае месцазнаходжанне і прапануе спампаваць мапы для гэтага рэгіёна.</string>
<string name="first_usage_wizard_desc">OsmAnd вызначыць ваша месцазнаходжанне і прапануе спампаваць мапы для гэтага рэгіёна.</string>
<string name="location_not_found">Не атрымалася вызначыць месцазнаходжанне</string>
<string name="no_inet_connection">Злучэнне з Інтэрнэтам адсутнічае</string>
<string name="no_inet_connection_desc_map">Патрабуецца для спампоўвання мапаў.</string>

18
OsmAnd/res/values-fi/strings.xml
View file

@ -2543,5 +2543,21 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
<string name="mapillary_item">OsmAnd + mapillary</string>
<string name="quick_action_item">Pikatoiminto</string>
<string name="radius_ruler_item">Sädeviivain</string>
<string name="download_unsupported_action">Toimintoa ei tuettu %1$s</string>
<string name="download_unsupported_action">Ei tuettu toiminto %1$s</string>
<string name="travel_item">Matkailu (Wikivoyage ja Wikipedia)</string>
<string name="select_track_file">Valitse jälkitiedosto</string>
<string name="wiki_menu_download_descr">Lisäkarttoja tarvitaan Wikipedian erikoiskohteiden tarkastelemiseen kartalla.</string>
<string name="select_wikipedia_article_langs">Valitse kielet, joilla Wikipedia-artikkelit näkyvät kartalla. Voit vaihtaa kaikkien käytettävissä olevien kielten välillä lukiessasi artikkelia.</string>
<string name="some_articles_may_not_available_in_lang">Jotkut Wikipedia-artikkelit eivät välttämättä ole saatavilla omalla kielelläsi.</string>
<string name="lang_zhyue">Kantoninkiina</string>
<string name="lang_uz">uzbekki</string>
<string name="lang_tt">tataari</string>
<string name="lang_sco">skotti</string>
<string name="lang_ne">nepali</string>
<string name="search_poi_types">Etsi POI-tyyppejä</string>
<string name="custom_osmand_plugin">Muokattu OsmAnd-laajennus</string>
<string name="changes_applied_to_profile">Muutokset lisätty \'%1$s\' profiiliin.</string>
<string name="settings_item_read_error">Ei voitu lukea \'%1$s\'.</string>
<string name="settings_item_write_error">Ei voitu kirjoittaa \'%1$s\'.</string>
<string name="settings_item_import_error">Ei voitu tuoda kohteesta \'%1$s\'.</string>
</resources>

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

@ -3853,4 +3853,6 @@
<string name="import_track_descr">Sélectionnez le fichier de trace à suivre ou importez-en un.</string>
<string name="gpx_monitoring_start">Reprendre l\'enregistrement du trajet</string>
<string name="gpx_monitoring_stop">Suspendre l\'enregistrement du trajet</string>
<string name="save_global_track_interval_descr">Définit la fréquence d’enregistrement du parcours (enregistrement activé depuis le gadget sur la carte).</string>
<string name="disable_recording_once_app_killed_descrp">Suspend l\'enregistrement du parcours lorsque l\'application est arrêtée via Applications récentes ; les indications OsmAnd ne seront plus affichées dans la barre de notifications.</string>
</resources>

2
OsmAnd/res/values-night/colors.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="splash_screen_background_color">@color/map_background_color_dark</color>
<color name="splash_screen_background_color">@color/list_background_color_dark</color>
</resources>

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

@ -3375,7 +3375,7 @@
<string name="rendering_attr_highway_class_track_grade5_name">Класс 5</string>
<string name="app_mode_wagon">Фургон</string>
<string name="map_look">Вид карты</string>
<string name="reset_to_default">Сбросить на значения по умолчанию</string>
<string name="reset_to_default">Сброс к настройкам по умолчанию</string>
<string name="rendering_attr_piste_type_sled_name">Только самоходные сани</string>
<string name="rendering_attr_piste_type_hike_name">Хайк</string>
<string name="rendering_attr_piste_type_connection_name">Соединение</string>

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

@ -3856,4 +3856,35 @@
<string name="number_of_gpx_files_selected_pattern">%s documentos de rasta ischertados</string>
<string name="save_global_track_interval_descr">Dislinda s’intervallu pro sa registratzione generale de sas rastas (abilitadu pro mèdiu de su widget registratzione GPX in sa mapa).</string>
<string name="monitoring_control_start">Registra</string>
<string name="shared_string_gpx_route">Àndala de una rasta</string>
<string name="follow_track">Sighi sa rasta</string>
<string name="follow_track_descr">Issèbera su documentu de sa rasta de sighire</string>
<string name="import_track_descr">Issèbera su documentu de sa rasta de sighire, o importa·nde unu.</string>
<string name="select_another_track">Ischerta un\'àtera rasta</string>
<string name="navigate_to_track_descr">Nàviga dae sa positzione mea a sa rasta</string>
<string name="pass_whole_track_descr">Puntu de sa rasta de navigare</string>
<string name="start_of_the_track">Incumintzu de sa rasta</string>
<string name="nearest_point">Puntu prus a curtzu</string>
<string name="attach_to_the_roads">Bloca in sos caminos</string>
<string name="delete_address">Iscantzella s\'indiritzu</string>
<string name="add_address">Annanghe un\'indiritzu</string>
<string name="access_hint_enter_address">Inserta s\'indiritzu</string>
<string name="plan_route_trim_before">Trunca in antis de</string>
<string name="plan_route_trim_after">Trunca a pustis de</string>
<string name="plan_route_change_route_type_before">Càmbia sa casta de àndala in antis de</string>
<string name="plan_route_change_route_type_after">Càmbia sa casta de àndala a pustis de</string>
<string name="simplified_track">Rasta semplificada</string>
<string name="simplified_track_description">S\'at a sarvare petzi sa lìnia de s\'àndala, sos puntos de coladòrgiu s\'ant a iscantzellare.</string>
<string name="shared_string_file_name">Nùmene de su documentu</string>
<string name="system_default_theme">Predefinidu de su sistema</string>
<string name="all_next_segments">Totu sos segmentos imbenientes</string>
<string name="previous_segment">Segmentu antepostu</string>
<string name="all_previous_segments">Totu sos segmentos antepostos</string>
<string name="only_selected_segment_recalc">Petzi su segmentu ischertadu s\'at a torrare a carculare impreende su profilu ischertadu.</string>
<string name="all_next_segments_will_be_recalc">Totu sos segmentos imbenientes s\'ant a torrare a carculare impreende su segmentu ischertadu.</string>
<string name="all_previous_segments_will_be_recalc">Totu sos segmentos s\'ant a torrare a carculare impreende su profilu ischertadu.</string>
<string name="open_saved_track">Aberi una rasta sarvada</string>
<string name="shared_string_is_saved">est sarvadu</string>
<string name="one_point_error">Pro praghere annanghe a su mancu duos puntos.</string>
<string name="shared_string_redo">Torra a fàghere</string>
</resources>

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

@ -136,6 +136,8 @@
<string name="poi_fire_hydrant_pressure_filter">Pressure</string>
<string name="poi_traffic_signals_vibration">Vibration</string>
<string name="poi_traffic_signals_arrow">Arrow</string>
<string name="poi_drinking_water_refill">Drinking water refill</string>
<string name="poi_departures_board">Departures board</string>
<!-- categories -->
<string name="poi_shop">Store</string>
@ -4220,7 +4222,7 @@
<string name="poi_seamark_water_level_below_mwl">Water level: below mean water level</string>
<string name="poi_seamark_obstruction">Obstruction</string>
<string name="poi_drinking_water_refill_yes">Drinking water refill: yes</string>
<string name="poi_drinking_water_refill_yes">Yes</string>
<string name="poi_drinking_water_refill_no">Drinking water refill: no</string>
<string name="poi_drinking_water_refill_network">Drinking water refill network</string>
@ -4243,5 +4245,11 @@
<string name="poi_elevator">Elevator</string>
<string name="poi_departures_board_no">Departures board: no</string>
<string name="poi_departures_board_yes">Yes</string>
<string name="poi_departures_board_delay">Delay</string>
<string name="poi_departures_board_realtime">Realtime</string>
<string name="poi_departures_board_timetable">Timetable</string>
</resources>

10
OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
View file

@ -34,6 +34,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
public static boolean SHOW = true;
public static boolean VISIBLE = false;
private boolean systemDefaultNightMode;
public MapActivity getMapActivity() {
return (MapActivity) getActivity();
}
@ -77,14 +79,14 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
OsmandApplication app = requireMyApplication();
FragmentActivity activity = requireActivity();
UiUtilities iconsCache = app.getUIUtilities();
boolean systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() &&
systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() &&
!app.getSettings().isLightSystemDefaultTheme();
RelativeLayout view = new RelativeLayout(activity);
view.setOnClickListener(null);
int backgroundColorId = systemDefaultNightMode ?
R.color.map_background_color_dark :
R.color.list_background_color_dark :
R.color.map_background_color_light;
view.setBackgroundColor(getResources().getColor(backgroundColorId));
@ -184,6 +186,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
@Override
public int getStatusBarColorId() {
return R.color.status_bar_transparent_light;
return systemDefaultNightMode ?
R.color.status_bar_color_dark :
R.color.status_bar_transparent_light;
}
}