From a289083067065362a7197d11d9b50bca1047c30d Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 28 Sep 2016 02:24:08 +0300
Subject: [PATCH 1/7] [android] fix: MyTarget slot ID is passed as integer.

---
 android/jni/com/mapswithme/maps/PrivateVariables.cpp  | 4 ++--
 android/src/com/mapswithme/maps/PrivateVariables.java | 2 +-
 configure.sh                                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/PrivateVariables.cpp b/android/jni/com/mapswithme/maps/PrivateVariables.cpp
index 55fa8722e8..4eb2f58956 100644
--- a/android/jni/com/mapswithme/maps/PrivateVariables.cpp
+++ b/android/jni/com/mapswithme/maps/PrivateVariables.cpp
@@ -22,10 +22,10 @@ extern "C"
     return env->NewStringUTF(MY_TRACKER_KEY);
   }
 
-  JNIEXPORT jstring JNICALL
+  JNIEXPORT jint JNICALL
   Java_com_mapswithme_maps_PrivateVariables_myTargetSlot(JNIEnv * env, jclass clazz)
   {
-    return env->NewStringUTF(MY_TARGET_KEY);
+    return MY_TARGET_KEY;
   }
 
   JNIEXPORT jstring JNICALL
diff --git a/android/src/com/mapswithme/maps/PrivateVariables.java b/android/src/com/mapswithme/maps/PrivateVariables.java
index dd413627e2..ea2ebca2bc 100644
--- a/android/src/com/mapswithme/maps/PrivateVariables.java
+++ b/android/src/com/mapswithme/maps/PrivateVariables.java
@@ -8,7 +8,7 @@ public class PrivateVariables
   public static native String alohalyticsUrl();
   public static native String flurryKey();
   public static native String myTrackerKey();
