From ee0492a1db4216e4faaf318c743a958b8a452a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Mon, 4 Dec 2017 14:03:36 +0300
Subject: [PATCH] [andorid] Added url support for viator in discovery manager

---
 android/res/layout/card_loading.xml           |  2 +-
 .../maps/discovery/DiscoveryFragment.java     | 69 ++++++++++++++++---
 .../maps/gallery/ErrorAdapterStrategy.java    | 14 +---
 .../maps/gallery/GalleryAdapter.java          |  6 +-
 .../com/mapswithme/maps/gallery/Holders.java  | 32 ++++-----
 .../maps/gallery/LoadingAdapterStrategy.java  | 14 +---
 .../maps/gallery/OfflineAdapterStrategy.java  | 11 +--
 .../gallery/SingleItemAdapterStrategy.java    | 15 ++++
 .../maps/widget/placepage/PlacePageView.java  | 17 +++--
 android/src/com/mapswithme/util/Utils.java    | 13 ++++
 10 files changed, 129 insertions(+), 64 deletions(-)

diff --git a/android/res/layout/card_loading.xml b/android/res/layout/card_loading.xml
index 0f8853060f..d3364f0f1a 100644
--- a/android/res/layout/card_loading.xml
+++ b/android/res/layout/card_loading.xml
@@ -37,7 +37,7 @@
     android:gravity="center_horizontal"
     tools:text="Узнай сколько стоят квартиры в этом доме"/>
   <TextView
-    android:id="@+id/tv__more"
+    android:id="@+id/button"
     android:layout_width="match_parent"
     android:layout_height="@dimen/cian_details_height"
     android:textAppearance="@style/MwmTextAppearance.Button"
diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
index 8cd99fa16d..6e1f8648ad 100644
--- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
+++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
@@ -1,17 +1,20 @@
 package com.mapswithme.maps.discovery;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmToolbarFragment;
+import com.mapswithme.maps.gallery.GalleryAdapter;
 import com.mapswithme.maps.gallery.impl.Factory;
 import com.mapswithme.maps.search.SearchResult;
 import com.mapswithme.maps.viator.ViatorProduct;
@@ -26,6 +29,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
 {
   private static final int ITEMS_COUNT = 5;
   private static final int[] ITEM_TYPES = { DiscoveryParams.ITEM_TYPE_VIATOR };
+  private static final GalleryAdapter.ItemSelectedListener LISTENER = new BaseItemSelectedListener();
   private boolean mOnlineMode;
   @SuppressWarnings("NullableProblems")
   @NonNull
@@ -37,13 +41,26 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
   {
     View view = inflater.inflate(R.layout.fragment_discovery, container, false);
 
+    initViatorGallery(view);
+    return view;
+  }
+
+  private void initViatorGallery(@NonNull View view)
+  {
+    view.findViewById(R.id.viatorLogo).setOnClickListener(new View.OnClickListener()
+    {
+      @Override
+      public void onClick(View v)
+      {
+        Utils.openUrl(getActivity(), DiscoveryManager.nativeGetViatorUrl());
+      }
+    });
     mThingsToDo = (RecyclerView) view.findViewById(R.id.thingsToDo);
     mThingsToDo.setLayoutManager(new LinearLayoutManager(getContext(),
-                                                        LinearLayoutManager.HORIZONTAL,
-                                                        false));
+                                                         LinearLayoutManager.HORIZONTAL,
+                                                         false));
     mThingsToDo.addItemDecoration(
         ItemDecoratorFactory.createSponsoredGalleryDecorator(getContext(), LinearLayoutManager.HORIZONTAL));
-    return view;
   }
 
   @Override
@@ -87,7 +104,8 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
     if (mOnlineMode)
     {
       // TODO: set loading adapter for local experts here.
-      mThingsToDo.setAdapter(Factory.createViatorLoadingAdapter(null, null));
+      mThingsToDo.setAdapter(Factory.createViatorLoadingAdapter(DiscoveryManager.nativeGetViatorUrl(),
+                                                                LISTENER));
       return;
     }
 
@@ -101,7 +119,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
     else
     {
       UiUtils.show(getView(), R.id.thingsToDoLayout, R.id.thingsToDo);
-      mThingsToDo.setAdapter(Factory.createViatorOfflineAdapter(null));
+      mThingsToDo.setAdapter(Factory.createViatorOfflineAdapter(new ViatorOfflineSelectedListener()));
     }
   }
 
@@ -141,7 +159,8 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
   public void onViatorProductsReceived(@Nullable ViatorProduct[] products)
   {
     if (products != null)
-      mThingsToDo.setAdapter(Factory.createViatorAdapter(products, null, null));
+      mThingsToDo.setAdapter(Factory.createViatorAdapter(products, DiscoveryManager.nativeGetViatorUrl(),
+                                                         LISTENER));
   }
 
   @MainThread
