diff --git a/android/res/drawable-hdpi/img_news_migration.png b/android/res/drawable-hdpi/img_migration.png similarity index 100% rename from android/res/drawable-hdpi/img_news_migration.png rename to android/res/drawable-hdpi/img_migration.png diff --git a/android/res/drawable-hdpi/img_news_bicycle.png b/android/res/drawable-hdpi/img_news_bicycle.png new file mode 100644 index 0000000000..7a0d2ab5c1 Binary files /dev/null and b/android/res/drawable-hdpi/img_news_bicycle.png differ diff --git a/android/res/drawable-hdpi/img_news_booking.png b/android/res/drawable-hdpi/img_news_booking.png new file mode 100644 index 0000000000..01cfb31aa7 Binary files /dev/null and b/android/res/drawable-hdpi/img_news_booking.png differ diff --git a/android/res/drawable-hdpi/img_news_editor.png b/android/res/drawable-hdpi/img_news_editor.png deleted file mode 100644 index 49e8211a51..0000000000 Binary files a/android/res/drawable-hdpi/img_news_editor.png and /dev/null differ diff --git a/android/res/drawable-hdpi/img_news_search.png b/android/res/drawable-hdpi/img_news_search.png deleted file mode 100644 index 2d13453751..0000000000 Binary files a/android/res/drawable-hdpi/img_news_search.png and /dev/null differ diff --git a/android/res/drawable-mdpi/img_news_migration.png b/android/res/drawable-mdpi/img_migration.png similarity index 100% rename from android/res/drawable-mdpi/img_news_migration.png rename to android/res/drawable-mdpi/img_migration.png diff --git a/android/res/drawable-mdpi/img_news_bicycle.png b/android/res/drawable-mdpi/img_news_bicycle.png new file mode 100644 index 0000000000..9096f77d1c Binary files /dev/null and b/android/res/drawable-mdpi/img_news_bicycle.png differ diff --git a/android/res/drawable-mdpi/img_news_booking.png b/android/res/drawable-mdpi/img_news_booking.png new file mode 100644 index 0000000000..93f9e5dfa7 Binary files /dev/null and b/android/res/drawable-mdpi/img_news_booking.png differ diff --git a/android/res/drawable-mdpi/img_news_editor.png b/android/res/drawable-mdpi/img_news_editor.png deleted file mode 100644 index ad1522118e..0000000000 Binary files a/android/res/drawable-mdpi/img_news_editor.png and /dev/null differ diff --git a/android/res/drawable-mdpi/img_news_search.png b/android/res/drawable-mdpi/img_news_search.png deleted file mode 100644 index 1f54decaa6..0000000000 Binary files a/android/res/drawable-mdpi/img_news_search.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/img_news_migration.png b/android/res/drawable-xhdpi/img_migration.png similarity index 100% rename from android/res/drawable-xhdpi/img_news_migration.png rename to android/res/drawable-xhdpi/img_migration.png diff --git a/android/res/drawable-xhdpi/img_news_bicycle.png b/android/res/drawable-xhdpi/img_news_bicycle.png new file mode 100644 index 0000000000..f20ecde974 Binary files /dev/null and b/android/res/drawable-xhdpi/img_news_bicycle.png differ diff --git a/android/res/drawable-xhdpi/img_news_booking.png b/android/res/drawable-xhdpi/img_news_booking.png new file mode 100644 index 0000000000..6ee23c3a0e Binary files /dev/null and b/android/res/drawable-xhdpi/img_news_booking.png differ diff --git a/android/res/drawable-xhdpi/img_news_editor.png b/android/res/drawable-xhdpi/img_news_editor.png deleted file mode 100644 index 60ec5a0732..0000000000 Binary files a/android/res/drawable-xhdpi/img_news_editor.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/img_news_search.png b/android/res/drawable-xhdpi/img_news_search.png deleted file mode 100644 index e9ed2345e9..0000000000 Binary files a/android/res/drawable-xhdpi/img_news_search.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/img_news_migration.png b/android/res/drawable-xxhdpi/img_migration.png similarity index 100% rename from android/res/drawable-xxhdpi/img_news_migration.png rename to android/res/drawable-xxhdpi/img_migration.png diff --git a/android/res/drawable-xxhdpi/img_news_bicycle.png b/android/res/drawable-xxhdpi/img_news_bicycle.png new file mode 100644 index 0000000000..13681f59ed Binary files /dev/null and b/android/res/drawable-xxhdpi/img_news_bicycle.png differ diff --git a/android/res/drawable-xxhdpi/img_news_booking.png b/android/res/drawable-xxhdpi/img_news_booking.png new file mode 100644 index 0000000000..8449de153b Binary files /dev/null and b/android/res/drawable-xxhdpi/img_news_booking.png differ diff --git a/android/res/drawable-xxhdpi/img_news_editor.png b/android/res/drawable-xxhdpi/img_news_editor.png deleted file mode 100644 index bf5be7d011..0000000000 Binary files a/android/res/drawable-xxhdpi/img_news_editor.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/img_news_search.png b/android/res/drawable-xxhdpi/img_news_search.png deleted file mode 100644 index 74bfbe9697..0000000000 Binary files a/android/res/drawable-xxhdpi/img_news_search.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/img_news_migration.png b/android/res/drawable-xxxhdpi/img_migration.png similarity index 100% rename from android/res/drawable-xxxhdpi/img_news_migration.png rename to android/res/drawable-xxxhdpi/img_migration.png diff --git a/android/res/drawable-xxxhdpi/img_news_bicycle.png b/android/res/drawable-xxxhdpi/img_news_bicycle.png new file mode 100644 index 0000000000..79f8786f80 Binary files /dev/null and b/android/res/drawable-xxxhdpi/img_news_bicycle.png differ diff --git a/android/res/drawable-xxxhdpi/img_news_booking.png b/android/res/drawable-xxxhdpi/img_news_booking.png new file mode 100644 index 0000000000..32cb5c3c40 Binary files /dev/null and b/android/res/drawable-xxxhdpi/img_news_booking.png differ diff --git a/android/res/drawable-xxxhdpi/img_news_editor.png b/android/res/drawable-xxxhdpi/img_news_editor.png deleted file mode 100644 index 790c15635e..0000000000 Binary files a/android/res/drawable-xxxhdpi/img_news_editor.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/img_news_search.png b/android/res/drawable-xxxhdpi/img_news_search.png deleted file mode 100644 index 55c90e20a9..0000000000 Binary files a/android/res/drawable-xxxhdpi/img_news_search.png and /dev/null differ diff --git a/android/res/layout/fragment_migrate.xml b/android/res/layout/fragment_migrate.xml index f24c9fea2a..dbcafbac08 100644 --- a/android/res/layout/fragment_migrate.xml +++ b/android/res/layout/fragment_migrate.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/margin_base" - android:src="@drawable/img_news_migration" + android:src="@drawable/img_migration" android:tag="@string/tag_height_limited"/> + + - - diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml index 3e226616d8..93fc214065 100644 --- a/android/res/values/arrays.xml +++ b/android/res/values/arrays.xml @@ -87,38 +87,32 @@ - @drawable/img_news_migration - @drawable/img_news_editor - @drawable/img_news_search + @drawable/img_news_booking + @drawable/img_news_bicycle - @string/whatsnew_smallmwm_header - @string/whatsnew_editor_title - @string/whatsnew_search_header + @string/whatsnew_booking_header + @string/whatsnew_cycle_navigation_header - @string/whatsnew_smallmwm_message - @string/whatsnew_editor_message_1 - @string/whatsnew_search_message + @string/whatsnew_booking_message + @string/whatsnew_cycle_navigation_message - @string/whatsnew_editor_message_2 - - diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 498104e990..052451fdba 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -51,7 +51,7 @@ import com.mapswithme.maps.editor.ViralFragment; import com.mapswithme.maps.location.CompassData; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.news.FirstStartFragment; -import com.mapswithme.maps.news.SinglePageNewsFragment; +import com.mapswithme.maps.news.NewsFragment; import com.mapswithme.maps.routing.NavigationController; import com.mapswithme.maps.routing.RoutingController; import com.mapswithme.maps.routing.RoutingInfo; @@ -779,7 +779,7 @@ public class MwmActivity extends BaseMwmFragmentActivity } }); } - else if (!SinglePageNewsFragment.showOn(this)) + else if (!NewsFragment.showOn(this)) { if (ViralFragment.shouldDisplay()) new ViralFragment().show(getSupportFragmentManager(), "");