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

Help finished.

Browse source
This commit is contained in:
GaidamakUA 2016-04-28 13:29:56 +03:00
parent 93a42d60af
commit 88503a5ef9
30 changed files with 128 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/build.gradle
View file

@ -58,7 +58,6 @@ android {
} }
dexOptions { dexOptions {
jumboMode = true
incremental true incremental true
javaMaxHeapSize "4g" javaMaxHeapSize "4g"
} }

3
OsmAnd/no_translate.xml
View file

@ -28,5 +28,8 @@
<string name="hint_value">Value</string> <string name="hint_value">Value</string>
<!-- DEVELOPMENT --> <!-- DEVELOPMENT -->
<string name="osm_live_default_price">€1,49</string> <string name="osm_live_default_price">€1,49</string>
<string name="twitter_address">https://twitter.com/osmandapp</string>
<string name="facebook_address">https://www.facebook.com/osmandapp</string>
<string name="vk_address">https://vk.com/osmandapp</string>
</resources> </resources>

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

@ -9,6 +9,7 @@
android:minHeight="40dp" android:minHeight="40dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/list_header_padding" android:paddingLeft="@dimen/list_header_padding"
android:background="?attr/ctx_menu_info_view_bg"
android:paddingRight="@dimen/list_header_padding"> android:paddingRight="@dimen/list_header_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx

6
OsmAnd/res/layout/two_line_with_images_list_item.xml
View file

@ -15,7 +15,7 @@
android:paddingLeft="@dimen/list_content_padding"> android:paddingLeft="@dimen/list_content_padding">
<ImageView <ImageView
android:id="@+id/leftImageView" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -30,7 +30,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/name" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
@ -65,7 +65,7 @@
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/rightImageButton" android:id="@+id/secondaryIcon"
android:layout_width="@dimen/list_item_height" android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height" android:layout_height="@dimen/list_item_height"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

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

@ -959,7 +959,7 @@
<string name="poi_monitoring_station">Станцыя назіраньня</string> <string name="poi_monitoring_station">Станцыя назіраньня</string>
<string name="poi_email">Эл. пошта</string> <string name="poi_email">Эл. пошта</string>
<string name="poi_fax">Факс</string> <string name="poi_fax">Факс</string>
<string name="poi_facebook">Фэйсбук</string> <string name="facebook">Фэйсбук</string>
<string name="poi_mobile">Сотавы тэлефон</string> <string name="poi_mobile">Сотавы тэлефон</string>
<string name="poi_animal_shelter_dog">Прытулак для сабак</string> <string name="poi_animal_shelter_dog">Прытулак для сабак</string>
<string name="poi_animal_shelter_cat">Прытулак для катоў</string> <string name="poi_animal_shelter_cat">Прытулак для катоў</string>
@ -1054,11 +1054,11 @@
<string name="poi_recycling_waste_oil">Адпрацаваная алiва</string> <string name="poi_recycling_waste_oil">Адпрацаваная алiва</string>
<string name="poi_perfumery">Парфумэрыя</string> <string name="poi_perfumery">Парфумэрыя</string>
<string name="poi_twitter">Твітар</string> <string name="twitter">Твітар</string>
<string name="poi_skype">Скайп</string> <string name="poi_skype">Скайп</string>
<string name="poi_youtube">Ютуб</string> <string name="poi_youtube">Ютуб</string>
<string name="poi_instagram">Інстаграм</string> <string name="poi_instagram">Інстаграм</string>
<string name="poi_vk">УКантакце</string> <string name="vk">УКантакце</string>
<string name="poi_google_plus">Гугл+</string> <string name="poi_google_plus">Гугл+</string>
<string name="poi_mill_pond">Млынавая сажалка</string> <string name="poi_mill_pond">Млынавая сажалка</string>
<string name="poi_building">Будынак</string> <string name="poi_building">Будынак</string>

6
OsmAnd/res/values-ca/phrases.xml
View file

