From f04e37e9050cf918f9b7643814ec893c61ba3992 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Fri, 15 Apr 2022 08:38:13 -0500
Subject: [PATCH] Remove CheckmarkDialog

---
 .../common/dialogs/CheckmarkDialog.kt         | 119 ------------------
 .../habits/list/ListHabitsScreen.kt           |  21 ----
 .../habits/show/ShowHabitActivity.kt          |  20 ---
 .../src/main/res/layout/checkmark_dialog.xml  |  95 --------------
 .../src/main/res/values/styles.xml            |  12 --
 .../screens/habits/list/ListHabitsBehavior.kt |  10 --
 .../screens/habits/show/views/HistoryCard.kt  |   9 --
 7 files changed, 286 deletions(-)
 delete mode 100644 uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
 delete mode 100644 uhabits-android/src/main/res/layout/checkmark_dialog.xml

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
deleted file mode 100644
index 4e62b614b..000000000
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.isoron.uhabits.activities.common.dialogs
-
-import android.content.Context
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-import android.widget.Button
-import androidx.appcompat.app.AlertDialog
-import org.isoron.platform.gui.toInt
-import org.isoron.platform.time.JavaLocalDateFormatter
-import org.isoron.platform.time.LocalDate
-import org.isoron.uhabits.R
-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.UNKNOWN
-import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
-import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
-import org.isoron.uhabits.core.models.PaletteColor
-import org.isoron.uhabits.core.preferences.Preferences
-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.inject.ActivityContext
-import org.isoron.uhabits.utils.InterfaceUtils
-import org.isoron.uhabits.utils.StyledResources
-import java.util.Locale
-import javax.inject.Inject
-
-class CheckmarkDialog
-@Inject constructor(
-    @ActivityContext private val context: Context,
-    private val preferences: Preferences,
-) : View.OnClickListener {
-
-    private lateinit var binding: CheckmarkDialogBinding
-    private lateinit var fontAwesome: Typeface
-    private val allButtons = mutableListOf<Button>()
-    private var selectedButton: Button? = null
-
-    fun create(
-        selectedValue: Int,
-        notes: String,
-        date: LocalDate,
-        paletteColor: PaletteColor,
-        callback: ListHabitsBehavior.CheckMarkDialogCallback,
-        theme: Theme,
-    ): AlertDialog {
-        binding = CheckmarkDialogBinding.inflate(LayoutInflater.from(context))
-        fontAwesome = InterfaceUtils.getFontAwesome(context)!!
-        binding.etNotes.append(notes)
-        setUpButtons(selectedValue, theme.color(paletteColor).toInt())
-
-        val dialog = AlertDialog.Builder(context)
-            .setView(binding.root)
-            .setTitle(JavaLocalDateFormatter(Locale.getDefault()).longFormat(date))
-            .setPositiveButton(R.string.save) { _, _ ->
-                val newValue = when (selectedButton?.id) {
-                    R.id.yesBtn -> YES_MANUAL
-                    R.id.noBtn -> NO
-                    R.id.skippedBtn -> SKIP
-                    else -> UNKNOWN
-                }
-                callback.onNotesSaved(newValue, binding.etNotes.text.toString())
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                callback.onNotesDismissed()
-            }
-            .setOnDismissListener {
-                callback.onNotesDismissed()
-            }
-            .create()
-
-        dialog.setOnShowListener {
-            binding.etNotes.requestFocus()
-            dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        }
-
-        return dialog
-    }
-
-    private fun setUpButtons(value: Int, color: Int) {
-        val sres = StyledResources(context)
-        val mediumContrastColor = sres.getColor(R.attr.contrast60)
-        setButtonAttrs(binding.yesBtn, color)
-        setButtonAttrs(binding.noBtn, mediumContrastColor)
-        setButtonAttrs(binding.skippedBtn, color, visible = preferences.isSkipEnabled)
-        setButtonAttrs(binding.questionBtn, mediumContrastColor, visible = preferences.areQuestionMarksEnabled)
-        when (value) {
-            UNKNOWN -> if (preferences.areQuestionMarksEnabled) {
-                binding.questionBtn.performClick()
-            } else {
-                binding.noBtn.performClick()
-            }
-            SKIP -> binding.skippedBtn.performClick()
-            YES_MANUAL -> binding.yesBtn.performClick()
-            YES_AUTO, NO -> binding.noBtn.performClick()
-        }
-    }
-
-    private fun setButtonAttrs(button: Button, color: Int, visible: Boolean = true) {
-        button.apply {
-            visibility = if (visible) View.VISIBLE else View.GONE
-            typeface = fontAwesome
-            setTextColor(color)
-            setOnClickListener(this@CheckmarkDialog)
-        }
-        allButtons.add(button)
-    }
-
-    override fun onClick(v: View?) {
-        allButtons.forEach {
-            if (v?.id == it.id) {
-                it.isSelected = true
-                selectedButton = it
-            } else it.isSelected = false
-        }
-    }
-}
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index baec44b2f..d5794a388 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -26,9 +26,7 @@ import androidx.appcompat.app.AppCompatActivity
 import dagger.Lazy
 import org.isoron.platform.gui.ScreenLocation
 import org.isoron.platform.gui.toInt
-import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.R
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
@@ -98,7 +96,6 @@ class ListHabitsScreen
     private val importTaskFactory: ImportDataTaskFactory,
     private val colorPickerFactory: ColorPickerDialogFactory,
     private val numberPickerFactory: NumberPickerFactory,
-    private val checkMarkDialog: CheckmarkDialog,
     private val behavior: Lazy<ListHabitsBehavior>,
     private val preferences: Preferences,
     private val rootView: Lazy<ListHabitsRootView>,