-  public static native String myTargetSlot();
+  public static native int myTargetSlot();
   public static native String myTargetCheckUrl();
   /**
    * @return interval in seconds
diff --git a/configure.sh b/configure.sh
index 3c6129aa4f..6bc1d12062 100755
--- a/configure.sh
+++ b/configure.sh
@@ -33,7 +33,7 @@ else
 #define ALOHALYTICS_URL ""
 #define FLURRY_KEY "12345678901234567890"
 #define MY_TRACKER_KEY ""
-#define MY_TARGET_KEY ""
+#define MY_TARGET_KEY 0
 #define PUSHWOOSH_APPLICATION_ID ""
 #define OSM_CONSUMER_KEY ""
 #define OSM_CONSUMER_SECRET ""

From a6c109b3e2206a4cabe2e6a2f345aa80e4a064c1 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 28 Sep 2016 02:40:51 +0300
Subject: [PATCH 2/7] [android] add: Ads in downloader.

---
 android/build.gradle                          |   2 +-
 android/res/layout/downloader_item_ad.xml     |  57 +++
 android/res/values/dimens.xml                 |   1 +
 .../src/com/mapswithme/maps/MwmActivity.java  |  38 +-
 .../maps/downloader/CountryItem.java          |   1 +
 .../maps/downloader/DownloaderAdapter.java    | 324 ++++++++++++++++--
 .../util/statistics/MytargetHelper.java       | 113 ++++--
 7 files changed, 465 insertions(+), 71 deletions(-)
 create mode 100644 android/res/layout/downloader_item_ad.xml

diff --git a/android/build.gradle b/android/build.gradle
index 23d3f503c9..bdf098e8fe 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -49,7 +49,7 @@ dependencies {
   compile 'com.facebook.android:facebook-android-sdk:4.8.0'
   compile 'com.google.code.gson:gson:2.6.1'
   compile 'com.pushwoosh:pushwoosh:4.6.3'
-  compile 'com.my.tracker:mytracker-sdk:1.3.2'
+  compile 'com.my.tracker:mytracker-sdk:1.3.5'
   compile fileTree(dir: '3rd_party', include: '*.jar')
   // BottomSheet
   compile project(":3rd_party:BottomSheet")
diff --git a/android/res/layout/downloader_item_ad.xml b/android/res/layout/downloader_item_ad.xml
new file mode 100644
index 0000000000..b980532fb6
--- /dev/null
+++ b/android/res/layout/downloader_item_ad.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:minHeight="@dimen/height_item_multiline"
+  android:paddingLeft="@dimen/margin_base"
+  android:paddingRight="@dimen/margin_base"
+  android:background="?clickableBackground"
+  android:clipToPadding="false"
+  tools:background="#200000FF">
+  <Button
+    android:id="@+id/downloader_ad_action"
+    style="@style/MwmWidget.Button.Accent"
+    android:layout_width="wrap_content"
+    android:layout_alignParentRight="true"
+    android:layout_centerVertical="true"
+    tools:text="Install"/>
+
+  <ImageView
+    android:id="@+id/downloader_ad_icon"
+    android:layout_width="@dimen/downloader_ad_icon_size"
+    android:layout_height="@dimen/downloader_ad_icon_size"
+    android:layout_centerVertical="true"
+    tools:background="#8000FF00"/>
+
+  <LinearLayout android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginLeft="@dimen/margin_base"
+                android:layout_marginRight="@dimen/margin_half"
+                android:layout_toRightOf="@id/downloader_ad_icon"
+                android:layout_toLeftOf="@id/downloader_ad_action"
+                android:layout_centerVertical="true"
+                tools:background="#20FF0000">
+    <TextView
+      android:id="@+id/downloader_ad_title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
+      android:maxLines="2"
+      android:ellipsize="end"
+      tools:text="This is the coolest advertisment ever!!!"
+      tools:background="#40FF0000"/>
+
+    <TextView
+      android:id="@+id/downloader_ad_subtitle"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/MwmTextAppearance.Body4"
+      android:maxLines="2"
+      android:ellipsize="end"
+      tools:text="Buy me now\nCan you hear me?"
+      tools:background="#60FFFF00"/>
+  </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 3639d21f51..6910b5b8ae 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -39,6 +39,7 @@
   <dimen name="place_page_buttons_height">56dp</dimen>
 
   <dimen name="downloader_status_size">40dp</dimen>
+  <dimen name="downloader_ad_icon_size">@dimen/downloader_status_size</dimen>
   <dimen name="search_progress_size">32dp</dimen>
 
   <dimen name="panel_width">360dp</dimen>
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 4a113c0bbc..e328dd8e5f 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -16,7 +16,6 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -87,6 +86,7 @@ import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
 import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Stack;
 
 public class MwmActivity extends BaseMwmFragmentActivity
@@ -956,7 +956,41 @@ public class MwmActivity extends BaseMwmFragmentActivity
       @Override
       public void onDismissDialog(NativeAppwallAd nativeAppwallAd) {}
     };
-    mMytargetHelper = new MytargetHelper(listener, this);
+
+
+    mMytargetHelper = new MytargetHelper(new MytargetHelper.Listener<Void>()
+    {
+      private void onNoAdsInternal()
+      {
+        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
+      }
+
+      @Override
+      public void onNoAds()
+      {
+        onNoAdsInternal();
+      }
+
+      @Override
+      public void onDataReady(Void data)
+      {
+        mMytargetHelper.loadShowcase(new MytargetHelper.Listener<List<NativeAppwallBanner>>()
+        {
+          @Override
+          public void onNoAds()
+          {
+            onNoAdsInternal();
+          }
+
+          @Override
+          public void onDataReady(List<NativeAppwallBanner> banners)
+          {
+            mMainMenu.setShowcaseText(banners.get(0).getTitle());
+            mMainMenu.setVisible(MainMenu.Item.SHOWCASE, true);
+          }
+        }, MwmActivity.this);
+      }
+    });
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/downloader/CountryItem.java b/android/src/com/mapswithme/maps/downloader/CountryItem.java
index 14a6e2746c..ef8ab1af1e 100644
--- a/android/src/com/mapswithme/maps/downloader/CountryItem.java
+++ b/android/src/com/mapswithme/maps/downloader/CountryItem.java
@@ -15,6 +15,7 @@ public final class CountryItem implements Comparable<CountryItem>
   static final int CATEGORY_NEAR_ME = 0;
   static final int CATEGORY_DOWNLOADED = 1;
   static final int CATEGORY_AVAILABLE = 2;
+  static final int CATEGORY__LAST = CATEGORY_AVAILABLE;
 
   // Must correspond to NodeStatus in storage_defines.hpp
   public static final int STATUS_UNKNOWN = 0;
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index e7bc3e9ee6..1a115c4e79 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -3,9 +3,11 @@ package com.mapswithme.maps.downloader;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.location.Location;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -19,16 +21,10 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
 import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
@@ -37,31 +33,54 @@ import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.routing.RoutingController;
 import com.mapswithme.util.BottomSheetHelper;
 import com.mapswithme.util.StringUtils;
+import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.UiUtils;
+import com.mapswithme.util.statistics.MytargetHelper;
 import com.mapswithme.util.statistics.Statistics;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersAdapter;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration;
+import ru.mail.android.mytarget.core.models.banners.AbstractBanner;
+import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
 
-class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolder>
+class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolderWrapper>
                      implements StickyRecyclerHeadersAdapter<DownloaderAdapter.HeaderViewHolder>
 {
+  private static final String HEADER_ADVERTISMENT_TITLE = "MY.COM";
+  private static final int HEADER_ADVERTISMENT_ID = CountryItem.CATEGORY__LAST + 1;
+
+  private static final int KIND_COUNTRY = 0;
+  private static final int KIND_ADVERTISMENT = 1;
+
   private final RecyclerView mRecycler;
   private final Activity mActivity;
   private final DownloaderFragment mFragment;
   private final StickyRecyclerHeadersDecoration mHeadersDecoration;
 
   private boolean mMyMapsMode = true;
+  private boolean mAdsLoaded;
+  private boolean mAdsLoading;
+  private boolean mShowAds;
   private boolean mSearchResultsMode;
   private String mSearchQuery;
 
   private final List<CountryItem> mItems = new ArrayList<>();
   private final Map<String, CountryItem> mCountryIndex = new HashMap<>();  // Country.id -> Country
+  private final List<NativeAppwallBanner> mAds = new ArrayList<>();
 
   private final SparseArray<String> mHeaders = new SparseArray<>();
   private final Stack<PathEntry> mPath = new Stack<>();  // Holds navigation history. The last element is the current level.
+  private int mNearMeCount;
 
   private int mListenerSlot;
+  private MytargetHelper mMytargetHelper;
 
   private enum MenuItem
   {
@@ -248,9 +267,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
       for (int i = first; i <= last; i++)
       {
-        ViewHolder vh = (ViewHolder)mRecycler.findViewHolderForAdapterPosition(i);
-        if (vh != null && vh.mItem.id.equals(countryId))
-          vh.bind(vh.mItem);
+        ViewHolderWrapper vh = (ViewHolderWrapper)mRecycler.findViewHolderForAdapterPosition(i);
+        if (vh != null && vh.mKind == KIND_COUNTRY && ((CountryItem)vh.mHolder.mItem).id.equals(countryId))
+          vh.mHolder.rebind();
       }
     }
 
@@ -284,7 +303,59 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     }
   };
 
-  class ViewHolder extends RecyclerView.ViewHolder
+  private View createViewHolderFrame(ViewGroup parent, int kind)
+  {
+    return inflate(parent, (kind == KIND_ADVERTISMENT ? R.layout.downloader_item_ad
+                                                      : R.layout.downloader_item));
+  }
+
+  class ViewHolderWrapper extends RecyclerView.ViewHolder
+  {
+    private final int mKind;
+    private final BaseInnerViewHolder mHolder;
+
+    ViewHolderWrapper(ViewGroup parent, int kind)
+    {
+      super(createViewHolderFrame(parent, kind));
+
+      mKind = kind;
+      mHolder = (kind == KIND_ADVERTISMENT) ? new AdViewHolder(itemView)
+                                            : new ItemViewHolder(itemView);
+    }
+
+    @SuppressWarnings("unchecked")
+    void bind(int position)
+    {
+      int kind = DownloaderAdapter.this.getItemViewType(position);
+      if (kind == KIND_ADVERTISMENT)
+      {
+        mHolder.bind(mAds.get(position - mNearMeCount));
+        return;
+      }
+
+      if (position > mNearMeCount)
+        position -= getAdsCount();
+
+      mHolder.bind(mItems.get(position));
+    }
+  }
+
+  private static abstract class BaseInnerViewHolder<T>
+  {
+    T mItem;
+
+    void bind(T item)
+    {
+      mItem = item;
+    }
+
+    void rebind()
+    {
+      bind(mItem);
+    }
+  }
+
+  private class ItemViewHolder extends BaseInnerViewHolder<CountryItem>
   {
     private final DownloaderStatusIcon mStatusIcon;
     private final TextView mName;
@@ -292,8 +363,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     private final TextView mFoundName;
     private final TextView mSize;
 
-    private CountryItem mItem;
-
     private void processClick(boolean clickOnStatus)
     {
       switch (mItem.status)
@@ -409,10 +478,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       }).tint().show();
     }
 
-    public ViewHolder(View frame)
+    ItemViewHolder(View frame)
     {
-      super(frame);
-
       mStatusIcon = new DownloaderStatusIcon(frame.findViewById(R.id.downloader_status_frame))
       {
         @Override
@@ -480,9 +547,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       });
     }
 
+    @Override
     void bind(CountryItem item)
     {
-      mItem = item;
+      super.bind(item);
 
       if (mSearchResultsMode)
       {
@@ -530,21 +598,84 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     }
   }
 
-  class HeaderViewHolder extends RecyclerView.ViewHolder {
+  class HeaderViewHolder extends RecyclerView.ViewHolder
+  {
     private final TextView mTitle;
 
-    HeaderViewHolder(View frame) {
+    HeaderViewHolder(View frame)
+    {
       super(frame);
       mTitle = (TextView) frame.findViewById(R.id.title);
     }
 
-    void bind(int position) {
-      mTitle.setText(mHeaders.get(mItems.get(position).headerId));
+    void bind(int position)
+    {
+      if (position >= mNearMeCount && position < mNearMeCount + getAdsCount())
+        mTitle.setText(HEADER_ADVERTISMENT_TITLE);
+      else
+        mTitle.setText(mHeaders.get(mItems.get(position).headerId));
+    }
+  }
+
+  class AdViewHolder extends BaseInnerViewHolder<NativeAppwallBanner>
+  {
+    private final ImageView mIcon;
+    private final TextView mTitle;
+    private final TextView mSubtitle;
+    private final Button mAction;
+
+    private NativeAppwallBanner mData;
+
+    private final View.OnClickListener mClickListener = new View.OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        if (mData == null)
+          return;
+
+        String packageId = ((AbstractBanner)mData).getBundleId();
+        if (mData.isAppInstalled())
+        {
+          PackageManager pm = MwmApplication.get().getPackageManager();
+          Intent intent = pm.getLaunchIntentForPackage(packageId);
+          if (intent != null)
+            mActivity.startActivity(intent);
+        } else
+          mMytargetHelper.onBannerClick(mData);
+      }
+    };
+
+    AdViewHolder(View frame)
+    {
+      mIcon = (ImageView)frame.findViewById(R.id.downloader_ad_icon);
+      mTitle = (TextView)frame.findViewById(R.id.downloader_ad_title);
+      mSubtitle = (TextView)frame.findViewById(R.id.downloader_ad_subtitle);
+      mAction = (Button)frame.findViewById(R.id.downloader_ad_action);
+
+      UiUtils.updateAccentButton(mAction);
+      mAction.setOnClickListener(mClickListener);
+      frame.setOnClickListener(mClickListener);
+    }
+
+    @Override
+    void bind(NativeAppwallBanner item)
+    {
+      mData = item;
+      super.bind(item);
+
+      mIcon.setImageBitmap(item.getIcon().getBitmap());
+      mTitle.setText(item.getTitle());
+      mSubtitle.setText(item.getDescription());
+
+      // TODO: Texts?
+      mAction.setText(item.isAppInstalled() ? "Run" : "Install");
     }
   }
 
   private void collectHeaders()
   {
+    mNearMeCount = 0;
     mHeaders.clear();
     if (mSearchResultsMode)
       return;
@@ -562,6 +693,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
           mHeaders.put(headerId, MwmApplication.get().getString(R.string.downloader_near_me_subtitle));
           prev = ci.category;
         }
+
+        mNearMeCount++;
         break;
 
       case CountryItem.CATEGORY_DOWNLOADED:
@@ -575,7 +708,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
       default:
         int prevHeader = headerId;
-        headerId = CountryItem.CATEGORY_AVAILABLE + ci.name.charAt(0);
+        headerId = CountryItem.CATEGORY_AVAILABLE * 10 + ci.name.charAt(0);
 
         if (headerId != prevHeader)
           mHeaders.put(headerId, ci.name.substring(0, 1).toUpperCase());
@@ -609,6 +742,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
     MapManager.nativeListItems(parent, lat, lon, hasLocation, mMyMapsMode, mItems);
     processData();
+    loadAds();
   }
 
   void setSearchResultsMode(Collection<CountryItem> results, String query)
@@ -639,13 +773,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     for (CountryItem ci: mItems)
       mCountryIndex.put(ci.id, ci);
 
-    mHeadersDecoration.invalidateHeaders();
-    notifyDataSetChanged();
-
     if (mItems.isEmpty())
       mFragment.setupPlaceholder();
 
     mFragment.showPlaceholder(mItems.isEmpty());
+
+    mHeadersDecoration.invalidateHeaders();
+    notifyDataSetChanged();
   }
 
   DownloaderAdapter(DownloaderFragment fragment)
@@ -657,22 +791,39 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     mRecycler.addItemDecoration(mHeadersDecoration);
   }
 
-  @Override
-  public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+  private View inflate(ViewGroup parent, @LayoutRes int layoutId)
   {
-    return new ViewHolder(LayoutInflater.from(mActivity).inflate(R.layout.downloader_item, parent, false));
+    return LayoutInflater.from(mActivity).inflate(layoutId, parent, false);
   }
 
   @Override
-  public void onBindViewHolder(ViewHolder holder, int position)
+  public int getItemViewType(int position)
   {
-    holder.bind(mItems.get(position));
+    if (position < mNearMeCount)
+      return KIND_COUNTRY;
+
+    if (position < mNearMeCount + getAdsCount())
+      return KIND_ADVERTISMENT;
+
+    return KIND_COUNTRY;
+  }
+
+  @Override
+  public ViewHolderWrapper onCreateViewHolder(ViewGroup parent, int viewType)
+  {
+    return new ViewHolderWrapper(parent, viewType);
+  }
+
+  @Override
+  public void onBindViewHolder(ViewHolderWrapper holder, int position)
+  {
+    holder.bind(position);
   }
 
   @Override
   public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent)
   {
-    return new HeaderViewHolder(LayoutInflater.from(mActivity).inflate(R.layout.downloader_item_header, parent, false));
+    return new HeaderViewHolder(inflate(parent, R.layout.downloader_item_header));
   }
 
   @Override
@@ -684,13 +835,26 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   @Override
   public long getHeaderId(int position)
   {
+    if (position >= mNearMeCount)
+    {
+      if (position < mNearMeCount + getAdsCount())
+        return HEADER_ADVERTISMENT_ID;
+
+      position -= getAdsCount();
+    }
+
     return mItems.get(position).headerId;
   }
 
+  private int getAdsCount()
+  {
+    return (mShowAds ? mAds.size() : 0);
+  }
+
   @Override
   public int getItemCount()
   {
-    return mItems.size();
+    return mItems.size() + getAdsCount();
   }
 
   private void goDeeper(CountryItem child, boolean refresh)
@@ -776,6 +940,93 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     return mMyMapsMode;
   }
 
+  /**
+   * Loads banner if:
+   * <ul>
+   *   <li>Not in `my maps` mode;</li>
+   *   <li>Currently at root level;</li>
+   *   <li>Day mode is active;</li>
+   *   <li>There is at least one map downloaded.</li>
+   * </ul>
+   */
+  private void loadAds()
+  {
+    mShowAds = false;
+    if (mAdsLoading)
+      return;
+
+    if (mMyMapsMode || !CountryItem.isRoot(getCurrentRootId()))
+      return;
+
+    if (!ThemeUtils.isDefaultTheme())
+      return;
+
+    if (MapManager.nativeGetDownloadedCount() < 1)
+      return;
+
+    mShowAds = true;
+    if (mAdsLoaded)
+    {
+      mHeadersDecoration.invalidateHeaders();
+      notifyItemRangeInserted(mNearMeCount, mAds.size());
+      return;
+    }
+
+    mAdsLoading = true;
+    mMytargetHelper = new MytargetHelper(new MytargetHelper.Listener<Void>()
+    {
+      private void onNoAdsInternal()
+      {
+        mAdsLoading = false;
+        mAdsLoaded = true;
+
+        int oldSize = mAds.size();
+        mAds.clear();
+        if (oldSize > 0)
+        {
+          mHeadersDecoration.invalidateHeaders();
+          notifyItemRangeRemoved(mNearMeCount, oldSize);
+        }
+      }
+
+      @Override
+      public void onNoAds()
+      {
+        onNoAdsInternal();
+      }
+
+      @Override
+      public void onDataReady(Void data)
+      {
+        mMytargetHelper.loadShowcase(new MytargetHelper.Listener<List<NativeAppwallBanner>>()
+        {
+          @Override
+          public void onNoAds()
+          {
+            onNoAdsInternal();
+          }
+
+          @Override
+          public void onDataReady(List<NativeAppwallBanner> banners)
+          {
+            mAdsLoading = false;
+            mAdsLoaded = true;
+
+            int oldSize = mAds.size();
+            mAds.clear();
+            mAds.addAll(banners);
+
+            mHeadersDecoration.invalidateHeaders();
+            if (oldSize == 0)
+              notifyItemRangeInserted(mNearMeCount, mAds.size());
+            else
+              notifyDataSetChanged();
+          }
+        }, mActivity);
+      }
+    });
+  }
+
   void attach()
   {
     mListenerSlot = MapManager.nativeSubscribe(mStorageCallback);
@@ -784,6 +1035,11 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   void detach()
   {
     MapManager.nativeUnsubscribe(mListenerSlot);
+
+    if (mMytargetHelper != null)
+      mMytargetHelper.cancel();
+
+    mAdsLoading = false;
   }
 
   boolean isSearchResultsMode()
diff --git a/android/src/com/mapswithme/util/statistics/MytargetHelper.java b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
index b4176d9b0d..794401643c 100644
--- a/android/src/com/mapswithme/util/statistics/MytargetHelper.java
+++ b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
@@ -5,11 +5,6 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.PrivateVariables;
 import com.mapswithme.maps.R;
@@ -18,6 +13,15 @@ import com.mapswithme.util.concurrency.ThreadPool;
 import com.mapswithme.util.concurrency.UiThread;
 import ru.mail.android.mytarget.core.net.Hosts;
 import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
+import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import static com.mapswithme.maps.MwmApplication.prefs;
 
 public final class MytargetHelper
 {
@@ -30,23 +34,24 @@ public final class MytargetHelper
   private static final int TIMEOUT = 1000;
 
   private NativeAppwallAd mShowcase;
-  private Activity mActivity;
-  private NativeAppwallAd.AppwallAdListener mListener;
+  private boolean mCancelled;
+
+  public interface Listener<T>
+  {
+    void onNoAds();
+    void onDataReady(T data);
+  }
 
   static
   {
     Hosts.setMyComHost();
   }
 
-  public MytargetHelper(@NonNull NativeAppwallAd.AppwallAdListener listener, @NonNull Activity activity)
+  public MytargetHelper(final @NonNull Listener<Void> listener)
   {
-    mListener = listener;
-    mActivity = activity;
-
-    if (!ConnectionState.isConnected() ||
-        !isShowcaseSwitchedOnLocal())
+    if (!ConnectionState.isConnected() || !isShowcaseSwitchedOnLocal())
     {
-      listener.onNoAd("Switched off", null);
+      listener.onNoAds();
       return;
     }
 
@@ -56,21 +61,22 @@ public final class MytargetHelper
       public void run()
       {
         final boolean showShowcase = getShowcaseSetting();
+
+        if (mCancelled)
+          return;
+
         UiThread.run(new Runnable()
         {
           @Override
           public void run()
           {
-            if (mListener == null || mActivity == null)
+            if (mCancelled)
               return;
 
-            if (!showShowcase)
-            {
-              mListener.onNoAd("Switched off on server", null);
-              return;
-            }
-
-            loadShowcase(mListener, mActivity);
+            if (showShowcase)
+              listener.onDataReady(null);
+            else
+              listener.onNoAds();
           }
         });
       }
@@ -79,14 +85,13 @@ public final class MytargetHelper
 
   public void cancel()
   {
-    mListener = null;
-    mActivity = null;
+    mCancelled = true;
   }
 
   @WorkerThread
   private static boolean getShowcaseSetting()
   {
-    final long lastCheckMillis = MwmApplication.prefs().getLong(PREF_CHECK_MILLIS, 0);
+    final long lastCheckMillis = prefs().getLong(PREF_CHECK_MILLIS, 0);
     final long currentMillis = System.currentTimeMillis();
     if (currentMillis - lastCheckMillis < CHECK_INTERVAL_MILLIS)
       return isShowcaseSwitchedOnServer();
@@ -121,20 +126,58 @@ public final class MytargetHelper
     return false;
   }
 
-  private void loadShowcase(NativeAppwallAd.AppwallAdListener listener, Activity activity)
+  public void loadShowcase(final @NonNull Listener<List<NativeAppwallBanner>> listener, Activity activity)
   {
-    mShowcase = new NativeAppwallAd(Integer.parseInt(PrivateVariables.myTargetSlot()), activity);
-    mShowcase.setListener(listener);
-    mShowcase.load();
+    if (mShowcase == null)
+      mShowcase = loadAds(listener, activity);
+  }
+
+  private NativeAppwallAd loadAds(final @NonNull Listener<List<NativeAppwallBanner>> listener, Activity activity)
+  {
+    NativeAppwallAd res = new NativeAppwallAd(PrivateVariables.myTargetSlot(), activity);
+    res.setListener(new NativeAppwallAd.AppwallAdListener()
+    {
+      @Override
+      public void onLoad(NativeAppwallAd ad)
+      {
+        if (mCancelled)
+          return;
+
+        if (ad.getBanners().isEmpty())
+          listener.onNoAds();
+        else
+          listener.onDataReady(ad.getBanners());
+      }
+
+      @Override
+      public void onNoAd(String s, NativeAppwallAd nativeAppwallAd)
+      {
+        listener.onNoAds();
+      }
+
+      @Override
+      public void onClick(NativeAppwallBanner nativeAppwallBanner, NativeAppwallAd nativeAppwallAd) {}
+
+      @Override
+      public void onDismissDialog(NativeAppwallAd nativeAppwallAd) {}
+    });
+
+    res.load();
+    return res;
+  }
+
+  public void onBannerClick(NativeAppwallBanner banner)
+  {
+    mShowcase.handleBannerClick(banner);
   }
 
   public void displayShowcase()
   {
     if (!mShowcase.getBanners().isEmpty())
-      mShowcase.handleBannerClick(mShowcase.getBanners().get(0));
+      onBannerClick(mShowcase.getBanners().get(0));
   }
 
-  public static boolean isShowcaseSwitchedOnLocal()
+  private static boolean isShowcaseSwitchedOnLocal()
   {
     return PreferenceManager.getDefaultSharedPreferences(MwmApplication.get())
                             .getBoolean(MwmApplication.get().getString(R.string.pref_showcase_switched_on), false);
@@ -142,12 +185,14 @@ public final class MytargetHelper
 
   public static boolean isShowcaseSwitchedOnServer()
   {
-    return MwmApplication.prefs().getBoolean(PREF_CHECK, false);
+    return prefs().getBoolean(PREF_CHECK, true);
   }
 
   private static void setShowcaseSwitchedOnServer(boolean switchedOn)
   {
-    MwmApplication.prefs().edit().putLong(PREF_CHECK_MILLIS, System.currentTimeMillis())
-                                 .putBoolean(PREF_CHECK, switchedOn).apply();
+    prefs().edit()
+           .putLong(PREF_CHECK_MILLIS, System.currentTimeMillis())
+           .putBoolean(PREF_CHECK, switchedOn)
+           .apply();
   }
 }

From a94387f6ede117c29f9ee8a2b980cf2e8bad278c Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 28 Sep 2016 23:25:17 +0300
Subject: [PATCH 3/7] [android] del: Showcase removed.

---
 .../res/drawable-hdpi/ic_menu_showcase.png    | Bin 250 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_showcase.png    | Bin 129 -> 0 bytes
 .../res/drawable-xhdpi/ic_menu_showcase.png   | Bin 193 -> 0 bytes
 .../res/drawable-xxhdpi/ic_menu_showcase.png  | Bin 264 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_menu_showcase.png | Bin 305 -> 0 bytes
 .../res/layout-w1020dp/menu_buttons_line.xml  |   7 +-
 android/res/layout/menu_content.xml           |  11 +-
 android/res/layout/menu_content_grid.xml      |  11 +-
 .../src/com/mapswithme/maps/MwmActivity.java  | 110 ++----------------
 .../mapswithme/maps/widget/menu/MainMenu.java |  11 +-
 .../util/statistics/AlohaHelper.java          |   1 -
 .../util/statistics/MytargetHelper.java       |   6 -
 .../util/statistics/Statistics.java           |  13 +--
 13 files changed, 20 insertions(+), 150 deletions(-)
 delete mode 100644 android/res/drawable-hdpi/ic_menu_showcase.png
 delete mode 100644 android/res/drawable-mdpi/ic_menu_showcase.png
 delete mode 100644 android/res/drawable-xhdpi/ic_menu_showcase.png
 delete mode 100644 android/res/drawable-xxhdpi/ic_menu_showcase.png
 delete mode 100644 android/res/drawable-xxxhdpi/ic_menu_showcase.png

diff --git a/android/res/drawable-hdpi/ic_menu_showcase.png b/android/res/drawable-hdpi/ic_menu_showcase.png
deleted file mode 100644
index e79e7e8ffb96d5fc11082d88ef60217213bb1914..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tlychEy=Vy|KNq#Xz9-Vdo3S
z-WAN-M7}QQ5#U-VlB?;}Df;*MUtf#z?0fEPC#rAW6%qsiH8ZPtUa6md`+br>gr=u%
z;>h{)PQkX`U*=EVR*n*zr$4I?Ue;yW_w?uQCU420wkZo=pSf@#c>exyo5M;4$Bgak
z?H^`}HNMf|{ry{h_vS4r-HwYk)KqGHo^GG^YP&txNtJs~&2OrfW!+lJ`};;`VD?O-
vB|MtW)9VBF{8{|vh*ZJNg4-@2@Px6sWF6a_lp=nhXBa$P{an^LB{Ts5hGJ^$

diff --git a/android/res/drawable-mdpi/ic_menu_showcase.png b/android/res/drawable-mdpi/ic_menu_showcase.png
deleted file mode 100644
index 309a6faed38e8efeb60aeeac3c9c7ba062fb0f94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}t4^J1zkP61PSB^3^IPkax-tzvh
z>Z5p=w>)gZ|Gd}JawbbN97x=$e!S|f>a^oq;;K8-uVqI*_{sgGf6<@H38L|=oyVAJ
cL>U^y?!PSCuKz>U4`?QXr>mdKI;Vst0L3FMbpQYW

diff --git a/android/res/drawable-xhdpi/ic_menu_showcase.png b/android/res/drawable-xhdpi/ic_menu_showcase.png
deleted file mode 100644
index d48e45068f8310866beddc36780bb238d45ecb4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgIy_w*Ln;{G-q^|5Y#`w3D8A^I
zYx=1b4|g-j-}&y7b3i|8ZJZAyP$9#FNwcQqM`fM5bN`)+YVE(5!O#AbnZGnza_;Bb
zyh}z)e1E;YXQUHc_j?5cBNGdUfWm>mr1rye9)BrtGT*br=fCa-_U%G>sxqo`+*pCK
n3090uGOBmHc1#7C&G3MCIs2(A^5-|*2Jt*y{an^LB{Ts5=&?v9

diff --git a/android/res/drawable-xxhdpi/ic_menu_showcase.png b/android/res/drawable-xxhdpi/ic_menu_showcase.png
deleted file mode 100644
index b950a640161280ba7a6b5a952b8681b80797ca17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(Kn^PVn_Ar*{oZ-z4-HV|Mv$kE2x
zwe+8;4bz7vg}Zl+8Dg%jEH}RfR0s!}D_=@h<}O*j>`YC|-_uj3o!{zXESLB{=+dXT
z(~NEle$zL-zk0K5;{T%a-+$$}-`L+%lYgeVCHA!cGutKyCQg+JXhh|N&P6l7yt|Qg
zqx<F>CWd{_{sw#rKRo~HUE_BK2F69A9tw>tLa2lhzfqvc<ZV}PFjgDR4u!jnf#Ct8
Wn>ZtPN|vG;NYK;O&t;ucLK6U{id?V&

diff --git a/android/res/drawable-xxxhdpi/ic_menu_showcase.png b/android/res/drawable-xxxhdpi/ic_menu_showcase.png
deleted file mode 100644
index fbbacd6b83362e1363ff08bda8fd511c57e127ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvG8AvYpRA>UE<N|y`T!Hj|+(4yf_Eew>u96_X
zU<REDS3mz}oBDU(X_iWFpy&=y7srqa#y2N4r5FQ58Uj1@I*-Y2U_8vklb<z9>*O)j
z8|zbc?K6-4YX1>r9T=G2O8#v0+Vva%?%6*d@J|fQzIS%|hTipFr#XKASXI(f(6#>5
z369l2R{8X7=v#m45XbBvt7gc5tlg5V&dP8=LEy-r-EOSqNeT0o&K4DbfD`p!KA)d<
z<*@euk~8*opU;2)!|(A=oNGhq4XqqeKX*nDXgt@j_E1>jYOoU&7#?uD=5cR4xeUbh
MboFyt=akR{03le0g8%>k

diff --git a/android/res/layout-w1020dp/menu_buttons_line.xml b/android/res/layout-w1020dp/menu_buttons_line.xml
index 0a6d7a5e6f..93f3e16d9e 100644
--- a/android/res/layout-w1020dp/menu_buttons_line.xml
+++ b/android/res/layout-w1020dp/menu_buttons_line.xml
@@ -37,11 +37,6 @@
     style="@style/MwmTheme.Menu.Line.Button"
     android:src="@drawable/ic_menu_share"/>
 
-  <ImageView
-    android:id="@+id/showcase"
-    style="@style/MwmTheme.Menu.Line.Button"
-    android:src="@drawable/ic_menu_showcase"/>
-
   <Space
     android:layout_width="0dp"
     android:layout_height="match_parent"
@@ -70,4 +65,4 @@
     android:layout_height="@dimen/menu_line_height"
     android:background="@drawable/menu_button_right"
     android:src="@drawable/ic_menu_settings"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/res/layout/menu_content.xml b/android/res/layout/menu_content.xml
index 5a3d249004..f2bc70fa31 100644
--- a/android/res/layout/menu_content.xml
+++ b/android/res/layout/menu_content.xml
@@ -62,13 +62,4 @@
     android:drawableLeft="@drawable/ic_menu_share"
     android:text="@string/share_my_location"
     tools:background="#400FF000"/>
-
-  <TextView
-    android:id="@+id/showcase"
-    style="@style/MwmTheme.Menu.Content.ListItem"
-    android:drawableLeft="@drawable/ic_menu_showcase"
-    android:visibility="gone"
-    android:text="@string/showcase_more_apps"
-    tools:visibility="visible"
-    tools:background="#20FF0000"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/res/layout/menu_content_grid.xml b/android/res/layout/menu_content_grid.xml
index eb9ad6c701..386bcb7ed4 100644
--- a/android/res/layout/menu_content_grid.xml
+++ b/android/res/layout/menu_content_grid.xml
@@ -64,13 +64,4 @@
     android:drawableTop="@drawable/ic_menu_share"
     android:text="@string/share_my_location"
     tools:background="#200000FF"/>
-
-  <TextView
-    android:id="@+id/showcase"
-    style="@style/MwmTheme.Menu.Content.GridItem.Text"
-    android:drawableTop="@drawable/ic_menu_showcase"
-    android:visibility="gone"
-    android:text="@string/showcase_more_apps"
-    tools:background="#200000FF"
-    tools:visibility="visible"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index e328dd8e5f..efef3d4d53 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -80,13 +80,9 @@ import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.sharing.ShareOption;
 import com.mapswithme.util.sharing.SharingHelper;
 import com.mapswithme.util.statistics.AlohaHelper;
-import com.mapswithme.util.statistics.MytargetHelper;
 import com.mapswithme.util.statistics.Statistics;
-import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
-import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
 
 import java.io.Serializable;
-import java.util.List;
 import java.util.Stack;
 
 public class MwmActivity extends BaseMwmFragmentActivity
@@ -118,8 +114,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private final Stack<MapTask> mTasks = new Stack<>();
   private final StoragePathManager mPathManager = new StoragePathManager();
 
-  private View mMapFrame;
-
   private MapFragment mMapFragment;
   private PlacePageView mPlacePage;
 
@@ -130,12 +124,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private PanelAnimator mPanelAnimator;
   private OnmapDownloader mOnmapDownloader;
-  private MytargetHelper mMytargetHelper;
 
   private FadeView mFadeView;
 
-  // TODO create outer controller
-  private View mZoomFrame;
   private View mNavZoomIn;
   private View mNavZoomOut;
   private MyPositionButton mNavMyPosition;
@@ -177,7 +168,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       m_listener = listener;
     }
 
-    public void setPlacePageVisible(boolean visible)
+    void setPlacePageVisible(boolean visible)
     {
       int orientation = MwmActivity.this.getResources().getConfiguration().orientation;
       if(orientation == Configuration.ORIENTATION_LANDSCAPE)
@@ -187,7 +178,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       }
     }
 
-    public void setPreviewVisible(boolean visible)
+    void setPreviewVisible(boolean visible)
     {
       int orientation = MwmActivity.this.getResources().getConfiguration().orientation;
       if(orientation == Configuration.ORIENTATION_PORTRAIT)
@@ -290,7 +281,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   }
 
   @Nullable
-  public Fragment getFragment(Class<? extends Fragment> clazz)
+  Fragment getFragment(Class<? extends Fragment> clazz)
   {
     if (!mIsFragmentContainer)
       throw new IllegalStateException("Must be called for tablets only!");
@@ -496,8 +487,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void initMap()
   {
-    mMapFrame = findViewById(R.id.map_fragment_container);
-
     mFadeView = (FadeView) findViewById(R.id.fade_view);
     mFadeView.setListener(new FadeView.Listener()
     {
@@ -517,17 +506,18 @@ public class MwmActivity extends BaseMwmFragmentActivity
           .replace(R.id.map_fragment_container, mMapFragment, MapFragment.class.getName())
           .commit();
     }
-    mMapFrame.setOnTouchListener(this);
+
+    findViewById(R.id.map_fragment_container).setOnTouchListener(this);
   }
 
   private void initNavigationButtons()
   {
-    mZoomFrame = findViewById(R.id.navigation_buttons);
-    mNavZoomIn = mZoomFrame.findViewById(R.id.nav_zoom_in);
+    View frame = findViewById(R.id.navigation_buttons);
+    mNavZoomIn = frame.findViewById(R.id.nav_zoom_in);
     mNavZoomIn.setOnClickListener(this);
-    mNavZoomOut = mZoomFrame.findViewById(R.id.nav_zoom_out);
+    mNavZoomOut = frame.findViewById(R.id.nav_zoom_out);
     mNavZoomOut.setOnClickListener(this);
-    mNavMyPosition = new MyPositionButton(mZoomFrame.findViewById(R.id.my_position));
+    mNavMyPosition = new MyPositionButton(frame.findViewById(R.id.my_position));
   }
 
   private boolean closePlacePage()
@@ -707,17 +697,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
             }
           });
           break;
-
-        case SHOWCASE:
-          closeMenu(Statistics.EventName.MENU_SHOWCASE, AlohaHelper.MENU_SHOWCASE, new Runnable()
-          {
-            @Override
-            public void run()
-            {
-              mMytargetHelper.displayShowcase();
-            }
-          });
-          break;
         }
       }
     });