@@ -157,11 +176,45 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements UICallb
     switch (type)
     {
       case VIATOR:
-        // TODO: pass cityUrl instead of null and non-null ItemSelectedListener.
-        mThingsToDo.setAdapter(Factory.createViatorErrorAdapter(null, null));
+        mThingsToDo.setAdapter(Factory.createViatorErrorAdapter(DiscoveryManager.nativeGetViatorUrl(),
+                                                                LISTENER));
         break;
 
       // TODO: processing for other adapters is coming soon.
     }
   }
+
+  private static class BaseItemSelectedListener implements GalleryAdapter.ItemSelectedListener
+  {
+
+    @Override
+    public void onItemSelected(@NonNull Context context, @NonNull String url)
+    {
+      Utils.openUrl(context, url);
+    }
+
+    @Override
+    public void onMoreItemSelected(@NonNull Context context, @NonNull String url)
+    {
+      Utils.openUrl(context, url);
+    }
+
+    @Override
+    public void onDetailsSelected(@NonNull Context context, @Nullable String url)
+    {
+      if (TextUtils.isEmpty(url))
+        return;
+
+      Utils.openUrl(context, url);
+    }
+  }
+
+  private static class ViatorOfflineSelectedListener extends BaseItemSelectedListener
+  {
+    @Override
+    public void onDetailsSelected(@NonNull Context context, @Nullable String url)
+    {
+      Utils.showWirelessSettings(context);
+    }
+  }
 }
diff --git a/android/src/com/mapswithme/maps/gallery/ErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/ErrorAdapterStrategy.java
index f227c17850..a49bc10108 100644
--- a/android/src/com/mapswithme/maps/gallery/ErrorAdapterStrategy.java
+++ b/android/src/com/mapswithme/maps/gallery/ErrorAdapterStrategy.java
@@ -2,12 +2,7 @@ package com.mapswithme.maps.gallery;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.mapswithme.maps.R;
 
 public abstract class ErrorAdapterStrategy extends SingleItemAdapterStrategy<Holders.ErrorViewHolder>
 {
@@ -16,14 +11,9 @@ public abstract class ErrorAdapterStrategy extends SingleItemAdapterStrategy<Hol
     super(url);
   }
 
-  @NonNull
   @Override
-  Holders.ErrorViewHolder createViewHolder(@NonNull ViewGroup parent, int viewType,
-                                           @NonNull GalleryAdapter adapter)
+  protected Holders.ErrorViewHolder createViewHolder(@NonNull View itemView, @NonNull GalleryAdapter adapter)
   {
-    View errorView = inflateView(LayoutInflater.from(parent.getContext()), parent);
-    TextView moreView = (TextView) errorView.findViewById(R.id.tv__more);
-    moreView.setText(getLabelForDetailsView());
-    return new Holders.ErrorViewHolder(errorView, mItems, adapter);
+    return new Holders.ErrorViewHolder(itemView, mItems, adapter);
   }
 }
diff --git a/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java b/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java
index 74fedc6747..77dec2672b 100644
--- a/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java
+++ b/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps.gallery;
 
+import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
@@ -51,7 +52,8 @@ public class GalleryAdapter<VH extends Holders.BaseViewHolder<I>, I extends Item
 
   public interface ItemSelectedListener
   {
-    void onItemSelected(@NonNull String url);
-    void onMoreItemSelected(@NonNull String url);
+    void onItemSelected(@NonNull Context context, @NonNull String url);
+    void onMoreItemSelected(@NonNull Context context, @NonNull String url);
+    void onDetailsSelected(@NonNull Context context, @Nullable String url);
   }
 }
diff --git a/android/src/com/mapswithme/maps/gallery/Holders.java b/android/src/com/mapswithme/maps/gallery/Holders.java
index 785b576eac..161c46a7fc 100644
--- a/android/src/com/mapswithme/maps/gallery/Holders.java
+++ b/android/src/com/mapswithme/maps/gallery/Holders.java
@@ -72,13 +72,13 @@ public class Holders
     }
 
     @Override
-    protected void onItemSelected(@NonNull ViatorItem item)
+    protected void onItemSelected(@NonNull Context context, @NonNull ViatorItem item)
     {
       GalleryAdapter.ItemSelectedListener listener = mAdapter.getListener();
       if (listener == null || TextUtils.isEmpty(item.getUrl()))
         return;
 
-      listener.onItemSelected(item.getUrl());
+      listener.onItemSelected(context, item.getUrl());
     }
   }
 
