CheckmarkDialog: Use theme color instead of CSV

pull/1103/head
Alinson S. Xavier 4 years ago
parent 8036b10ee6
commit 990c85aedd
No known key found for this signature in database
GPG Key ID: DCA0DAD4D2F58624

@ -1,13 +1,13 @@
package org.isoron.uhabits.activities.common.dialogs package org.isoron.uhabits.activities.common.dialogs
import android.content.Context import android.content.Context
import android.graphics.Color
import android.graphics.Typeface import android.graphics.Typeface
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
import android.widget.Button import android.widget.Button
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import org.isoron.platform.gui.toInt
import org.isoron.uhabits.R import org.isoron.uhabits.R
import org.isoron.uhabits.core.models.Entry.Companion.NO import org.isoron.uhabits.core.models.Entry.Companion.NO
import org.isoron.uhabits.core.models.Entry.Companion.SKIP import org.isoron.uhabits.core.models.Entry.Companion.SKIP
@ -17,6 +17,7 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.PaletteColor
import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
import org.isoron.uhabits.core.ui.views.Theme
import org.isoron.uhabits.databinding.CheckmarkDialogBinding import org.isoron.uhabits.databinding.CheckmarkDialogBinding
import org.isoron.uhabits.inject.ActivityContext import org.isoron.uhabits.inject.ActivityContext
import org.isoron.uhabits.utils.InterfaceUtils import org.isoron.uhabits.utils.InterfaceUtils
@ -39,13 +40,13 @@ class CheckmarkDialog
notes: String, notes: String,
dateString: String, dateString: String,
paletteColor: PaletteColor, paletteColor: PaletteColor,
callback: ListHabitsBehavior.CheckMarkDialogCallback callback: ListHabitsBehavior.CheckMarkDialogCallback,
theme: Theme,
): AlertDialog { ): AlertDialog {
binding = CheckmarkDialogBinding.inflate(LayoutInflater.from(context)) binding = CheckmarkDialogBinding.inflate(LayoutInflater.from(context))
fontAwesome = InterfaceUtils.getFontAwesome(context)!! fontAwesome = InterfaceUtils.getFontAwesome(context)!!
binding.etNotes.setText(notes) binding.etNotes.setText(notes)
setUpButtons(value, Color.parseColor(paletteColor.toCsvColor())) setUpButtons(value, theme.color(paletteColor).toInt())
val dialog = AlertDialog.Builder(context) val dialog = AlertDialog.Builder(context)
.setView(binding.root) .setView(binding.root)

@ -241,7 +241,14 @@ class ListHabitsScreen
color: PaletteColor, color: PaletteColor,
callback: ListHabitsBehavior.CheckMarkDialogCallback callback: ListHabitsBehavior.CheckMarkDialogCallback
) { ) {
checkMarkDialog.create(value, notes, dateString, color, callback).show() checkMarkDialog.create(
value,
notes,
dateString,
color,
callback,
themeSwitcher.currentTheme!!,
).show()
} }
private fun getExecuteString(command: Command): String? { private fun getExecuteString(command: Command): String? {

@ -181,7 +181,14 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
color: PaletteColor, color: PaletteColor,
callback: ListHabitsBehavior.CheckMarkDialogCallback callback: ListHabitsBehavior.CheckMarkDialogCallback
) { ) {
CheckmarkDialog(this@ShowHabitActivity, preferences).create(value, notes, dateString, color, callback).show() CheckmarkDialog(this@ShowHabitActivity, preferences).create(
value,
notes,
dateString,
color,
callback,
themeSwitcher.currentTheme!!,
).show()
} }
override fun showEditHabitScreen(habit: Habit) { override fun showEditHabitScreen(habit: Habit) {

Loading…
Cancel
Save