@@ -917,7 +896,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
   protected void onStart()
   {
     super.onStart();
-    initShowcase();
     RoutingController.get().attach(this);
     if (!mIsFragmentContainer)
       mRoutingPlanInplaceController.setStartButton();
@@ -926,79 +904,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
       LocationHelper.INSTANCE.attach(this);
   }
 
-  private void initShowcase()
-  {
-    NativeAppwallAd.AppwallAdListener listener = new NativeAppwallAd.AppwallAdListener()
-    {
-      @Override
-      public void onLoad(NativeAppwallAd nativeAppwallAd)
-      {
-        if (nativeAppwallAd.getBanners().isEmpty())
-        {
-          mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
-          return;
-        }
-
-        final NativeAppwallBanner menuBanner = nativeAppwallAd.getBanners().get(0);
-        mMainMenu.setShowcaseText(menuBanner.getTitle());
-        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, true);
-      }
-
-      @Override
-      public void onNoAd(String reason, NativeAppwallAd nativeAppwallAd)
-      {
-        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
-      }
-
-      @Override
-      public void onClick(NativeAppwallBanner nativeAppwallBanner, NativeAppwallAd nativeAppwallAd) {}
-
-      @Override
-      public void onDismissDialog(NativeAppwallAd nativeAppwallAd) {}
-    };
-
-
-    mMytargetHelper = new MytargetHelper(new MytargetHelper.Listener<Void>()
-    {
-      private void onNoAdsInternal()
-      {
-        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
-      }
-
-      @Override
-      public void onNoAds()
-      {
-        onNoAdsInternal();
-      }
-
-      @Override
-      public void onDataReady(Void data)
-      {
-        mMytargetHelper.loadShowcase(new MytargetHelper.Listener<List<NativeAppwallBanner>>()
-        {
-          @Override
-          public void onNoAds()
-          {
-            onNoAdsInternal();
-          }
-
-          @Override
-          public void onDataReady(List<NativeAppwallBanner> banners)
-          {
-            mMainMenu.setShowcaseText(banners.get(0).getTitle());
-            mMainMenu.setVisible(MainMenu.Item.SHOWCASE, true);
-          }
-        }, MwmActivity.this);
-      }
-    });
-  }
-
   @Override
   protected void onStop()
   {
     super.onStop();
     LocationHelper.INSTANCE.detach(!isFinishing());
-    mMytargetHelper.cancel();
     RoutingController.get().detach();
   }
 
