diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index 3fdcf5ac20..e7e21702cf 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -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, ""); } diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml index 9c0afa0a84..d31cf4aa7b 100644 --- a/android/res/layout/fragment_editor.xml +++ b/android/res/layout/fragment_editor.xml @@ -7,24 +7,25 @@ android:padding="@dimen/margin_half" tools:context=".editor.EditorActivity" tools:ignore="DuplicateIds"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -233,17 +234,17 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/android/res/layout/item_editor_input.xml b/android/res/layout/item_editor_input.xml index d5b62dd79c..522088237b 100644 --- a/android/res/layout/item_editor_input.xml +++ b/android/res/layout/item_editor_input.xml @@ -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"> diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java index 9e314cba68..b09616eaa3 100644 --- a/android/src/com/mapswithme/maps/editor/Editor.java +++ b/android/src/com/mapswithme/maps/editor/Editor.java @@ -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); } diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index e83d465a19..4f98a02281 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -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); } diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index 64d544671d..58b3cbb6fb 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -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); diff --git a/android/src/com/mapswithme/maps/editor/ReportActivity.java b/android/src/com/mapswithme/maps/editor/ReportActivity.java index ba38f2e5a8..11fbced37c 100644 --- a/android/src/com/mapswithme/maps/editor/ReportActivity.java +++ b/android/src/com/mapswithme/maps/editor/ReportActivity.java @@ -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); - } } diff --git a/android/src/com/mapswithme/maps/editor/ReportFragment.java b/android/src/com/mapswithme/maps/editor/ReportFragment.java index 571e6de454..d392cc4f0e 100644 --- a/android/src/com/mapswithme/maps/editor/ReportFragment.java +++ b/android/src/com/mapswithme/maps/editor/ReportFragment.java @@ -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(); } diff --git a/strings.txt b/strings.txt index bb00f801aa..2f351cbf18 100644 --- a/strings.txt +++ b/strings.txt @@ -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