@ -954,7 +954,7 @@
<string name="poi_email">Correu electrònic</string> <string name="poi_email">Correu electrònic</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Mòbil</string> <string name="poi_mobile">Mòbil</string>
<string name="poi_animal_shelter_dog">Tipus de refugi: per gossos</string> <string name="poi_animal_shelter_dog">Tipus de refugi: per gossos</string>
<string name="poi_animal_shelter_cat">Tipus de refugi: per gats</string> <string name="poi_animal_shelter_cat">Tipus de refugi: per gats</string>
@ -1048,11 +1048,11 @@
<string name="poi_recycling_beverage_cartons">Envasos de cartró de begudes</string> <string name="poi_recycling_beverage_cartons">Envasos de cartró de begudes</string>
<string name="poi_recycling_sheet_metal">Xapa metàl·lica</string> <string name="poi_recycling_sheet_metal">Xapa metàl·lica</string>
<string name="poi_mill_pond">Bassa del molí</string> <string name="poi_mill_pond">Bassa del molí</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumeria</string> <string name="poi_perfumery">Perfumeria</string>

6
OsmAnd/res/values-cs/phrases.xml
View file

@ -1078,12 +1078,12 @@
<string name="poi_military_office">Vojenský úřad</string> <string name="poi_military_office">Vojenský úřad</string>
<string name="poi_email">E-mail</string> <string name="poi_email">E-mail</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_mobile">Mobilní telefon</string> <string name="poi_mobile">Mobilní telefon</string>
<string name="poi_height">Výška</string> <string name="poi_height">Výška</string>

6
OsmAnd/res/values-da/phrases.xml
View file

@ -966,7 +966,7 @@
<string name="poi_email">E-mail</string> <string name="poi_email">E-mail</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Mobiltelefon</string> <string name="poi_mobile">Mobiltelefon</string>
<string name="poi_animal_shelter_dog">Internat: hund</string> <string name="poi_animal_shelter_dog">Internat: hund</string>
<string name="poi_animal_shelter_cat">Internat: kat</string> <string name="poi_animal_shelter_cat">Internat: kat</string>
@ -1060,11 +1060,11 @@
<string name="poi_crossing_unmarked">Ikke markeret</string> <string name="poi_crossing_unmarked">Ikke markeret</string>
<string name="poi_mill_pond">Mølledam</string> <string name="poi_mill_pond">Mølledam</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Parfumeri</string> <string name="poi_perfumery">Parfumeri</string>

6
OsmAnd/res/values-de/phrases.xml
View file

@ -956,7 +956,7 @@
<string name="poi_shower">Dusche</string> <string name="poi_shower">Dusche</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Mobiltelefon</string> <string name="poi_mobile">Mobiltelefon</string>
<string name="poi_fee_no">kostenfrei</string> <string name="poi_fee_no">kostenfrei</string>
<string name="poi_drinking_water_yes">Trinkwasser</string> <string name="poi_drinking_water_yes">Trinkwasser</string>
@ -1008,11 +1008,11 @@
<string name="poi_animal_shelter_bird">Unterkunftstyp: Vogel</string> <string name="poi_animal_shelter_bird">Unterkunftstyp: Vogel</string>
<string name="poi_mill_pond">Mühlenteich</string> <string name="poi_mill_pond">Mühlenteich</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">Youtube</string> <string name="poi_youtube">Youtube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Parfümerie</string> <string name="poi_perfumery">Parfümerie</string>

6
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -949,7 +949,7 @@
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Móvil</string> <string name="poi_mobile">Móvil</string>
<string name="poi_animal_shelter_dog">Refugio canino</string> <string name="poi_animal_shelter_dog">Refugio canino</string>
<string name="poi_animal_shelter_cat">Refugio gatuno</string> <string name="poi_animal_shelter_cat">Refugio gatuno</string>
@ -1042,11 +1042,11 @@
<string name="poi_recycling_hardcore">Escombros</string> <string name="poi_recycling_hardcore">Escombros</string>
<string name="poi_recycling_chipboard">Cartón prensado</string> <string name="poi_recycling_chipboard">Cartón prensado</string>
<string name="poi_mill_pond">Laguna de molino</string> <string name="poi_mill_pond">Laguna de molino</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumería</string> <string name="poi_perfumery">Perfumería</string>

