From e0fc98e3aaccbea2ab87e9698adbc13b8d92968b Mon Sep 17 00:00:00 2001
From: razeeman <freeraz@mail.ru>
Date: Sat, 18 Dec 2021 19:39:19 +0300
Subject: [PATCH] add color selection hints

---
 core/src/main/res/values-de/strings.xml       |  4 ++
 core/src/main/res/values-in/strings.xml       |  4 ++
 core/src/main/res/values-it/strings.xml       |  4 ++
 core/src/main/res/values-ru/strings.xml       |  4 ++
 core/src/main/res/values-sv/strings.xml       |  4 ++
 core/src/main/res/values-uk/strings.xml       |  4 ++
 core/src/main/res/values-zh/strings.xml       |  4 ++
 core/src/main/res/values/strings.xml          |  4 ++
 .../color_selection_dialog_fragment.xml       | 44 ++++++++++++++++---
 9 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index 62f26f44..5f1317a3 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Speichern</string>
     <string name="duration_dialog_disable">Deaktivieren</string>
 
+    <string name="color_selection_base_color_hint">Grundfarbe auswählen</string>
+    <string name="color_selection_adjust_color_hint">Farbe anpassen</string>
+    <string name="color_selection_final_color_hint">Endgültige Farbe</string>
+
     <string name="csv_export_settings_range">Bereich</string>
     <string name="csv_export_settings_all">Alles</string>
     <string name="csv_export_settings_hint">Zeitbereich auswählen oder alle Datensätze exportieren</string>
diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml
index ceaf3c48..2e9f5d88 100644
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Simpan</string>
     <string name="duration_dialog_disable">Nonaktifkan</string>
 
+    <string name="color_selection_base_color_hint">Pilih warna dasar</string>
+    <string name="color_selection_adjust_color_hint">Sesuaikan warna</string>
+    <string name="color_selection_final_color_hint">Warna akhir</string>
+
     <string name="csv_export_settings_range">Rentang</string>
     <string name="csv_export_settings_all">Semua</string>
     <string name="csv_export_settings_hint">Pilih rentang waktu atau ekspor semua rekor</string>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 8ae4f3c5..81e02c21 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Salva</string>
     <string name="duration_dialog_disable">Disabilita</string>
 
+    <string name="color_selection_base_color_hint">Seleziona il colore di base</string>
+    <string name="color_selection_adjust_color_hint">Regola il colore</string>
+    <string name="color_selection_final_color_hint">Colore finale</string>
+
     <string name="csv_export_settings_range">Intervallo</string>
     <string name="csv_export_settings_all">Tutto</string>
     <string name="csv_export_settings_hint">Seleziona un intervallo temporale per esportare tutte le registrazioni</string>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index 2047aafa..0750bf24 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Сохранить</string>
     <string name="duration_dialog_disable">Отключить</string>
 
+    <string name="color_selection_base_color_hint">Выберите базовый цвет</string>
+    <string name="color_selection_adjust_color_hint">Отрегулируйте цвет</string>
+    <string name="color_selection_final_color_hint">Окончательный цвет</string>
+
     <string name="csv_export_settings_range">Диапазон</string>
     <string name="csv_export_settings_all">Все</string>
     <string name="csv_export_settings_hint">Выберите временной диапазон или экспортируйте все записи</string>
diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml
index cc67125e..39f91d4d 100644
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Spara</string>
     <string name="duration_dialog_disable">Inaktivera</string>
 
+    <string name="color_selection_base_color_hint">Välj basfärg</string>
+    <string name="color_selection_adjust_color_hint">Justera färg</string>
+    <string name="color_selection_final_color_hint">Slutlig färg</string>
+
     <string name="csv_export_settings_range">Intervall</string>
     <string name="csv_export_settings_all">Allt</string>
     <string name="csv_export_settings_hint">Välj tidsintervall eller exportera alla händelser</string>
diff --git a/core/src/main/res/values-uk/strings.xml b/core/src/main/res/values-uk/strings.xml
index 72fd774c..497b8002 100644
--- a/core/src/main/res/values-uk/strings.xml
+++ b/core/src/main/res/values-uk/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Зберегти</string>
     <string name="duration_dialog_disable">Вимкнути</string>
 
+    <string name="color_selection_base_color_hint">Виберіть основний колір</string>
+    <string name="color_selection_adjust_color_hint">Налаштуйте колір</string>
+    <string name="color_selection_final_color_hint">Кінцевий колір</string>
+
     <string name="csv_export_settings_range">Діапазон</string>
     <string name="csv_export_settings_all">Все</string>
     <string name="csv_export_settings_hint">Виберіть діапазон часу або експортуйте всі записи</string>
diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml
index c6a432e5..a1ac290d 100644
--- a/core/src/main/res/values-zh/strings.xml
+++ b/core/src/main/res/values-zh/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">保存</string>
     <string name="duration_dialog_disable">不启用</string>
 
+    <string name="color_selection_base_color_hint">选择基色</string>
+    <string name="color_selection_adjust_color_hint">调整颜色</string>
+    <string name="color_selection_final_color_hint">最终颜色</string>
+
     <string name="csv_export_settings_range">跨度</string>
     <string name="csv_export_settings_all">全部</string>
     <string name="csv_export_settings_hint">選擇時間範圍或導出所有記錄</string>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index ab2a50eb..c985eaa8 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -128,6 +128,10 @@
     <string name="duration_dialog_save">Save</string>
     <string name="duration_dialog_disable">Disable</string>
 
+    <string name="color_selection_base_color_hint">Select base color</string>
+    <string name="color_selection_adjust_color_hint">Adjust color</string>
+    <string name="color_selection_final_color_hint">Final color</string>
+
     <string name="csv_export_settings_range">Range</string>
     <string name="csv_export_settings_all">All</string>
     <string name="csv_export_settings_hint">Select time range or export all records</string>
diff --git a/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml b/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
index 79de9cf1..3c13869b 100644
--- a/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
+++ b/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
@@ -16,36 +16,66 @@
         android:tint="?appContrastColor"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvColorSelectionBaseColorHint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:text="@string/color_selection_base_color_hint"
+        android:textColor="?appTextHintColor"
+        app:layout_constraintTop_toBottomOf="@id/ivColorSelectionArrow" />
+
     <com.google.android.material.slider.Slider
         android:id="@+id/sliderColorSelectionHue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:valueFrom="0"
         android:valueTo="360"
         app:labelBehavior="gone"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ivColorSelectionArrow" />
+        app:layout_constraintTop_toBottomOf="@id/tvColorSelectionBaseColorHint" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvColorSelectionAdjustColorHint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:gravity="center"
+        android:text="@string/color_selection_adjust_color_hint"
+        android:textColor="?appTextHintColor"
+        app:layout_constraintTop_toBottomOf="@id/sliderColorSelectionHue" />
 
     <com.example.util.simpletimetracker.feature_dialogs.colorSelection.customView.ColorSelectionView
         android:id="@+id/viewColorSelectionView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginHorizontal="5dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
         app:colorSelectionSelectedColorRadius="10dp"
         app:colorSelectionSelectedColorStrokeColor="@color/white"
         app:colorSelectionSelectedColorStrokeWidth="2dp"
-        app:layout_constraintBottom_toTopOf="@id/containerColorSelectionSelectedColor"
-        app:layout_constraintTop_toBottomOf="@id/sliderColorSelectionHue"
+        app:layout_constraintBottom_toTopOf="@id/tvColorSelectionFinalColorHint"
+        app:layout_constraintTop_toBottomOf="@id/tvColorSelectionAdjustColorHint"
         app:layout_constraintVertical_weight="2"
         tools:colorSelectionHue="180"
         tools:colorSelectionSaturation="0.4"
         tools:colorSelectionValue="0.3" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvColorSelectionFinalColorHint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginBottom="11dp"
+        android:gravity="center"
+        android:text="@string/color_selection_final_color_hint"
+        android:textColor="?appTextHintColor"
+        app:layout_constraintBottom_toTopOf="@id/containerColorSelectionSelectedColor"
+        app:layout_constraintTop_toBottomOf="@id/viewColorSelectionView" />
+
     <androidx.cardview.widget.CardView
         android:id="@+id/containerColorSelectionSelectedColor"
         android:layout_width="match_parent"
@@ -56,7 +86,7 @@
         app:cardCornerRadius="@dimen/record_type_card_corner_radius"
         app:cardElevation="0dp"
         app:layout_constraintBottom_toTopOf="@id/inputColorSelectionHex"
-        app:layout_constraintTop_toBottomOf="@id/viewColorSelectionView"
+        app:layout_constraintTop_toBottomOf="@id/tvColorSelectionFinalColorHint"
         app:layout_constraintVertical_weight="1">
 
         <androidx.cardview.widget.CardView
-- 
2.51.2