[android] Whats new screens.

22 files changed, 132 insertions, 4 deletions

diff --git a/android/res/drawable-hdpi/img_whatsnew_traffic.png b/android/res/drawable-hdpi/img_whatsnew_traffic.png
new file mode 100644
index 0000000000..98ec5b97a6
--- /dev/null
+++ b/android/res/drawable-hdpi/img_whatsnew_traffic.png
diff --git a/android/res/drawable-hdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-hdpi/img_whatsnew_traffic_roaming.png
new file mode 100644
index 0000000000..6a0c7ea0b4
--- /dev/null
+++ b/android/res/drawable-hdpi/img_whatsnew_traffic_roaming.png
diff --git a/android/res/drawable-hdpi/img_whatsnew_update_uber.png b/android/res/drawable-hdpi/img_whatsnew_update_uber.png
new file mode 100644
index 0000000000..40d1b9b130
--- /dev/null
+++ b/android/res/drawable-hdpi/img_whatsnew_update_uber.png
diff --git a/android/res/drawable-mdpi/img_whatsnew_traffic.png b/android/res/drawable-mdpi/img_whatsnew_traffic.png
new file mode 100644
index 0000000000..7427db592a
--- /dev/null
+++ b/android/res/drawable-mdpi/img_whatsnew_traffic.png
diff --git a/android/res/drawable-mdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-mdpi/img_whatsnew_traffic_roaming.png
new file mode 100644
index 0000000000..080785c637
--- /dev/null
+++ b/android/res/drawable-mdpi/img_whatsnew_traffic_roaming.png
diff --git a/android/res/drawable-mdpi/img_whatsnew_update_uber.png b/android/res/drawable-mdpi/img_whatsnew_update_uber.png
new file mode 100644
index 0000000000..231f6b4b51
--- /dev/null
+++ b/android/res/drawable-mdpi/img_whatsnew_update_uber.png
diff --git a/android/res/drawable-xhdpi/img_whatsnew_traffic.png b/android/res/drawable-xhdpi/img_whatsnew_traffic.png
new file mode 100644
index 0000000000..2efa120141
--- /dev/null
+++ b/android/res/drawable-xhdpi/img_whatsnew_traffic.png
diff --git a/android/res/drawable-xhdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-xhdpi/img_whatsnew_traffic_roaming.png
new file mode 100644
index 0000000000..4644c5e1c9
--- /dev/null
+++ b/android/res/drawable-xhdpi/img_whatsnew_traffic_roaming.png
diff --git a/android/res/drawable-xhdpi/img_whatsnew_update_uber.png b/android/res/drawable-xhdpi/img_whatsnew_update_uber.png
new file mode 100644
index 0000000000..541bd1c5ae
--- /dev/null
+++ b/android/res/drawable-xhdpi/img_whatsnew_update_uber.png
diff --git a/android/res/drawable-xxhdpi/img_whats_new_traffic_roaming.png b/android/res/drawable-xxhdpi/img_whats_new_traffic_roaming.png
new file mode 100644
index 0000000000..6819071a95
--- /dev/null
+++ b/android/res/drawable-xxhdpi/img_whats_new_traffic_roaming.png
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_traffic.png b/android/res/drawable-xxhdpi/img_whatsnew_traffic.png
new file mode 100644
index 0000000000..76fab9b611
--- /dev/null
+++ b/android/res/drawable-xxhdpi/img_whatsnew_traffic.png
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_update_uber.png b/android/res/drawable-xxhdpi/img_whatsnew_update_uber.png
new file mode 100644
index 0000000000..e0bc45cb9a
--- /dev/null
+++ b/android/res/drawable-xxhdpi/img_whatsnew_update_uber.png
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_traffic.png b/android/res/drawable-xxxhdpi/img_whatsnew_traffic.png
new file mode 100644
index 0000000000..9cd0e8b6c3
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/img_whatsnew_traffic.png
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-xxxhdpi/img_whatsnew_traffic_roaming.png
new file mode 100644
index 0000000000..107e0477e3
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/img_whatsnew_traffic_roaming.png
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_update_uber.png b/android/res/drawable-xxxhdpi/img_whatsnew_update_uber.png
new file mode 100644
index 0000000000..9bf8942eee
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/img_whatsnew_update_uber.png
diff --git a/android/res/layout-land/news_page.xml b/android/res/layout-land/news_page.xml
new file mode 100644
index 0000000000..247b0bb0bf
--- /dev/null
+++ b/android/res/layout-land/news_page.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="horizontal"
+  android:gravity="center">
+  <ImageView
+    android:id="@+id/image"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/margin_double_plus"
+    android:layout_marginStart="@dimen/margin_double_plus"
+    android:layout_gravity="center_vertical"
+    tools:src="@drawable/img_whats_new_traffic_roaming"/>
+  <LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginEnd="@dimen/margin_double_plus"
+    android:layout_marginRight="@dimen/margin_double_plus"
+    android:layout_marginLeft="@dimen/margin_base"
+    android:layout_marginStart="@dimen/margin_base"
+    android:orientation="vertical">
+    <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1">
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="center">
+        <TextView
+          android:id="@+id/title"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_base"
+          android:textAppearance="@style/MwmTextAppearance.Title"
+          android:layout_gravity="center_horizontal"
+          android:gravity="center_horizontal"
+          android:fontFamily="@string/robotoMedium"
+          tools:text="Whats new feature!"/>
+
+        <TextView
+          android:id="@+id/subtitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          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."/>
+      </LinearLayout>
+    </FrameLayout>
+
+    <LinearLayout
+      android:id="@+id/switch_block"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:minHeight="64dp"
+      android:orientation="horizontal"
+      android:gravity="center_vertical"
+      android:background="?clickableBackground">
+      <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+        <TextView
+          android:id="@+id/switch_title"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textAppearance="@style/MwmTextAppearance.Body1"
+          android:singleLine="true"
+          tools:text="Switch block title"/>
+
+        <TextView
+          android:id="@+id/switch_subtitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:text="Switch block subtitle"/>
+      </LinearLayout>
+
+      <android.support.v7.widget.SwitchCompat
+        android:id="@+id/switch_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"/>
+    </LinearLayout>
+  </LinearLayout>
+
+</LinearLayout>
diff --git a/android/res/layout/fragment_news.xml b/android/res/layout/fragment_news.xml
index 1fad118080..496fa1a2d7 100644
--- a/android/res/layout/fragment_news.xml
+++ b/android/res/layout/fragment_news.xml
@@ -21,6 +21,18 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+    <TextView
+      android:id="@+id/skip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="start"
+      android:text="@string/skip"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:textColor="?colorAccent"
+      android:textAllCaps="true"
+      android:padding="@dimen/margin_base"
+      android:background="?clickableBackground"/>
+
     <ImageView
       android:id="@+id/back"
       android:layout_width="wrap_content"