@@ -1273,7 +1183,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     private static final long serialVersionUID = 1L;
     private final String mUrl;
 
-    public OpenUrlTask(String url)
+    OpenUrlTask(String url)
     {
       Utils.checkNotNull(url);
       mUrl = url;
diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
index 0d3ddbec2b..1c62360eca 100644
--- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
+++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
@@ -13,8 +13,6 @@ import com.mapswithme.maps.downloader.UpdateInfo;
 import com.mapswithme.maps.routing.RoutingController;
 import com.mapswithme.util.Graphics;
 import com.mapswithme.util.UiUtils;
-import com.mapswithme.util.log.DebugLogger;
-import com.mapswithme.util.log.Logger;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -123,8 +121,7 @@ public class MainMenu extends BaseMenu
     BOOKMARKS(R.id.bookmarks),
     SHARE(R.id.share),
     DOWNLOADER(R.id.download_maps),
-    SETTINGS(R.id.settings),
-    SHOWCASE(R.id.showcase);
+    SETTINGS(R.id.settings);
 
     private final int mViewId;
 
@@ -216,7 +213,6 @@ public class MainMenu extends BaseMenu
     mapItem(Item.SHARE);
     mapItem(Item.DOWNLOADER);
     mapItem(Item.SETTINGS);
-    mapItem(Item.SHOWCASE);
 
     adjustCollapsedItems();
     setState(State.MENU, false);
@@ -310,11 +306,6 @@ public class MainMenu extends BaseMenu
     return mAnimationTrackListener;
   }
 
