[android] Added ability to set different ad choices icon for different network ads

android/res/layout/place_page_banner.xml

@@ -60,20 +60,13 @@
       android:layout_toEndOf="@id/iv__banner_icon"
       android:layout_toRightOf="@id/iv__banner_icon"
       android:gravity="center_vertical">
-      <TextView
-        android:id="@+id/tv__ads"
+      <ImageView
+        android:id="@+id/ad_choices"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/margin_half_plus"
+        android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_quarter"
         android:layout_marginEnd="@dimen/margin_quarter"
-        android:textSize="@dimen/text_size_banner"
-        android:textColor="?android:textColorSecondary"
-        android:gravity="center"
-        android:visibility="gone"
-        android:background="?adsBackground"
-        android:text="@string/advertisement"
-        android:fontFamily="@string/robotoMedium"
-        tools:targetApi="jelly_bean"/>
+        android:visibility="gone"/>
       <TextView
         android:id="@+id/tv__banner_title"
         android:layout_width="match_parent"

android/res/values/themes-attrs.xml

@@ -97,6 +97,7 @@
     <attr name="transitPedestrianBackground" format="color"/>
     <attr name="transitStepDivider" format="reference"/>
     <attr name="filterPropertyBackground" format="reference"/>
+    <attr name="adChoicesIcon" format="reference"/>
   </declare-styleable>
 
   <declare-styleable name="ThemeAttrs.NavButtons">

android/res/values/themes-base.xml

@@ -122,6 +122,7 @@
     <item name="transitPedestrianBackground">@color/black_4</item>
     <item name="transitStepDivider">@drawable/dot_divider</item>
     <item name="filterPropertyBackground">@drawable/button_with_border</item>
+    <item name="adChoicesIcon">@drawable/ic_ad_light</item>
   </style>
 
   <!-- Night theme -->
@@ -246,5 +247,6 @@
     <item name="transitPedestrianBackground">@color/white_4</item>
     <item name="transitStepDivider">@drawable/dot_divider_night</item>
     <item name="filterPropertyBackground">@drawable/button_with_border_night</item>
+    <item name="adChoicesIcon">@drawable/ic_ad_dark</item>
   </style>
 </resources>

android/src/com/mapswithme/maps/ads/FacebookNativeAd.java

@@ -99,4 +99,11 @@ class FacebookNativeAd extends CachedMwmNativeAd
                                "AdListener class! Not '" + listener.getClass() + "'!");
     mAd.setAdListener((AdListener) listener);
   }
+
+  @NonNull
+  @Override
+  public NetworkType getNetworkType()
+  {
+    return NetworkType.FACEBOOK;
+  }
 }

android/src/com/mapswithme/maps/ads/MopubNativeAd.java

@@ -14,6 +14,7 @@ class MopubNativeAd extends CachedMwmNativeAd
 {
   @NonNull
   private final NativeAd mNativeAd;
+  @NonNull
   private final StaticNativeAd mAd;
 
   MopubNativeAd(@NonNull NativeAd ad, long timestamp)
@@ -98,4 +99,16 @@ class MopubNativeAd extends CachedMwmNativeAd
                                + listener.getClass() + "'!");
     mNativeAd.setMoPubNativeEventListener((NativeAd.MoPubNativeEventListener) listener);
   }
+
+  @NonNull
+  @Override
+  public NetworkType getNetworkType()
+  {
+    // There is no more elegant way to detect the type of the native ad when it's hidden under the
+    // Mopub architecture(classes).
+    String className = mAd.getClass().toString().toLowerCase();
+    if (className.contains("facebook"))
+      return NetworkType.FACEBOOK;
+    return NetworkType.UKNOWN;
+  }
 }

android/src/com/mapswithme/maps/ads/MwmNativeAd.java

@@ -10,6 +10,10 @@ import android.view.View;
  */
 public interface MwmNativeAd
 {
+  enum NetworkType{
+    UNKNOWN, FACEBOOK, MYTARGET, GOOGLE;
+  }
+
   @NonNull
   String getBannerId();
 
@@ -51,4 +55,10 @@ public interface MwmNativeAd
    */
   @Nullable
   String getPrivacyInfoUrl();
+
+  /**
+   * Returns a network type which the native ad belongs to.
+   */
+  @NonNull
+  NetworkType getNetworkType();
 }