@@ -271,24 +268,6 @@ class ListHabitsScreen
         }
     }
 
-    override fun showCheckmarkDialog(
-        selectedValue: Int,
-        notes: String,
-        date: LocalDate,
-        dateString: String,
-        color: PaletteColor,
-        callback: ListHabitsBehavior.CheckMarkDialogCallback
-    ) {
-        checkMarkDialog.create(
-            selectedValue,
-            notes,
-            date,
-            color,
-            callback,
-            themeSwitcher.currentTheme!!,
-        ).show()
-    }
-
     private fun getExecuteString(command: Command): String? {
         when (command) {
             is ArchiveHabitsCommand -> {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
index 95c6bdbbf..6eadb1b59 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -29,13 +29,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.isoron.platform.gui.ScreenLocation
 import org.isoron.platform.gui.toInt
-import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.AndroidDirFinder
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.HabitsDirFinder
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
@@ -189,24 +187,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             ).show()
         }
 
-        override fun showCheckmarkDialog(
-            selectedValue: Int,
-            notes: String,
-            date: LocalDate,
-            preferences: Preferences,
-            color: PaletteColor,
-            callback: ListHabitsBehavior.CheckMarkDialogCallback
-        ) {
-            CheckmarkDialog(this@ShowHabitActivity, preferences).create(
-                selectedValue,
-                notes,
-                date,
-                color,
-                callback,
-                themeSwitcher.currentTheme!!,
-            ).show()
-        }
-
         override fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,
diff --git a/uhabits-android/src/main/res/layout/checkmark_dialog.xml b/uhabits-android/src/main/res/layout/checkmark_dialog.xml
deleted file mode 100644
index 70f3d3a91..000000000
--- a/uhabits-android/src/main/res/layout/checkmark_dialog.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:gravity="center"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="12dp"
-    android:paddingStart="10dp"
-    android:paddingEnd="10dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="8dp"
-        android:baselineAligned="false">
-
-        <FrameLayout
-            style="@style/FormOuterBox"
-            android:layout_width="0dp"
-            android:layout_weight="1">
-            <LinearLayout style="@style/DialogFormInnerBox">
-
-                <TextView
-                    style="@style/DialogFormLabel"
-                    android:text="@string/value" />
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:gravity="center_horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="8dp">
-
-                    <Button
-                        android:id="@+id/yesBtn"
-                        android:text="@string/fa_check"
-                        style="@style/CheckmarkDialogBtn"/>
-                    <Button
-                        android:id="@+id/skippedBtn"
-                        android:text="@string/fa_skipped"
-                        android:visibility="gone"
-                        style="@style/CheckmarkDialogBtn"/>
-
-                    <Button
-                        android:id="@+id/noBtn"
-                        android:text="@string/fa_times"
-                        style="@style/CheckmarkDialogBtn"/>
-
-                    <Button
-                        android:id="@+id/questionBtn"
-                        android:text="@string/fa_question"
-                        android:visibility="gone"
-                        style="@style/CheckmarkDialogBtn"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </FrameLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="5dp"
-        android:baselineAligned="false">
-
-        <FrameLayout
-            style="@style/FormOuterBox"
-            android:layout_width="0dp"
-            android:layout_weight="1">
-
-            <LinearLayout style="@style/DialogFormInnerBox">
-
-                <TextView
-                    style="@style/DialogFormLabel"
-                    android:text="@string/notes" />
-
-                <EditText
-                    android:id="@+id/etNotes"
-                    android:inputType="textCapSentences|textMultiLine"
-                    style="@style/FormInput"
-                    android:scrollbars="vertical"
-                    android:hint="@string/example_notes"/>
-
-            </LinearLayout>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ 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 474d62d16..f25602748 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -387,18 +387,6 @@
         <item name="android:textSize">@dimen/smallTextSize</item>
     </style>
 
-    <style name="CheckmarkDialogBtn">
-        <item name="android:layout_width">48dp</item>
-        <item name="android:layout_height">48dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
-        <item name="android:layout_marginEnd">12dp</item>
-        <item name="android:textSize">@dimen/regularTextSize</item>
-        <item name="backgroundTint">@null</item>
-        <item name="android:background">@drawable/bg_select_button</item>
-        <item name="selectable">true</item>
-    </style>
-
     <style name="CheckmarkPopupBtn">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
index 14fa256e9..b14ecc591 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
@@ -19,7 +19,6 @@
 package org.isoron.uhabits.core.ui.screens.habits.list
 
 import org.isoron.platform.gui.ScreenLocation
-import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
 import org.isoron.uhabits.core.models.Frequency
@@ -178,15 +177,6 @@ open class ListHabitsBehavior @Inject constructor(
             location: ScreenLocation,
             callback: CheckMarkDialogCallback
         )
-        fun showCheckmarkDialog(
-            selectedValue: Int,
-            notes: String,
-            date: LocalDate,
-            dateString: String,
-            color: PaletteColor,
-            callback: CheckMarkDialogCallback
-        )
-
         fun showSendBugReportToDeveloperScreen(log: String)
         fun showSendFileScreen(filename: String)
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
index 7c932fb42..a6f9fd98b 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
@@ -214,15 +214,6 @@ class HistoryCardPresenter(
             callback: ListHabitsBehavior.NumberPickerCallback
         )
 
-        fun showCheckmarkDialog(
-            selectedValue: Int,
-            notes: String,
-            date: LocalDate,
-            preferences: Preferences,
-            color: PaletteColor,
-            callback: ListHabitsBehavior.CheckMarkDialogCallback,
-        )
-
         fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,