-  public void setShowcaseText(String text)
-  {
-    ((TextView) mItemViews.get(Item.SHOWCASE)).setText(text);
-  }
-
   public Button getRouteStartButton()
   {
     return mRouteStartButton;
diff --git a/android/src/com/mapswithme/util/statistics/AlohaHelper.java b/android/src/com/mapswithme/util/statistics/AlohaHelper.java
index cc4a3bf9e2..09efd5bd8f 100644
--- a/android/src/com/mapswithme/util/statistics/AlohaHelper.java
+++ b/android/src/com/mapswithme/util/statistics/AlohaHelper.java
@@ -52,7 +52,6 @@ public class AlohaHelper
   // menu actions
   public static final String MENU_DOWNLOADER = "downloader";
   public static final String MENU_SETTINGS = "settingsAndMore";
-  public static final String MENU_SHOWCASE = "showcase";
   public static final String MENU_SHARE = "share@";
   public static final String MENU_POINT2POINT = "point2point";
   public static final String MENU_ADD_PLACE = "addPlace";
diff --git a/android/src/com/mapswithme/util/statistics/MytargetHelper.java b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
index 794401643c..33b2f470e9 100644
--- a/android/src/com/mapswithme/util/statistics/MytargetHelper.java
+++ b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
@@ -171,12 +171,6 @@ public final class MytargetHelper
     mShowcase.handleBannerClick(banner);
   }
 
-  public void displayShowcase()
-  {
-    if (!mShowcase.getBanners().isEmpty())
-      onBannerClick(mShowcase.getBanners().get(0));
-  }
-
   private static boolean isShowcaseSwitchedOnLocal()
   {
     return PreferenceManager.getDefaultSharedPreferences(MwmApplication.get())
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index f1199db1e7..4be6ba2f42 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -9,11 +9,6 @@ import android.os.Build;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.facebook.appevents.AppEventsLogger;
 import com.flurry.android.FlurryAgent;
 import com.mapswithme.maps.BuildConfig;
@@ -27,6 +22,11 @@ import com.mapswithme.maps.editor.OsmOAuth;
 import com.mapswithme.util.Config;
 import com.mapswithme.util.ConnectionState;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public enum Statistics
 {
   INSTANCE;
@@ -82,7 +82,6 @@ public enum Statistics
     public static final String MENU_DOWNLOADER = "Menu. Downloader";
     public static final String MENU_SETTINGS = "Menu. SettingsAndMore";
     public static final String MENU_SHARE = "Menu. Share";
-    public static final String MENU_SHOWCASE = "Menu. Showcase";
     public static final String MENU_P2P = "Menu. Point to point.";
     public static final String MENU_ADD_PLACE = "Menu. Add place.";
     // dialogs
@@ -463,4 +462,4 @@ public enum Statistics
     return MapObject.isOfType(MapObject.MY_POSITION, point) ? Statistics.EventParam.MY_POSITION
                                                             : Statistics.EventParam.POINT;
   }
-}
\ No newline at end of file
+}

From 352d2387b0ca646cd950d290103b106d54b4568e Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 28 Sep 2016 23:57:56 +0300
Subject: [PATCH 4/7] [android] fix: Ads UI fixes.

---
 android/res/layout/downloader_item_ad.xml     | 12 +--------
 .../maps/downloader/DownloaderAdapter.java    | 27 ++++---------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/android/res/layout/downloader_item_ad.xml b/android/res/layout/downloader_item_ad.xml
index b980532fb6..328ed29ade 100644
--- a/android/res/layout/downloader_item_ad.xml
+++ b/android/res/layout/downloader_item_ad.xml
@@ -10,14 +10,6 @@
   android:background="?clickableBackground"
   android:clipToPadding="false"
   tools:background="#200000FF">
-  <Button
-    android:id="@+id/downloader_ad_action"
-    style="@style/MwmWidget.Button.Accent"
-    android:layout_width="wrap_content"
-    android:layout_alignParentRight="true"
-    android:layout_centerVertical="true"
-    tools:text="Install"/>
-
   <ImageView
     android:id="@+id/downloader_ad_icon"
     android:layout_width="@dimen/downloader_ad_icon_size"
@@ -29,9 +21,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginLeft="@dimen/margin_base"
-                android:layout_marginRight="@dimen/margin_half"
                 android:layout_toRightOf="@id/downloader_ad_icon"
-                android:layout_toLeftOf="@id/downloader_ad_action"
                 android:layout_centerVertical="true"
                 tools:background="#20FF0000">
     <TextView
@@ -54,4 +44,4 @@
       tools:text="Buy me now\nCan you hear me?"
       tools:background="#60FFFF00"/>
   </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index 1a115c4e79..f62e5bfbe1 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -3,7 +3,6 @@ package com.mapswithme.maps.downloader;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.location.Location;
 import android.support.annotation.DrawableRes;
@@ -21,7 +20,6 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -39,7 +37,6 @@ import com.mapswithme.util.statistics.MytargetHelper;
 import com.mapswithme.util.statistics.Statistics;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersAdapter;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration;
-import ru.mail.android.mytarget.core.models.banners.AbstractBanner;
 import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
 
 import java.util.ArrayList;
@@ -622,7 +619,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     private final ImageView mIcon;
     private final TextView mTitle;
     private final TextView mSubtitle;
-    private final Button mAction;
 
     private NativeAppwallBanner mData;
 
@@ -631,17 +627,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       @Override
       public void onClick(View v)
       {
-        if (mData == null)
-          return;
-
-        String packageId = ((AbstractBanner)mData).getBundleId();
-        if (mData.isAppInstalled())
-        {
-          PackageManager pm = MwmApplication.get().getPackageManager();
-          Intent intent = pm.getLaunchIntentForPackage(packageId);
-          if (intent != null)
-            mActivity.startActivity(intent);
-        } else
+        if (mData != null)
           mMytargetHelper.onBannerClick(mData);
       }
     };
