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

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
GaidamakUA 2015-11-30 15:55:43 +02:00
commit 89719e4eee
7 changed files with 164 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -142,6 +142,7 @@
android:layout_marginLeft="8dp"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:imeOptions="actionDone"
android:inputType="text"/>

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

@ -137,6 +137,7 @@
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:text="Name"
android:imeOptions="actionDone"
android:inputType="text"/>

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

@ -1327,7 +1327,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="poi_dialog_comment_default">Промяна на POI</string>
<string name="poi_dialog_other_tags_message">Всички други тагове се запазват</string>
<string name="default_buttons_commit">Изпрати</string>
<string name="shared_string_clear">Нулиране</string>
<string name="shared_string_clear">Изчисти</string>
<string name="filter_current_poiButton">Филтър</string>
<string name="edit_filter_save_as_menu_item">Запиши като</string>

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

@ -1709,10 +1709,10 @@
<string name="poi_religion_multifaith">Mehrfachgläubig</string>
<string name="poi_religion_scientologist">Scientology</string>
<string name="poi_denomination_uniting">Vereinigung</string>
<string name="poi_denomination_congregational">Congregational</string>
<string name="poi_denomination_congregational">Kongregationalismus</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Äthiopisch-orthodoxe tewahedo-Kirche</string>
<string name="poi_denomination_unitarian">Unitarisch</string>
<string name="poi_denomination_wesleyan">Wesleyan</string>
<string name="poi_denomination_wesleyan">Wesleyaner</string>
<string name="poi_denomination_shingon_shu">Schule des wahren Wortes</string>
<string name="poi_denomination_mahayana">Mahayana</string>
@ -2393,4 +2393,55 @@
<string name="poi_historic_period_roman_greece">Historisches Zeitalter: Römisch-griechisch (146 v. Chr - 330 n. Chr.)</string>
<string name="poi_historic_period_roman_kingdom">Historisches Zeitalter: Römische Königszeit (756 - 509 v. Chr.)</string>
<string name="poi_historic_period_dominate">Historisches Zeitalter: Dominat (285 - 476 n. Chr.)</string>
<string name="poi_historic_period_ptolemaic_egypt">Historisches Zeitalter: Ptolemäisches Königreich (305 - 30 v. Chr.)</string>
<string name="poi_historic_period_villager">Historisches Zeitalter: Spiedler (Epoche I, II, 1580 v. Chr. - 133 n. Chr.)</string>
<string name="poi_historic_period_urban">Historisches Zeitalter: städtisch (Epoche III, 133 - 374 n. Chr.)</string>
<string name="poi_historic_period_classical">Historisches Zeitalter: Klassik (Epache IV, 374 - 900 n. Chr.)</string>
<string name="poi_historic_period_imperial">"Historisches Zeitalter: Imperialismus (Epoch V, 900 - 1200 n. Chr.)"</string>
<string name="poi_historic_era_paleolithic">Historische Epoche: Altsteinzeit (2,6 millionen Jahre - 10000 BP (vor heute))</string>
<string name="poi_historic_era_mesolithic">Historische Epoche: Mittelsteinzeit</string>
<string name="poi_historic_era_neolithic">Historische Epoche: Jungsteinzeit</string>
<string name="poi_historic_era_chalcolithic">Historische Epoche: Kupfersteinzeit (IV-III Jahrtausend v.Chr.)</string>
<string name="poi_stone_type_conciliation_cross">Typ: Steinkreuz</string>
<string name="poi_site_type_hut_circle">Typ: Hüttenkreis</string>
<string name="poi_site_type_petroglyph">Typ: Petroglyphe</string>
<string name="poi_megalith_type_nuraghe">Megalith-Typ: Nuraghe</string>
<string name="poi_megalith_type_stone_circle">Megalith-Typ: Steinkreis</string>
<string name="poi_megalith_type_passage_grave">Megalith-Typ: Ganggrab</string>
<string name="poi_summit_cross">Gipfelkreuz: Ja</string>
<string name="poi_conveying_yes">Vermittlung: Ja</string>
<string name="poi_wiki_lang_af">Afrikanisches Wiki</string>
<string name="poi_wiki_lang_az">Aserbaidschanisches Wiki</string>
<string name="poi_wiki_lang_bn">Bengalisches Wiki</string>
<string name="poi_wiki_lang_bpy">Bishnupriyaisches Wiki</string>
<string name="poi_wiki_lang_br">Bretonisches Wiki</string>
<string name="poi_wiki_lang_cy">Walisisches Wiki</string>
<string name="poi_wiki_lang_eo">Esperantoisches Wiki</string>
<string name="poi_wiki_lang_eu">baskisches Wiki</string>
<string name="poi_wiki_lang_fa">Farsisches Wiki</string>
<string name="poi_wiki_lang_ml">Malayalamisches Wiki</string>
<string name="poi_wiki_lang_mr">Marathisches Wiki</string>
<string name="poi_wiki_lang_nv">Navajoisches Wiki</string>
<string name="poi_wiki_lang_war">Warayisches Wiki</string>
<string name="poi_wiki_lang_min">Minangkabauisches Wiki</string>
<string name="poi_wiki_lang_zhminnan">Minnanisches Wiki</string>
<string name="poi_wiki_lang_mg">Malagasisches Wiki</string>
<string name="poi_wiki_lang_tt">Tatarisches Wiki</string>
<string name="poi_wiki_lang_ky">kirgisisches Wiki</string>
<string name="poi_wiki_lang_tg">Tadschikisches Wiki</string>
<string name="poi_wiki_lang_ba">baschkirisches Wiki</string>
<string name="poi_wiki_lang_sco">Schottisches Wiki</string>
<string name="poi_wiki_lang_pnb">Panjabisches Wiki</string>
<string name="poi_wiki_lang_cv">Tschuwaschisches Wiki</string>
<string name="poi_wiki_lang_my">Burmesisches Wiki</string>
<string name="poi_wiki_lang_yo">Yorubaisches Wiki</string>
<string name="poi_wiki_lang_an">Aragonesisches Wiki</string>
<string name="poi_wiki_lang_gu">Gujaratisches Wiki</string>
<string name="poi_wetland_palsa_bog">Palsamoor</string>
<string name="poi_payment_icsf_yes">IC gespeicherte Fährfahrkarten akzeptiert</string>
<string name="poi_payment_icsf_no">IC gespeicherte Fährfahrkarten nicht akzeptiert</string>
</resources>

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