6
OsmAnd/res/values-es-rUS/phrases.xml
View file

@ -894,7 +894,7 @@
<string name="poi_fee_no">Sin cargo</string> <string name="poi_fee_no">Sin cargo</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Móvil</string> <string name="poi_mobile">Móvil</string>
<string name="poi_animal_shelter_dog">Refugio canino</string> <string name="poi_animal_shelter_dog">Refugio canino</string>
<string name="poi_animal_shelter_cat">Refugio gatuno</string> <string name="poi_animal_shelter_cat">Refugio gatuno</string>
@ -984,11 +984,11 @@
<string name="poi_recycling_hardcore">Escombros</string> <string name="poi_recycling_hardcore">Escombros</string>
<string name="poi_recycling_chipboard">Cartón prensado</string> <string name="poi_recycling_chipboard">Cartón prensado</string>
<string name="poi_mill_pond">Laguna de molino</string> <string name="poi_mill_pond">Laguna de molino</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumería</string> <string name="poi_perfumery">Perfumería</string>
<string name="poi_building">Edificio</string> <string name="poi_building">Edificio</string>

6
OsmAnd/res/values-es/phrases.xml
View file

@ -952,7 +952,7 @@
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Móvil</string> <string name="poi_mobile">Móvil</string>
<string name="poi_animal_shelter_dog">Refugio canino</string> <string name="poi_animal_shelter_dog">Refugio canino</string>
<string name="poi_animal_shelter_cat">Refugio gatuno</string> <string name="poi_animal_shelter_cat">Refugio gatuno</string>
@ -1045,11 +1045,11 @@
<string name="poi_recycling_hardcore">Escombros</string> <string name="poi_recycling_hardcore">Escombros</string>
<string name="poi_recycling_chipboard">Cartón prensado</string> <string name="poi_recycling_chipboard">Cartón prensado</string>
<string name="poi_mill_pond">Lago de molino</string> <string name="poi_mill_pond">Lago de molino</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumería</string> <string name="poi_perfumery">Perfumería</string>

6
OsmAnd/res/values-fr/phrases.xml
View file

@ -956,7 +956,7 @@
<string name="poi_shower">Douche</string> <string name="poi_shower">Douche</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_drinking_water_yes">Eau potable : Oui</string> <string name="poi_drinking_water_yes">Eau potable : Oui</string>
<string name="poi_drinking_water_no">Eau potable : Non</string> <string name="poi_drinking_water_no">Eau potable : Non</string>
<string name="poi_seasonal_no">Permanent</string> <string name="poi_seasonal_no">Permanent</string>
@ -1019,7 +1019,7 @@
<string name="poi_recycling_light_bulbs">Ampoules électriques</string> <string name="poi_recycling_light_bulbs">Ampoules électriques</string>
<string name="poi_recycling_chipboard">Contreplaqué</string> <string name="poi_recycling_chipboard">Contreplaqué</string>
<string name="poi_recycling_fridge_and_freezer">Réfrigérateur et congélateur</string> <string name="poi_recycling_fridge_and_freezer">Réfrigérateur et congélateur</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
@ -1867,7 +1867,7 @@
<string name="poi_debris">Gravats</string> <string name="poi_debris">Gravats</string>
<string name="poi_jersey_barrier">Mur Jersey</string> <string name="poi_jersey_barrier">Mur Jersey</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_content_silage">Contenu : ensilage</string> <string name="poi_content_silage">Contenu : ensilage</string>
<string name="poi_content_manure">Contenu : fumier</string> <string name="poi_content_manure">Contenu : fumier</string>
<string name="poi_nudism_permissive">Nudisme autorisé</string> <string name="poi_nudism_permissive">Nudisme autorisé</string>

