From 059ba40b073f8c33540da861f3401c307d043869 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sun, 16 Oct 2022 08:47:48 +0300
Subject: [PATCH] [android] Removed unused resources

As API 21 is our minimum, there is no need to override it anymore

Co-authored-by: Roman Tsisyk <roman@tsisyk.com>
Signed-off-by: Alexander Borsuk <me@alex.bio>
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
---
 android/res/{color-v21 => color}/button.xml   |  0
 .../{color-v21 => color}/button_accent.xml    |  0
 .../button_accent_night.xml                   |  0
 .../res/{color-v21 => color}/button_night.xml |  0
 android/res/drawable-v21/button.xml           | 10 ----------
 android/res/drawable-v21/button_accent.xml    |  7 -------
 .../res/drawable-v21/button_accent_night.xml  |  7 -------
 .../res/drawable-v21/button_editor_light.xml  | 11 ----------
 android/res/drawable-v21/button_night.xml     | 10 ----------
 android/res/drawable-v21/button_red.xml       | 10 ----------
 .../drawable-v21/routing_toolbar_button.xml   | 13 ------------
 .../routing_toolbar_button_night.xml          | 13 ------------
 android/res/drawable/button.xml               | 18 ++++++++---------
 android/res/drawable/button_accent.xml        |  8 +++++---
 android/res/drawable/button_accent_night.xml  |  8 +++++---
 android/res/drawable/button_editor_light.xml  | 17 +++++-----------
 android/res/drawable/button_night.xml         | 18 ++++++++---------
 android/res/drawable/button_red.xml           | 18 ++++++++---------
 .../ripple_mask.xml                           |  0
 .../res/drawable/routing_toolbar_button.xml   | 20 +++++++++++--------
 .../drawable/routing_toolbar_button_night.xml | 20 +++++++++++--------
 android/res/layout/activity_splash.xml        |  1 -
 .../values-preference.xml                     |  0
 android/res/values-v21/donottranslate.xml     |  4 ----
 android/res/values/colors.xml                 |  4 ----
 android/res/values/donottranslate.xml         |  3 +--
 .../BaseRoutingErrorDialogFragment.java       |  5 +----
 .../src/com/mapswithme/util/HttpUploader.java | 11 +---------
 28 files changed, 69 insertions(+), 167 deletions(-)
 rename android/res/{color-v21 => color}/button.xml (100%)
 rename android/res/{color-v21 => color}/button_accent.xml (100%)
 rename android/res/{color-v21 => color}/button_accent_night.xml (100%)
 rename android/res/{color-v21 => color}/button_night.xml (100%)
 delete mode 100644 android/res/drawable-v21/button.xml
 delete mode 100644 android/res/drawable-v21/button_accent.xml
 delete mode 100644 android/res/drawable-v21/button_accent_night.xml
 delete mode 100644 android/res/drawable-v21/button_editor_light.xml
 delete mode 100644 android/res/drawable-v21/button_night.xml
 delete mode 100644 android/res/drawable-v21/button_red.xml
 delete mode 100644 android/res/drawable-v21/routing_toolbar_button.xml
 delete mode 100644 android/res/drawable-v21/routing_toolbar_button_night.xml
 rename android/res/{drawable-v21 => drawable}/ripple_mask.xml (100%)
 rename android/res/{values-sw360dp-v13 => values-sw360dp}/values-preference.xml (100%)
 delete mode 100644 android/res/values-v21/donottranslate.xml

