[android] fix: Whats new.

31 files changed, 21 insertions, 27 deletions

diff --git a/android/res/drawable-hdpi/img_news_migration.png b/android/res/drawable-hdpi/img_migration.png
index 0928a370b4..0928a370b4 100644
--- a/android/res/drawable-hdpi/img_news_migration.png
+++ b/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
--- /dev/null
+++ b/android/res/drawable-hdpi/img_news_bicycle.png
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
--- /dev/null
+++ b/android/res/drawable-hdpi/img_news_booking.png
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
--- a/android/res/drawable-hdpi/img_news_editor.png
+++ /dev/null
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
--- a/android/res/drawable-hdpi/img_news_search.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_news_migration.png b/android/res/drawable-mdpi/img_migration.png
index 48d00a0a64..48d00a0a64 100644
--- a/android/res/drawable-mdpi/img_news_migration.png
+++ b/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
--- /dev/null
+++ b/android/res/drawable-mdpi/img_news_bicycle.png
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
--- /dev/null
+++ b/android/res/drawable-mdpi/img_news_booking.png
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
--- a/android/res/drawable-mdpi/img_news_editor.png
+++ /dev/null
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
--- a/android/res/drawable-mdpi/img_news_search.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_news_migration.png b/android/res/drawable-xhdpi/img_migration.png
index 252e661501..252e661501 100644
--- a/android/res/drawable-xhdpi/img_news_migration.png
+++ b/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
--- /dev/null
+++ b/android/res/drawable-xhdpi/img_news_bicycle.png
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
--- /dev/null
+++ b/android/res/drawable-xhdpi/img_news_booking.png
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
--- a/android/res/drawable-xhdpi/img_news_editor.png
+++ /dev/null
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
--- a/android/res/drawable-xhdpi/img_news_search.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/img_news_migration.png b/android/res/drawable-xxhdpi/img_migration.png
index e27db045e1..e27db045e1 100644
--- a/android/res/drawable-xxhdpi/img_news_migration.png
+++ b/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
--- /dev/null
+++ b/android/res/drawable-xxhdpi/img_news_bicycle.png
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
--- /dev/null
+++ b/android/res/drawable-xxhdpi/img_news_booking.png
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
--- a/android/res/drawable-xxhdpi/img_news_editor.png
+++ /dev/null
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
--- a/android/res/drawable-xxhdpi/img_news_search.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_news_migration.png b/android/res/drawable-xxxhdpi/img_migration.png
index 5486784643..5486784643 100644
--- a/android/res/drawable-xxxhdpi/img_news_migration.png
+++ b/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
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/img_news_bicycle.png
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
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/img_news_booking.png
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
--- a/android/res/drawable-xxxhdpi/img_news_editor.png
+++ /dev/null
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
--- a/android/res/drawable-xxxhdpi/img_news_search.png
+++ /dev/null
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"/>
 
     <TextView
diff --git a/android/res/layout/fragment_news.xml b/android/res/layout/fragment_news.xml
index 6aae172d35..1fad118080 100644
--- a/android/res/layout/fragment_news.xml
+++ b/android/res/layout/fragment_news.xml
@@ -74,7 +74,7 @@
       android:id="@+id/done"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="right"
+      android:layout_gravity="end"
       android:text="@string/done"
       android:textAppearance="@style/MwmTextAppearance.Body3"
       android:textColor="?colorAccent"
diff --git a/android/res/layout/fragment_news_single.xml b/android/res/layout/fragment_news_single.xml
index 421a26532f..35ac49868f 100644
--- a/android/res/layout/fragment_news_single.xml
+++ b/android/res/layout/fragment_news_single.xml
@@ -25,7 +25,7 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="@dimen/margin_base"
       android:layout_gravity="center_horizontal"
-      android:src="@drawable/img_news_editor"
+      android:src="@drawable/img_news_booking"
       android:tag="@string/tag_height_limited"/>
 
     <TextView
diff --git a/android/res/layout/news_page.xml b/android/res/layout/news_page.xml
index f5764c2164..223a53d5b3 100644
--- a/android/res/layout/news_page.xml
+++ b/android/res/layout/news_page.xml
@@ -17,6 +17,15 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_gravity="center">
+        <ImageView
+          android:id="@+id/image"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_base"
+          android:layout_gravity="center_horizontal"
+          android:tag="@string/tag_height_limited"
+          tools:src="@drawable/img_news_booking"/>
+
         <TextView
           android:id="@+id/title"
           android:layout_width="wrap_content"
@@ -30,22 +39,13 @@
           android:fontFamily="@string/robotoMedium"
           tools:text="Whats new feature!"/>
 
-        <ImageView
-          android:id="@+id/image"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="@dimen/margin_base"
-          android:layout_gravity="center_horizontal"
-          android:tag="@string/tag_height_limited"
-          tools:src="@drawable/img_news_night"/>
-
         <TextView
           android:id="@+id/subtitle"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginLeft="@dimen/margin_base"
           android:layout_marginRight="@dimen/margin_base"
-          android:textAppearance="@style/MwmTextAppearance.Body1"
+          android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
           android:layout_gravity="center_horizontal"
           android:gravity="center_horizontal"
           tools:text="We\'ve made some cool stuff!\nSit down and be happy now, man."/>
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 @@
 
   <!-- What's new -->
   <integer-array name="news_images">
-    <item>@drawable/img_news_migration</item>
-    <item>@drawable/img_news_editor</item>
-    <item>@drawable/img_news_search</item>
+    <item>@drawable/img_news_booking</item>
+    <item>@drawable/img_news_bicycle</item>
   </integer-array>
 
   <string-array name="news_titles">
-    <item>@string/whatsnew_smallmwm_header</item>
-    <item>@string/whatsnew_editor_title</item>
-    <item>@string/whatsnew_search_header</item>
+    <item>@string/whatsnew_booking_header</item>
+    <item>@string/whatsnew_cycle_navigation_header</item>
   </string-array>
 
   <string-array name="news_messages_1">
-    <item>@string/whatsnew_smallmwm_message</item>
-    <item>@string/whatsnew_editor_message_1</item>
-    <item>@string/whatsnew_search_message</item>
+    <item>@string/whatsnew_booking_message</item>
+    <item>@string/whatsnew_cycle_navigation_message</item>
   </string-array>
 
   <string-array name="news_messages_2">
     <item/>
-    <item>@string/whatsnew_editor_message_2</item>
     <item/>
   </string-array>
 
   <string-array name="news_switch_titles">
     <item/>
     <item/>
-    <item/>
   </string-array>
 
   <string-array name="news_switch_subtitles">
     <item/>
     <item/>
-    <item/>
   </string-array>
 </resources>
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(), "");