6
OsmAnd/res/values-gl/phrases.xml
View file

@ -712,12 +712,12 @@
<string name="poi_website">Sitio web</string> <string name="poi_website">Sitio web</string>
<string name="poi_email">Correo electrónico</string> <string name="poi_email">Correo electrónico</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">Youtube</string> <string name="poi_youtube">Youtube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">Vkontakte</string> <string name="vk">Vkontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_mobile">Móbil</string> <string name="poi_mobile">Móbil</string>
<string name="poi_maxheight">Altura máxima</string> <string name="poi_maxheight">Altura máxima</string>

6
OsmAnd/res/values-hu/phrases.xml
View file

@ -970,12 +970,12 @@
<string name="poi_website">Weboldal</string> <string name="poi_website">Weboldal</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_mobile">Mobiltelefon</string> <string name="poi_mobile">Mobiltelefon</string>
<string name="poi_service_times">Szolgáltatási idő</string> <string name="poi_service_times">Szolgáltatási idő</string>

6
OsmAnd/res/values-nl/phrases.xml
View file

@ -1102,12 +1102,12 @@
<string name="poi_website">Website</string> <string name="poi_website">Website</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_mobile">Mobiel</string> <string name="poi_mobile">Mobiel</string>
<string name="poi_service_times">Aanvangstijd</string> <string name="poi_service_times">Aanvangstijd</string>

6
OsmAnd/res/values-pl/phrases.xml
View file

@ -1040,12 +1040,12 @@
<string name="poi_shower">Prysznic</string> <string name="poi_shower">Prysznic</string>
<string name="poi_email">E-mail</string> <string name="poi_email">E-mail</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_height">Wysokość</string> <string name="poi_height">Wysokość</string>
<string name="poi_ele">Wysokość nad poziomem morza</string> <string name="poi_ele">Wysokość nad poziomem morza</string>

6
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -949,7 +949,7 @@
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Celular</string> <string name="poi_mobile">Celular</string>
<string name="poi_animal_shelter_dog">Abrigo para cães</string> <string name="poi_animal_shelter_dog">Abrigo para cães</string>
<string name="poi_animal_shelter_cat">Abrigo para gatos</string> <string name="poi_animal_shelter_cat">Abrigo para gatos</string>
@ -1043,11 +1043,11 @@
<string name="poi_crossing_unmarked">Desmarcado</string> <string name="poi_crossing_unmarked">Desmarcado</string>
<string name="poi_mill_pond">Lagoa do moinho</string> <string name="poi_mill_pond">Lagoa do moinho</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumaria</string> <string name="poi_perfumery">Perfumaria</string>

6
OsmAnd/res/values-ru/phrases.xml
View file

@ -1969,7 +1969,7 @@
<string name="poi_entrance_exit">Выход</string> <string name="poi_entrance_exit">Выход</string>
<string name="poi_highway_crossing">Пешеходный переход</string> <string name="poi_highway_crossing">Пешеходный переход</string>
<string name="poi_vk">ВКонтакте</string> <string name="vk">ВКонтакте</string>
<string name="poi_content_silage">Содержимое: силос</string> <string name="poi_content_silage">Содержимое: силос</string>
<string name="poi_content_water">Содержимое: вода</string> <string name="poi_content_water">Содержимое: вода</string>
@ -2372,8 +2372,8 @@
<string name="poi_boat_storage">Место для хранения лодок</string> <string name="poi_boat_storage">Место для хранения лодок</string>
<string name="poi_kissing_gate">Калитка</string> <string name="poi_kissing_gate">Калитка</string>
<string name="poi_facebook">Фейсбук</string> <string name="facebook">Фейсбук</string>
<string name="poi_twitter">Твиттер</string> <string name="twitter">Твиттер</string>
<string name="poi_skype">Скайп</string> <string name="poi_skype">Скайп</string>
<string name="poi_garden_style_kitchen">Стиль сада: кухня</string> <string name="poi_garden_style_kitchen">Стиль сада: кухня</string>
<string name="poi_toilets_access_community">Туалет: общественный</string> <string name="poi_toilets_access_community">Туалет: общественный</string>

