diff --git a/android/res/drawable-hdpi/img_news_3d.png b/android/res/drawable-hdpi/img_news_3d.png deleted file mode 100644 index 62a7d5ad55..0000000000 Binary files a/android/res/drawable-hdpi/img_news_3d.png and /dev/null differ diff --git a/android/res/drawable-hdpi/img_news_3d_buildings.png b/android/res/drawable-hdpi/img_news_3d_buildings.png deleted file mode 100644 index 010fd4aaf5..0000000000 Binary files a/android/res/drawable-hdpi/img_news_3d_buildings.png and /dev/null differ diff --git a/android/res/drawable-hdpi/img_news_night.png b/android/res/drawable-hdpi/img_news_night.png new file mode 100644 index 0000000000..2b72ba8a49 Binary files /dev/null and b/android/res/drawable-hdpi/img_news_night.png differ diff --git a/android/res/drawable-mdpi/img_news_3d.png b/android/res/drawable-mdpi/img_news_3d.png deleted file mode 100644 index fe9e0c0d7b..0000000000 Binary files a/android/res/drawable-mdpi/img_news_3d.png and /dev/null differ diff --git a/android/res/drawable-mdpi/img_news_3d_buildings.png b/android/res/drawable-mdpi/img_news_3d_buildings.png deleted file mode 100644 index 7a8bae8d7e..0000000000 Binary files a/android/res/drawable-mdpi/img_news_3d_buildings.png and /dev/null differ diff --git a/android/res/drawable-mdpi/img_news_night.png b/android/res/drawable-mdpi/img_news_night.png new file mode 100644 index 0000000000..72b96a8e86 Binary files /dev/null and b/android/res/drawable-mdpi/img_news_night.png differ diff --git a/android/res/drawable-xhdpi/img_news_3d.png b/android/res/drawable-xhdpi/img_news_3d.png deleted file mode 100644 index abffe161be..0000000000 Binary files a/android/res/drawable-xhdpi/img_news_3d.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/img_news_3d_buildings.png b/android/res/drawable-xhdpi/img_news_3d_buildings.png deleted file mode 100644 index ccc3a244a3..0000000000 Binary files a/android/res/drawable-xhdpi/img_news_3d_buildings.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/img_news_night.png b/android/res/drawable-xhdpi/img_news_night.png new file mode 100644 index 0000000000..bcd83edc3c Binary files /dev/null and b/android/res/drawable-xhdpi/img_news_night.png differ diff --git a/android/res/drawable-xxhdpi/img_news_3d.png b/android/res/drawable-xxhdpi/img_news_3d.png deleted file mode 100644 index ebb4d8b51a..0000000000 Binary files a/android/res/drawable-xxhdpi/img_news_3d.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/img_news_3d_buildings.png b/android/res/drawable-xxhdpi/img_news_3d_buildings.png deleted file mode 100644 index 55e27462f1..0000000000 Binary files a/android/res/drawable-xxhdpi/img_news_3d_buildings.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/img_news_night.png b/android/res/drawable-xxhdpi/img_news_night.png new file mode 100644 index 0000000000..37f09ed7be Binary files /dev/null and b/android/res/drawable-xxhdpi/img_news_night.png differ diff --git a/android/res/drawable-xxxhdpi/img_news_3d.png b/android/res/drawable-xxxhdpi/img_news_3d.png deleted file mode 100644 index b568829bee..0000000000 Binary files a/android/res/drawable-xxxhdpi/img_news_3d.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/img_news_3d_buildings.png b/android/res/drawable-xxxhdpi/img_news_3d_buildings.png deleted file mode 100644 index 739ea5bf21..0000000000 Binary files a/android/res/drawable-xxxhdpi/img_news_3d_buildings.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/img_news_night.png b/android/res/drawable-xxxhdpi/img_news_night.png new file mode 100644 index 0000000000..dc82ad18e6 Binary files /dev/null and b/android/res/drawable-xxxhdpi/img_news_night.png differ diff --git a/android/res/layout/fragment_news.xml b/android/res/layout/fragment_news.xml index 6b95746117..d1f91938cc 100644 --- a/android/res/layout/fragment_news.xml +++ b/android/res/layout/fragment_news.xml @@ -35,12 +35,13 @@ android:id="@+id/dots" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center"> - + + tools:src="@drawable/img_news_night"/> - @drawable/img_news_3d - @drawable/img_news_3d_buildings + @drawable/img_news_night - @string/whats_new_3d_title - @string/whats_new_3d_buildings_title + @string/whats_new_night_caption - @string/whats_new_3d_subtitle - @string/whats_new_3d_buildings_subtitle + @string/whats_new_night_body - @string/pref_map_3d_title - @string/pref_map_3d_buildings_title + - \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/NewsFragment.java b/android/src/com/mapswithme/maps/NewsFragment.java index b70abf22a9..1fb0a6e207 100644 --- a/android/src/com/mapswithme/maps/NewsFragment.java +++ b/android/src/com/mapswithme/maps/NewsFragment.java @@ -48,9 +48,6 @@ public class NewsFragment extends BaseMwmDialogFragment mImages[i] = images.getResourceId(i, 0); images.recycle(); - - // TODO: Temporary solution. Remove for the next WhatsNews - mSubtitles[1] += "\n\n" + MwmApplication.get().getString(R.string.whats_new_3d_update_maps); } @Override @@ -100,15 +97,7 @@ public class NewsFragment extends BaseMwmDialogFragment @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - Framework.Params3dMode _3d = new Framework.Params3dMode(); - Framework.nativeGet3dMode(_3d); - - if (position == 0) - _3d.enabled = isChecked; - else - _3d.buildings = isChecked; - - Framework.nativeSet3dMode(_3d.enabled, _3d.buildings); + // Unused now } });