@ -526,7 +526,7 @@
<string name="poi_religion_shinto">Xintoísmo</string>
<string name="poi_religion_taoist">Taoísmo</string>
<string name="poi_internet_access_wlan">Acesso à Internet: wlan</string>
<string name="poi_internet_access_wlan">Acesso à Internet: wifi</string>
<string name="poi_internet_access_terminal">Acesso à Internet: terminal</string>
<string name="poi_internet_access_wired">Acesso à Internet: com fio</string>
<string name="poi_internet_access_public">Acesso à Internet: público</string>
@ -1746,7 +1746,7 @@
<string name="poi_resource_lignite">Linhite</string>
<string name="poi_resource_limestone">Pedra calcária</string>
<string name="poi_resource_marble">Mármore</string>
<string name="poi_resource_mercury"/>
<string name="poi_resource_mercury">Mercúrio</string>
<string name="poi_resource_mica">Mica</string>
<string name="poi_resource_mineral_oil">Óleo mineral</string>
<string name="poi_resource_nickel">Níquel</string>
@ -1790,4 +1790,85 @@
<string name="poi_shelter_type_public_transport">Tipo de abrigo: transporte público</string>
<string name="poi_shelter_type_picnic_shelter">Tipo de abrigo: abrigo de piquenique</string>
<string name="poi_shelter_type_weather_shelter">Tipo de abrigo: abrigo do tempo</string>
<string name="poi_piste_grooming_scooter">Pista de preparação: scooter</string>
<string name="poi_piste_grooming_skating">Pista de preparação: skating</string>
<string name="poi_piste_grooming_no">Pista de preparação: não</string>
<string name="poi_piste_grooming_mogul">Pista de preparação: mogul</string>
<string name="poi_aerialway_bubble_yes">Bolha</string>
<string name="poi_aerialway_bubble_no">Sem bolha</string>
<string name="poi_vending_bicycle_tube">Tubos para bicicletas</string>
<string name="poi_branch">Seção</string>
<string name="poi_memorial_cross">Cruzeiro</string>
<string name="poi_wetland_tidalflat">Planície de maré</string>
<string name="poi_wetland_saltmarsh">Pântano salgado</string>
<string name="poi_wetland_mangrove">Mangue</string>
<string name="poi_wetland_string_bog">Cadeia de pântanos</string>
<string name="poi_wetland_fen">Pântano subeterrâneo</string>
<string name="poi_wetland_palsa_bog">Pântano palsa</string>
<string name="poi_wetland_mud">Lama</string>
<string name="poi_beach_sand">Tipo de praia: areia</string>
<string name="poi_beach_shingle">Tipo de praia: cascalho</string>
<string name="poi_beach_rocky">Tipo de praia: rocha</string>
<string name="poi_flagpole">Mastro de bandeira</string>
<string name="poi_shelter_type_lean_to">Tipo de abrigo: alpendre</string>
<string name="poi_shelter_type_basic_hut">Tipo de abrigo: cabana básica</string>
<string name="poi_shelter_type_building">Tipo de abrigo: edifício</string>
<string name="poi_shelter_type_wildlife_hide">Tipo de abrigo: esconderijo para animais selvagens</string>
<string name="poi_shelter_type_rock_shelter">Tipo de abrigo: rocha</string>
<string name="poi_shelter_type_sun_shelter">Tipo de abrigo: abrigo do sol</string>
<string name="poi_shelter_type_field_shelter">Tipo de abrigo: abrigo de campo</string>
<string name="poi_shelter_type_tent">Tipo de abrigo: tenda</string>
<string name="poi_shelter_type_abandoned">Tipo de abrigo: abandonado</string>
<string name="poi_internet_access_type_wlan">Tipo de acesso à Internet: wifi</string>
<string name="poi_internet_access_type_terminal">Tipo de acesso à Internet: terminal</string>
<string name="poi_internet_access_type_wired">Tipo de acesso à Internet: cabo</string>
<string name="poi_internet_access_type_public">Tipo de acesso à Internet: público</string>
<string name="poi_internet_access_type_service">Tipo de acesso à Internet: serviço</string>
<string name="poi_internet_access_type_no">Sem acesso à Internet</string>
<string name="poi_internet_access_type_yes">Com acesso à Internet</string>
<string name="poi_maxwidth">Largura máxima</string>
<string name="poi_iata">Código IATA</string>
<string name="poi_icao">Código ICAO</string>
<string name="poi_faa">Código FAA</string>
<string name="poi_artwork_type_sculpture">Tipo de obra de arte: escultura</string>
<string name="poi_artwork_type_statue">Tipo de obra de arte: estátua</string>
<string name="poi_artwork_type_mural">Tipo de obra de arte: mural</string>
<string name="poi_artwork_type_architecture">Tipo de obra de arte: arquitetura</string>
<string name="poi_artwork_type_painting">Tipo de obra de arte: pintura</string>
<string name="poi_artwork_type_stone">Tipo de obra de arte: pedra</string>
<string name="poi_artwork_type_bust">Tipo de obra de arte: busto</string>
<string name="poi_artwork_type_installation">Tipo de obra de arte: instalação</string>
<string name="poi_artwork_type_mosaic">Tipo de obra de arte: mosaico</string>
<string name="poi_artwork_type_relief">Tipo de obra de arte: relevo</string>
<string name="poi_artwork_type_graffiti">Tipo de obra de arte: grafite</string>
<string name="poi_artwork_type_stele">Tipo de obra de arte: estela</string>
<string name="poi_artwork_type_fountain">Tipo de obra de arte: fonte</string>
<string name="poi_width">Largura</string>
<string name="poi_architect_name">Arquiteto</string>
<string name="poi_architecture_modern">Arquitetura: moderna</string>
<string name="poi_architecture_stalinist_neoclassicism">Arquitetura: neoclassicismo stalinista</string>
<string name="poi_architecture_eclectic">Arquitetura: eclética</string>
<string name="poi_architecture_new_objectivity">Arquitetura: nova objetividade</string>
<string name="poi_architecture_contemporary">Arquitetura: contemporâneo</string>
<string name="poi_architecture_constructivism">Arquitetura: construtivismo</string>
<string name="poi_architecture_umgebinde">Arquitetura: umgebinde</string>
<string name="poi_architecture_timber_frame">Arquitetura: enxaimel</string>
<string name="poi_architecture_art_nouveau">Arquitetura: art nouveau</string>
<string name="poi_architecture_neoclassicism">Arquitetura: neoclassicismo</string>
<string name="poi_architecture_victorian">Arquitetura: vitoriana</string>
<string name="poi_architecture_brutalism">Arquitetura: brutalista</string>
<string name="poi_architecture_classicism">Arquitetura: classicismo</string>
<string name="poi_architecture_gothic">Arquitetura: gótica</string>
<string name="poi_architecture_oldrussian">Arquitetura: russa antiga</string>
</resources>

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