6
OsmAnd/res/values-sc/phrases.xml
View file

@ -1045,12 +1045,12 @@
<string name="poi_military_office">Ufìtziu militare</string> <string name="poi_military_office">Ufìtziu militare</string>
<string name="poi_bollard">Bita</string> <string name="poi_bollard">Bita</string>
<string name="poi_cattle_grid">Inferriada/cràdica pro su bestiàmene</string> <string name="poi_cattle_grid">Inferriada/cràdica pro su bestiàmene</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_mobile">Mòbile</string> <string name="poi_mobile">Mòbile</string>
<string name="poi_height">Artària</string> <string name="poi_height">Artària</string>

6
OsmAnd/res/values-sk/phrases.xml
View file

@ -1023,7 +1023,7 @@
<string name="poi_abandoned_poi">Opustený objekt</string> <string name="poi_abandoned_poi">Opustený objekt</string>
<string name="poi_email">E-mailová adresa</string> <string name="poi_email">E-mailová adresa</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_mobile">Mobilný telefón</string> <string name="poi_mobile">Mobilný telefón</string>
<string name="poi_route_hiking_iwn_poi">Medzinárodná pešia trasa</string> <string name="poi_route_hiking_iwn_poi">Medzinárodná pešia trasa</string>
<string name="poi_route_hiking_nwn_poi">Národná pešia trasa</string> <string name="poi_route_hiking_nwn_poi">Národná pešia trasa</string>
@ -1075,11 +1075,11 @@
<string name="poi_denomination_church_of_christ">Kristova cirkev</string> <string name="poi_denomination_church_of_christ">Kristova cirkev</string>
<string name="poi_building">Budova</string> <string name="poi_building">Budova</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_military_office">Vojenský úrad</string> <string name="poi_military_office">Vojenský úrad</string>
<string name="poi_landfill_waste_nuclear">Jadrový odpad</string> <string name="poi_landfill_waste_nuclear">Jadrový odpad</string>

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

@ -996,7 +996,7 @@
<string name="poi_fax">Faks</string> <string name="poi_fax">Faks</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">İnstagram</string> <string name="poi_instagram">İnstagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google +</string> <string name="poi_google_plus">Google +</string>
<string name="poi_mobile">Mobil</string> <string name="poi_mobile">Mobil</string>
<string name="poi_maxweight">Maksimum ağırlık</string> <string name="poi_maxweight">Maksimum ağırlık</string>

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

@ -948,7 +948,7 @@
<string name="poi_email">電子郵件</string> <string name="poi_email">電子郵件</string>
<string name="poi_fax">傳真</string> <string name="poi_fax">傳真</string>
<string name="poi_facebook">臉書</string> <string name="facebook">臉書</string>
<string name="poi_mobile">行動電話</string> <string name="poi_mobile">行動電話</string>
<string name="poi_animal_shelter_dog">收容所類型：狗</string> <string name="poi_animal_shelter_dog">收容所類型：狗</string>
<string name="poi_animal_shelter_cat">收容所：貓</string> <string name="poi_animal_shelter_cat">收容所：貓</string>
@ -1041,11 +1041,11 @@
<string name="poi_supervised_yes">有監管</string> <string name="poi_supervised_yes">有監管</string>
<string name="poi_supervised_no">沒有監管</string> <string name="poi_supervised_no">沒有監管</string>
<string name="poi_mill_pond">磨房水塘</string> <string name="poi_mill_pond">磨房水塘</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">Youtube</string> <string name="poi_youtube">Youtube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">香水商店</string> <string name="poi_perfumery">香水商店</string>

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

