Merge pull request #5255 from alexzatsepin/MAPSME-3612-whats-newbeta-583beta-582beta-581

[android] Updated Whats New screens with 'Font size' and 'Filter in S…

45 files changed, 6 insertions, 236 deletions

diff --git a/android/res/drawable-hdpi/ic_whatsnew_filter.png b/android/res/drawable-hdpi/ic_whatsnew_filter.png
new file mode 100644
index 0000000000..51ed377283
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_whatsnew_filter.png
diff --git a/android/res/drawable-hdpi/ic_whatsnew_label.png b/android/res/drawable-hdpi/ic_whatsnew_label.png
new file mode 100644
index 0000000000..5d444a517d
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_whatsnew_label.png
diff --git a/android/res/drawable-hdpi/img_whatsnew_booking_improved.png b/android/res/drawable-hdpi/img_whatsnew_booking_improved.png
deleted file mode 100644
index 803c75f7e2..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_booking_improved.png
+++ /dev/null
diff --git a/android/res/drawable-hdpi/img_whatsnew_car_navigation.png b/android/res/drawable-hdpi/img_whatsnew_car_navigation.png
deleted file mode 100644
index e70fa03065..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_car_navigation.png
+++ /dev/null
diff --git a/android/res/drawable-hdpi/img_whatsnew_cycle_navigation_improved.png b/android/res/drawable-hdpi/img_whatsnew_cycle_navigation_improved.png
deleted file mode 100644
index 22f9e47b30..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_cycle_navigation_improved.png
+++ /dev/null
diff --git a/android/res/drawable-hdpi/img_whatsnew_traffic.png b/android/res/drawable-hdpi/img_whatsnew_traffic.png
deleted file mode 100644
index 98ec5b97a6..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_traffic.png
+++ /dev/null
diff --git a/android/res/drawable-hdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-hdpi/img_whatsnew_traffic_roaming.png
deleted file mode 100644
index 6a0c7ea0b4..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_traffic_roaming.png
+++ /dev/null
diff --git a/android/res/drawable-hdpi/img_whatsnew_uber.png b/android/res/drawable-hdpi/img_whatsnew_uber.png
deleted file mode 100644
index 89d9388695..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_uber.png
+++ /dev/null
diff --git a/android/res/drawable-hdpi/img_whatsnew_update_uber.png b/android/res/drawable-hdpi/img_whatsnew_update_uber.png
deleted file mode 100644
index 40d1b9b130..0000000000
--- a/android/res/drawable-hdpi/img_whatsnew_update_uber.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/ic_whatsnew_filter.png b/android/res/drawable-mdpi/ic_whatsnew_filter.png
new file mode 100644
index 0000000000..573d31c06d
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_whatsnew_filter.png
diff --git a/android/res/drawable-mdpi/ic_whatsnew_label.png b/android/res/drawable-mdpi/ic_whatsnew_label.png
new file mode 100644
index 0000000000..74b60cf5b3
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_whatsnew_label.png
diff --git a/android/res/drawable-mdpi/img_whatsnew_booking_improved.png b/android/res/drawable-mdpi/img_whatsnew_booking_improved.png
deleted file mode 100644
index b3a64495d7..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_booking_improved.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_whatsnew_car_navigation.png b/android/res/drawable-mdpi/img_whatsnew_car_navigation.png
deleted file mode 100644
index 4b4b568d0e..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_car_navigation.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_whatsnew_cycle_navigation_improved.png b/android/res/drawable-mdpi/img_whatsnew_cycle_navigation_improved.png
deleted file mode 100644
index 7d7593ead1..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_cycle_navigation_improved.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_whatsnew_traffic.png b/android/res/drawable-mdpi/img_whatsnew_traffic.png
deleted file mode 100644
index 7427db592a..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_traffic.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-mdpi/img_whatsnew_traffic_roaming.png
deleted file mode 100644
index 080785c637..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_traffic_roaming.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_whatsnew_uber.png b/android/res/drawable-mdpi/img_whatsnew_uber.png
deleted file mode 100644
index 46f4f561a8..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_uber.png
+++ /dev/null
diff --git a/android/res/drawable-mdpi/img_whatsnew_update_uber.png b/android/res/drawable-mdpi/img_whatsnew_update_uber.png
deleted file mode 100644
index 231f6b4b51..0000000000
--- a/android/res/drawable-mdpi/img_whatsnew_update_uber.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/ic_whatsnew_filter.png b/android/res/drawable-xhdpi/ic_whatsnew_filter.png
new file mode 100644
index 0000000000..a29e065367
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_whatsnew_filter.png
diff --git a/android/res/drawable-xhdpi/ic_whatsnew_label.png b/android/res/drawable-xhdpi/ic_whatsnew_label.png
new file mode 100644
index 0000000000..c559c87fe4
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_whatsnew_label.png
diff --git a/android/res/drawable-xhdpi/img_whatsnew_booking_improved.png b/android/res/drawable-xhdpi/img_whatsnew_booking_improved.png
deleted file mode 100644
index 4c19e9414c..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_booking_improved.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_whatsnew_car_navigation.png b/android/res/drawable-xhdpi/img_whatsnew_car_navigation.png
deleted file mode 100644
index 0e667d4c46..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_car_navigation.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_whatsnew_cycle_navigation_improved.png b/android/res/drawable-xhdpi/img_whatsnew_cycle_navigation_improved.png
deleted file mode 100644
index 184d4f070d..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_cycle_navigation_improved.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_whatsnew_traffic.png b/android/res/drawable-xhdpi/img_whatsnew_traffic.png
deleted file mode 100644
index 2efa120141..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_traffic.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-xhdpi/img_whatsnew_traffic_roaming.png
deleted file mode 100644
index 4644c5e1c9..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_traffic_roaming.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_whatsnew_uber.png b/android/res/drawable-xhdpi/img_whatsnew_uber.png
deleted file mode 100644
index 31ccfb609d..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_uber.png
+++ /dev/null
diff --git a/android/res/drawable-xhdpi/img_whatsnew_update_uber.png b/android/res/drawable-xhdpi/img_whatsnew_update_uber.png
deleted file mode 100644
index 541bd1c5ae..0000000000
--- a/android/res/drawable-xhdpi/img_whatsnew_update_uber.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/ic_whatsnew_filter.png b/android/res/drawable-xxhdpi/ic_whatsnew_filter.png
new file mode 100644
index 0000000000..c37b608fef
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_whatsnew_filter.png
diff --git a/android/res/drawable-xxhdpi/ic_whatsnew_label.png b/android/res/drawable-xxhdpi/ic_whatsnew_label.png
new file mode 100644
index 0000000000..484de36255
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_whatsnew_label.png
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_booking_improved.png b/android/res/drawable-xxhdpi/img_whatsnew_booking_improved.png
deleted file mode 100644
index b3e470589b..0000000000
--- a/android/res/drawable-xxhdpi/img_whatsnew_booking_improved.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_car_navigation.png b/android/res/drawable-xxhdpi/img_whatsnew_car_navigation.png
deleted file mode 100644
index 379f48ad24..0000000000
--- a/android/res/drawable-xxhdpi/img_whatsnew_car_navigation.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_cycle_navigation_improved.png b/android/res/drawable-xxhdpi/img_whatsnew_cycle_navigation_improved.png
deleted file mode 100644
index b6a18c1663..0000000000
--- a/android/res/drawable-xxhdpi/img_whatsnew_cycle_navigation_improved.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_traffic.png b/android/res/drawable-xxhdpi/img_whatsnew_traffic.png
deleted file mode 100644
index 76fab9b611..0000000000
--- a/android/res/drawable-xxhdpi/img_whatsnew_traffic.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_uber.png b/android/res/drawable-xxhdpi/img_whatsnew_uber.png
deleted file mode 100644
index 209ca06228..0000000000
--- a/android/res/drawable-xxhdpi/img_whatsnew_uber.png
+++ /dev/null
diff --git a/android/res/drawable-xxhdpi/img_whatsnew_update_uber.png b/android/res/drawable-xxhdpi/img_whatsnew_update_uber.png
deleted file mode 100644
index e0bc45cb9a..0000000000
--- a/android/res/drawable-xxhdpi/img_whatsnew_update_uber.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_booking_improved.png b/android/res/drawable-xxxhdpi/img_whatsnew_booking_improved.png
deleted file mode 100644
index b61490b33d..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_booking_improved.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_car_navigation.png b/android/res/drawable-xxxhdpi/img_whatsnew_car_navigation.png
deleted file mode 100644
index ee02193f6b..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_car_navigation.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_cycle_navigation_improved.png b/android/res/drawable-xxxhdpi/img_whatsnew_cycle_navigation_improved.png
deleted file mode 100644
index cb5c19b503..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_cycle_navigation_improved.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_traffic.png b/android/res/drawable-xxxhdpi/img_whatsnew_traffic.png
deleted file mode 100644
index 9cd0e8b6c3..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_traffic.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_traffic_roaming.png b/android/res/drawable-xxxhdpi/img_whatsnew_traffic_roaming.png
deleted file mode 100644
index 107e0477e3..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_traffic_roaming.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_uber.png b/android/res/drawable-xxxhdpi/img_whatsnew_uber.png
deleted file mode 100644
index 54d8c0c163..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_uber.png
+++ /dev/null
diff --git a/android/res/drawable-xxxhdpi/img_whatsnew_update_uber.png b/android/res/drawable-xxxhdpi/img_whatsnew_update_uber.png
deleted file mode 100644
index 9bf8942eee..0000000000
--- a/android/res/drawable-xxxhdpi/img_whatsnew_update_uber.png
+++ /dev/null
diff --git a/android/res/layout/fragment_news_single.xml b/android/res/layout/fragment_news_single.xml
deleted file mode 100644
index f03661d355..0000000000
--- a/android/res/layout/fragment_news_single.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.mapswithme.maps.widget.HeightLimitedFrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content">
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_base_plus"
-      android:layout_marginBottom="@dimen/margin_base"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_marginRight="@dimen/margin_base"
-      android:text="@string/whatsnew_update_editor_title"
-      android:textAppearance="@style/MwmTextAppearance.Title"
-      android:layout_gravity="center_horizontal"
-      android:gravity="center_horizontal"
-      android:fontFamily="@string/robotoMedium"/>
-
-    <ImageView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_base"
-      android:layout_gravity="center_horizontal"
-      android:src="@drawable/img_whatsnew_booking_improved"
-      android:tag="@string/tag_height_limited"/>
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_marginRight="@dimen/margin_base"
-      android:text="@string/whatsnew_update_editor_message"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
-      android:layout_gravity="center_horizontal"
-      android:gravity="center_horizontal"/>
-
-    <TextView
-      android:id="@+id/migrate_message"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_base_plus"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_marginRight="@dimen/margin_base"
-      android:text="@string/whatsnew_update_editor_message_update"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
-      android:layout_gravity="center_horizontal"
-      android:gravity="center_horizontal"/>
-
-    <Space
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      android:layout_weight="1"/>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:layout_marginTop="@dimen/margin_base">
-      <TextView
-        android:id="@+id/done"
-        android:layout_width="wrap_content"
-        style="@style/MwmWidget.Button"
-        android:paddingLeft="@dimen/margin_base"
-        android:paddingRight="@dimen/margin_base"
-        android:layout_gravity="right|bottom"
-        android:gravity="center"
-        android:text="@string/done"
-        android:textAppearance="@style/MwmTextAppearance.Button"
-        android:textColor="?colorAccent"/>
-
-      <LinearLayout
-        android:id="@+id/migrate_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_base"
-        android:clipToPadding="false"
-        android:orientation="horizontal">
-        <TextView
-          android:id="@+id/close"
-          android:layout_width="0dp"
-          android:layout_weight="3"
-          style="@style/MwmWidget.Button"
-          android:gravity="center"
-          android:text="@string/not_now"
-          android:textAppearance="@style/MwmTextAppearance.Button"
-          android:textColor="?colorAccent"/>
-
-        <Button
-          android:id="@+id/migrate"
-          android:layout_width="0dp"
-          android:layout_weight="5"
-          style="@style/MwmWidget.Button.Accent"
-          android:layout_marginLeft="@dimen/margin_base"
-          android:text="@string/migration_update_all_button"
-          android:textAppearance="@style/MwmTextAppearance.Button"
-          android:textColor="?android:textColorPrimaryInverse"/>
-      </LinearLayout>
-    </LinearLayout>
-  </LinearLayout>
-</com.mapswithme.maps.widget.HeightLimitedFrameLayout>
\ No newline at end of file
diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index 49aea869d4..07c581410e 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -29,38 +29,32 @@
 
   <!-- What's new -->
   <integer-array name="news_images">
