From e0cb2b42a64fb617fc6635c752c78a672fc77286 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <arnaud.vergnet@mailo.com>
Date: Sun, 13 Mar 2022 11:21:42 +0100
Subject: [PATCH] [android] Remove com.cocosw.bottomsheet dependency

Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
---
 android/build.gradle                          |   3 +-
 android/res/anim/slide_in_up.xml              |   8 +
 android/res/anim/slide_out_down.xml           |   8 +
 android/res/drawable-hdpi/ic_more.webp        | Bin 86 -> 0 bytes
 android/res/drawable-mdpi/ic_more.webp        | Bin 70 -> 0 bytes
 android/res/drawable-xhdpi/ic_more.webp       | Bin 98 -> 0 bytes
 android/res/drawable-xxhdpi/ic_more.webp      | Bin 122 -> 0 bytes
 android/res/drawable/ic_more.xml              |   5 +
 android/res/values/styles.xml                 |   8 +-
 android/res/values/themes.xml                 |  11 --
 .../widget/placepage/PlacePageButtons.java    |   2 +-
 .../mapswithme/util/BottomSheetHelper.java    | 146 ------------------
 .../bottomsheet/MenuBottomSheetFragment.java  |   1 +
 13 files changed, 28 insertions(+), 164 deletions(-)
 create mode 100644 android/res/anim/slide_in_up.xml
 create mode 100644 android/res/anim/slide_out_down.xml
 delete mode 100644 android/res/drawable-hdpi/ic_more.webp
 delete mode 100644 android/res/drawable-mdpi/ic_more.webp
 delete mode 100644 android/res/drawable-xhdpi/ic_more.webp
 delete mode 100644 android/res/drawable-xxhdpi/ic_more.webp
 create mode 100644 android/res/drawable/ic_more.xml
 delete mode 100644 android/src/com/mapswithme/util/BottomSheetHelper.java

diff --git a/android/build.gradle b/android/build.gradle
index 103961f163..56f58fe23b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -83,8 +83,7 @@ dependencies {
 
   // 3-party
   implementation 'com.google.code.gson:gson:2.9.0'
-  // BottomSheet
-  implementation 'com.cocosw:bottomsheet:1.5.0@aar'
+  // Sticky recycler view headers
   implementation 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
   // Glide
   implementation 'com.github.bumptech.glide:glide:4.13.0'
diff --git a/android/res/anim/slide_in_up.xml b/android/res/anim/slide_in_up.xml
new file mode 100644
index 0000000000..1dfd319e43
--- /dev/null
+++ b/android/res/anim/slide_in_up.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate
+    android:duration="@android:integer/config_mediumAnimTime"
+    android:fromYDelta="100%"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toYDelta="0" />
+</set>
\ No newline at end of file
diff --git a/android/res/anim/slide_out_down.xml b/android/res/anim/slide_out_down.xml
new file mode 100644
index 0000000000..c53d0ff585
--- /dev/null
+++ b/android/res/anim/slide_out_down.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate
+    android:duration="@android:integer/config_mediumAnimTime"
+    android:fromYDelta="0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toYDelta="100%" />
+</set>
\ No newline at end of file
diff --git a/android/res/drawable-hdpi/ic_more.webp b/android/res/drawable-hdpi/ic_more.webp
deleted file mode 100644
index 241a15685f16da6e28fe8962d49cae13d68ed087..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmWIYbaV4#U|<M$bqWXzu<&sLvh`UHunOoK{QqqKzw4Gq<F_aMj(;9lHSo(FNnEHf
qX=)c=iUPw5UIWH`|6>1SH+B5u=ID~y;5?Uk>B2I`!1So!dsqN4?IEuK