diff --git a/android/res/layout/news_page.xml b/android/res/layout/news_page.xml
index 223a53d5b3..8b17372a86 100644
--- a/android/res/layout/news_page.xml
+++ b/android/res/layout/news_page.xml
@@ -24,7 +24,7 @@
           android:layout_marginBottom="@dimen/margin_base"
           android:layout_gravity="center_horizontal"
           android:tag="@string/tag_height_limited"
-          tools:src="@drawable/img_news_booking"/>
+          tools:src="@drawable/img_whats_new_traffic_roaming"/>
 
         <TextView
           android:id="@+id/title"
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index f3443e7dae..78a7a86034 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1059,4 +1059,5 @@
 	<string name="whatsnew_font_size">Размер шрифта</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Названия объектов на карте теперь можно сделать крупнее.</string>
+	<string name="skip">Пропустить</string>
 </resources>
diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index 0af3789ab9..49aea869d4 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -29,29 +29,38 @@
 
   <!-- What's new -->
   <integer-array name="news_images">
-    <item>@drawable/img_whatsnew_uber</item>
+    <item>@drawable/img_whatsnew_traffic</item>
+    <item>@drawable/img_whatsnew_traffic_roaming</item>
+    <item>@drawable/img_whatsnew_update_uber</item>
   </integer-array>
 
   <string-array name="news_titles">
-    <item>@string/whatsnew_uber_header</item>
+    <item>@string/whatsnew_traffic</item>
+    <item>@string/whatsnew_traffic_roaming</item>
+    <item>@string/whatsnew_order_taxi</item>
   </string-array>
 
   <string-array name="news_messages_1">
-    <item>@string/whatsnew_uber_message</item>
+    <item>@string/whatsnew_traffic_text</item>
+    <item>@string/whatsnew_traffic_roaming_text</item>
+    <item>@string/whatsnew_order_taxi_text</item>
   </string-array>
 
   <string-array name="news_messages_2">
     <item/>
     <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/res/values/strings.xml b/android/res/values/strings.xml
index c9b063e951..a878683525 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1063,4 +1063,5 @@
 	<string name="whatsnew_font_size">Font Size</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Labels on the map can be made bigger.</string>
+	<string name="skip">Skip</string>
 </resources>
diff --git a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java
index 04eda628ca..b33839f4ec 100644
--- a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java
+++ b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java
@@ -35,6 +35,7 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment
   private View mPrevButton;
   private View mNextButton;
   private View mDoneButton;
+  private View mSkipButton;
   private ImageView[] mDots;
 
   private int mPageCount;
@@ -164,6 +165,7 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment
     UiUtils.showIf(cur > 0, mPrevButton);
     UiUtils.showIf(cur + 1 < mPageCount, mNextButton);
     UiUtils.visibleIf(cur + 1 == mPageCount, mDoneButton);
+    UiUtils.visibleIf(cur == 0, mSkipButton);
 
     if (mPageCount == 1)
       return;
@@ -253,6 +255,7 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment
     mPrevButton = content.findViewById(R.id.back);
     mNextButton = content.findViewById(R.id.next);
     mDoneButton = content.findViewById(R.id.done);
+    mSkipButton = content.findViewById(R.id.skip);
 
     mPrevButton.setOnClickListener(new View.OnClickListener()
     {
@@ -281,6 +284,15 @@ abstract class BaseNewsFragment extends BaseMwmDialogFragment
       }
     });
 
+    mSkipButton.setOnClickListener(new View.OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        dismissAllowingStateLoss();
+      }
+    });
+
     update();
     return res;
   }