pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Android] Add missing icons in editor, refactor 'operator'

Browse source 
Adds missing icons for `Email` & `Website`, refactor implementation of `Operator` (not a complex field so can just use InitBlock)
Signed-off-by: Harry Bond <endim8@pm.me>
This commit is contained in:
Harry Bond 2022-09-25 15:50:31 +01:00 • committed by Alexander Borsuk
parent 6d1c843af6
commit 28d3ff7691
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -432,12 +432,10 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mEditPhoneLink = blockPhone.findViewById(R.id.edit_phone);
mEditPhoneLink.setOnClickListener(this);
mPhone.setOnClickListener(this);
View blockWeb = initBlock(view, Metadata.MetadataType.FMD_WEBSITE, R.id.block_website,
0, R.string.website, InputType.TYPE_TEXT_VARIATION_URI);
View blockEmail = initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
0, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
initBlock(view, Metadata.MetadataType.FMD_WEBSITE, R.id.block_website,
R.drawable.ic_website, R.string.website, InputType.TYPE_TEXT_VARIATION_URI);
initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook,
R.drawable.ic_facebook_white, R.string.facebook, InputType.TYPE_TEXT_VARIATION_URI);
initBlock(view, Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.id.block_instagram,
@ -448,14 +446,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
R.drawable.ic_vk_white, R.string.vk, InputType.TYPE_TEXT_VARIATION_URI);
initBlock(view, Metadata.MetadataType.FMD_CONTACT_LINE, R.id.block_line,
R.drawable.ic_line_white, R.string.editor_line_social_network, InputType.TYPE_TEXT_VARIATION_URI);
initBlock(view, Metadata.MetadataType.FMD_OPERATOR, R.id.block_operator,
R.drawable.ic_operator, R.string.editor_operator, 0);
View blockCuisine = view.findViewById(R.id.block_cuisine);
blockCuisine.setOnClickListener(this);
mCuisine = view.findViewById(R.id.cuisine);
View blockOperator = initBlock(view, Metadata.MetadataType.FMD_OPERATOR, R.id.block_operator,
R.drawable.ic_operator, R.string.editor_operator, 0);
View blockWifi = view.findViewById(R.id.block_wifi);
mWifi = view.findViewById(R.id.sw__wifi);
blockWifi.setOnClickListener(this);
@ -474,10 +471,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mDetailsBlocks.put(Metadata.MetadataType.FMD_OPEN_HOURS, blockOpeningHours);
mDetailsBlocks.put(Metadata.MetadataType.FMD_PHONE_NUMBER, blockPhone);
mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE, blockWeb);
mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, blockEmail);
mDetailsBlocks.put(Metadata.MetadataType.FMD_CUISINE, blockCuisine);
mDetailsBlocks.put(Metadata.MetadataType.FMD_OPERATOR, blockOperator);
mDetailsBlocks.put(Metadata.MetadataType.FMD_INTERNET, blockWifi);
}