diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index ce7529ae7f..21ca624a52 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -475,4 +475,9 @@ namespace android { m_work.AddString(name, value); } + + void Framework::Scale(double k) + { + m_work.Scale(k); + } } diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index 6525ad6881..0d4c084487 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -101,6 +101,8 @@ namespace android string const GetCountryName(double x, double y) const; void AddString(string const & name, string const & value); + + void Scale(double k); }; } diff --git a/android/jni/com/mapswithme/maps/MWMActivity.cpp b/android/jni/com/mapswithme/maps/MWMActivity.cpp index 5f7cde4d08..311acaa392 100644 --- a/android/jni/com/mapswithme/maps/MWMActivity.cpp +++ b/android/jni/com/mapswithme/maps/MWMActivity.cpp @@ -218,4 +218,10 @@ extern "C" env->SetObjectArrayElement(ret, i, env->NewStringUTF(v[i].c_str())); return ret; } + + JNIEXPORT void JNICALL + Java_com_mapswithme_maps_MWMActivity_nativeScale(JNIEnv * env, jobject thiz, jdouble k) + { + g_framework->Scale(static_cast(k)); + } } // extern "C" diff --git a/android/res/drawable-hdpi/ic_minus.png b/android/res/drawable-hdpi/ic_minus.png new file mode 100644 index 0000000000..68d7261ee1 Binary files /dev/null and b/android/res/drawable-hdpi/ic_minus.png differ diff --git a/android/res/drawable-hdpi/ic_minus_highlighted.png b/android/res/drawable-hdpi/ic_minus_highlighted.png new file mode 100644 index 0000000000..a28e3f2dc0 Binary files /dev/null and b/android/res/drawable-hdpi/ic_minus_highlighted.png differ diff --git a/android/res/drawable-hdpi/ic_plus.png b/android/res/drawable-hdpi/ic_plus.png new file mode 100644 index 0000000000..68d7261ee1 Binary files /dev/null and b/android/res/drawable-hdpi/ic_plus.png differ diff --git a/android/res/drawable-hdpi/ic_plus_highlighted.png b/android/res/drawable-hdpi/ic_plus_highlighted.png new file mode 100644 index 0000000000..a28e3f2dc0 Binary files /dev/null and b/android/res/drawable-hdpi/ic_plus_highlighted.png differ diff --git a/android/res/drawable-ldpi/ic_minus.png b/android/res/drawable-ldpi/ic_minus.png new file mode 100644 index 0000000000..7712a36958 Binary files /dev/null and b/android/res/drawable-ldpi/ic_minus.png differ diff --git a/android/res/drawable-ldpi/ic_minus_highlighted.png b/android/res/drawable-ldpi/ic_minus_highlighted.png new file mode 100644 index 0000000000..068d00a833 Binary files /dev/null and b/android/res/drawable-ldpi/ic_minus_highlighted.png differ diff --git a/android/res/drawable-ldpi/ic_plus.png b/android/res/drawable-ldpi/ic_plus.png new file mode 100644 index 0000000000..7712a36958 Binary files /dev/null and b/android/res/drawable-ldpi/ic_plus.png differ diff --git a/android/res/drawable-ldpi/ic_plus_highlighted.png b/android/res/drawable-ldpi/ic_plus_highlighted.png new file mode 100644 index 0000000000..068d00a833 Binary files /dev/null and b/android/res/drawable-ldpi/ic_plus_highlighted.png differ diff --git a/android/res/drawable-mdpi/ic_minus.png b/android/res/drawable-mdpi/ic_minus.png new file mode 100644 index 0000000000..2aadc03305 Binary files /dev/null and b/android/res/drawable-mdpi/ic_minus.png differ diff --git a/android/res/drawable-mdpi/ic_minus_highlighted.png b/android/res/drawable-mdpi/ic_minus_highlighted.png new file mode 100644 index 0000000000..6ef26d8462 Binary files /dev/null and b/android/res/drawable-mdpi/ic_minus_highlighted.png differ diff --git a/android/res/drawable-mdpi/ic_plus.png b/android/res/drawable-mdpi/ic_plus.png new file mode 100644 index 0000000000..2aadc03305 Binary files /dev/null and b/android/res/drawable-mdpi/ic_plus.png differ diff --git a/android/res/drawable-mdpi/ic_plus_highlighted.png b/android/res/drawable-mdpi/ic_plus_highlighted.png new file mode 100644 index 0000000000..6ef26d8462 Binary files /dev/null and b/android/res/drawable-mdpi/ic_plus_highlighted.png differ diff --git a/android/res/drawable-xhdpi/ic_minus.png b/android/res/drawable-xhdpi/ic_minus.png new file mode 100644 index 0000000000..db75b90cf7 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_minus.png differ diff --git a/android/res/drawable-xhdpi/ic_minus_highlighted.png b/android/res/drawable-xhdpi/ic_minus_highlighted.png new file mode 100644 index 0000000000..af3dd186ae Binary files /dev/null and b/android/res/drawable-xhdpi/ic_minus_highlighted.png differ diff --git a/android/res/drawable-xhdpi/ic_plus.png b/android/res/drawable-xhdpi/ic_plus.png new file mode 100644 index 0000000000..db75b90cf7 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_plus.png differ diff --git a/android/res/drawable-xhdpi/ic_plus_highlighted.png b/android/res/drawable-xhdpi/ic_plus_highlighted.png new file mode 100644 index 0000000000..af3dd186ae Binary files /dev/null and b/android/res/drawable-xhdpi/ic_plus_highlighted.png differ diff --git a/android/res/drawable/minus_button.xml b/android/res/drawable/minus_button.xml new file mode 100644 index 0000000000..2b15aabc50 --- /dev/null +++ b/android/res/drawable/minus_button.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/android/res/drawable/plus_button.xml b/android/res/drawable/plus_button.xml new file mode 100644 index 0000000000..e2e0441798 --- /dev/null +++ b/android/res/drawable/plus_button.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/android/res/layout/map.xml b/android/res/layout/map.xml index 595f13cb56..81be8e5eb6 100644 --- a/android/res/layout/map.xml +++ b/android/res/layout/map.xml @@ -4,7 +4,39 @@ + + +