@ -2354,4 +2354,8 @@
<string name="poi_aerialway_length">長度</string>
</resources>
<string name="poi_wiki_lang_ast">阿斯圖爾-萊昂語維基</string>
<string name="poi_wiki_lang_tg">塔吉克語維基</string>
<string name="poi_wiki_lang_ba">巴什基爾語維基</string>
<string name="poi_wiki_lang_sco">低地蘇格蘭語維基</string>
</resources>

26
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
View file

@ -24,6 +24,7 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.AndroidUtils;
import net.osmand.data.LatLon;
import net.osmand.data.QuadPoint;
import net.osmand.data.RotatedTileBox;
@ -44,6 +45,7 @@ public abstract class PointEditorFragment extends Fragment {
private View view;
private int mainViewHeight;
private EditText nameEdit;
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
@Override
@ -103,7 +105,7 @@ public abstract class PointEditorFragment extends Fragment {
TextView categoryCaption = (TextView) view.findViewById(R.id.category_caption);
categoryCaption.setText(getCategoryCaption());
EditText nameEdit = (EditText) view.findViewById(R.id.name_edit);
nameEdit = (EditText) view.findViewById(R.id.name_edit);
nameEdit.setText(getNameInitValue());
AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) view.findViewById(R.id.category_edit);
categoryEdit.setText(getCategoryInitValue());
@ -152,6 +154,16 @@ public abstract class PointEditorFragment extends Fragment {
getMapActivity().getContextMenu().setBaseFragmentVisibility(false);
}
@Override
public void onResume() {
super.onResume();
if (getEditor().isNew()) {
nameEdit.selectAll();
nameEdit.requestFocus();
AndroidUtils.softKeyboardDelayed(nameEdit);
}
}
@Override
public void onStop() {
super.onStop();
@ -233,11 +245,13 @@ public abstract class PointEditorFragment extends Fragment {
private void hideKeyboard() {
InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
View currentFocus = getActivity().getCurrentFocus();
if (currentFocus != null) {
IBinder windowToken = currentFocus.getWindowToken();
if (windowToken != null) {
inputMethodManager.hideSoftInputFromWindow(windowToken, 0);
if (inputMethodManager != null) {
View currentFocus = getActivity().getCurrentFocus();
if (currentFocus != null) {
IBinder windowToken = currentFocus.getWindowToken();
if (windowToken != null) {
inputMethodManager.hideSoftInputFromWindow(windowToken, 0);
}
}
}
}