-    <item>@drawable/img_whatsnew_traffic</item>
-    <item>@drawable/img_whatsnew_traffic_roaming</item>
-    <item>@drawable/img_whatsnew_update_uber</item>
+    <item>@drawable/ic_whatsnew_filter</item>
+    <item>@drawable/ic_whatsnew_label</item>
   </integer-array>
 
   <string-array name="news_titles">
-    <item>@string/whatsnew_traffic</item>
-    <item>@string/whatsnew_traffic_roaming</item>
-    <item>@string/whatsnew_order_taxi</item>
+    <item>@string/whatsnew_filters_in_search</item>
+    <item>@string/whatsnew_font_size</item>
   </string-array>
 
   <string-array name="news_messages_1">
-    <item>@string/whatsnew_traffic_text</item>
-    <item>@string/whatsnew_traffic_roaming_text</item>
-    <item>@string/whatsnew_order_taxi_text</item>
+    <item>@string/whatsnew_filters_in_search_text</item>
+    <item>@string/whatsnew_font_size_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/src/com/mapswithme/maps/news/SinglePageNewsFragment.java b/android/src/com/mapswithme/maps/news/SinglePageNewsFragment.java
deleted file mode 100644
index cce0100a46..0000000000
--- a/android/src/com/mapswithme/maps/news/SinglePageNewsFragment.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.mapswithme.maps.news;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.view.View;
-import android.view.Window;
-
-import com.mapswithme.maps.BuildConfig;
-import com.mapswithme.maps.MwmActivity;
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmDialogFragment;
-import com.mapswithme.maps.downloader.MapManager;
-import com.mapswithme.util.Config;
-import com.mapswithme.util.UiUtils;
-
-// TODO (trashkalmar): This is temporary class
-public class SinglePageNewsFragment extends BaseMwmDialogFragment
-{
-  @Override
-  protected int getCustomTheme()
-  {
-    return (UiUtils.isTablet() ? super.getCustomTheme()
-                               : getFullscreenTheme());
-  }
-
-  @Override
-  public @NonNull Dialog onCreateDialog(Bundle savedInstanceState)
-  {
-    Dialog res = super.onCreateDialog(savedInstanceState);
-    res.requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-    View content = View.inflate(getActivity(), R.layout.fragment_news_single, null);
-    res.setContentView(content);
-
-    View done = content.findViewById(R.id.done);
-    if (MapManager.nativeIsLegacyMode())
-    {
-      UiUtils.hide(done);
-      done = content.findViewById(R.id.close);
-
-      content.findViewById(R.id.migrate).setOnClickListener(new View.OnClickListener()
-      {
-        @Override
-        public void onClick(View v)
-        {
-          ((MwmActivity) getActivity()).showDownloader(false);
-          dismissAllowingStateLoss();
-        }
-      });
-    }
-    else
-    {
-      UiUtils.hide(content.findViewById(R.id.migrate_message));
-      UiUtils.hide(content.findViewById(R.id.migrate_buttons));
-    }
-
-    done.setOnClickListener(new View.OnClickListener()
-    {
-      @Override
-      public void onClick(View v)
-      {
-        dismissAllowingStateLoss();
-      }
-    });
-
-    return res;
-  }
-
-  @SuppressWarnings("TryWithIdenticalCatches")
-  private static void create(FragmentActivity activity)
-  {
-    try
-    {
-      SinglePageNewsFragment fragment = SinglePageNewsFragment.class.newInstance();
-      fragment.show(activity.getSupportFragmentManager(), SinglePageNewsFragment.class.getName());
-    } catch (java.lang.InstantiationException ignored)
-    {}
-    catch (IllegalAccessException ignored)
-    {}
-  }
-
-  private static boolean recreate(FragmentActivity activity)
-  {
-    FragmentManager fm = activity.getSupportFragmentManager();
-    Fragment f = fm.findFragmentByTag(SinglePageNewsFragment.class.getName());
-    if (f == null)
-      return false;
-
-    // If we're here, it means that the user has rotated the screen.
-    // We use different dialog themes for landscape and portrait modes on tablets,
-    // so the fragment should be recreated to be displayed correctly.
-    fm.beginTransaction().remove(f).commitAllowingStateLoss();
-    fm.executePendingTransactions();
-    return true;
-  }
-
-  public static boolean showOn(FragmentActivity activity)
-  {
-    if (Config.getFirstInstallVersion() >= BuildConfig.VERSION_CODE)
-      return false;
-
-    FragmentManager fm = activity.getSupportFragmentManager();
-    if (fm.isDestroyed())
-      return false;
-
-    if (Config.getLastWhatsNewVersion() / 10 >= BuildConfig.VERSION_CODE / 10 &&
-        !recreate(activity))
-      return false;
-
-    create(activity);
-
-    Config.setWhatsNewShown();
-    return true;
-  }
-
-}