@@ -92,13 +92,13 @@ public class Holders
     }
 
     @Override
-    protected void onItemSelected(@NonNull Items.ViatorItem item)
+    protected void onItemSelected(@NonNull Context context, @NonNull Items.ViatorItem item)
     {
       GalleryAdapter.ItemSelectedListener listener = mAdapter.getListener();
       if (listener == null || TextUtils.isEmpty(item.getUrl()))
         return;
 
-      listener.onMoreItemSelected(item.getUrl());
+      listener.onMoreItemSelected(context, item.getUrl());
     }
   }
 
@@ -135,13 +135,13 @@ public class Holders
     }
 
     @Override
-    protected void onItemSelected(@NonNull T item)
+    protected void onItemSelected(@NonNull Context context, @NonNull T item)
     {
       GalleryAdapter.ItemSelectedListener listener = mAdapter.getListener();
       if (listener == null || TextUtils.isEmpty(item.getUrl()))
         return;
 
-      listener.onMoreItemSelected(item.getUrl());
+      listener.onMoreItemSelected(context, item.getUrl());
     }
   }
 
@@ -155,7 +155,7 @@ public class Holders
     @NonNull
     GalleryAdapter mAdapter;
 
-    protected BaseViewHolder(@NonNull View itemView, @NonNull List<I> items,
+    BaseViewHolder(@NonNull View itemView, @NonNull List<I> items,
                              @NonNull GalleryAdapter adapter)
     {
       super(itemView);
@@ -178,10 +178,10 @@ public class Holders
       if (position == RecyclerView.NO_POSITION || mItems.isEmpty())
         return;
 
-      onItemSelected(mItems.get(position));
+      onItemSelected(mTitle.getContext(), mItems.get(position));
     }
 
-    protected void onItemSelected(@NonNull I item)
+    protected void onItemSelected(@NonNull Context context, @NonNull I item)
     {
     }
   }
@@ -201,7 +201,7 @@ public class Holders
       super(itemView, items, adapter);
       mProgressBar = (ProgressBar) itemView.findViewById(R.id.pb__progress);
       mSubtitle = (TextView) itemView.findViewById(R.id.tv__subtitle);
-      mMore = (TextView) itemView.findViewById(R.id.tv__more);
+      mMore = (TextView) itemView.findViewById(R.id.button);
     }
 
     @CallSuper
@@ -219,20 +219,20 @@ public class Holders
       if (position == RecyclerView.NO_POSITION)
         return;
 
-      onItemSelected(mItems.get(position));
+      onItemSelected(mProgressBar.getContext(), mItems.get(position));
     }
 
     @Override
-    protected void onItemSelected(@NonNull Items.Item item)
+    protected void onItemSelected(@NonNull Context context, @NonNull Items.Item item)
     {
       if (mAdapter.getListener() == null || TextUtils.isEmpty(item.getUrl()))
         return;
 
-      mAdapter.getListener().onItemSelected(item.getUrl());
+      mAdapter.getListener().onDetailsSelected(context, item.getUrl());
     }
   }
 
-  public static class ErrorViewHolder extends LoadingViewHolder
+  static class ErrorViewHolder extends LoadingViewHolder
   {
 
     ErrorViewHolder(@NonNull View itemView, @NonNull List<Items.Item> items, @NonNull GalleryAdapter adapter)
@@ -260,12 +260,12 @@ public class Holders
     }
 
     @Override
-    protected void onItemSelected(@NonNull Items.Item item)
+    protected void onItemSelected(@NonNull Context context, @NonNull Items.Item item)
     {
       if (mAdapter.getListener() == null)
         return;
 
-      // TODO: coming soon.
+      mAdapter.getListener().onDetailsSelected(mTitle.getContext(), item.getUrl());
     }
   }
 }
diff --git a/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java
index 3d8bf96215..f25ab7afcb 100644
--- a/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java
+++ b/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java
@@ -2,12 +2,7 @@ package com.mapswithme.maps.gallery;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.mapswithme.maps.R;
 
 public abstract class LoadingAdapterStrategy
     extends SingleItemAdapterStrategy<Holders.LoadingViewHolder>
@@ -18,14 +13,9 @@ public abstract class LoadingAdapterStrategy
     super(url);
   }
 
-  @NonNull
   @Override
-  protected Holders.LoadingViewHolder createViewHolder(@NonNull ViewGroup parent, int viewType,
-                                                       @NonNull GalleryAdapter adapter)
+  protected Holders.LoadingViewHolder createViewHolder(@NonNull View itemView, @NonNull GalleryAdapter adapter)
   {
-    View loadingView = inflateView(LayoutInflater.from(parent.getContext()), parent);
-    TextView moreView = (TextView) loadingView.findViewById(R.id.tv__more);
-    moreView.setText(getLabelForDetailsView());
-    return new Holders.LoadingViewHolder(loadingView, mItems, adapter);
+    return new Holders.LoadingViewHolder(itemView, mItems, adapter);
   }
 }
