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

[editor] Add support for self_service key

Browse source 
Signed-off-by: Arthur-GYT <a.gayot@posteo.com>
This commit is contained in:
Arthur-GYT 2024-07-24 15:18:37 +02:00 • committed by Viktor Havaka
parent 58b74432ce
commit 1c21d0c0be
8 changed files with 271 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/app/src/main/java/app/organicmaps/editor/Editor.java
View file

@ -87,6 +87,17 @@ public final class Editor
public static native boolean nativeHasWifi();
public static native void nativeSetHasWifi(boolean hasWifi);
public static void nativeSetSwitchInput(int id, Boolean switchValue, String checkedValue, String uncheckedValue)
{
nativeSetMetadata(id, switchValue ? checkedValue : uncheckedValue);
}
public static boolean nativeGetSwitchInput(int id, String checkedValue)
{
String value = nativeGetMetadata(id);
return value.equals(checkedValue);
}
public static native boolean nativeIsAddressEditable();
public static native boolean nativeIsNameEditable();
public static native boolean nativeIsPointType();

11
android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
View file

@ -101,6 +101,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
private TextView mEditPhoneLink;
private TextView mCuisine;
private SwitchCompat mWifi;
private TextView mSelfService;
// Default Metadata entries.
private static final class MetadataEntry
@ -192,6 +193,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_LINE, R.string.error_enter_correct_line_page);
mCuisine.setText(Editor.nativeGetFormattedCuisine());
String selfServiceMetadata = Editor.nativeGetMetadata(Metadata.MetadataType.FMD_SELF_SERVICE.toInt());
mSelfService.setText(Utils.getTagValueLocalized(view.getContext(), "self_service", selfServiceMetadata));
initMetadataEntry(Metadata.MetadataType.FMD_OPERATOR, 0);
mWifi.setChecked(Editor.nativeHasWifi());
refreshOpeningTime();
@ -452,6 +455,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
View blockWifi = view.findViewById(R.id.block_wifi);
mWifi = view.findViewById(R.id.sw__wifi);
blockWifi.setOnClickListener(this);
View blockSelfService = view.findViewById(R.id.block_self_service);
blockSelfService.setOnClickListener(this);
mSelfService = view.findViewById(R.id.self_service);
View blockOpeningHours = view.findViewById(R.id.block_opening_hours);
mEditOpeningHours = blockOpeningHours.findViewById(R.id.edit_opening_hours);
mEditOpeningHours.setOnClickListener(this);
@ -469,6 +477,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mDetailsBlocks.put(Metadata.MetadataType.FMD_PHONE_NUMBER, blockPhone);
mDetailsBlocks.put(Metadata.MetadataType.FMD_CUISINE, blockCuisine);
mDetailsBlocks.put(Metadata.MetadataType.FMD_INTERNET, blockWifi);
mDetailsBlocks.put(Metadata.MetadataType.FMD_SELF_SERVICE, blockSelfService);
mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE, websiteBlock);
mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE_MENU, websiteMenuBlock);
mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, emailBlock);
@ -508,6 +517,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mParent.editPhone();
else if (id == R.id.block_wifi)
mWifi.toggle();
else if (id == R.id.block_self_service)
mParent.editSelfService();
else if (id == R.id.block_street)
mParent.editStreet();
else if (id == R.id.block_cuisine)

19
android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
View file

@ -19,6 +19,7 @@ import androidx.fragment.app.FragmentManager;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.editor.data.Language;
import app.organicmaps.editor.data.LocalizedName;
import app.organicmaps.editor.data.LocalizedStreet;
@ -50,7 +51,8 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
STREET,
CUISINE,
LANGUAGE,
PHONE
PHONE,
SELF_SERVICE
}
private Mode mMode;
@ -171,7 +173,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
{
switch (mMode)
{
case OPENING_HOURS, STREET, CUISINE, LANGUAGE, PHONE -> editMapObject();
case OPENING_HOURS, STREET, CUISINE, LANGUAGE, PHONE, SELF_SERVICE -> editMapObject();
default -> Utils.navigateToParent(requireActivity());
}
return true;
@ -224,6 +226,11 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
editWithFragment(Mode.CUISINE, R.string.select_cuisine, null, CuisineFragment.class, true);
}
protected void editSelfService()
{
editWithFragment(Mode.SELF_SERVICE, R.string.select_option, null, SelfServiceFragment.class, false);
}
protected void addLanguage()
{
Bundle args = new Bundle();
@ -298,6 +305,8 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
Editor.nativeSetSelectedCuisines(cuisines);
editMapObject();
}
case SELF_SERVICE ->
setSelection(Metadata.MetadataType.FMD_SELF_SERVICE, ((SelfServiceFragment) getChildFragmentManager().findFragmentByTag(SelfServiceFragment.class.getName())).getSelection());
case LANGUAGE -> editMapObject();
case MAP_OBJECT ->
{
@ -394,6 +403,12 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
editMapObject();
}
public void setSelection(Metadata.MetadataType metadata, String selection)
{
Editor.nativeSetMetadata(metadata.toInt(), selection);
editMapObject();
}
public boolean addingNewObject()
{
return mIsNewObject;

86
android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java Normal file
View file

@ -0,0 +1,86 @@
package app.organicmaps.editor;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils;
public class SelfServiceAdapter extends RecyclerView.Adapter<SelfServiceAdapter.ViewHolder>
{
private final String[] mItems = new String[]{"yes", "only", "partially", "no"};
private final SelfServiceFragment mFragment;
private String mSelectedOption;
public SelfServiceAdapter(@NonNull SelfServiceFragment host, @NonNull String selected)
{
mFragment = host;
mSelectedOption = selected;
}
public String getSelected()
{
return mSelectedOption;
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
{
return new SelfServiceAdapter.ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_selection, parent, false));
}
@Override
public void onBindViewHolder(SelfServiceAdapter.ViewHolder holder, int position)
{
holder.bind(position);
}
@Override
public int getItemCount()
{
return mItems.length;
}
protected class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
{
final TextView selfServiceDef;
final CompoundButton selected;
public ViewHolder(View itemView)
{
super(itemView);
selfServiceDef = itemView.findViewById(R.id.self_service_default);
selected = itemView.findViewById(R.id.self_service_selected);
itemView.setOnClickListener(this);
selected.setOnClickListener(v -> {
selected.toggle();
SelfServiceAdapter.ViewHolder.this.onClick(selected);
});
}
public void bind(int position)
{
Context context = itemView.getContext();
selected.setChecked(mSelectedOption.equals(mItems[position]));
String text = Utils.getTagValueLocalized(context, "self_service", mItems[position]);
selfServiceDef.setText(text);
}
@Override
public void onClick(View v)
{
mSelectedOption = mItems[getBindingAdapterPosition()];
notifyDataSetChanged();
mFragment.saveSelection(mSelectedOption);
}
}
}