diff --git a/android/res/color-v21/button.xml b/android/res/color/button.xml
similarity index 100%
rename from android/res/color-v21/button.xml
rename to android/res/color/button.xml
diff --git a/android/res/color-v21/button_accent.xml b/android/res/color/button_accent.xml
similarity index 100%
rename from android/res/color-v21/button_accent.xml
rename to android/res/color/button_accent.xml
diff --git a/android/res/color-v21/button_accent_night.xml b/android/res/color/button_accent_night.xml
similarity index 100%
rename from android/res/color-v21/button_accent_night.xml
rename to android/res/color/button_accent_night.xml
diff --git a/android/res/color-v21/button_night.xml b/android/res/color/button_night.xml
similarity index 100%
rename from android/res/color-v21/button_night.xml
rename to android/res/color/button_night.xml
diff --git a/android/res/drawable-v21/button.xml b/android/res/drawable-v21/button.xml
deleted file mode 100644
index e5c2d39a13..0000000000
--- a/android/res/drawable-v21/button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?attr/colorBtnHighlight">
-  <item android:id="@android:id/mask">
-    <shape android:shape="rectangle">
-      <solid android:color="@android:color/white"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
diff --git a/android/res/drawable-v21/button_accent.xml b/android/res/drawable-v21/button_accent.xml
deleted file mode 100644
index 102a72b2a8..0000000000
--- a/android/res/drawable-v21/button_accent.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="?attr/colorBtnHighlight">
-  <item android:drawable="@drawable/ripple_mask"/>
-  <item android:drawable="@drawable/button_accent_internal"/>
-</ripple>
diff --git a/android/res/drawable-v21/button_accent_night.xml b/android/res/drawable-v21/button_accent_night.xml
deleted file mode 100644
index 192a6af3ec..0000000000
--- a/android/res/drawable-v21/button_accent_night.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="?attr/colorBtnHighlight">
-  <item android:drawable="@drawable/ripple_mask"/>
-  <item android:drawable="@drawable/button_accent_night_internal"/>
-</ripple>
diff --git a/android/res/drawable-v21/button_editor_light.xml b/android/res/drawable-v21/button_editor_light.xml
deleted file mode 100644
index 3cea8a1a18..0000000000
--- a/android/res/drawable-v21/button_editor_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/bg_editor_light_pressed">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/bg_editor_light"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/button_night.xml b/android/res/drawable-v21/button_night.xml
deleted file mode 100644
index a4f3d16e0f..0000000000
--- a/android/res/drawable-v21/button_night.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/button_pressed_night">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/button_night"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/button_red.xml b/android/res/drawable-v21/button_red.xml
deleted file mode 100644
index f8132991f8..0000000000
--- a/android/res/drawable-v21/button_red.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/button_pressed">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/button_red"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/routing_toolbar_button.xml b/android/res/drawable-v21/routing_toolbar_button.xml
deleted file mode 100644
index d007dff933..0000000000
--- a/android/res/drawable-v21/routing_toolbar_button.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?attr/colorControlHighlight">
-  <item>
-    <selector>
-      <item
-        android:state_activated="true"
-        android:drawable="@drawable/routing_toolbar_button_active"/>
-      <item
-        android:drawable="@drawable/routing_toolbar_button_normal"/>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/res/drawable-v21/routing_toolbar_button_night.xml b/android/res/drawable-v21/routing_toolbar_button_night.xml
deleted file mode 100644
index 0be952a4b4..0000000000
--- a/android/res/drawable-v21/routing_toolbar_button_night.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?attr/colorControlHighlight">
-  <item>
-    <selector>
-      <item
-        android:state_activated="true"
-        android:drawable="@drawable/routing_toolbar_button_active"/>
-      <item
-        android:drawable="@drawable/routing_toolbar_button_normal_night"/>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/res/drawable/button.xml b/android/res/drawable/button.xml
index 3249c892ad..e5c2d39a13 100644
--- a/android/res/drawable/button.xml
+++ b/android/res/drawable/button.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_pressed"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/button_normal"
-        android:state_enabled="true"/>
-
-  <item android:drawable="@drawable/button_disabled"/>
-</selector>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?attr/colorBtnHighlight">
+  <item android:id="@android:id/mask">
+    <shape android:shape="rectangle">
+      <solid android:color="@android:color/white"/>
+      <corners android:radius="2dp"/>
+    </shape>
+  </item>
+</ripple>
diff --git a/android/res/drawable/button_accent.xml b/android/res/drawable/button_accent.xml
index 72ffa49022..102a72b2a8 100644
--- a/android/res/drawable/button_accent.xml
+++ b/android/res/drawable/button_accent.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorBtnHighlight">
+  <item android:drawable="@drawable/ripple_mask"/>
   <item android:drawable="@drawable/button_accent_internal"/>