@@ -651,10 +637,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       mIcon = (ImageView)frame.findViewById(R.id.downloader_ad_icon);
       mTitle = (TextView)frame.findViewById(R.id.downloader_ad_title);
       mSubtitle = (TextView)frame.findViewById(R.id.downloader_ad_subtitle);
-      mAction = (Button)frame.findViewById(R.id.downloader_ad_action);
 
-      UiUtils.updateAccentButton(mAction);
-      mAction.setOnClickListener(mClickListener);
       frame.setOnClickListener(mClickListener);
     }
 
@@ -667,9 +650,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       mIcon.setImageBitmap(item.getIcon().getBitmap());
       mTitle.setText(item.getTitle());
       mSubtitle.setText(item.getDescription());
-
-      // TODO: Texts?
-      mAction.setText(item.isAppInstalled() ? "Run" : "Install");
     }
   }
 
@@ -1014,7 +994,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
             int oldSize = mAds.size();
             mAds.clear();
-            mAds.addAll(banners);
+
+            for (NativeAppwallBanner banner: banners)
+              if (!banner.isAppInstalled())
+                mAds.add(banner);
 
             mHeadersDecoration.invalidateHeaders();
             if (oldSize == 0)

From 204a8450c1ff48e15cfea6d28e474ba176120c44 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 28 Sep 2016 23:32:31 +0300
Subject: [PATCH 5/7] [android] del: Showcase strings removed from strings.txt.

---
 strings.txt | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/strings.txt b/strings.txt
index ed95cf256e..7097077d64 100644
--- a/strings.txt
+++ b/strings.txt
@@ -11556,45 +11556,6 @@
     zh-Hant = 顯示優惠
     sk = Zobraziť akcie
 
-  [showcase_plan_your_trip]
-    comment = Showcase menu item.
-    tags = ios
-    en = Plan your trip
-    ru = Подготовься к путешествию
-    fr = Planifiez votre voyage
-    pl = Zaplanuj podróż
-    es = Planifica tu viaje
-
-  [showcase_more_apps]
-    tags = ios, android
-    en = More My.com Apps
-    ru = Другие приложения My.com
-    ar = المزيد من تطبيقات My.com
-    cs = Více aplikací My.com
-    da = Flere My.com apps
-    nl = Meer My.com apps
-    fi = Lisää My.com sovelluksia
-    fr = Plus d'applications My.com
-    de = Weitere Apps von My.com
-    hu = Több My.com alkalmazás
-    id = Lebih Banyak Aplikasi My.com
-    it = Altre app su My.com
-    ja = 他のMy.comアプリ
-    ko = 기타 My.com 앱
-    nb = Flere apper fra My.com
-    pl = Więcej aplikacji My.com
-    pt = Mais aplicativos do My.com
-    ro = Mai multe aplicații My.com
-    es = Más apps de My.com
-    sv = Mai multe aplicații My.com
-    th = แอป My.com เพิ่มเติม
-    tr = Daha fazla My.com uygulamaları
-    uk = Інші додатки My.com
-    vi = Thêm Ứng dụng My.com
-    zh-Hans = 更多My.com应用
-    zh-Hant = 更多 My.com 應用程式
-    sk = Ďalšie My.com aplikácie
-
   [read_in_wikipedia]
     comment = Place Page link to Wikipedia article (if map object has it).
     tags = ios, android

From 08fc2bdd891d9fa9c8504e00ef43b9a5bc36af08 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 28 Sep 2016 23:43:28 +0300
Subject: [PATCH 6/7] [android] fix: Generated strings.

---
 android/res/values-ar/strings.xml             | 1 -
 android/res/values-cs/strings.xml             | 1 -
 android/res/values-da/strings.xml             | 1 -
 android/res/values-de/strings.xml             | 1 -
 android/res/values-es/strings.xml             | 3 ---
 android/res/values-fi/strings.xml             | 1 -
 android/res/values-fr/strings.xml             | 3 ---
 android/res/values-hu/strings.xml             | 1 -
 android/res/values-in/strings.xml             | 1 -
 android/res/values-it/strings.xml             | 1 -
 android/res/values-ja/strings.xml             | 1 -
 android/res/values-ko/strings.xml             | 1 -
 android/res/values-nb/strings.xml             | 1 -
 android/res/values-nl/strings.xml             | 1 -
 android/res/values-pl/strings.xml             | 3 ---
 android/res/values-pt/strings.xml             | 1 -
 android/res/values-ro/strings.xml             | 1 -
 android/res/values-ru/strings.xml             | 3 ---
 android/res/values-sk/strings.xml             | 1 -
 android/res/values-sv/strings.xml             | 1 -
 android/res/values-th/strings.xml             | 1 -
 android/res/values-tr/strings.xml             | 1 -
 android/res/values-uk/strings.xml             | 1 -
 android/res/values-vi/strings.xml             | 1 -
 android/res/values-zh-rTW/strings.xml         | 1 -
 android/res/values-zh/strings.xml             | 1 -
 android/res/values/strings.xml                | 3 ---
 iphone/Maps/ar.lproj/Localizable.strings      | 5 -----
 iphone/Maps/cs.lproj/Localizable.strings      | 5 -----
 iphone/Maps/da.lproj/Localizable.strings      | 5 -----
 iphone/Maps/de.lproj/Localizable.strings      | 5 -----
 iphone/Maps/en-GB.lproj/Localizable.strings   | 5 -----
 iphone/Maps/en.lproj/Localizable.strings      | 5 -----
 iphone/Maps/es.lproj/Localizable.strings      | 5 -----
 iphone/Maps/fi.lproj/Localizable.strings      | 5 -----
 iphone/Maps/fr.lproj/Localizable.strings      | 5 -----
 iphone/Maps/hu.lproj/Localizable.strings      | 5 -----
 iphone/Maps/id.lproj/Localizable.strings      | 5 -----
 iphone/Maps/it.lproj/Localizable.strings      | 5 -----
 iphone/Maps/ja.lproj/Localizable.strings      | 5 -----
 iphone/Maps/ko.lproj/Localizable.strings      | 5 -----
 iphone/Maps/nb.lproj/Localizable.strings      | 5 -----
 iphone/Maps/nl.lproj/Localizable.strings      | 5 -----
 iphone/Maps/pl.lproj/Localizable.strings      | 5 -----
 iphone/Maps/pt.lproj/Localizable.strings      | 5 -----
 iphone/Maps/ro.lproj/Localizable.strings      | 5 -----
 iphone/Maps/ru.lproj/Localizable.strings      | 5 -----
 iphone/Maps/sk.lproj/Localizable.strings      | 5 -----
 iphone/Maps/sv.lproj/Localizable.strings      | 5 -----
 iphone/Maps/th.lproj/Localizable.strings      | 5 -----
 iphone/Maps/tr.lproj/Localizable.strings      | 5 -----
 iphone/Maps/uk.lproj/Localizable.strings      | 5 -----
 iphone/Maps/vi.lproj/Localizable.strings      | 5 -----
 iphone/Maps/zh-Hans.lproj/Localizable.strings | 5 -----
 iphone/Maps/zh-Hant.lproj/Localizable.strings | 5 -----
 55 files changed, 177 deletions(-)

diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 2bbfab6f7c..84a11cb1ef 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -635,7 +635,6 @@
 	<string name="clear_search">مسح تاريخ البحث</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">رؤية العروض</string>
-	<string name="showcase_more_apps">المزيد من تطبيقات My.com</string>
 	<string name="p2p_route_planning">تخطيط الطريق</string>
 	<string name="p2p_your_location">موقعك</string>
 	<string name="p2p_from">نقطة المغادرة</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 1d1b971cb2..744b461189 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -636,7 +636,6 @@
 	<string name="clear_search">Vymazat historii vyhledávání</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Zobrazit nabídky</string>
-	<string name="showcase_more_apps">Více aplikací My.com</string>
 	<string name="p2p_route_planning">Plánování trasy</string>
 	<string name="p2p_your_location">Vaše umístění</string>
 	<string name="p2p_from">Počátek cesty</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 70d5d958cc..223bdeb503 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -633,7 +633,6 @@
 	<string name="clear_search">Ryd historiksøgning</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Vis tilbud</string>
-	<string name="showcase_more_apps">Flere My.com apps</string>
 	<string name="p2p_route_planning">Ruteplanlægning</string>
 	<string name="p2p_your_location">Din lokalitet</string>
 	<string name="p2p_from">Afgangssted</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index e17fb1e9b2..42c45b6509 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -647,7 +647,6 @@
 	<string name="clear_search">Suchverlauf löschen</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Angebote anzeigen</string>
-	<string name="showcase_more_apps">Weitere Apps von My.com</string>
 	<string name="p2p_route_planning">Routenplanung</string>
 	<string name="p2p_your_location">Ihr Standort</string>
 	<string name="p2p_from">Startpunkt</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index d37eb7f25a..eefbc6bd0c 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -622,9 +622,6 @@
 	<string name="clear_search">Eliminar el historial de búsqueda</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Mostrar ofertas</string>
-	<!-- Showcase menu item. -->
-	<string name="showcase_plan_your_trip">Planifica tu viaje</string>
-	<string name="showcase_more_apps">Más apps de My.com</string>
 	<string name="p2p_route_planning">Planificación de ruta</string>
 	<string name="p2p_your_location">Tu ubicación</string>
 	<string name="p2p_from">El punto de origen</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 41c00c221f..42f8d22254 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -629,7 +629,6 @@
 	<string name="clear_search">Poista hakuhistoria</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Näytä tarjoukset</string>
-	<string name="showcase_more_apps">Lisää My.com sovelluksia</string>
 	<string name="p2p_route_planning">Reittisuunnittelu</string>
 	<string name="p2p_your_location">Sijaintisi</string>
 	<string name="p2p_from">Lähtöpiste</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 4b2710382d..8370b98759 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -644,9 +644,6 @@
 	<string name="clear_search">Effacer l\&#39;historique de recherche</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Afficher les offres</string>
