drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 22:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add level to Android editor

Browse Source 
Signed-off-by: map per <map-per@gmx.de>
This commit is contained in:
map per
2025-06-13 23:08:41 +02:00
committed by Konstantin Pastbin
parent ddbbe244f2
commit 47c9940ee3
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
View File

@@ -189,6 +189,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE, R.string.error_enter_correct_web); initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE, R.string.error_enter_correct_web);
initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE_MENU, R.string.error_enter_correct_web); initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE_MENU, R.string.error_enter_correct_web);
initMetadataEntry(Metadata.MetadataType.FMD_EMAIL, R.string.error_enter_correct_email); initMetadataEntry(Metadata.MetadataType.FMD_EMAIL, R.string.error_enter_correct_email);
initMetadataEntry(Metadata.MetadataType.FMD_LEVEL, R.string.error_enter_correct_level);
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.string.error_enter_correct_fediverse_page); initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.string.error_enter_correct_fediverse_page);
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.string.error_enter_correct_facebook_page); initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.string.error_enter_correct_facebook_page);
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.string.error_enter_correct_instagram_page); initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.string.error_enter_correct_instagram_page);
@@ -445,6 +446,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
R.drawable.ic_website_menu, R.string.website_menu, InputType.TYPE_TEXT_VARIATION_URI); R.drawable.ic_website_menu, R.string.website_menu, InputType.TYPE_TEXT_VARIATION_URI);
View emailBlock = initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email, View emailBlock = initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
View levelBlock = initBlock(view, Metadata.MetadataType.FMD_LEVEL, R.id.block_level,
R.drawable.ic_level_white, R.string.editor_level, InputType.TYPE_CLASS_NUMBER);
View fediverseContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse, View fediverseContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse,
R.drawable.ic_mastodon_white, R.string.mastodon, InputType.TYPE_TEXT_VARIATION_URI); R.drawable.ic_mastodon_white, R.string.mastodon, InputType.TYPE_TEXT_VARIATION_URI);
View facebookContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook, View facebookContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook,
@@ -502,6 +505,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE, websiteBlock); mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE, websiteBlock);
mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE_MENU, websiteMenuBlock); mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE_MENU, websiteMenuBlock);
mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, emailBlock); mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, emailBlock);
mDetailsBlocks.put(Metadata.MetadataType.FMD_LEVEL, levelBlock);
mDetailsBlocks.put(Metadata.MetadataType.FMD_OPERATOR, operatorBlock); mDetailsBlocks.put(Metadata.MetadataType.FMD_OPERATOR, operatorBlock);
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, fediverseContactBlock); mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, fediverseContactBlock);

4
android/app/src/main/res/layout/fragment_editor.xml
View File

@@ -228,7 +228,9 @@
android:id="@+id/block_email" android:id="@+id/block_email"
layout="@layout/item_editor_input"/> layout="@layout/item_editor_input"/>
<!-- ToDo: Level is missing compared with iOS. --> <include
android:id="@+id/block_level"
layout="@layout/item_editor_input"/>
<RelativeLayout <RelativeLayout
android:id="@+id/block_wifi" android:id="@+id/block_wifi"

2
android/app/src/main/res/values/strings.xml
View File

@@ -601,6 +601,8 @@
<string name="error_enter_correct_phone">Enter a valid phone number</string> <string name="error_enter_correct_phone">Enter a valid phone number</string>
<string name="error_enter_correct_web">Enter a valid web address</string> <string name="error_enter_correct_web">Enter a valid web address</string>
<string name="error_enter_correct_email">Enter a valid email</string> <string name="error_enter_correct_email">Enter a valid email</string>
<string name="editor_level">Floor (0 is ground floor)</string>
<string name="error_enter_correct_level">Enter a valid floor number</string>
<string name="error_enter_correct_facebook_page">Enter a valid Facebook web address, account, or page name</string> <string name="error_enter_correct_facebook_page">Enter a valid Facebook web address, account, or page name</string>
<string name="error_enter_correct_instagram_page">Enter a valid Instagram username or web address</string> <string name="error_enter_correct_instagram_page">Enter a valid Instagram username or web address</string>
<string name="error_enter_correct_twitter_page">Enter a valid Twitter username or web address</string> <string name="error_enter_correct_twitter_page">Enter a valid Twitter username or web address</string>