-</layer-list>
+</ripple>
diff --git a/android/res/drawable/button_accent_night.xml b/android/res/drawable/button_accent_night.xml
index c2b770f0d5..192a6af3ec 100644
--- a/android/res/drawable/button_accent_night.xml
+++ b/android/res/drawable/button_accent_night.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorBtnHighlight">
+  <item android:drawable="@drawable/ripple_mask"/>
   <item android:drawable="@drawable/button_accent_night_internal"/>
-</layer-list>
+</ripple>
diff --git a/android/res/drawable/button_editor_light.xml b/android/res/drawable/button_editor_light.xml
index 3e104c6f8d..3cea8a1a18 100644
--- a/android/res/drawable/button_editor_light.xml
+++ b/android/res/drawable/button_editor_light.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_pressed="true">
-    <shape android:shape="rectangle">
-      <solid android:color="@color/bg_editor_light_pressed"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="@color/bg_editor_light_pressed">
   <item>
-    <shape
-      android:shape="rectangle">
+    <shape android:shape="rectangle">
       <solid android:color="@color/bg_editor_light"/>
       <corners android:radius="2dp"/>
     </shape>
   </item>
-</selector>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/android/res/drawable/button_night.xml b/android/res/drawable/button_night.xml
index 0d04298f79..a4f3d16e0f 100644
--- a/android/res/drawable/button_night.xml
+++ b/android/res/drawable/button_night.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_pressed_night"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/button_normal_night"
-        android:state_enabled="true"/>
-
-  <item android:drawable="@drawable/button_disabled_night"/>
-</selector>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/button_pressed_night">
+  <item>
+    <shape android:shape="rectangle">
+      <solid android:color="@color/button_night"/>
+      <corners android:radius="2dp"/>
+    </shape>
+  </item>
+</ripple>
\ No newline at end of file
diff --git a/android/res/drawable/button_red.xml b/android/res/drawable/button_red.xml
index 9b81d5bc3d..f8132991f8 100644
--- a/android/res/drawable/button_red.xml
+++ b/android/res/drawable/button_red.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_red_pressed"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/button_red_normal"
-        android:state_enabled="true"/>
-
-  <item android:drawable="@drawable/button_red_disabled"/>
-</selector>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/button_pressed">
+  <item>
+    <shape android:shape="rectangle">
+      <solid android:color="@color/button_red"/>
+      <corners android:radius="2dp"/>
+    </shape>
+  </item>
+</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/ripple_mask.xml b/android/res/drawable/ripple_mask.xml
similarity index 100%
rename from android/res/drawable-v21/ripple_mask.xml
rename to android/res/drawable/ripple_mask.xml
diff --git a/android/res/drawable/routing_toolbar_button.xml b/android/res/drawable/routing_toolbar_button.xml
index fcc598f54c..d007dff933 100644
--- a/android/res/drawable/routing_toolbar_button.xml
+++ b/android/res/drawable/routing_toolbar_button.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_activated="true"
-    android:drawable="@drawable/routing_toolbar_button_active"/>
-  <item
-    android:drawable="@drawable/routing_toolbar_button_normal"/>
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?attr/colorControlHighlight">
+  <item>
+    <selector>
+      <item
+        android:state_activated="true"
+        android:drawable="@drawable/routing_toolbar_button_active"/>
+      <item
+        android:drawable="@drawable/routing_toolbar_button_normal"/>
+    </selector>
+  </item>
+</ripple>
diff --git a/android/res/drawable/routing_toolbar_button_night.xml b/android/res/drawable/routing_toolbar_button_night.xml
index 9a25142f67..0be952a4b4 100644
--- a/android/res/drawable/routing_toolbar_button_night.xml
+++ b/android/res/drawable/routing_toolbar_button_night.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_activated="true"
-    android:drawable="@drawable/routing_toolbar_button_active"/>
-  <item
-    android:drawable="@drawable/routing_toolbar_button_normal_night"/>
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?attr/colorControlHighlight">
+  <item>
+    <selector>
+      <item
+        android:state_activated="true"
+        android:drawable="@drawable/routing_toolbar_button_active"/>
+      <item
+        android:drawable="@drawable/routing_toolbar_button_normal_night"/>
+    </selector>
+  </item>
+</ripple>
diff --git a/android/res/layout/activity_splash.xml b/android/res/layout/activity_splash.xml
index 7d0a1b691b..7eec1e8b13 100644
--- a/android/res/layout/activity_splash.xml
+++ b/android/res/layout/activity_splash.xml
@@ -20,7 +20,6 @@
       android:orientation="vertical"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_alignParentBottom="true"
       android:paddingBottom="@dimen/margin_double">
 
     <TextView