diff --git a/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java
index c0ca0540cc..5f5b19b4bf 100644
--- a/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java
+++ b/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java
@@ -2,10 +2,7 @@ package com.mapswithme.maps.gallery;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 
 import com.mapswithme.maps.R;
 
@@ -16,14 +13,10 @@ public abstract class OfflineAdapterStrategy extends SingleItemAdapterStrategy<H
     super(url);
   }
 
-  @NonNull
   @Override
-  Holders.OfflineViewHolder createViewHolder(@NonNull ViewGroup parent, int viewType, @NonNull GalleryAdapter adapter)
+  protected Holders.OfflineViewHolder createViewHolder(@NonNull View itemView, @NonNull GalleryAdapter adapter)
   {
-    View offlineView = inflateView(LayoutInflater.from(parent.getContext()), parent);
-    TextView moreView = (TextView) offlineView.findViewById(R.id.tv__more);
-    moreView.setText(getLabelForDetailsView());
-    return new Holders.OfflineViewHolder(offlineView, mItems, adapter);
+    return new Holders.OfflineViewHolder(itemView, mItems, adapter);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java
index 10700122dd..e08eaee7b2 100644
--- a/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java
+++ b/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java
@@ -7,8 +7,10 @@ import android.support.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.mapswithme.maps.MwmApplication;
+import com.mapswithme.maps.R;
 
 abstract class SingleItemAdapterStrategy<T extends Holders.BaseViewHolder<Items.Item>>
     extends AdapterStrategy<T, Items.Item>
@@ -30,6 +32,19 @@ abstract class SingleItemAdapterStrategy<T extends Holders.BaseViewHolder<Items.
   protected abstract View inflateView(@NonNull LayoutInflater inflater,
                                       @NonNull ViewGroup parent);
 
+  @NonNull
+  @Override
+  protected T createViewHolder(@NonNull ViewGroup parent, int viewType,
+                                                       @NonNull GalleryAdapter adapter)
+  {
+    View itemView = inflateView(LayoutInflater.from(parent.getContext()), parent);
+    TextView button = (TextView) itemView.findViewById(R.id.button);
+    button.setText(getLabelForDetailsView());
+    return createViewHolder(itemView, adapter);
+  }
+
+  protected abstract T createViewHolder(@NonNull View itemView, @NonNull GalleryAdapter adapter);
+
   @StringRes
   protected abstract int getLabelForDetailsView();
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index edf883d899..7b3f92d1b9 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -923,23 +923,32 @@ public class PlacePageView extends RelativeLayout
   }
 
   @Override
-  public void onItemSelected(@NonNull String url)
+  public void onItemSelected(@NonNull Context context, @NonNull String url)
   {
-    Utils.openUrl(getContext(), url);
+    Utils.openUrl(context, url);
     if (mSponsored != null)
       Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.PP_SPONSOR_ITEM_SELECTED,
                                               mSponsored.getType());
   }
 
   @Override
-  public void onMoreItemSelected(@NonNull String url)
+  public void onMoreItemSelected(@NonNull Context context, @NonNull String url)
   {
-    Utils.openUrl(getContext(), url);
+    Utils.openUrl(context, url);
     if (mSponsored != null)
       Statistics.INSTANCE.trackSponsoredEvent(Statistics.EventName.PP_SPONSOR_MORE_SELECTED,
                                               mSponsored.getType());
   }
 
+  @Override
+  public void onDetailsSelected(@NonNull Context context, @Nullable String url)
+  {
+    if (TextUtils.isEmpty(url))
+      return;
+
+    Utils.openUrl(context, url);
+  }
+
   @Override
   public void onLineCountCalculated(boolean grater)
   {
diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java
index ddf4d4364c..808ec89730 100644
--- a/android/src/com/mapswithme/util/Utils.java
+++ b/android/src/com/mapswithme/util/Utils.java
@@ -11,6 +11,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
+import android.provider.Settings;
 import android.support.annotation.DimenRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -379,6 +380,18 @@ public class Utils
     }
   }
 
+  public static void showWirelessSettings(@NonNull Context context)
+  {
+    try
+    {
+      context.startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+    }
+    catch (ActivityNotFoundException e)
+    {
+      LOGGER.e(TAG, "Failed to open wireless settings", e);
+    }
+  }
+
   @Nullable
   public static String getCurrencyCode()
   {