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

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	OsmAnd/res/values-cs/strings.xml
	OsmAnd/res/values-ru/strings.xml
	OsmAnd/res/values-sk/strings.xml
This commit is contained in:
Weblate 2014-06-18 10:53:04 +02:00
commit bbc5cf68ec
20 changed files with 304 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/AndroidManifest.xml
View file

@ -176,7 +176,9 @@
<activity android:name="net.osmand.plus.activities.LocalIndexesActivity" android:label="@string/local_index_descr_title"></activity>
<activity android:name="net.osmand.plus.osmedit.LocalOpenstreetmapActivity" android:label="@string/local_openstreetmap_act_title"></activity>
<service android:process="net.osmand.plus" android:label="@string/process_navigation_service" android:name="net.osmand.plus.NavigationService">
<!-- keep android:process on a separate line !! -->
<service android:process="net.osmand.plus"
android:label="@string/process_navigation_service" android:name="net.osmand.plus.NavigationService">
<intent-filter>
<action android:name="net.osmand.plus.NavigationService"></action>
</intent-filter>

80
OsmAnd/build.xml
View file

@ -64,32 +64,51 @@
<replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;' replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" />
</then>
</if>
<if>
<condition>
<isset property="net.osmand" />
<isset property="net.osmand.sherpafy" />
</condition>
<then>
<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon"' replace='"@drawable/icon_free"' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='package="net.osmand.plus"' replace='package="net.osmand"' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='android:process="net.osmand.plus"' replace='android:process="net.osmand"' byline="true" />
<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;OsmAnd&lt;' byline="true" />
<replaceregexp file="res/layout/search_address.xml" match='net.osmand.plus' replace='net.osmand' byline="true" />
<replaceregexp file="res/layout/navigate_point.xml" match='net.osmand.plus' replace='net.osmand' byline="true" />
<property name="package.name" value="net.osmand.sherpafy" />
<property name="app.name" value="Sherpafy" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_sherpafy"' byline="true" />
</then>
<else>
<replaceregexp file="AndroidManifest.xml" match='"@drawable/icon_free"' replace='"@drawable/icon"' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='package="net.osmand"' replace='package="net.osmand.plus"' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='android:process="net.osmand"' replace='android:process="net.osmand.plus"' byline="true" />
</else>
</if>
<if>
<condition>
<isset property="net.osmand.plus" />
<isset property="net.osmand" />
</condition>
<then>
<property name="package.name" value="net.osmand" />
<property name="app.name" value="OsmAnd" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" />
</then>
</if>
<if>
<condition>
<isset property="net.osmand.plus" />
</condition>
<then>
<property name="package.name" value="net.osmand.plus" />
<property name="app.name" value="OsmAnd+" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" />
</then>
</if>
<if>
<condition>
<isset property="package.name" />
</condition>
<then>
<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;OsmAnd+&lt;' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='package="(.*)"' replace='package="${package.name}"' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='android:process="(.*)"' replace='android:process="${package.name}"' byline="true" />
<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"'
replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"'
replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
</then>
</if>
</if>
<if>
<condition>
<isset property="build.version.code" />
@ -115,12 +134,31 @@
<target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
<!-- osmchange : Osmand plus support -->
<mkdir dir="${gen.absolute.dir}/net/osmand/plus"/>
<copy todir="${gen.absolute.dir}/net/osmand/plus">
<fileset dir="${gen.absolute.dir}/net/osmand">
<include name="R.java" />
</fileset>
</copy>
<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package net.osmand;' replace='package net.osmand.plus;' byline="true" />
<if>
<condition>
<isset property="net.osmand.sherpafy" />
</condition>
<then>
<copy todir="${gen.absolute.dir}/net/osmand/plus">
<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
<include name="R.java" />
</fileset>
</copy>
</then>
</if>
<if>
<condition>
<isset property="net.osmand" />
</condition>
<then>
<copy todir="${gen.absolute.dir}/net/osmand/plus">
<fileset dir="${gen.absolute.dir}/net/osmand">
<include name="R.java" />
</fileset>
</copy>
</then>
</if>
<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" />
<!-- osmchange : Osmand plus support -->
<do-only-if-manifest-hasCode elseText="hasCode = false. Skipping...">

BIN
OsmAnd/res/drawable-hdpi/icon_sherpafy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
OsmAnd/res/drawable-mdpi/icon_sherpafy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
OsmAnd/res/drawable-xhdpi/icon_sherpafy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
OsmAnd/res/drawable-xxhdpi/icon_sherpafy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/icon_sherpafy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

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