-	<!-- Showcase menu item. -->
-	<string name="showcase_plan_your_trip">Planifiez votre voyage</string>
-	<string name="showcase_more_apps">Plus d\&#39;applications My.com</string>
 	<!-- Place Page link to Wikipedia article (if map object has it). -->
 	<string name="read_in_wikipedia">Wikipédia</string>
 	<string name="p2p_route_planning">Planification d’itinéraire</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index b4cfcb6d5a..749cea93f2 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -630,7 +630,6 @@
 	<string name="clear_search">A keresési előzmények törlése</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Ajánlatok mutatása</string>
-	<string name="showcase_more_apps">Több My.com alkalmazás</string>
 	<string name="p2p_route_planning">Útvonaltervezés</string>
 	<string name="p2p_your_location">Az Ön helyzete</string>
 	<string name="p2p_from">Az indulás helye</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 2afe1fc12d..c35462248a 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -628,7 +628,6 @@
 	<string name="clear_search">Bersihkan riwayat pencarian</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Tampilkan penawaran</string>
-	<string name="showcase_more_apps">Lebih Banyak Aplikasi My.com</string>
 	<string name="p2p_route_planning">Perencana Rute</string>
 	<string name="p2p_your_location">Lokasi Anda</string>
 	<string name="p2p_from">Titik keberangkatan</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 217cfb05a2..2d9c0006c2 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -628,7 +628,6 @@
 	<string name="clear_search">Cancella сronologia ricerche</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Mostra offerte</string>
-	<string name="showcase_more_apps">Altre app su My.com</string>
 	<string name="p2p_route_planning">Pianificazione percorso</string>
 	<string name="p2p_your_location">La tua posizione</string>
 	<string name="p2p_from">Il punto di partenza</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 97967b1a79..c83a13675f 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -628,7 +628,6 @@
 	<string name="clear_search">検索履歴を消去</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">オファーを表示</string>
-	<string name="showcase_more_apps">他のMy.comアプリ</string>
 	<string name="p2p_route_planning">ルート作成</string>
 	<string name="p2p_your_location">現在位置</string>
 	<string name="p2p_from">出発地</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 716b809475..30c15bac78 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -625,7 +625,6 @@
 	<string name="clear_search">이력 검색 지우기</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">추천 보기</string>
-	<string name="showcase_more_apps">기타 My.com 앱</string>
 	<string name="p2p_route_planning">경로 계획 중</string>
 	<string name="p2p_your_location">위치</string>
 	<string name="p2p_from">출발 지점</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 0689fa8dab..f8ca6aed16 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -629,7 +629,6 @@
 	<string name="clear_search">Tøm søkehistorikk</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Vis tilbud</string>
-	<string name="showcase_more_apps">Flere apper fra My.com</string>
 	<string name="p2p_route_planning">Ruteplanlegging</string>
 	<string name="p2p_your_location">Din beliggenhet</string>
 	<string name="p2p_from">Avreisested</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index a36ec444e0..316f573d18 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -629,7 +629,6 @@
 	<string name="clear_search">Zoekgeschiedenis wissen</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Aanbiedingen weergeven</string>
-	<string name="showcase_more_apps">Meer My.com apps</string>
 	<string name="p2p_route_planning">Routeberekening</string>
 	<string name="p2p_your_location">Uw locatie</string>
 	<string name="p2p_from">Vertrekpunt</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 3063687ecb..a62292191d 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -636,9 +636,6 @@
 	<string name="clear_search">Wyczyść historię wyszukiwania</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Oferty</string>
-	<!-- Showcase menu item. -->
-	<string name="showcase_plan_your_trip">Zaplanuj podróż</string>
-	<string name="showcase_more_apps">Więcej aplikacji My.com</string>
 	<string name="p2p_route_planning">Planowanie trasy</string>
 	<string name="p2p_your_location">Twoja lokalizacja</string>
 	<string name="p2p_from">Miejsce wyjazdu</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 1f552cf58d..746e7da5bb 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -628,7 +628,6 @@
 	<string name="clear_search">Limpar histórico de pesquisa</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Mostrar ofertas</string>
-	<string name="showcase_more_apps">Mais aplicativos do My.com</string>
 	<string name="p2p_route_planning">Planejar rota</string>
 	<string name="p2p_your_location">Localização atual</string>
 	<string name="p2p_from">O ponto de partida</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 7f37b07bfa..94f8283a7f 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -626,7 +626,6 @@
 	<string name="clear_search">Ștergere istoric de căutare</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Afișare oferte</string>
-	<string name="showcase_more_apps">Mai multe aplicații My.com</string>
 	<string name="p2p_route_planning">Planificare rută</string>
 	<string name="p2p_your_location">Locația dvs.</string>
 	<string name="p2p_from">Punctul de plecare</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 05915fed30..576d2216eb 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -647,9 +647,6 @@
 	<string name="clear_search">Очистить историю поиска</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Показывать предложения</string>
-	<!-- Showcase menu item. -->
-	<string name="showcase_plan_your_trip">Подготовься к путешествию</string>
-	<string name="showcase_more_apps">Другие приложения My.com</string>
 	<string name="p2p_route_planning">Планирование маршрута</string>
 	<string name="p2p_your_location">Ваше местоположение</string>
 	<string name="p2p_from">Пункт отправления</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 68902dce43..87e75fd8e4 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -632,7 +632,6 @@
 	<string name="clear_search">Vymazať históriu vyhľadávania</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Zobraziť akcie</string>
-	<string name="showcase_more_apps">Ďalšie My.com aplikácie</string>
 	<string name="p2p_route_planning">Plánovanie trasy</string>
 	<string name="p2p_your_location">Vaša poloha</string>
 	<string name="p2p_from">Východiskový bod</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 3d903d0880..e3fa18a6bf 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -633,7 +633,6 @@
 	<string name="clear_search">Rensa sökhistorik</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Visa erbjudanden</string>
-	<string name="showcase_more_apps">Mai multe aplicații My.com</string>
 	<string name="p2p_route_planning">Ruttplanering</string>
 	<string name="p2p_your_location">Din plats</string>
 	<string name="p2p_from">Startplats</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 5e9df22fe4..d4095bce77 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -635,7 +635,6 @@
 	<string name="clear_search">ล้างการค้นหาประวัติ</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">แสดงข้อเสนอ</string>
-	<string name="showcase_more_apps">แอป My.com เพิ่มเติม</string>
 	<string name="p2p_route_planning">การวางแผนเส้นทาง</string>
 	<string name="p2p_your_location">ตำแหน่งที่ตั้งของคุณ</string>
 	<string name="p2p_from">จุดที่ออกเดินทาง</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 105126142d..44fd9164e1 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -635,7 +635,6 @@
 	<string name="clear_search">Arama geçmişini temizle</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Teklifleri göster</string>
-	<string name="showcase_more_apps">Daha fazla My.com uygulamaları</string>
 	<string name="p2p_route_planning">Rota planlama</string>
 	<string name="p2p_your_location">Konumunuz</string>
 	<string name="p2p_from">Kalkış noktası</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 9bccd19249..1c5e36eff4 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -633,7 +633,6 @@
 	<string name="clear_search">Очистити історію пошуку</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Показати пропозиції</string>
-	<string name="showcase_more_apps">Інші додатки My.com</string>
 	<string name="p2p_route_planning">Планування маршруту</string>
 	<string name="p2p_your_location">Ваше місцезнаходження</string>
 	<string name="p2p_from">Пункт відправлення</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index e3564c1d31..09bf4d7836 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -629,7 +629,6 @@
 	<string name="clear_search">Xóa Lịch sử Tìm kiếm</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Hiển thị lời mời</string>
-	<string name="showcase_more_apps">Thêm Ứng dụng My.com</string>
 	<string name="p2p_route_planning">Hoạch định đường đi</string>
 	<string name="p2p_your_location">Vị trí của bạn</string>
 	<string name="p2p_from">Điểm khởi hành</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 8a01c4d82c..113d708f10 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -639,7 +639,6 @@
 	<string name="clear_search">清除搜尋記錄</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">顯示優惠</string>
-	<string name="showcase_more_apps">更多 My.com 應用程式</string>
 	<!-- Place Page link to Wikipedia article (if map object has it). -->
 	<string name="read_in_wikipedia">維基百科</string>
 	<string name="p2p_route_planning">路線計劃</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index de56c9f9d6..ba114d6799 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -635,7 +635,6 @@
 	<string name="clear_search">清除历史搜索</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">显示优惠</string>
-	<string name="showcase_more_apps">更多My.com应用</string>
 	<string name="p2p_route_planning">路线计划</string>
 	<string name="p2p_your_location">您的位置</string>
 	<string name="p2p_from">出发地点</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 79a04bf47e..605fa4643d 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -649,9 +649,6 @@
 	<string name="clear_search">Clear Search History</string>
 	<!-- Title for settings to enable/disable showcase menu button -->
 	<string name="showcase_settings_title">Show offers</string>