diff --git a/android/res/drawable-mdpi/ic_more.webp b/android/res/drawable-mdpi/ic_more.webp
deleted file mode 100644
index 4cd2fca6c1d6d1b3c036e86d54ef6ebf3a8edc1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 70
zcmWIYbaS&~U|<M$bqWXzu<$Vgvh|q{Fbk*~{QqqKpXH|6?Bgwc6}K7W`2;&y6mm8k
aWR(6R?`ovD=)Y4F%Vzg8D}2`EGXntbrWh>%

diff --git a/android/res/drawable-xhdpi/ic_more.webp b/android/res/drawable-xhdpi/ic_more.webp
deleted file mode 100644
index 2f5644c0628ad1427337da2beb4bda1e1728adca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmV-o0G<C*Nk&Fm00012MM6+kP&iCY0000l2fzmqH!%P6KmTe15MYd33_-LLJAfC*
zU=RVTNU|D%gJgl?9}@^bLK^=b$lM8t=)c;wZ5VrMDR-#kWB{ANH;5fw^h#eOw*23p
E03kUg6#xJL

diff --git a/android/res/drawable-xxhdpi/ic_more.webp b/android/res/drawable-xxhdpi/ic_more.webp
deleted file mode 100644
index 2c037837eba419165766ad55295273a01cbbb57e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122
zcmV-=0EPcjNk&F;00012MM6+kP&iCx0000l3&0ByPcZ-UKmTeY*`U+!gGi_Z4ao)Y
z!r<^A3Japaw6?Z3|6zruSpmreWeg-E;7QXx>*oJdnvUqd+O};Nd2)K*AlHH<yPand
c`MhLi#;;5|m<gz8umlI;wdA@e=^p*_k0io4$p8QV

diff --git a/android/res/drawable/ic_more.xml b/android/res/drawable/ic_more.xml
new file mode 100644
index 0000000000..6a7f27486b
--- /dev/null
+++ b/android/res/drawable/ic_more.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index e0b185fbd0..3e996e699a 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -9,12 +9,12 @@
 
   <style name="MwmWidget.Downloader"/>
 
-  <style name="BottomSheet.Icon">
-    <item name="android:layout_width">0dp</item>
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_marginStart">0dp</item>
+  <style name="BottomSheetAnimation">
+    <item name="android:windowEnterAnimation">@anim/slide_in_up</item>
+    <item name="android:windowExitAnimation">@anim/slide_out_down</item>
   </style>
 
+
   <style name="MwmWidget.MapButton" parent="android:Widget.ImageButton">
     <item name="android:scaleType">center</item>
     <item name="android:layout_height">64dp</item>
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 579890c33f..482183fabf 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -142,17 +142,6 @@
     <item name="android:background">@color/bg_cards_night</item>
   </style>
 
-  <style name="BottomSheet.Dialog.Dark">
-    <item name="android:textColorPrimary">@color/text_light</item>
-    <item name="android:textColorSecondary">@color/text_light</item>
-    <item name="android:textColorHint">@color/text_light_subtitle</item>
-    <item name="bs_dialogBackground">?panel</item>
-    <item name="bs_dividerColor">@color/bs_dark_divider_color</item>
-    <item name="bs_listStyle">@style/BottomSheet.List.Dark</item>
-    <item name="bs_closeDrawable">@drawable/bs_ic_clear</item>
-    <item name="bs_moreDrawable">@drawable/bs_ic_more</item>
-  </style>
-
   <style name="MwmTheme.Editor"/>
 
   <style name="MwmTheme.Downloader">
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
index 21200e9eab..b350e72155 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
@@ -181,7 +181,7 @@ public final class PlacePageButtons
     // Must not be used outside
     MORE(
         R.string.placepage_more_button,
-        new ImageResources(R.drawable.bs_ic_more),
+        new ImageResources(R.drawable.ic_more),
         ButtonType.MORE),
 
     CALL(
diff --git a/android/src/com/mapswithme/util/BottomSheetHelper.java b/android/src/com/mapswithme/util/BottomSheetHelper.java
deleted file mode 100644
index 63b90f161e..0000000000
--- a/android/src/com/mapswithme/util/BottomSheetHelper.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.mapswithme.util;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.graphics.drawable.Drawable;
-import android.view.MenuItem;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.IdRes;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-
-import com.cocosw.bottomsheet.BottomSheet;
-
-public final class BottomSheetHelper
-{
-  public static class Builder extends BottomSheet.Builder
-  {
-    public Builder(@NonNull Activity context)
-    {
-      super(context);
-      setOnDismissListener(null);
-      if (ThemeUtils.isNightTheme(context))
-        darkTheme();
-    }
-
-    @Override
-    public BottomSheet build()
-    {
-      BottomSheet res = super.build();
-      return res;
-    }
-
-    @SuppressWarnings("NullableProblems")
-    @Override
-    public Builder setOnDismissListener(final DialogInterface.OnDismissListener listener)
-    {
-      super.setOnDismissListener(new DialogInterface.OnDismissListener()
-      {
-        @Override
-        public void onDismiss(DialogInterface dialog)
-        {
-          if (listener != null)
-            listener.onDismiss(dialog);
-        }
-      });
-
-      return this;
-    }
-
-    @Override
-    public Builder title(CharSequence title)
-    {
-      super.title(title);
-      return this;
-    }
-
-    @Override
-    public Builder title(@StringRes int title)
-    {
-      super.title(title);
-      return this;
-    }
-
-    @Override
-    public Builder sheet(@MenuRes int xmlRes)
-    {
-      super.sheet(xmlRes);
-      return this;
-    }
-
-    @Override
-    public Builder sheet(int id, @NonNull Drawable icon, @NonNull CharSequence text)
-    {
-      super.sheet(id, icon, text);
-      return this;
-    }
-
-    @Override
-    public Builder sheet(int id, @DrawableRes int iconRes, @StringRes int textRes)
-    {
-      super.sheet(id, iconRes, textRes);
-      return this;
-    }
-
-    @Override
-    public Builder grid()
-    {
-      super.grid();
-      return this;
-    }
-
-    @Override
-    public Builder listener(@NonNull MenuItem.OnMenuItemClickListener listener)
-    {
-      super.listener(listener);
-      return this;
-    }
-  }
-
-  public static void tint(@NonNull BottomSheet bottomSheet)
-  {
-    for (int i = 0; i < bottomSheet.getMenu().size(); i++)
-    {
-      MenuItem mi = bottomSheet.getMenu().getItem(i);
-      Drawable icon = mi.getIcon();
-      if (icon != null)
-        mi.setIcon(Graphics.tint(bottomSheet.getContext(), icon));
-    }
-  }
-
-  @NonNull
-  public static MenuItem findItemById(@NonNull BottomSheet bottomSheet, @IdRes int id)
-  {
-    MenuItem item = bottomSheet.getMenu().findItem(id);
-
-    if (item == null)
-      throw new AssertionError("Can not find bottom sheet item with id: " + id);
-
-    return item;
-  }
-
-  private BottomSheetHelper()
-  {}
-
-  public static Builder create(Activity context)
-  {
-    return new Builder(context);
-  }
-
-  public static Builder create(Activity context, @StringRes int title)
-  {
-    return create(context).title(title);
-  }
-
-  public static Builder create(Activity context, CharSequence title)
-  {
-    return create(context).title(title);
-  }
-
-  public static Builder createGrid(Activity context, @StringRes int title)
-  {
-    return create(context, title).grid();
-  }
-}
diff --git a/android/src/com/mapswithme/util/bottomsheet/MenuBottomSheetFragment.java b/android/src/com/mapswithme/util/bottomsheet/MenuBottomSheetFragment.java
index 602fa85bbb..77b93b0884 100644
--- a/android/src/com/mapswithme/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/src/com/mapswithme/util/bottomsheet/MenuBottomSheetFragment.java
@@ -75,5 +75,6 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
     MenuAdapter menuAdapter = new MenuAdapter(menuBottomSheetItems, this::dismiss);
     recyclerView.setAdapter(menuAdapter);
     recyclerView.setLayoutManager(new LinearLayoutManager(requireActivity()));
+    requireDialog().getWindow().getAttributes().windowAnimations = R.style.BottomSheetAnimation;
   }
 }