android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java

@@ -105,4 +105,11 @@ class MyTargetNativeAd extends CachedMwmNativeAd
                                "NativeAd.NativeAdListener class! Not '" + listener.getClass() + "'!");
     mAd.setListener((NativeAd.NativeAdListener) listener);
   }
+
+  @NonNull
+  @Override
+  public NetworkType getNetworkType()
+  {
+    return NetworkType.MYTARGET;
+  }
 }

android/src/com/mapswithme/maps/widget/placepage/BannerController.java

@@ -13,7 +13,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.ads.AdTracker;
 import com.mapswithme.maps.ads.Banner;
@@ -70,7 +69,7 @@ final class BannerController
   @NonNull
   private final TextView mActionLarge;
   @NonNull
-  private final View mAds;
+  private final ImageView mAdChoices;
 
   private final float mCloseFrameHeight;
 
@@ -96,32 +95,18 @@ final class BannerController
     mListener = listener;
     Resources resources = mFrame.getResources();
     mCloseFrameHeight = resources.getDimension(R.dimen.placepage_banner_height);
-    mIcon = (ImageView) bannerView.findViewById(R.id.iv__banner_icon);
-    mTitle = (TextView) bannerView.findViewById(R.id.tv__banner_title);
-    mMessage = (TextView) bannerView.findViewById(R.id.tv__banner_message);
-    mActionSmall = (TextView) bannerView.findViewById(R.id.tv__action_small);
-    mActionLarge = (TextView) bannerView.findViewById(R.id.tv__action_large);
-    mAds = bannerView.findViewById(R.id.tv__ads);
-    mAds.setOnClickListener(new View.OnClickListener()
-    {
-      @Override
-      public void onClick(View v)
-      {
-        handlePrivacyInfoUrl();
-      }
-    });
+    mIcon = bannerView.findViewById(R.id.iv__banner_icon);
+    mTitle = bannerView.findViewById(R.id.tv__banner_title);
+    mMessage = bannerView.findViewById(R.id.tv__banner_message);
+    mActionSmall = bannerView.findViewById(R.id.tv__action_small);
+    mActionLarge = bannerView.findViewById(R.id.tv__action_large);
+    mAdChoices = bannerView.findViewById(R.id.ad_choices);
+    mAdChoices.setOnClickListener(v -> handlePrivacyInfoUrl());
     Resources res = mFrame.getResources();
-    UiUtils.expandTouchAreaForView(mAds, (int) res.getDimension(R.dimen.margin_quarter_plus));
+    UiUtils.expandTouchAreaForView(mAdChoices, (int) res.getDimension(R.dimen.margin_quarter_plus));
     mAdsLoader = loader;
     mAdTracker = tracker;
-    mFrame.setOnClickListener(new View.OnClickListener()
-    {
-      @Override
-      public void onClick(View v)
-      {
-        animateActionButton();
-      }
-    });
+    mFrame.setOnClickListener(v -> animateActionButton());
   }
 
   private void handlePrivacyInfoUrl()
@@ -155,11 +140,11 @@ final class BannerController
     if ((mAdsLoader.isAdLoading() || hasErrorOccurred())
         && mCurrentAd == null)
     {
-      UiUtils.hide(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAds);
+      UiUtils.hide(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAdChoices);
     }
     else
     {
-      UiUtils.show(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAds);
+      UiUtils.show(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAdChoices);
       if (mOpened)
         UiUtils.hide(mActionSmall);
       else
@@ -292,6 +277,16 @@ final class BannerController
     mMessage.setText(data.getDescription());
     mActionSmall.setText(data.getAction());
     mActionLarge.setText(data.getAction());
+    fillAdChoicesIcon(data);
+  }
+
+  private void fillAdChoicesIcon(@NonNull MwmNativeAd data)
+  {
+    MwmNativeAd.NetworkType type = data.getNetworkType();
+    if (type == MwmNativeAd.NetworkType.FACEBOOK)
+      mAdChoices.setImageResource(R.drawable.ic_ads_fb);
+    else
+      mAdChoices.setImageResource(ThemeUtils.getResource(mFrame.getContext(), R.attr.adChoicesIcon));
   }
 
   private void loadIconAndOpenIfNeeded(@NonNull MwmNativeAd data)