From 8bd9f17e203960939c790d9bbfc22350002e41ff Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Tue, 15 Dec 2020 12:23:27 +0400
Subject: [PATCH] Changed RGB wheel to HSL

---
 .../ui/dialogs/ManagerAccentColorDialog.kt    |  4 ++++
 .../res/drawable/ic_baseline_close_24.xml     | 10 ++++++++++
 .../layout/dialog_manager_accent_color.xml    | 20 +++++++++++++++++--
 app/src/main/res/layout/view_app_checkbox.xml |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_close_24.xml

diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
index a205b491..a7ba16d4 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
@@ -83,6 +83,10 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
 
                 })
             }
+            accentCancel.setOnClickListener {
+                mutableAccentColor.value = accent
+                dismiss()
+            }
             accentSave.setOnClickListener {
                 try {
                     val colorFromEditText = Color.parseColor(hexEdittext.text.toString())
diff --git a/app/src/main/res/drawable/ic_baseline_close_24.xml b/app/src/main/res/drawable/ic_baseline_close_24.xml
new file mode 100644
index 00000000..16d6d37d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_close_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_manager_accent_color.xml b/app/src/main/res/layout/dialog_manager_accent_color.xml
index 84624c13..2686185e 100644
--- a/app/src/main/res/layout/dialog_manager_accent_color.xml
+++ b/app/src/main/res/layout/dialog_manager_accent_color.xml
@@ -1,21 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:contentPaddingLeft="0dp"
+    app:contentPaddingRight="0dp"
     style="@style/BottomDialogCard">
 
+    <ImageButton
+        android:id="@+id/accent_cancel"
+        android:layout_width="48dp"
+        android:layout_height="36dp"
+        android:src="@drawable/ic_baseline_close_24"
+        android:layout_marginTop="4dp"
+        android:layout_gravity="end"
+        android:background="@android:color/transparent"
+        android:tint="?colorSettingsTitle"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingHorizontal="8dp"
         android:orientation="vertical">
 
         <TextView
             android:text="@string/accent_color"
             style="@style/BottomDialogCardTitle" />
 
-        <com.madrapps.pikolo.RGBColorPicker
+        <com.madrapps.pikolo.HSLColorPicker
             android:id="@+id/accent_picker"
             android:layout_width="match_parent"
-            android:layout_height="350dp" />
+            android:layout_height="350dp"
+            app:lightness_radius_offset="40dp"
+            app:saturation_radius_offset="40dp"/>
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/hex_edittext"
diff --git a/app/src/main/res/layout/view_app_checkbox.xml b/app/src/main/res/layout/view_app_checkbox.xml
index 5f2111bb..f12a9453 100644
--- a/app/src/main/res/layout/view_app_checkbox.xml
+++ b/app/src/main/res/layout/view_app_checkbox.xml
@@ -38,7 +38,7 @@
         app:layout_constraintTop_toBottomOf="@id/app_checkbox_text"
         tools:text="YouTube Vanced is the stock Android YouTube App, but better!" />
 
-    <com.google.android.material.checkbox.MaterialCheckBox
+    <com.vanced.manager.ui.core.ThemedMaterialCheckbox
         android:id="@+id/app_checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"