From 5e8152d7b00b627d55b622181a95d462e26b66c5 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Wed, 17 Jul 2019 07:58:13 +0300
Subject: [PATCH] [android] Removed clicks on Progress view

---
 .../layout/catalog_promo_placeholder_card.xml | 89 ++++++++++---------
 .../com/mapswithme/maps/gallery/Holders.java  |  1 +
 .../mapswithme/maps/gallery/impl/Factory.java |  4 +-
 3 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/android/res/layout/catalog_promo_placeholder_card.xml b/android/res/layout/catalog_promo_placeholder_card.xml
index bcd968bec8..5f46bb15c6 100644
--- a/android/res/layout/catalog_promo_placeholder_card.xml
+++ b/android/res/layout/catalog_promo_placeholder_card.xml
@@ -11,49 +11,56 @@
     android:layout_height="wrap_content"
     android:minHeight="@dimen/discovery_expert_item_min_height">
     <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:minHeight="@dimen/discovery_search_item_min_height"
-      android:background="?attr/clickableBackground"
       android:orientation="vertical"
-      android:gravity="center_horizontal">
-      <ProgressBar
-        android:id="@+id/progress"
-        android:layout_width="@dimen/margin_base_plus"
-        android:layout_height="@dimen/margin_base_plus"
-        android:layout_marginTop="@dimen/margin_base_plus"/>
-      <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_half_plus"
-        android:layout_marginLeft="@dimen/margin_half_plus"
-        android:layout_marginRight="@dimen/margin_half_plus"
-        style="@style/MwmWidget.Discovery.Item.Title"
-        android:maxLines="1"
-        android:minLines="1"
-        android:textAppearance="@style/MwmTextAppearance.Discovery.Item.Title"
-        tools:text="Irina Severintseva"/>
-      <TextView
-        android:id="@+id/subtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_eighth"
-        android:layout_marginLeft="@dimen/margin_half_plus"
-        android:layout_marginRight="@dimen/margin_half_plus"
-        style="@style/MwmWidget.Discovery.Item.Subtitle"
-        android:ellipsize="middle"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:text="★ ★ ★ ★ ★"/>
-    </LinearLayout>
-    <TextView
-      android:id="@+id/button"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:textAppearance="@style/MwmTextAppearance.Discovery.Item.Button"
-      style="@style/MwmWidget.Discovery.Item.Button"
-      android:layout_gravity="bottom"
-      android:lines="1"
-      android:text="@string/details"/>
+      android:minHeight="@dimen/discovery_expert_item_min_height">
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:minHeight="@dimen/discovery_search_item_min_height"
+        android:background="?attr/clickableBackground"
+        android:orientation="vertical"
+        android:gravity="center_horizontal">
+        <ProgressBar
+          android:id="@+id/progress"
+          android:layout_width="@dimen/margin_base_plus"
+          android:layout_height="@dimen/margin_base_plus"
+          android:layout_marginTop="@dimen/margin_base_plus"/>
+        <TextView
+          android:id="@+id/title"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_half_plus"
+          android:layout_marginLeft="@dimen/margin_half_plus"
+          android:layout_marginRight="@dimen/margin_half_plus"
+          style="@style/MwmWidget.Discovery.Item.Title"
+          android:maxLines="1"
+          android:minLines="1"
+          android:textAppearance="@style/MwmTextAppearance.Discovery.Item.Title"
+          tools:text="Irina Severintseva"/>
+        <TextView
+          android:id="@+id/subtitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_eighth"
+          android:layout_marginLeft="@dimen/margin_half_plus"
+          android:layout_marginRight="@dimen/margin_half_plus"
+          style="@style/MwmWidget.Discovery.Item.Subtitle"
+          android:ellipsize="middle"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:text="★ ★ ★ ★ ★"/>
+      </LinearLayout>
+      <TextView
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/MwmTextAppearance.Discovery.Item.Button"
+        style="@style/MwmWidget.Discovery.Item.Button"
+        android:layout_gravity="bottom"
+        android:lines="1"
+        android:text="@string/details"/>
+    </LinearLayout>
   </android.support.v7.widget.CardView>
 </FrameLayout>
diff --git a/android/src/com/mapswithme/maps/gallery/Holders.java b/android/src/com/mapswithme/maps/gallery/Holders.java
index da4cd55094..5a709498f5 100644
--- a/android/src/com/mapswithme/maps/gallery/Holders.java
+++ b/android/src/com/mapswithme/maps/gallery/Holders.java
@@ -506,6 +506,7 @@ public class Holders
       super.bind(item);
       getTitle().setText(R.string.gallery_pp_download_guides_offline_title);
       mSubTitle.setText(R.string.gallery_pp_download_guides_offline_subtitle);
+      UiUtils.hide(getButton());
     }
   }
 
diff --git a/android/src/com/mapswithme/maps/gallery/impl/Factory.java b/android/src/com/mapswithme/maps/gallery/impl/Factory.java
index c65f9ea998..d5c1566f80 100644
--- a/android/src/com/mapswithme/maps/gallery/impl/Factory.java
+++ b/android/src/com/mapswithme/maps/gallery/impl/Factory.java
@@ -110,9 +110,7 @@ public class Factory
   @NonNull
   public static GalleryAdapter createCatalogPromoLoadingAdapter(@NonNull ItemSelectedListener<Items.Item> listener)
   {
-    NetworkPolicy policy = NetworkPolicy.newInstance(NetworkPolicy.getCurrentNetworkUsageStatus());
-    CatalogPromoLoadingAdapterStrategy strategy =
-        new CatalogPromoLoadingAdapterStrategy(listener, Promo.nativeGetCityUrl(policy));
+    CatalogPromoLoadingAdapterStrategy strategy = new CatalogPromoLoadingAdapterStrategy(null, null);
     return new GalleryAdapter<>(strategy);
   }