@ -1626,6 +1626,6 @@ s často kladenými otázkami.</string>
<string name="select_destination_and_intermediate_points">Vybrat body na trase</string>
<string name="layer_amenity_label">Textové popisky</string>
<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> mapová klasifikace s obrázky</string>
<string name="show_zoom_buttons_navigation_descr">Zobrazit tlačítka lupy během navigace</string>
<string name="show_zoom_buttons_navigation_descr">Zobrazit tlačítka lupy během navigace</string>
<string name="show_zoom_buttons_navigation">Zobrazit tlačítka lupy</string>
</resources>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
\n\t- Natív renderelő minden eszközre
\n\t- Offline POI szerkesztés
\n\t- Akadálymentesítés
@ -128,7 +129,7 @@
<string name="routing_settings">Navigáció</string>
<string name="routing_settings_descr">Navigáció beállításai</string>
<string name="global_settings">Globális beállítások</string>
<string name="index_settings">Offline adatok (Letöltés)</string>
<string name="index_settings">Térképek kezelése</string>
<string name="index_settings_descr">Térképek és más, pl. GPX útvonalak, letöltése és kezelése</string>
<string name="general_settings">Általános beállítások</string>
<string name="general_settings_descr">Kijelző és más általános beállítások</string>
@ -242,7 +243,7 @@
<string name="local_index_items_restored">%2$d darabból %1$d sikeresen aktiválva.</string>
<string name="local_index_no_items_to_do">Nincs elem a művelethez: %1$s</string>
<string name="local_index_action_do">%2$s darab elemen végre lesz hajtva a %1$s. Folytatod?</string>
<string name="local_index_descr_title">Offline - kapcsolat nélküli adatkezelés</string>
<string name="local_index_descr_title">Térképek kezelése</string>
<string name="local_index_mi_restore">Aktiválás</string>
<string name="local_index_mi_backup">Deaktiválás</string>
<string name="local_index_mi_delete">Törlés</string>
@ -725,7 +726,7 @@
<string name="exit_Button">Kilép</string>
<string name="map_Button">Térkép</string>
<string name="settings_Button">Beállítások</string>
<string name="favorites_Button">Kedvencek</string>
<string name="favorites_Button">Saját helyek</string>
<string name="search_button">Keresés</string>
<string name="search_activity">Keresés</string>
<string name="searchpoi_activity">POI kiválasztás</string>
@ -1433,8 +1434,8 @@
<string name="routing_attr_weight_name">Maximális súly</string>
<string name="routing_attr_weight_description">Jármű súlykorlátozásának megadása</string>
<string name="android_19_location_disabled">Az Android 4.4 KitKat verzió óta nem lehet térképet letölteni és frissíteni a korábbi helyre (%s). Szeretnéd az összes fájlt egy engedélyezett helyre másolni?
\n Megjegyzés : a régi fájlok érintetlenül maradnak.
\n Megjegyzés : nem lehetséges az OsmAnd és OsmAnd+ között fájlokat megosztani. </string>
\n Megjegyzés: a régi fájlok érintetlenül maradnak.
\n Megjegyzés: nem lehetséges az OsmAnd és OsmAnd+ között fájlokat megosztani. </string>
<string name="application_dir_change_warning2">Az OsmAnd megpróbálja az adatokat új helyre másolni. Szeretnéd?</string>
<string name="copying_osmand_one_file_descr">%s fájl másolás új helyre…</string>
<string name="copying_osmand_files_descr">OsmAnd fájlok másolása új helyre (%s)</string>
@ -1511,8 +1512,8 @@
<string name="osmo_settings_uuid">Egyedi eszközazonosító</string>
<string name="osmo_settings_descr">Egyedi eszközregisztrációs kulcs megtekintése és egyéb monitoring beállítások </string>
<string name="osmo_plugin_description">OpenStreetMap-Monitoring – Fejlett Live Monitoring sok funkcióval http://osmo.mobi távirányításhoz</string>
<string name="osmo_plugin_name">OSMo (Fejlett Live Monitoring)</string>
<string name="osmo_settings">OSMo</string>
<string name="osmo_plugin_name">OsMo (Fejlett Live Monitoring)</string>
<string name="osmo_settings">OsMo OpenStreetMap Megfigyelés (béta)</string>
<string name="always_center_position_on_map">Pozíció megjelenítése mindig középen</string>
<string name="voice_pref_title">Hang</string>
<string name="misc_pref_title">Egyebek</string>
@ -1546,10 +1547,106 @@
<string name="osmo_edit_color">Megjelenítési szín</string>
<string name="osmo_group_info">Infó</string>
<string name="osmo_group">OsMo csoport</string>
<string name="osmo_group_share">%2$s csoporthoz csatlakozáshoz add meg a csoportazonosítót (%1$s)</string>
<string name="osmo_group_share">%2$s csoporthoz csatlakozáshoz add meg a csoportazonosítót (%1$s).</string>
<string name="osmo_share_connect_device">Eszköz állandó követésének engedélyezése</string>
<string name="osmo_share_current_session">Aktuális munkamenet megosztása böngészőben</string>
<string name="osmo_session_not_available">Munkamenet nem elérhető, kérlek ellenőrizd, hogy a \'Hely küldése\' be van-e kapcsolva.</string>
<string name="osmo_share_session">Munkamenet megosztása</string>
<string name="osmo_session_id_share">Munkamenet URL az eszköz követéséhez (%1$s)</string>
</resources>
<string name="show_zoom_buttons_navigation_descr">Zoom gombok megjelenítése navigáció közben</string>
<string name="show_zoom_buttons_navigation">Zoom gombok megjelenítése</string>
<string name="save_as_favorites_points">Mentés kedvencek csoportként</string>
<string name="select_destination_and_intermediate_points">Útpontok kiválasztása</string>
<string name="layer_amenity_label">Pont nevek</string>
<string name="map_widget_plain_time">Pontos idő</string>
<string name="gpx_wpt">Útpont</string>
<string name="selected_gpx_info_show">\n\nTérképen megtekintéshez nyomd meg hosszan</string>
<string name="delay_navigation_start">Navigáció indítása késleltetéssel</string>
<string name="selected">kiválasztott</string>
<string name="gpx_split_interval">Felosztási intervallum kiválasztása</string>
<string name="gpx_info_subtracks">Résznyomvonalak: %1$s </string>
<string name="gpx_info_waypoints">Útpontok: %1$s </string>
<string name="gpx_info_distance">Távolság: %1$s (%2$s pont) </string>
<string name="gpx_info_start_time">Kezdés: %1$tF, %1$tT </string>
<string name="gpx_info_end_time">Befejezés: %1$tF, %1$tT </string>
<string name="gpx_info_average_speed">Átlagos sebesség: %1$s </string>
<string name="gpx_info_maximum_speed">Legnagyobb sebesség: %1$s </string>
<string name="gpx_info_avg_altitude">Átlagos magasság: %1$s</string>
<string name="gpx_info_diff_altitude">Magasság tartomány: %1$s</string>
<string name="gpx_info_asc_altitude">Le/fel: %1$s</string>
<string name="gpx_timespan">Eltelt idő: %1$s</string>
<string name="gpx_timemoving">Mozgási idő: %1$s</string>
<string name="gpx_selection_segment_title">Szakasz</string>
<string name="gpx_selection_number_of_points"> %1$s pont</string>
<string name="gpx_selection_point">%1$s. pont</string>
<string name="gpx_selection_current_track">felvétel</string>
<string name="gpx_selection_route_points">%1$s \n%2$s útpont</string>
<string name="gpx_selection_points">%1$s \nPontok</string>
<string name="gpx_selection_track">%1$s \nNyomvonal %2$s</string>
<string name="gpx_available_current_track">Aktív nyomvonal rögzítés</string>
<string name="gpx_file_is_empty">A gpx nyomvonal üres</string>
<string name="selected_track">Kiválasztott nyomvonalak</string>
<string name="my_tracks">Összes nyomvonal</string>
<string name="my_favorites">Kedvenceim</string>
<string name="my_data_Button">Saját helyek</string>
<string name="my_data_activity">Saját helyek</string>
<string name="osmo_user_joined">%1$s felhasználó csatlakozott a(z) %2$s csoporthoz</string>
<string name="osmo_user_left">%1$s felhasználó elhagyta a(z) %2$s csoportot</string>
<string name="osmo_show_group_notifications">Csoportértesítések megjelenítése</string>
<string name="osmo_show_group_notifications_descr">Értesítő popup megjelenítése, ha egy felhasználó csatlakozik a csoporthoz, vagy elhagyja</string>
<string name="osmo_follow">Követés</string>
<string name="osmo_sign_in">Bejelentkezés</string>
<string name="osmo_create_groups_confirm">Csoport létrehozásáshoz regisztrált OsMo felhasználó kell legyél.</string>
<string name="osmo_credentials_not_valid">Az OsMo hitelesítő adataid érvénytelenek.</string>
<string name="osmo_regenerate_login_ids_confirm">Biztosan újragenerálod a személyes azonosítód? A hozzád kapcsolt összes készülék képtelen lesz követni téged.</string>
<string name="osmo_regenerate_login_ids">Felhasználói azonosító újragenerálása</string>
<string name="osmo_cancel_moving_target">Cél mozgatásának visszavonása</string>
<string name="osmo_center_location">Képernyő közepére</string>
<string name="osmo_set_moving_target">Beállítás mozgó célpontnak</string>
<string name="osmo_use_server_name">Regisztrált név</string>
<string name="osmo_connect_to_my_nickname">Felhasználónevem</string>
<string name="osmo_user_name">Felhasználó</string>
<string name="color_green">zöld</string>
<string name="osmo_track_interval">Rögzítési intervallum</string>
<string name="osmo_track_interval_descr">Válaszd ki a pozícióküldés gyakoriságát</string>
<string name="int_days">nap</string>
<string name="osmo_connect_menu">Kapcsolódás</string>
<string name="osmo_expire_group">Lejár</string>
<string name="osmo_group_description">Leírás</string>
<string name="osmo_group_policy">Irányelv</string>
<string name="osmo_connect_to_device_tracker_id">Követő ID</string>
<string name="osmo_connect_to_device_name">Felhasználónév</string>
<string name="osmo_connect_to_group_id">Csoport ID</string>
<string name="osmo_group_name">Csoportnév</string>
<string name="osmo_connect_to_device">Összekötés eszközzel</string>
<string name="osmo_connect_to_group">Összekötés csoporttal</string>
<string name="osmo_connect">Kapcsolódás ide</string>
<string name="osmo_create_group">Csoport létrehozása</string>
<string name="osmo_server_operation_failed">OsMo kiszolgáló művelet sikertelen</string>
<string name="osmo_activity">OpenStreetMap-Megfigyelés</string>
<string name="osmo_enable_tracker">Pozícióm küldése</string>
<string name="osmo_control">OsMo gyors elérés</string>
<string name="hours_ago">órával ezelőtt</string>
<string name="minutes_ago">perce</string>
<string name="seconds_ago">másodperce</string>
<string name="osmo_connected_devices">Összekapcsolt eszközök</string>
<string name="osmo_groups">OsMo Csoportok/Eszközök</string>
<string name="osmo_auto_send_locations_descr">A programindítás után a nyomkövető automatikus indítása és pozícióküldés</string>
<string name="osmo_auto_send_locations">Nyomkövető automatikus indítása</string>
<string name="osmo_tracker_id">Személyes nyomkövető ID</string>
<string name="tip_recent_changes_1_8_alpha">Az 1.8 kiadás újdonságai:
* Útvonaltervezés a GPX útvonalpontjai között
* Letöltésnél az országok nevei helyi nyelven jelennek meg
* GPX/KML import (konvertálás KML-ből GPX-be)
* Felvett GPX nyomvonalak a \'Saját helyek\' menüből érhetőek el
* Feldarabolhatod a GPX nyomvonalat távolságonként és ellenőrizheted a sebesség és magasság adatokat
* Navigáció automatikus indítása késleltetéssel
</string>
<string name="use_points_as_intermediates">Útvonal tervezése pontok között</string>
<string name="local_index_mi_export">Exportálás</string>
<string name="import_file_favourites">Mentés GPX fájlként, vagy importálás a kedvencekbe?</string>
<string name="import_save">Mentés</string>
<string name="share_fav">Megosztás</string>
<string name="share_fav_subject">OsmAndból megosztott kedvencek</string>
</resources>

