From 6af2edb690cac9ba1a54356fa5030c9365dc0db5 Mon Sep 17 00:00:00 2001
From: Quentin Hibon <qh.public@yahoo.com>
Date: Thu, 1 Apr 2021 13:12:37 +0200
Subject: [PATCH] Delete v21 resources (#864)

---
 .../main/res/drawable/selected_box_amoled.xml | 24 --------------
 .../main/res/drawable/selected_box_dark.xml   | 24 --------------
 .../main/res/drawable/selected_box_light.xml  | 24 --------------
 .../src/main/res/values-v21/styles.xml        | 32 -------------------
 .../src/main/res/values/styles.xml            |  9 ++++--
 5 files changed, 6 insertions(+), 107 deletions(-)
 delete mode 100644 uhabits-android/src/main/res/drawable/selected_box_amoled.xml
 delete mode 100644 uhabits-android/src/main/res/drawable/selected_box_dark.xml
 delete mode 100644 uhabits-android/src/main/res/drawable/selected_box_light.xml
 delete mode 100644 uhabits-android/src/main/res/values-v21/styles.xml

diff --git a/uhabits-android/src/main/res/drawable/selected_box_amoled.xml b/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
deleted file mode 100644
index fc5db70f2..000000000
--- a/uhabits-android/src/main/res/drawable/selected_box_amoled.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/black" />
-    <stroke android:width="2dip" android:color="@color/grey_500"/>
-</shape>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/drawable/selected_box_dark.xml b/uhabits-android/src/main/res/drawable/selected_box_dark.xml
deleted file mode 100644
index 4a5fd64ed..000000000
--- a/uhabits-android/src/main/res/drawable/selected_box_dark.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/grey_800" />
-    <stroke android:width="2dip" android:color="@color/grey_500"/>
-</shape>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/drawable/selected_box_light.xml b/uhabits-android/src/main/res/drawable/selected_box_light.xml
deleted file mode 100644
index bc31f2146..000000000
--- a/uhabits-android/src/main/res/drawable/selected_box_light.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/grey_100" />
-    <stroke android:width="2dip" android:color="@color/grey_500"/>
-</shape>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values-v21/styles.xml b/uhabits-android/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 1c3c72a1a..000000000
--- a/uhabits-android/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<resources>
-    <style name="Card" parent="CardCommon">
-        <item name="android:elevation">1dp</item>
-        <item name="android:background">?attr/cardBgColor</item>
-    </style>
-
-    <style name="About.Item.Clickable" parent="About.Item">
-        <item name="android:paddingBottom">12dp</item>
-        <item name="android:paddingTop">12dp</item>
-        <item name="android:background">@drawable/ripple_transparent</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index 7ddc7bc20..7e029b5dd 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -52,7 +52,7 @@
         <item name="palette">@array/lightPalette</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="scrollableRecyclerViewStyle">@style/ScrollableRecyclerViewStyle</item>
-        <item name="selectedBackground">@drawable/selected_box_light</item>
+        <item name="selectedBackground">@drawable/selected_box</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="useHabitColorAsPrimary">true</item>
         <item name="widgetBackgroundAlpha">1</item>
@@ -93,7 +93,7 @@
         <item name="popupMenuBackground">@color/black</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="scrollableRecyclerViewStyle">@style/ScrollableRecyclerViewStyle</item>
-        <item name="selectedBackground">@drawable/selected_box_dark</item>
+        <item name="selectedBackground">@drawable/selected_box</item>
         <item name="textColorAlertDialogListItem">@color/grey_100</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
         <item name="useHabitColorAsPrimary">false</item>
@@ -120,7 +120,7 @@
         <item name="contrast60">@color/grey_700</item>
         <item name="contrast80">@color/grey_700</item>
         <item name="contrast100">@color/grey_200</item>
-        <item name="selectedBackground">@drawable/selected_box_amoled</item>
+        <item name="selectedBackground">@drawable/selected_box</item>
         <item name="textColorAlertDialogListItem">@color/grey_100</item>
         <item name="windowBackgroundColor">@color/black</item>
     </style>
@@ -168,6 +168,8 @@
 
     <style name="Card" parent="CardCommon">
         <item name="android:layout_marginBottom">1dp</item>
+        <item name="android:elevation">1dp</item>
+        <item name="android:background">?attr/cardBgColor</item>
     </style>
 
     <style name="CardHeader">
@@ -190,6 +192,7 @@
     <style name="About.Item.Clickable">
         <item name="android:paddingBottom">12dp</item>
         <item name="android:paddingTop">12dp</item>
+        <item name="android:background">@drawable/ripple_transparent</item>
     </style>
 
     <style name="Toolbar">