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

Review fixes.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-04-21 14:49:02 +03:00
parent ae81056da1
commit d025ef7c67
9 changed files with 77 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/jni/com/mapswithme/maps/editor/Editor.cpp
View file

@ -427,19 +427,19 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass
return g_editableMapObject.GetID().GetMwmVersion();
}
// static void nativeCreateNote(double lat, double lon, String text);
// static void nativeCreateNote(String text);
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jstring text)
Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
{
Editor::Instance().CreateNote(ms::LatLon(lat, lon), g_editableMapObject.GetID(),
Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
}
// static void nativePlaceDoesNotExist(double lat, double lon);
// static void nativePlaceDoesNotExist();
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon)
Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz)
{
Editor::Instance().CreateNote(ms::LatLon(lat, lon), g_editableMapObject.GetID(),
Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::PlaceDoesNotExist, "");
}

85
android/res/layout/fragment_editor.xml
View file

@ -7,24 +7,25 @@
android:padding="@dimen/margin_half"
tools:context=".editor.EditorActivity"
tools:ignore="DuplicateIds">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/cv__category"
style="@style/MwmWidget.Editor.CardView">
<RelativeLayout
android:id="@+id/category"
style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="wrap_content"
android:minHeight="@dimen/editor_height_field"
android:layout_marginBottom="0dp"
android:padding="@dimen/margin_half_plus">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
@ -66,13 +67,13 @@
tools:text="Ololo"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/cv__name"
style="@style/MwmWidget.Editor.CardView">
<LinearLayout
android:id="@+id/name"
android:layout_width="match_parent"
@ -85,19 +86,19 @@
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingStart="@dimen/margin_base">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input"
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:hint="@string/editor_edit_place_name_hint"
android:singleLine="true"/>
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/name_multilang"
android:layout_width="match_parent"
@ -108,15 +109,15 @@
android:gravity="center_vertical"
android:text="@string/add_language"
android:textAppearance="@style/MwmTextAppearance.Body3"/>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/cv__address"
style="@style/MwmWidget.Editor.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -125,7 +126,7 @@
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingStart="@dimen/margin_base">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -134,17 +135,17 @@
android:text="@string/address"
android:textAppearance="@style/MwmTextAppearance.Body3"
tools:ignore="UnusedAttribute"/>
<RelativeLayout
android:id="@+id/block_street"
style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half">
<ImageView
style="@style/MwmWidget.Editor.MetadataIcon"
android:src="@drawable/ic_address"/>
<TextView
android:id="@+id/street_title"
android:layout_width="match_parent"
@ -153,7 +154,7 @@
android:layout_marginStart="@dimen/editor_margin_left"
android:text="@string/street"
android:textAppearance="@style/MwmTextAppearance.Body4"/>
<TextView
android:id="@+id/street"
style="@style/MwmWidget.Editor.FieldLayout"
@ -164,7 +165,7 @@
android:gravity="center_vertical"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Red str."/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@ -173,7 +174,7 @@
android:layout_below="@id/street"
android:layout_marginTop="@dimen/margin_quarter_plus"
android:background="?dividerHorizontal"/>
</RelativeLayout>
<include
@ -187,15 +188,15 @@
<include
android:id="@+id/block_levels"
layout="@layout/item_editor_input"/>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/cv__metadata"
style="@style/MwmWidget.Editor.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -204,7 +205,7 @@
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingStart="@dimen/margin_base">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -213,7 +214,7 @@
android:text="@string/details"
android:textAppearance="@style/MwmTextAppearance.Body3"
tools:ignore="UnusedAttribute"/>
<include
android:id="@+id/block_opening_hours"
layout="@layout/item_opening_hours"/>
@ -233,17 +234,17 @@
<include
android:id="@+id/block_operator"
layout="@layout/item_editor_input"/>
<RelativeLayout
android:id="@+id/block_cuisine"
style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half">
<ImageView
style="@style/MwmWidget.Editor.MetadataIcon"
android:src="@drawable/ic_cuisine"/>
<TextView
android:id="@+id/title_cuisine"
android:layout_width="match_parent"
@ -252,7 +253,7 @@
android:layout_marginStart="@dimen/editor_margin_left"
android:text="@string/cuisine"
android:textAppearance="@style/MwmTextAppearance.Body4"/>
<TextView
android:id="@+id/cuisine"
style="@style/MwmWidget.Editor.FieldLayout"
@ -263,7 +264,7 @@
android:gravity="center_vertical"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Italian, russian, russian, russian, russian, russian, russian, russian, russian"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@ -272,17 +273,17 @@
android:layout_below="@id/cuisine"
android:layout_marginTop="@dimen/margin_quarter_plus"
android:background="?dividerHorizontal"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/block_wifi"
style="@style/MwmWidget.Editor.MetadataBlock.Clickable">
<ImageView
style="@style/MwmWidget.Editor.MetadataIcon"
android:src="@drawable/ic_wifi"/>
<TextView
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:layout_width="match_parent"
@ -293,7 +294,7 @@
android:layout_toLeftOf="@+id/sw__wifi"
android:layout_toStartOf="@+id/sw__wifi"
android:text="@string/wifi"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/sw__wifi"
android:layout_width="wrap_content"
@ -302,9 +303,9 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
@ -356,7 +357,7 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>

1
android/res/layout/item_editor_input.xml
View file

@ -13,7 +13,6 @@
android:id="@+id/custom_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="54dp"
android:layout_marginStart="54dp">

4
android/src/com/mapswithme/maps/editor/Editor.java
View file