12
OsmAnd/res/values-lt/strings.xml
View file

@ -1848,4 +1848,16 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="gpx_info_average_speed">Vidutinis greitis: %1$s </string>
<string name="gpx_info_maximum_speed">Maksimalus greitis: %1$s </string>
<string name="gpx_selection_number_of_points"> %1$s taškai/-ų</string>
<string name="show_zoom_buttons_navigation_descr">Rodyti mąstelio mygtukus navigacijos metu</string>
<string name="show_zoom_buttons_navigation">Rodyti mąstelio mygtukus</string>
<string name="save_as_favorites_points">Išsaugoti kaip grupę įsimintų vietų</string>
<string name="select_destination_and_intermediate_points">Pasirinkti tarpinius kelionės taškus</string>
<string name="layer_amenity_label">Taškų pavadinimai</string>
<string name="loading_smth">Įkeliama %1$s …</string>
<string name="map_widget_plain_time">Dabartinis laikas</string>
<string name="gpx_wpt">Kelionės taškas</string>
<string name="selected_gpx_info_show">\n\nPaspauskite ir laikykite kad pamatytumėte ant žemėlapio</string>
<string name="delay_navigation_start">Pradėti navigaciją su uždelsimu</string>
<string name="selected">pasirinkti</string>
<string name="gpx_split_interval">Pasirinkti padalinimo intervalą</string>
</resources>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
<string name="select_plugin_to_activate">Atzīmējiet spraudni, lai to aktivizētu vai deaktivizētu. (Iespējams OsmAnd vajadzēs restartēt.)</string>
<string name="prefs_plugins_descr">Spraudņi iespējo aplikācijas papildus funkcijas un uzstādījumus kā piemēram sekošana, enerģijas taupīšana, pieejamība un daudzas citas</string>
@ -1769,4 +1769,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="gpx_selection_points">%1$s \nPunkti</string>
<string name="gpx_selection_track">%1$s \nTreks %2$s</string>
<string name="gpx_available_current_track">Pašreizējais treka ieraksts</string>
<string name="save_as_favorites_points">Saglabāt kā izlases grupu</string>
<string name="select_destination_and_intermediate_points">Atlasīt ceļapunktus</string>
<string name="layer_amenity_label">Punktu nosaukumi</string>
</resources>