diff --git a/android/res/values-sw360dp-v13/values-preference.xml b/android/res/values-sw360dp/values-preference.xml
similarity index 100%
rename from android/res/values-sw360dp-v13/values-preference.xml
rename to android/res/values-sw360dp/values-preference.xml
diff --git a/android/res/values-v21/donottranslate.xml b/android/res/values-v21/donottranslate.xml
deleted file mode 100644
index bdbf441b70..0000000000
--- a/android/res/values-v21/donottranslate.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="robotoMedium" translatable="false">sans-serif-medium</string>
-</resources>
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 362212dee8..a98809f005 100644
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -85,8 +85,6 @@
   <color name="bg_statusbar_night">#121417</color>
 
   <!-- Buttons -->
-  <color name="button">@color/button_normal</color>
-  <color name="button_night">@color/button_normal_night</color>
   <color name="button_normal">#00000000</color>
   <color name="button_normal_night">#00000000</color>
   <color name="button_pressed">#66999999</color>
@@ -98,8 +96,6 @@
   <color name="button_text_disabled">#42000000</color>
   <color name="button_text_disabled_night">#4CFFFFFF</color>
 
-  <color name="button_accent">@color/button_accent_normal</color>
-  <color name="button_accent_night">@color/button_accent_normal_night</color>
   <color name="button_accent_normal">@color/base_accent</color>
   <color name="button_accent_normal_night">@color/base_accent_night</color>
   <color name="button_accent_pressed">#FF1C85D6</color>
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index a858a14bc7..4e69c609be 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -3,8 +3,7 @@
   <!-- Font names -->
   <string name="robotoLight" translatable="false">sans-serif-light</string>
   <string name="robotoRegular" translatable="false">sans-serif</string>
-  <!--  roboto medium (android 5.0)-->
-  <string name="robotoMedium" translatable="false">sans-serif</string>
+  <string name="robotoMedium" translatable="false">sans-serif-medium</string>
 
   <!--  Prefs -->
   <string name="pref_munits" translatable="false">MeasurementUnits</string>
diff --git a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java
index 10b02e2f21..46b0fc28f5 100644
--- a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java
@@ -141,10 +141,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
         final int width = listView.getWidth();
         final int indicatorWidth = UiUtils.dimen(requireContext(), R.dimen.margin_quadruple);
         listView.setIndicatorBounds(width - indicatorWidth, width);
-        if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
-          listView.setIndicatorBounds(width - indicatorWidth, width);
-        else
-          listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
+        listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
       }
     });
 
diff --git a/android/src/com/mapswithme/util/HttpUploader.java b/android/src/com/mapswithme/util/HttpUploader.java
index 0014dbea7d..23618c6d5a 100644
--- a/android/src/com/mapswithme/util/HttpUploader.java
+++ b/android/src/com/mapswithme/util/HttpUploader.java
@@ -120,16 +120,7 @@ public final class HttpUploader extends AbstractHttpUploader
 
   private static void setStreamingMode(@NonNull HttpURLConnection connection, long bodyLength)
   {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-    {
-      connection.setFixedLengthStreamingMode(bodyLength);
-      return;
-    }
-
-    if (bodyLength <= Integer.MAX_VALUE)
-      connection.setFixedLengthStreamingMode((int) bodyLength);
-    else
-      connection.setChunkedStreamingMode(BUFFER);
+    connection.setFixedLengthStreamingMode(bodyLength);
   }
 
   @NonNull