@ -1083,12 +1083,12 @@
<string name="poi_website">Website</string> <string name="poi_website">Website</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="facebook">Facebook</string>
<string name="poi_twitter">Twitter</string> <string name="twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">YouTube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_mobile">Mobile</string> <string name="poi_mobile">Mobile</string>
<string name="poi_service_times">Service times</string> <string name="poi_service_times">Service times</string>

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

@ -10,6 +10,7 @@
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="follow_us">Follow us</string>
<string name="access_direction_audio_feedback">Direction audio feedback</string> <string name="access_direction_audio_feedback">Direction audio feedback</string>
<string name="access_direction_audio_feedback_descr">Indicate target point direction by sound</string> <string name="access_direction_audio_feedback_descr">Indicate target point direction by sound</string>
<string name="access_direction_haptic_feedback">Direction haptic feedback</string> <string name="access_direction_haptic_feedback">Direction haptic feedback</string>

3
OsmAnd/src/net/osmand/AndroidUtils.java
View file

@ -36,9 +36,6 @@ public class AndroidUtils {
return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS; return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
} }
/**
* @param context
*/
public static void softKeyboardDelayed(final View view) { public static void softKeyboardDelayed(final View view) {
view.post(new Runnable() { view.post(new Runnable() {
@Override @Override

11
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -290,12 +290,13 @@ public class ContextMenuAdapter {
dividerView.setVisibility(View.VISIBLE); dividerView.setVisibility(View.VISIBLE);
} }
} }
return convertView;
}
@Override if (item.isCategory()) {
public boolean isEnabled(int position) { convertView.setFocusable(false);
return !getItem(position).isCategory(); convertView.setClickable(false);
}
return convertView;
} }
} }

53
OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
View file