@ -150,8 +150,8 @@ public final class Editor
public static native String nativeGetMwmName();
public static native long nativeGetMwmVersion();
public static native void nativeCreateNote(double lat, double lon, String text);
public static native void nativePlaceDoesNotExist(double lat, double lon);
public static native void nativeCreateNote(String text);
public static native void nativePlaceDoesNotExist();
public static native boolean nativeIsHouseValid(String houseNumber);
}

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

@ -2,6 +2,7 @@ package com.mapswithme.maps.editor;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.design.widget.TextInputLayout;
@ -125,6 +126,12 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
return true;
}
@NonNull
protected String getDescription()
{
return mDescription.getText().toString().trim();
}
private boolean validateFields()
{
if (!Editor.nativeIsHouseValid(mHouseNumber.getText().toString()))
@ -238,15 +245,15 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mMetaBlocks.append(MetadataType.FMD_INTERNET.toInt(), blockWifi);
}
private EditText findInput(View view)
private EditText findInput(View blockWithInput)
{
return (EditText) view.findViewById(R.id.input);
return (EditText) blockWithInput.findViewById(R.id.input);
}
private EditText findInputAndInitBlock(View block, @DrawableRes int icon, @StringRes int hint)
private EditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, @StringRes int hint)
{
((ImageView) block.findViewById(R.id.icon)).setImageResource(icon);
final TextInputLayout input = (TextInputLayout) block.findViewById(R.id.custom_input);
((ImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
final TextInputLayout input = (TextInputLayout) blockWithInput.findViewById(R.id.custom_input);
input.setHint(getString(hint));
return (EditText) input.findViewById(R.id.input);
}

8
android/src/com/mapswithme/maps/editor/EditorHostFragment.java
View file

@ -159,7 +159,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
if (!mIsNewObject)
return;
final EditorActivity host = (EditorActivity) getActivity();
final Activity host = getActivity();
host.finish();
startActivity(new Intent(host, FeatureCategoryActivity.class));
}
@ -185,6 +185,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
}
else
{
// TODO (yunikkk) correct translation
showMistakeDialog(R.string.editor_correct_mistake);
}
break;
@ -200,6 +201,11 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
if (!setEdits())
return;
// Save note
final String note = ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).getDescription();
if (note.length() != 0)
Editor.nativeCreateNote(note);
// Save object edits
if (Editor.nativeSaveEditedFeature())
{
Statistics.INSTANCE.trackEditorSuccess(mIsNewObject);

12
android/src/com/mapswithme/maps/editor/ReportActivity.java
View file

@ -1,12 +1,8 @@
package com.mapswithme.maps.editor;
import android.app.Activity;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import com.mapswithme.maps.base.BaseMwmFragmentActivity;
import com.mapswithme.maps.bookmarks.data.MapObject;
public class ReportActivity extends BaseMwmFragmentActivity
{
@ -15,12 +11,4 @@ public class ReportActivity extends BaseMwmFragmentActivity
{
return ReportFragment.class;
}
public static void start(@NonNull Activity activity, MapObject point)
{
final Intent intent = new Intent(activity, ReportActivity.class)
.putExtra(ReportFragment.EXTRA_LAT, point.getLat())
.putExtra(ReportFragment.EXTRA_LON, point.getLon());
activity.startActivity(intent);
}
}

14
android/src/com/mapswithme/maps/editor/ReportFragment.java
View file

@ -15,9 +15,6 @@ import com.mapswithme.util.UiUtils;
public class ReportFragment extends BaseMwmToolbarFragment implements View.OnClickListener
{
public static final String EXTRA_LAT = "lat";
public static final String EXTRA_LON = "lon";
private View mSimpleProblems;
private View mAdvancedProblem;
private View mSave;
@ -27,9 +24,6 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
@IntRange(from = 0, to = 3)
private int mSelectedProblem;
private double mLat;
private double mLon;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@ -43,10 +37,6 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
super.onViewCreated(view, savedInstanceState);
mToolbarController.setTitle(R.string.editor_report_problem_title);
Bundle args = getArguments();
mLat = args.getDouble(EXTRA_LAT);
mLon = args.getDouble(EXTRA_LON);
mSave = mToolbarController.findViewById(R.id.save);
mSave.setOnClickListener(this);
mSimpleProblems = view.findViewById(R.id.ll__problems);
@ -67,13 +57,13 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
private void send(String text)
{
Editor.nativeCreateNote(mLat, mLon, text);
Editor.nativeCreateNote(text);
mToolbarController.onUpClick();
}
private void sendNotExist()
{
Editor.nativePlaceDoesNotExist(mLat, mLon);
Editor.nativePlaceDoesNotExist();
mToolbarController.onUpClick();
}

10
strings.txt
View file

@ -4874,7 +4874,7 @@
en = Data version: %d
ru = Версия данных: %d
de = Datenversion: %d
zh-Hant = 資料版本： %d
zh-Hant = 資料版本： %d
[are_you_sure]
tags = android,tizen
@ -16217,13 +16217,13 @@
[editor_storey_number]
tags = ios, android
en = Storey number (maximum %1$@)
ru = Количество этажей (максимум %1$@)
en = Storey number (maximum %d)
ru = Количество этажей (максимум %d)
[error_enter_correct_storey_number]
tags = ios, android
en = Edit buildings with maximum of %1$@ floors
ru = Редактируйте здания высотой максимум %1$@ этажей.
en = Maximum building levels number is limited to %d.
ru = Редактируйте здания высотой максимум %d этажей.
[editor_zip_code]
tags = ios, android