From e7f0f59379bc64af280bd9dd7602359c9995c45d Mon Sep 17 00:00:00 2001
From: KristianTashkov <kristian@hyperscience.com>
Date: Sat, 8 Aug 2020 19:13:03 +0300
Subject: [PATCH] add color to advanced options dialog

---
 .../dialogs/CheckmarkOptionPickerFactory.kt    | 18 +++++++++++++++++-
 .../layout/checkmark_option_picker_dialog.xml  | 16 +++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt
index 60a5368af..8300ae51b 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkOptionPickerFactory.kt
@@ -20,6 +20,8 @@
 package org.isoron.uhabits.activities.common.dialogs
 
 import android.content.*
+import android.graphics.*
+import android.os.*
 import android.view.*
 import android.widget.*
 import androidx.appcompat.app.*
@@ -28,6 +30,7 @@ import org.isoron.androidbase.utils.*
 import org.isoron.uhabits.*
 import org.isoron.uhabits.core.models.*
 import org.isoron.uhabits.core.ui.screens.habits.list.*
+import org.isoron.uhabits.utils.*
 import javax.inject.*
 
 
@@ -40,11 +43,21 @@ class CheckmarkOptionPickerFactory
                value: Int,
                callback: ListHabitsBehavior.CheckmarkOptionsCallback): AlertDialog {
 
+        var habitColor = PaletteUtils.getColor(context, habit.color)
+        val res = StyledResources(context)
+
+        val titleTextView = TextView(context)
+        titleTextView.setText(habit.name)
+        titleTextView.setTextSize(20F)
+        titleTextView.setPadding(20, 30, 20, 30);
+        titleTextView.setTextColor(res.getColor(R.attr.highContrastReverseTextColor))
+        titleTextView.setBackgroundColor(habitColor)
+
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.checkmark_option_picker_dialog, null)
         val dialog = AlertDialog.Builder(context)
                 .setView(view)
-                .setTitle(habit.name)
+                .setCustomTitle(titleTextView)
                 .setOnDismissListener{
                     callback.onCheckmarkOptionDismissed()
                 }
@@ -63,6 +76,7 @@ class CheckmarkOptionPickerFactory
                 Checkmark.UNCHECKED_EXPLICITLY_UNNECESSARY to R.id.no_button
         )
 
+
         for ((buttonId, buttonValue) in buttonValues) {
             val button = view.findViewById<Button>(buttonId)
             button.setOnClickListener{
@@ -73,6 +87,7 @@ class CheckmarkOptionPickerFactory
                     valuesToButton.containsKey(value) &&
                     valuesToButton[value] == buttonId)
             button.typeface = InterfaceUtils.getFontAwesome(context)
+            button.background.setTint(habitColor)
         }
 
         val questionTextView = view.findViewById<TextView>(R.id.choose_checkmark_question_textview)
@@ -83,6 +98,7 @@ class CheckmarkOptionPickerFactory
         val questionFullText = context.resources.getString(
                 R.string.choose_checkmark_question, question, habitTimestamp)
         questionTextView.text = questionFullText
+        questionTextView.setTextColor(habitColor)
 
         dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
 
diff --git a/android/uhabits-android/src/main/res/layout/checkmark_option_picker_dialog.xml b/android/uhabits-android/src/main/res/layout/checkmark_option_picker_dialog.xml
index 122956600..036d74ab3 100644
--- a/android/uhabits-android/src/main/res/layout/checkmark_option_picker_dialog.xml
+++ b/android/uhabits-android/src/main/res/layout/checkmark_option_picker_dialog.xml
@@ -38,46 +38,48 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:divider="?android:dividerVertical"
         android:gravity="center"
-        android:orientation="horizontal"
-        android:showDividers="middle">
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/yes_button"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Widget.AppCompat.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/yes_button_text"
+            android:textColor="?attr/highContrastReverseTextColor"
             app:cornerRadius="0dp" />
 
         <Button
             android:id="@+id/no_button"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Widget.AppCompat.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/no_button_text"
+            android:textColor="?attr/highContrastReverseTextColor"
             app:cornerRadius="0dp" />
 
         <Button
             android:id="@+id/skip_button"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Widget.AppCompat.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/skip_button_text"
+            android:textColor="?attr/highContrastReverseTextColor"
             app:cornerRadius="0dp" />
 
 
         <Button
             android:id="@+id/clear_button"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Widget.AppCompat.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/delete_button_text"
+            android:textColor="?attr/highContrastReverseTextColor"
             app:cornerRadius="0dp" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file