52
android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java Normal file
View file

@ -0,0 +1,52 @@
package app.organicmaps.editor;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.editor.data.LocalizedStreet;
public class SelfServiceFragment extends BaseMwmRecyclerFragment<SelfServiceAdapter>
{
private String mSelectedString;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
return super.onCreateView(inflater, container, savedInstanceState);
}
@NonNull
public String getSelection()
{
return getAdapter().getSelected();
}
@CallSuper
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
mSelectedString = Editor.nativeGetMetadata(Metadata.MetadataType.FMD_SELF_SERVICE.toInt());
super.onViewCreated(view, savedInstanceState);
}
@NonNull
@Override
protected SelfServiceAdapter createAdapter()
{
return new SelfServiceAdapter(this, mSelectedString);
}
protected void saveSelection(String selection)
{
if (getParentFragment() instanceof EditorHostFragment)
((EditorHostFragment) getParentFragment()).setSelection(Metadata.MetadataType.FMD_SELF_SERVICE, selection);
}
}

34
android/app/src/main/res/layout/fragment_editor.xml
View file

@ -241,6 +241,40 @@
android:layout_centerVertical="true"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/block_self_service"
style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half">
<ImageView
style="@style/MwmWidget.Editor.MetadataIcon"
app:srcCompat="@drawable/ic_self_service"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/self_service_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/editor_margin_left"
android:text="@string/self_service"
android:textAppearance="@style/MwmTextAppearance.Body4"/>
<TextView
android:id="@+id/self_service"
style="@style/MwmWidget.Editor.FieldLayout"
android:layout_below="@id/self_service_title"
android:layout_marginTop="@dimen/margin_quarter"
android:gravity="center_vertical"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Red str."
app:drawableEndCompat="@drawable/ic_arrow_down" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignStart="@id/self_service"
android:layout_below="@id/self_service"
android:layout_marginTop="@dimen/margin_quarter_plus"
android:background="?dividerHorizontal"/>
</RelativeLayout>
<!-- ToDo: Level is missing compared with iOS. -->
<include

44
android/app/src/main/res/layout/item_selection.xml Normal file
View file

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/height_item_oneline"
android:background="?clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="@dimen/margin_base"
android:paddingStart="@dimen/margin_half_plus">
<RadioButton
android:id="@+id/self_service_selected"
android:layout_width="48dp"
android:layout_height="48dp"
android:gravity="center_vertical"
android:layout_marginEnd="@dimen/margin_base"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="60dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/self_service_selected"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/self_service_default"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Selection"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

16
data/editor.config
View file

@ -99,6 +99,15 @@
<option value="yes" />
</value>
</field>
<field name="self_service">
<tag k="self_service" />
<value type="list">
<option value="yes" />
<option value="only" />
<option value="partially" />
<option value="no" />
</value>
</field>
<!-- Uncomment this and other ele fields when the code supports it. -->
<!-- <field name="ele">-->
<!-- <tag k="ele" />-->
@ -271,6 +280,7 @@
<include field="cuisine" />
<include field="website_menu" />
<include field="drive_through" />
<include field="self_service" />
</type>
<type id="amenity-ferry_terminal">
<include group="poi_internet" />
@ -284,6 +294,7 @@
<type id="amenity-fuel">
<include group="poi_internet" />
<include field="operator" />
<include field="self_service" />
</type>
<type id="amenity-grave_yard">
<include group="poi" />
@ -359,6 +370,7 @@
<include group="poi_internet" />
<include field="cuisine" />
<include field="website_menu" />
<include field="self_service" />
</type>
<type id="amenity-school" group="education">
<include group="poi_internet" />
@ -407,6 +419,7 @@
</type>
<type id="amenity-car_wash">
<include group="poi_internet" />
<include field="self_service" />
</type>
<type id="amenity-childcare">
<include group="poi_internet" />
@ -850,6 +863,7 @@
</type>
<type id="shop-laundry" group="shop">
<include group="poi_internet" />
<include field="self_service" />
</type>
<!-- Not addable as mapping as a node is uncommon -->
<type id="shop-mall" group="big_shop" can_add="no">
@ -1011,6 +1025,7 @@
</type>
<type id="tourism-hotel" group="accomodation">
<include group="poi_internet" />
<include field="self_service" />
</type>
<type id="tourism-information">
<include group="poi" />
@ -1058,6 +1073,7 @@
<include group="poi_internet" />
<include field="cuisine" />
<include field="website_menu" />
<include field="self_service" />
</type>
<type id="amenity-community_centre">
<include group="poi_internet" />