55
OsmAnd/res/values-nl/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="live_monitoring_mode_off">Start\n online tracking</string>
<string name="live_monitoring_mode_on">Stop\n online tracking</string>
<string name="layer_map_appearance">Configureer scherm</string>
@ -25,7 +25,7 @@
<string name="native_rendering">Interne kaartgeneratie</string>
<string name="test_voice_prompts">Test stem-instructies</string>
<string name="switch_to_raster_map_to_see">Geen offline vectorkaart aanwezig voor deze locatie. Je kan deze downloaden via Instellingen (Offline gegevens), of overschakelen naar online kaarten.</string>
<string name="switch_to_raster_map_to_see">Geen offline vectorkaart aanwezig voor deze locatie. Je kan deze downloaden via Instellingen (Kaartbeheer), of overschakelen naar online kaarten; activeer hiervoor de "online maps" plugin.</string>
<string name="tip_recent_changes_0_7_2_t">Wijzigingen in 0.7.2:
\n\t- Interne kaartgeneratie op alle apparaten
\n\t- Offline interessepunt-bewerking
@ -163,8 +163,8 @@
<string name="routing_settings">Navigatie</string>
<string name="routing_settings_descr">Opties voor navigatie</string>
<string name="global_settings">Algemene instellingen</string>
<string name="index_settings">Offline gegevens</string>
<string name="index_settings_descr">Download kaarten en stemmen, en beheer en bekijk GPX-tracks</string>
<string name="index_settings">Kaartbeheer</string>
<string name="index_settings_descr">Download en beheer kaarten, stemmen en GPX-tracks</string>
<string name="general_settings">Algemene instellingen</string>
<string name="general_settings_descr">Kaartweergave en algemene instellingen</string>
<string name="global_app_settings">Algemene app instellingen</string>
@ -283,7 +283,7 @@
<string name="local_index_items_restored">%1$d van %2$d gegevens succesvol geactiveerd.</string>
<string name="local_index_no_items_to_do">Voor %1$s: geen bestanden</string>
<string name="local_index_action_do">%1$s: %2$s bestanden. Doorgaan?</string>
<string name="local_index_descr_title">Offline gegevensbeheer</string>
<string name="local_index_descr_title">Kaartbeheer</string>
<string name="local_index_mi_restore">Activeer</string>
<string name="local_index_mi_backup">Deactiveer</string>
<string name="local_index_mi_delete">Verwijder</string>
@ -352,8 +352,8 @@
<string name="internet_not_available">De benodigde internetverbinding voor deze actie is niet beschikbaar</string>
<string name="install_more">Installeer meer…</string>
<string name="tip_update_index">Bijwerken van offline kaarten</string>
<string name="tip_update_index_t">Het is belangrijk dat de kaartgegevens up-to-date zijn voor zoeken op interessepunt/adres en voor offline navigatie. De downloadmanager kan deze offline kaarten (en enkele andere gegevens) downloaden en aangeven of er updates beschikbaar zijn.
\n\nOm kaarten te downloaden, ga naar \'Instellingen\' -&gt; \'Offline gegevens\' -&gt; \'Download of update offline gegevens\'.
<string name="tip_update_index_t">Het is belangrijk dat de kaartgegevens up-to-date zijn voor zoeken op interessepunt/adres en voor offline navigatie. De kaartmanager kan deze offline kaarten (en enkele andere gegevens) downloaden en aangeven of er updates beschikbaar zijn.
\n\nOm kaarten te downloaden, ga naar \'Instellingen\' -&gt; \'Kaartbeheer\' -&gt; \'Download of update offline gegevens\'.
\n\nNadat de regiolijst van het internet is opgehaald, druk op een item om deze te downloaden of te updaten.
\n\nJe kan de lijst doorzoeken door letters te typen, of gebruik de optie \'Instellingen\' -&gt; \'Toon gedownloade\' om alleen de gegevens te zien die al op je apparaat aanwezig zijn.
\n\n\t* Groen: deze gegevens zijn up-to-date
@ -369,7 +369,7 @@
<string name="tip_favorites">Favorieten</string>
<string name="tip_favorites_t">Veelgebruikte punten kunnen als volgt worden bewaard als favorieten:
\n\nIn het kaartcontextmenu van een punt, kies de optie \'Voeg toe aan favorieten\' en geef het dan een naam.
\n\nNa opslaan zijn favorieten toegankelijk via \'Hoofdmenu\' → \'Favorieten\'. Druk op een favoriet in het menu \'Favorieten\' om deze als als bestemming te kiezen, te bewerken of te verwijderen.
\n\nNa opslaan zijn favorieten toegankelijk via \'Hoofdmenu\' → \'Favorieten\'. Druk op een favoriet in het menu \'Mijn plaatsen\' om deze als als bestemming te kiezen, te bewerken of te verwijderen.
\n\nJe kan alle favorieten tegelijk op de kaart weergeven door de laag \'Favorieten\' aan te zetten op het kaartscherm in \'Menu\' → \'Kaartlagen\'.
</string>
<string name="create_poi_link_to_osm_doc">" <u>Online OSM</u> kaart classificatie met foto\'s"</string>
@ -608,7 +608,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
<string name="route_head">Koers</string>
<string name="first_time_continue">Ga door</string>
<string name="first_time_download">Download regio\'s</string>
<string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Offline gegevens\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
<string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
<string name="search_poi_location">Naar signaal zoeken…</string>
<string name="search_near_map">Zoek dichtbij de laatste kaartlocatie</string>
<string name="search_nearby">Zoek dichtbij</string>
@ -769,7 +769,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
<string name="exit_Button">Afsluiten</string>
<string name="map_Button">Kaart</string>
<string name="settings_Button">Instellingen</string>
<string name="favorites_Button">Favorieten</string>
<string name="favorites_Button">Mijn plaatsen</string>
<string name="search_button">Zoeken</string>
<string name="search_activity">Zoeken</string>
<string name="searchpoi_activity">Kies interessepunt</string>
@ -864,7 +864,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
<string name="offline_navigation_not_available">OsmAnd offline navigatie is tijdelijk niet beschikbaar.</string>
<string name="left_side_navigation">Linksrijdend verkeer</string>
<string name="left_side_navigation_descr">Activeer in een land waar men links rijdt</string>
<string name="download_link_and_local_description">Download of update offline gegevens.\nKlik op een item om meer details te zien, druk lang om te deactiveren, te hernoemen of te verwijderen. Huidige data op apparaat (%1$s vrij):</string>
<string name="download_link_and_local_description">Download of actualiseer offline kaarten.\nKlik op een item om meer details te zien, druk lang om te deactiveren, te hernoemen of te verwijderen. Huidige data op apparaat (%1$s vrij):</string>
<string name="unknown_from_location">Startlocatie is nog niet bepaald</string>
<string name="confirm_interrupt_download">Wil je het downloaden afbreken?</string>
<string name="basemap_was_selected_to_download">De basiskaart is nodig voor OsmAnd en is al geselecteerd om te downloaden.</string>
@ -1164,7 +1164,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
<string name="tip_altitude_offset">Hoogtecorrectie</string>
<string name="tip_altitude_offset_t">De meeste GPS ontvangers geven hoogtemetingen in het WGS84-systeem. De conversie naar lokale systemen vereist een positie-afhankelijke correctie.
\n\nEen nauwkeuriger benadering voor deze systemen is het EGM96-systeem (geoid).
\n\nOsmAnd kan de hoogte ook weergeven in het EGM96-systeem. Download hiervoor de gegevens voor World Altitude Correction (WW15MGH.DAC) via \'Instellingen\' -&gt; \'Offline gegevens\' (het origineel staat op http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC).
\n\nOsmAnd kan de hoogte ook weergeven in het EGM96-systeem. Download hiervoor de gegevens voor World Altitude Correction (WW15MGH.DAC) via \'Instellingen\' -&gt; \'Kaartbeheer\' (het origineel staat op http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC).
</string>
<string name="monitoring_control_start">GPX</string>
<string name="rendering_attr_noAdminboundaries_name">Verberg grenzen</string>
@ -1174,7 +1174,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
<string name="osmodroid_plugin_name">OsMoDroid-plugin</string>
<string name="index_srtm_parts">gedeelten</string>
<string name="index_srtm_ele">Hoogtelijnen</string>
<string name="srtm_plugin_description">Maakt het downloaden van offline hoogtelijnen en reliëfinformatie mogelijk (\'Instellingen\' → \'Offline gegevensbeheer\' → \'Download\' → Kies kaarttype).</string>
<string name="srtm_plugin_description">Maakt het downloaden van offline hoogtelijnen en reliëfinformatie mogelijk (\'Instellingen\' → \'Kaartbeheer\' → \'Download\' → Kies kaarttype).</string>
<string name="srtm_plugin_name">Hoogtelijnen-plugin</string>
<string name="download_select_map_types">Andere kaarten</string>
<string name="download_srtm_maps">Hoogtelijnen</string>
@ -1759,9 +1759,12 @@ De maximale afstand tussen start en bestemming is ongeveer 200 km. Maak één of
<string name="osmo_locations_sent">%1$d verzonden locaties (in buffer %2$d) </string>
<string name="osmo_conn_successfull">Verbinding gemaakt: %1$s </string>
<string name="tip_recent_changes_1_8_alpha">Wijzigingen in versie 1.8:
* Routeberekening tussen punten op een GPX-spoor
* Kaarten op het downloadscherm zoeken met de plaatselijke naam
* GPX/KML import (converteer KML naar GPX)
* Routeberekening tussen punten op een GPX-spoor
* Kaarten op het downloadscherm zoeken met de plaatselijke naam
* GPX/KML import (converteer KML naar GPX)
* GPX sporen verplaatst naar "Mijn plaatsen"
* GPX spoor splitsen en controle van hoogteverschil / snelheid
* Start navigatie automatisch na vertraging
</string>
<string name="use_points_as_intermediates">Bereken route tussen punten</string>
<string name="osmo_mode_restart">Herstart OsMo-sessie</string>
@ -1824,35 +1827,35 @@ De maximale afstand tussen start en bestemming is ongeveer 200 km. Maak één of
<string name="osmo_show_group_notifications">Toon groepsmeldingen</string>
<string name="osmo_show_group_notifications_descr">Toon meldingen als een gebruiker bij een groep komt of deze verlaat</string>
<string name="my_favorites">Mijn favorieten</string>
<string name="my_data_Button">Mijn gegevens</string>
<string name="my_data_activity">Mijn gegevens</string>
<string name="my_data_Button">Mijn plaatsen</string>
<string name="my_data_activity">Mijn plaatsen</string>
<string name="selected_track">Gekozen track</string>
<string name="my_tracks">Alle tracks</string>
<string name="gpx_file_is_empty">Gpx track is leeg</string>
<string name="gpx_info_subtracks">Subtracks: %1$s </string>
<string name="gpx_info_distance">Afstand: %1$s (%2$s punten) </string>
<string name="gpx_info_start_time">Starttijd: %1$tF, %1$tR </string>
<string name="gpx_info_end_time">Eindtijd: %1$tF, %1$tR </string>
<string name="gpx_info_start_time">Starttijd: %1$tF, %1$tT </string>
<string name="gpx_info_end_time">Eindtijd: %1$tF, %1$tT </string>
<string name="gpx_info_average_speed">Gemiddelde snelheid: %1$s </string>
<string name="gpx_info_maximum_speed">Maximum snelheid: %1$s </string>
<string name="gpx_info_avg_altitude">Gemiddelde hoogte: %1$s</string>
<string name="gpx_info_diff_altitude">Hoogteverschil: %1$s</string>
<string name="gpx_info_asc_altitude">Stijgingen: %1$s</string>
<string name="gpx_info_diff_altitude">Hoogtebereik: %1$s</string>
<string name="gpx_info_asc_altitude">Dalingen/Stijgingen: %1$s</string>
<string name="gpx_timespan">Tijdsduur: %1$s</string>
<string name="gpx_timemoving">Tijdsduur verplaatsingen: %1$s</string>
<string name="gpx_selection_segment_title">Segment</string>
<string name="gpx_selection_number_of_points"> %1$s punten</string>
<string name="gpx_selection_point">Punt %1$s</string>
<string name="gpx_selection_current_track">geregistreerde track</string>
<string name="gpx_selection_route_points">%1$s \n Routepunten %2$s</string>
<string name="gpx_selection_points">%1$s\n punten</string>
<string name="gpx_selection_track">%1$s\n Track %2$s</string>
<string name="gpx_selection_route_points">%1$s \nRoutepunten %2$s</string>
<string name="gpx_selection_points">%1$s \npunten</string>
<string name="gpx_selection_track">%1$s \nTrack %2$s</string>
<string name="gpx_available_current_track">Huidige geregistreerde track</string>
<string name="save_as_favorites_points">Bewaar als groep van favorieten</string>
<string name="loading_smth">Laad %1$s …</string>
<string name="map_widget_plain_time">Huidige tijd</string>
<string name="select_destination_and_intermediate_points">Kies routepunten</string>
<string name="layer_amenity_label">Tekstlabels</string>
<string name="layer_amenity_label">Punt-labels</string>
<string name="gpx_wpt">Routepunt</string>
<string name="selected_gpx_info_show">\n\nLang drukken om op de kaart te bekijken</string>
<string name="delay_navigation_start">Start navigatie met vertraging</string>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="amenity_type_administrative">Administrativo</string>
<string name="amenity_type_barrier">Barreira</string>
<string name="amenity_type_education">Educação</string>
@ -1235,7 +1235,7 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
<string name="context_menu_item_directions_to">Direções para</string>
<string name="context_menu_item_directions_from">Direções desde</string>
<string name="route_descr_map_location">Mapa: </string>
<string name="route_descr_lat_lon">Lat %1$.3f, Lon %2$.3f</string>
<string name="route_descr_lat_lon">Lat. %1$.3f, Lon. %2$.3f</string>
<string name="route_to">Para:</string>
<string name="route_via">Via:</string>
<string name="route_from">Desde:</string>

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

@ -319,7 +319,7 @@
<string name="vector_map_not_needed">Не нужно</string>
<string name="basemap_missing">Отсутствует базовая карта, покрывающая весь мир на мелком масштабе. Пожалуйста загрузите World_basemap_x.obf для полноценный работы приложения.</string>
<string name="vector_data_missing">Локальные данные отсутствуют на SD-носителе. Пожалуйста, загрузите их для того, чтобы использовать приложение без Интернета.</string>
<string name="local_index_gpx_info_show">\n\nДлинное нажатие для просмотра на карте</string>
<string name="local_index_gpx_info_show">\n\nНажать и удерживать для вызова меню</string>
@ -1677,9 +1677,9 @@ OsmAnd - открытый источник и активно развается.
<string name="osmo_follow">Следить</string>
<string name="osmo_edit_device">Изменить пользовательские свойства</string>
<string name="gpx_file_is_empty">Трек GPX пуст</string>
<string name="selected_track">Выбранный трек</string>
<string name="my_tracks">Все трэки</string>
<string name="my_favorites">Мои избранные</string>
<string name="selected_track">Выбранные треки</string>
<string name="my_tracks">Все треки</string>
<string name="my_favorites">Избранные</string>
<string name="my_data_Button">Мои места</string>
<string name="my_data_activity">Мои места</string>
<string name="osmo_user_joined">Пользователь %1$s присоединился к группе %2$s</string>
@ -1692,7 +1692,7 @@ OsmAnd - открытый источник и активно развается.
<string name="osmo_set_moving_target">Установить как движущуюся цель</string>
<string name="osmo_center_location">Центр на экране</string>
<string name="gpx_selection_segment_title">Сегмент</string>
<string name="gpx_info_distance">Дистанция: %1$s (%2$s точек) </string>
<string name="gpx_info_distance">Расстояние: %1$s (%2$s точек) </string>
<string name="gpx_info_start_time">Время старта: %1$tF, %1$tT </string>
<string name="gpx_info_end_time">Время завершения: %1$tF, %1$tT </string>
<string name="gpx_info_average_speed">Средняя скорость: %1$s </string>
@ -1700,10 +1700,10 @@ OsmAnd - открытый источник и активно развается.
<string name="gpx_info_avg_altitude">Средняя высота: %1$s</string>
<string name="gpx_info_diff_altitude">Диапазон высот: %1$s</string>
<string name="gpx_info_asc_altitude">Снижение/подъём: %1$s</string>
<string name="gpx_timespan">Отрезок времени: %1$s</string>
<string name="gpx_timemoving">Время передвижения: %1$s</string>
<string name="gpx_timespan">Общее время: %1$s</string>
<string name="gpx_timemoving">Время в движении: %1$s</string>
<string name="gpx_selection_points">%1$s \nТочек</string>
<string name="gpx_selection_track">%1$s \nТрэк %2$s</string>
<string name="gpx_selection_track">%1$s \nТрек %2$s</string>
<string name="gpx_available_current_track">Текущий пишущийся трек</string>
<string name="loading_smth">Загрузка %1$s…</string>
<string name="map_widget_plain_time">Текущее время</string>
@ -1720,6 +1720,6 @@ OsmAnd - открытый источник и активно развается.
<string name="gpx_selection_point">Точка %1$s</string>
<string name="gpx_selection_current_track">запись</string>
<string name="gpx_selection_route_points">%1$s \nМаршрутных точек %2$s</string>
<string name="show_zoom_buttons_navigation_descr">Отображать кнопки масштабирования при навигации</string>
<string name="show_zoom_buttons_navigation">Отображать кнопки масштабирования</string>
<string name="show_zoom_buttons_navigation_descr">Показывать кнопки изменения масштаба во время навигации</string>
<string name="show_zoom_buttons_navigation">Показывать кнопки изменения масштаба</string>
</resources>

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

@ -1887,5 +1887,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="save_as_favorites_points">Uložiť ako skupinu obľúbených</string>
<string name="select_destination_and_intermediate_points">Vybrať prechodné body</string>
<string name="layer_amenity_label">Popisy bodov</string>
<string name="show_zoom_buttons_navigation_descr">Zobraziť tlačidlá priblíženia počas navigácie</string>
<string name="show_zoom_buttons_navigation">Zobraziť tlačidlá priblíženia</string>
</resources>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string>
@ -1548,7 +1548,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
<string name="osmo_follow">Följ</string>
<string name="osmo_user_joined">Användare %1$s anslöt till grupp %2$s</string>
<string name="osmo_user_left">Användare %1$s lämnade grupp %2$s</string>
<string name="osmo_show_group_notifications">Visa gruppmeddelanden</string>
<string name="osmo_show_group_notifications">Visa gruppaviseringar</string>
<string name="osmo_show_group_notifications_descr">Visa popup-meddelande när användare ansluter till eller lämnar gruppen</string>
<string name="selected_track">Valda spår</string>
<string name="my_tracks">Alla spår</string>
@ -1585,5 +1585,9 @@ Aktuella data på enheten (%1$s ledigt):</string>
<string name="gpx_available_current_track">Aktuellt inspelningsspår</string>
<string name="save_as_favorites_points">Spara som grupp med favoriter</string>
<string name="select_destination_and_intermediate_points">Välj waypoints</string>
<string name="layer_amenity_label">Textetiketter</string>
<string name="layer_amenity_label">Punktetiketter</string>
<string name="show_zoom_buttons_navigation_descr">Visa zoom-knappar under navigering</string>
<string name="show_zoom_buttons_navigation">Visa zoom-knappar</string>
<string name="color_green">grön</string>
</resources>

9
OsmAnd/src/net/osmand/plus/Version.java
View file

@ -9,6 +9,7 @@ public class Version {
private final String appVersion;
private final String appName;
private final static String FREE_VERSION_NAME = "net.osmand";
private final static String SHERPAFY_VERSION_NAME = "net.osmand.sherpafy";
public static boolean isGpsStatusEnabled(OsmandApplication ctx) {
@ -48,6 +49,14 @@ public class Version {
return ctx.getString(R.string.versionFeatures).contains("+parking_plugin");
}
public static boolean isRouteNavPluginInlined(OsmandApplication ctx) {
return ctx.getString(R.string.versionFeatures).contains("+route_nav");
}
public static boolean isSherpafy(OsmandApplication ctx) {
return ctx.getPackageName().equals(SHERPAFY_VERSION_NAME);
}
private Version(OsmandApplication ctx) {
appVersion = ctx.getString(R.string.app_version);
appName = ctx.getString(R.string.app_name);

27
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -13,6 +13,7 @@ import net.osmand.plus.Version;
import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.render.MapRenderRepositories;
import net.osmand.plus.sherpafy.SherpafyCustomization;
import net.osmand.plus.sherpafy.TourViewActivity;
import android.app.Activity;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
@ -184,16 +185,21 @@ public class MainMenuActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if(getIntent() != null) {
setupCustomization(getIntent());
}
((OsmandApplication) getApplication()).applyTheme(this);
getMyApplication().applyTheme(this);
super.onCreate(savedInstanceState);
boolean exit = false;
if(Version.isSherpafy(getMyApplication())) {
final Intent mapIntent = new Intent(this, TourViewActivity.class);
getMyApplication().setAppCustomization(new SherpafyCustomization());
startActivity(mapIntent);
finish();
return;
}
if(getIntent() != null){
Intent intent = getIntent();
if(intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)){
exit = true;
getMyApplication().closeApplication(this);
return;
}
}
@ -250,10 +256,6 @@ public class MainMenuActivity extends Activity {
}
});
appCustomization.customizeMainMenu(window, this);
if(exit){
getMyApplication().closeApplication(activity);
return;
}
OsmandApplication app = getMyApplication();
// restore follow route mode
if(app.getSettings().FOLLOW_THE_ROUTE.get() && !app.getRoutingHelper().isRouteCalculated()){
@ -309,11 +311,6 @@ public class MainMenuActivity extends Activity {
}
}
private void setupCustomization(Intent intent) {
if (intent.hasExtra("SHERPAFY")) {
((OsmandApplication) getApplication()).setAppCustomization(new SherpafyCustomization());
}
}
private void applicationInstalledFirstTime() {
boolean netOsmandWasInstalled = false;

7
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -22,7 +22,6 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.api.FileSettingsAPIImpl;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.sherpafy.TourInformation.StageInformation;
import net.osmand.plus.views.OsmandMapTileView;
import android.app.Activity;
import android.view.Window;
import android.widget.TextView;
@ -226,18 +225,18 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
public void selectTour(TourInformation tour, IProgress progress) {
if(tour == null) {
if (tour == null) {
selectedTourPref.set(null);
} else {
selectedTourPref.set(tour.getName());
}
selectedTour = null;
selectedStage = null;
//to avoid null reference ecxeption if there's no selected tour yet.
// to avoid null reference ecxeption if there's no selected tour yet.
if (selectedStagePref != null) {
selectedStagePref.set(null);
}
app.getResourceManager().reloadIndexes(progress);
app.getResourceManager().reloadIndexes(progress);
}
@Override

74
OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
View file

@ -1,13 +1,15 @@
package net.osmand.plus.sherpafy;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import net.osmand.IProgress;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.DownloadIndexActivity;
@ -19,16 +21,11 @@ import android.app.AlertDialog.Builder;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.DialogInterface.OnClickListener;
import android.content.pm.ActivityInfo;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.graphics.Point;
import android.graphics.BitmapFactory.Options;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.text.Html;
@ -43,7 +40,6 @@ import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.FrameLayout;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@ -68,6 +64,9 @@ public class TourViewActivity extends SherlockFragmentActivity {
private static final int STATE_LOADING = 0;
private static final int STATE_SELECT_TOUR = -1;
private static int state = STATE_LOADING;
public static final int APP_EXIT_CODE = 4;
public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
private SherpafyCustomization customization;
ImageView img;
TextView description;
@ -75,7 +74,7 @@ public class TourViewActivity extends SherlockFragmentActivity {
RadioGroup stages;
private ToggleButton collapser;
Point size;
private boolean afterDownload = false;
private Set<TourInformation> currentTourInformations = new HashSet<TourInformation>();
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -87,6 +86,13 @@ public class TourViewActivity extends SherlockFragmentActivity {
setTheme(R.style.OsmandLightTheme);
((OsmandApplication) getApplication()).setLanguage(this);
super.onCreate(savedInstanceState);
if(getIntent() != null){
Intent intent = getIntent();
if(intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)){
getMyApplication().closeApplication(this);
return;
}
}
if(getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT ||
getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
@ -142,28 +148,32 @@ public class TourViewActivity extends SherlockFragmentActivity {
};
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if(resultCode == APP_EXIT_CODE){
getMyApplication().closeApplication(this);
}
}
@Override
protected void onResume() {
super.onResume();
//this flag needed to start indexing tours is user downloaded some and returned to activity
if (afterDownload){
if (customization.getTourInformations().isEmpty()){
customization.onIndexingFiles(IProgress.EMPTY_PROGRESS,new LinkedHashMap<String, String>());
}
if (!customization.getTourInformations().isEmpty()){
if (customization.getSelectedTour() == null){
setTourSelectionContentView();
state = STATE_SELECT_TOUR;
} else {
startTourView();
TourInformation selectedTour = customization.getSelectedTour();
if (selectedTour == null || currentTourInformations.contains(selectedTour)) {
for (TourInformation i : customization.getTourInformations()) {
if (!currentTourInformations.contains(i)) {
currentTourInformations.add(i);
selectedTour = i;
}
}
if(selectedTour != null) {
selectTourAsync(selectedTour);
//startTourView();
}
}
}
private void setTourInfoContent() {
@ -374,14 +384,21 @@ public class TourViewActivity extends SherlockFragmentActivity {
private void goToMap() {
if (customization.getSelectedStage() != null) {
GPXFile gpx = customization.getSelectedStage().getGpx();
if (gpx != null && gpx.findPointToShow() != null) {
WptPt p = gpx.findPointToShow();
getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon,
getMyApplication().getSettings().getLastKnownMapZoom(), null);
getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx);
List<SelectedGpxFile> sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles();
if(gpx == null && sgpx.size() > 0) {
getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
} else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) {
getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
if (gpx != null && gpx.findPointToShow() != null) {
WptPt p = gpx.findPointToShow();
getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon, 16, null);
getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx);
}
}
}
MapActivity.launchMapActivityMoveToTop(getActivity());
Intent newIntent = new Intent(this, customization.getMapActivity());
newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
this.startActivityForResult(newIntent, 0);
}
private void prepareBitmap(Bitmap imageBitmap) {
@ -483,7 +500,6 @@ public class TourViewActivity extends SherlockFragmentActivity {
private void startDownloadActivity() {
final Intent download = new Intent(this, DownloadIndexActivity.class);
download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
afterDownload = true;
startActivity(download);
}