-	<!-- Showcase menu item. -->
-	<string name="showcase_plan_your_trip">Plan your trip</string>
-	<string name="showcase_more_apps">More My.com Apps</string>
 	<!-- Place Page link to Wikipedia article (if map object has it). -->
 	<string name="read_in_wikipedia">Wikipedia</string>
 	<string name="p2p_route_planning">Route Planning</string>
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index bb750339de..1831118999 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "رؤية العروض";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "المزيد من تطبيقات My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index e8685d34a7..57b1ac47b9 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Zobrazit nabídky";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Více aplikací My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index 6230fb1434..850c7ea2a4 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Vis tilbud";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Flere My.com apps";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 86a56cc799..71e4fdb964 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Angebote anzeigen";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Weitere Apps von My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/en-GB.lproj/Localizable.strings b/iphone/Maps/en-GB.lproj/Localizable.strings
index 8e5bcebb29..31fdf21340 100644
--- a/iphone/Maps/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/en-GB.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Show offers";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "More My.com Apps";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index f2c6aa9cd5..ad98d92cc7 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Show offers";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "More My.com Apps";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 5fb18cc385..6c90dfedfc 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Mostrar ofertas";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Planifica tu viaje";
-
-"showcase_more_apps" = "Más apps de My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings
index 38b3cd5dc1..a50f1260d3 100644
--- a/iphone/Maps/fi.lproj/Localizable.strings
+++ b/iphone/Maps/fi.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Näytä tarjoukset";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Lisää My.com sovelluksia";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 3a19dbd63a..c41899cb83 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Afficher les offres";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Planifiez votre voyage";
-
-"showcase_more_apps" = "Plus d'applications My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipédia";
 
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index 9acf495dba..3aa701a7e3 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Ajánlatok mutatása";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Több My.com alkalmazás";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings
index 582068245d..9da4c1319e 100644
--- a/iphone/Maps/id.lproj/Localizable.strings
+++ b/iphone/Maps/id.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Tampilkan penawaran";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Lebih Banyak Aplikasi My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 9800d1f220..3de10146c8 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Mostra offerte";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Altre app su My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 9b977e4e57..b1ef111a0b 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "オファーを表示";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "他のMy.comアプリ";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index a80efc21a9..79e2171aed 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "추천 보기";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "기타 My.com 앱";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings
index ddc849c5e3..2e23851ff6 100644
--- a/iphone/Maps/nb.lproj/Localizable.strings
+++ b/iphone/Maps/nb.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Vis tilbud";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Flere apper fra My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index a86870baaa..6f3404cf28 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Aanbiedingen weergeven";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Meer My.com apps";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index 07723f74a7..4e1191f654 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Oferty";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Zaplanuj podróż";
-
-"showcase_more_apps" = "Więcej aplikacji My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index fcb25c47f5..4fb2a096fa 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Mostrar ofertas";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Mais aplicativos do My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings
index 115a126eeb..d4963ab4dc 100644
--- a/iphone/Maps/ro.lproj/Localizable.strings
+++ b/iphone/Maps/ro.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Afișare oferte";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Mai multe aplicații My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 0d81dae310..a566243a95 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Показывать предложения";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Подготовься к путешествию";
-
-"showcase_more_apps" = "Другие приложения My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index 30ec214553..e48c4af732 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Zobraziť akcie";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Ďalšie My.com aplikácie";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index 3a94aca6e6..14c739a57c 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Visa erbjudanden";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Mai multe aplicații My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index f4bb0add13..e2fb122f54 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "แสดงข้อเสนอ";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "แอป My.com เพิ่มเติม";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index af765d0166..663155f3e0 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Teklifleri göster";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Daha fazla My.com uygulamaları";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 6173e5da24..b9c96b8148 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Показати пропозиції";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Інші додатки My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings
index 85e0479fe5..684577b696 100644
--- a/iphone/Maps/vi.lproj/Localizable.strings
+++ b/iphone/Maps/vi.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "Hiển thị lời mời";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "Thêm Ứng dụng My.com";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 72b7e693d1..2163587712 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "显示优惠";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "更多My.com应用";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
 
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index ea8a9f5b89..47e98a53fb 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -1027,11 +1027,6 @@
 /* Title for settings to enable/disable showcase menu button */
 "showcase_settings_title" = "顯示優惠";
 
-/* Showcase menu item. */
-"showcase_plan_your_trip" = "Plan your trip";
-
-"showcase_more_apps" = "更多 My.com 應用程式";
-
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "維基百科";
 

From 9065a3d8582edaa5480cb5d91b12c189983ec550 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Fri, 30 Sep 2016 02:23:16 +0300
Subject: [PATCH 7/7] [android] fix: Review fixes.

---
 .../maps/downloader/DownloaderAdapter.java    | 49 +++++++++++--------
 .../util/statistics/MytargetHelper.java       |  3 +-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index f62e5bfbe1..8b1a8cb620 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -52,9 +52,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 {
   private static final String HEADER_ADVERTISMENT_TITLE = "MY.COM";
   private static final int HEADER_ADVERTISMENT_ID = CountryItem.CATEGORY__LAST + 1;
+  private static final int HEADER_ADS_OFFSET = 10;
 
-  private static final int KIND_COUNTRY = 0;
-  private static final int KIND_ADVERTISMENT = 1;
+  private static final int TYPE_COUNTRY = 0;
+  private static final int TYPE_ADVERTISMENT = 1;
 
   private final RecyclerView mRecycler;
   private final Activity mActivity;
@@ -77,6 +78,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   private int mNearMeCount;
 
   private int mListenerSlot;
+  @Nullable
   private MytargetHelper mMytargetHelper;
 
   private enum MenuItem
@@ -264,8 +266,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
       for (int i = first; i <= last; i++)
       {
-        ViewHolderWrapper vh = (ViewHolderWrapper)mRecycler.findViewHolderForAdapterPosition(i);
-        if (vh != null && vh.mKind == KIND_COUNTRY && ((CountryItem)vh.mHolder.mItem).id.equals(countryId))
+        ViewHolderWrapper vh = (ViewHolderWrapper) mRecycler.findViewHolderForAdapterPosition(i);
+        if (vh != null && vh.mKind == TYPE_COUNTRY && ((CountryItem) vh.mHolder.mItem).id.equals(countryId))
           vh.mHolder.rebind();
       }
     }
@@ -302,21 +304,22 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
   private View createViewHolderFrame(ViewGroup parent, int kind)
   {
-    return inflate(parent, (kind == KIND_ADVERTISMENT ? R.layout.downloader_item_ad
+    return inflate(parent, (kind == TYPE_ADVERTISMENT ? R.layout.downloader_item_ad
                                                       : R.layout.downloader_item));
   }
 
   class ViewHolderWrapper extends RecyclerView.ViewHolder
   {
     private final int mKind;
+    @NonNull
     private final BaseInnerViewHolder mHolder;
 
-    ViewHolderWrapper(ViewGroup parent, int kind)
+    ViewHolderWrapper(@NonNull ViewGroup parent, int kind)
     {
       super(createViewHolderFrame(parent, kind));
 
       mKind = kind;
-      mHolder = (kind == KIND_ADVERTISMENT) ? new AdViewHolder(itemView)
+      mHolder = (kind == TYPE_ADVERTISMENT) ? new AdViewHolder(itemView)
                                             : new ItemViewHolder(itemView);
     }
 
@@ -324,7 +327,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     void bind(int position)
     {
       int kind = DownloaderAdapter.this.getItemViewType(position);
-      if (kind == KIND_ADVERTISMENT)
+      if (kind == TYPE_ADVERTISMENT)
       {
         mHolder.bind(mAds.get(position - mNearMeCount));
         return;
@@ -597,9 +600,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
   class HeaderViewHolder extends RecyclerView.ViewHolder
   {
+    @NonNull
     private final TextView mTitle;
 
-    HeaderViewHolder(View frame)
+    HeaderViewHolder(@NonNull View frame)
     {
       super(frame);
       mTitle = (TextView) frame.findViewById(R.id.title);
@@ -614,7 +618,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     }
   }
 
-  class AdViewHolder extends BaseInnerViewHolder<NativeAppwallBanner>
+  private class AdViewHolder extends BaseInnerViewHolder<NativeAppwallBanner>
   {
     private final ImageView mIcon;
     private final TextView mTitle;
@@ -622,13 +626,15 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
     private NativeAppwallBanner mData;
 
+    @NonNull
     private final View.OnClickListener mClickListener = new View.OnClickListener()
     {
       @Override
       public void onClick(View v)
       {
         if (mData != null)
-          mMytargetHelper.onBannerClick(mData);
+          if (mMytargetHelper != null)
+            mMytargetHelper.onBannerClick(mData);
       }
     };
 
@@ -688,7 +694,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
       default:
         int prevHeader = headerId;
-        headerId = CountryItem.CATEGORY_AVAILABLE * 10 + ci.name.charAt(0);
+        headerId = CountryItem.CATEGORY_AVAILABLE * HEADER_ADS_OFFSET + ci.name.charAt(0);
 
         if (headerId != prevHeader)
           mHeaders.put(headerId, ci.name.substring(0, 1).toUpperCase());
@@ -771,6 +777,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     mRecycler.addItemDecoration(mHeadersDecoration);
   }
 
+  @NonNull
   private View inflate(ViewGroup parent, @LayoutRes int layoutId)
   {
     return LayoutInflater.from(mActivity).inflate(layoutId, parent, false);
@@ -780,12 +787,12 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   public int getItemViewType(int position)
   {
     if (position < mNearMeCount)
-      return KIND_COUNTRY;
+      return TYPE_COUNTRY;
 
     if (position < mNearMeCount + getAdsCount())
-      return KIND_ADVERTISMENT;
+      return TYPE_ADVERTISMENT;
 
-    return KIND_COUNTRY;
+    return TYPE_COUNTRY;
   }
 
   @Override
@@ -976,8 +983,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       }
 
       @Override
-      public void onDataReady(Void data)
+      public void onDataReady(@Nullable Void data)
       {
+        //noinspection ConstantConditions
         mMytargetHelper.loadShowcase(new MytargetHelper.Listener<List<NativeAppwallBanner>>()
         {
           @Override
@@ -987,7 +995,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
           }
 
           @Override
-          public void onDataReady(List<NativeAppwallBanner> banners)
+          public void onDataReady(@Nullable List<NativeAppwallBanner> banners)
           {
             mAdsLoading = false;
             mAdsLoaded = true;
@@ -995,9 +1003,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
             int oldSize = mAds.size();
             mAds.clear();
 
-            for (NativeAppwallBanner banner: banners)
-              if (!banner.isAppInstalled())
-                mAds.add(banner);
+            if (banners != null)
+              for (NativeAppwallBanner banner: banners)
+                if (!banner.isAppInstalled())
+                  mAds.add(banner);
 
             mHeadersDecoration.invalidateHeaders();
             if (oldSize == 0)
diff --git a/android/src/com/mapswithme/util/statistics/MytargetHelper.java b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
index 33b2f470e9..8de950f8c4 100644
--- a/android/src/com/mapswithme/util/statistics/MytargetHelper.java
+++ b/android/src/com/mapswithme/util/statistics/MytargetHelper.java
@@ -3,6 +3,7 @@ package com.mapswithme.util.statistics;
 import android.app.Activity;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 
 import com.mapswithme.maps.MwmApplication;
@@ -39,7 +40,7 @@ public final class MytargetHelper
   public interface Listener<T>
   {
     void onNoAds();
-    void onDataReady(T data);
+    void onDataReady(@Nullable T data);
   }
 
   static