@ -1,16 +1,22 @@
package net.osmand.plus.activities; package net.osmand.plus.activities;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.DrawableRes; import android.support.annotation.DrawableRes;
import android.support.annotation.IdRes; import android.support.annotation.IdRes;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.content.ContextCompat;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import net.osmand.AndroidUtils;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuItem; import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -35,7 +41,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
setContentView(R.layout.fragment_help_screen); setContentView(R.layout.fragment_help_screen);
ContextMenuAdapter contextMenuAdapter = new ContextMenuAdapter(); ContextMenuAdapter contextMenuAdapter = new ContextMenuAdapter();
contextMenuAdapter.setDefaultLayoutId(R.layout.list_item_icon_and_menu); contextMenuAdapter.setDefaultLayoutId(R.layout.two_line_with_images_list_item);
contextMenuAdapter.addItem(createCategory(R.string.begin_with_osmand_menu_group)); contextMenuAdapter.addItem(createCategory(R.string.begin_with_osmand_menu_group));
createBeginWithOsmandItems(contextMenuAdapter); createBeginWithOsmandItems(contextMenuAdapter);
@ -47,17 +53,33 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
createHelpUsToImproveItems(contextMenuAdapter); createHelpUsToImproveItems(contextMenuAdapter);
contextMenuAdapter.addItem(createCategory(R.string.other_menu_group)); contextMenuAdapter.addItem(createCategory(R.string.other_menu_group));
createOtherItems(contextMenuAdapter); createOtherItems(contextMenuAdapter);
contextMenuAdapter.addItem(createCategory(R.string.follow_us));
createSocialNetworksItems(contextMenuAdapter);
mAdapter = contextMenuAdapter.createListAdapter(this, getMyApplication().getSettings().isLightContent()); mAdapter = contextMenuAdapter.createListAdapter(this, getMyApplication().getSettings().isLightContent());
ListView listView = (ListView) findViewById(android.R.id.list); ListView listView = (ListView) findViewById(android.R.id.list);
listView.setAdapter(mAdapter); listView.setAdapter(mAdapter);
listView.setOnItemClickListener(this); listView.setOnItemClickListener(this);
Drawable dividerDrawable = new ColorDrawable(ContextCompat.getColor(this,
getMyApplication().getSettings().isLightContent() ?
R.color.icon_color_light : R.color.dialog_inactive_text_color_dark));
listView.setDivider(dividerDrawable);
listView.setDividerHeight(AndroidUtils.dpToPx(this, 1f));
setTitle(R.string.shared_string_help); setTitle(R.string.shared_string_help);
setupHomeButton(); setupHomeButton();
} }
private void createSocialNetworksItems(ContextMenuAdapter contextMenuAdapter) {
contextMenuAdapter.addItem(createSocialItem(R.string.twitter, R.string.twitter_address,
R.drawable.ic_action_social_twitter));
contextMenuAdapter.addItem(createSocialItem(R.string.facebook, R.string.facebook_address,
R.drawable.ic_action_social_facebook));
contextMenuAdapter.addItem(createSocialItem(R.string.vk, R.string.vk_address,
R.drawable.ic_action_social_vk));
}
private void createHelpUsToImproveItems(ContextMenuAdapter contextMenuAdapter) { private void createHelpUsToImproveItems(ContextMenuAdapter contextMenuAdapter) {
contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder() contextMenuAdapter.addItem(new ContextMenuItem.ItemBuilder()
.setLayout(R.layout.help_to_improve_item).createItem()); .setLayout(R.layout.help_to_improve_item).createItem());
@ -87,6 +109,28 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
.createItem(); .createItem();
} }
private ContextMenuItem createSocialItem(@StringRes int title,
@StringRes int urlRes,
@DrawableRes int icon) {
final String url = getString(urlRes);
return new ContextMenuItem.ItemBuilder()
.setTitle(getString(title))
.setDescription(url)
.setIcon(icon)
.setListener(new ContextMenuAdapter.ItemClickListener() {
@Override
public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter,
int itemId,
int position,
boolean isChecked) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
startActivity(intent);
return false;
}
})
.createItem();
}
private ContextMenuItem createItem(@StringRes int titleRes, private ContextMenuItem createItem(@StringRes int titleRes,
@StringRes int descriptionRes, @StringRes int descriptionRes,
String path) { String path) {
@ -118,8 +162,11 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
mAdapter.getItem(position).getItemClickListener() ContextMenuAdapter.ItemClickListener listener =
.onContextMenuClick(mAdapter, position, position, false); mAdapter.getItem(position).getItemClickListener();
if (listener != null) {
listener.onContextMenuClick(mAdapter, position, position, false);
}
} }
private void createFeaturesItems(ContextMenuAdapter contextMenuAdapter) { private void createFeaturesItems(ContextMenuAdapter contextMenuAdapter) {

6
OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java
View file

@ -79,10 +79,10 @@ public class ItemViewHolder {
dateFormat = android.text.format.DateFormat.getMediumDateFormat(context); dateFormat = android.text.format.DateFormat.getMediumDateFormat(context);
progressBar = (ProgressBar) view.findViewById(R.id.progressBar); progressBar = (ProgressBar) view.findViewById(R.id.progressBar);
rightButton = (Button) view.findViewById(R.id.rightButton); rightButton = (Button) view.findViewById(R.id.rightButton);
leftImageView = (ImageView) view.findViewById(R.id.leftImageView); leftImageView = (ImageView) view.findViewById(R.id.icon);
descrTextView = (TextView) view.findViewById(R.id.description); descrTextView = (TextView) view.findViewById(R.id.description);
rightImageButton = (ImageView) view.findViewById(R.id.rightImageButton); rightImageButton = (ImageView) view.findViewById(R.id.secondaryIcon);
nameTextView = (TextView) view.findViewById(R.id.name); nameTextView = (TextView) view.findViewById(R.id.title);
view.setAccessibilityDelegate(context.getAccessibilityAssistant()); view.setAccessibilityDelegate(context.getAccessibilityAssistant());
rightButton.setAccessibilityDelegate(context.getAccessibilityAssistant()); rightButton.setAccessibilityDelegate(context.getAccessibilityAssistant());

2
build.gradle
View file

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.0.0' classpath 'com.android.tools.build:gradle:2.1.0'
} }
} }