isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added 'UNKNOWN' button for measurable habits

Browse Source
This commit is contained in:
kalina559
2025-02-18 20:47:12 +01:00
parent 107c898f51
commit 74ce269446
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
View File

@@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatDialogFragment
import org.isoron.uhabits.HabitsApplication import org.isoron.uhabits.HabitsApplication
import org.isoron.uhabits.R import org.isoron.uhabits.R
import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.models.Entry
import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
import org.isoron.uhabits.databinding.CheckmarkPopupBinding import org.isoron.uhabits.databinding.CheckmarkPopupBinding
import org.isoron.uhabits.utils.InterfaceUtils import org.isoron.uhabits.utils.InterfaceUtils
import org.isoron.uhabits.utils.getCenter import org.isoron.uhabits.utils.getCenter
@@ -36,16 +37,17 @@ class NumberDialog : AppCompatDialogFragment() {
val appComponent = (requireActivity().application as HabitsApplication).component val appComponent = (requireActivity().application as HabitsApplication).component
val prefs = appComponent.preferences val prefs = appComponent.preferences
view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context)) view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
arrayOf(view.yesBtn, view.skipBtn).forEach { arrayOf(view.yesBtn).forEach {
it.setTextColor(requireArguments().getInt("color")) it.setTextColor(requireArguments().getInt("color"))
} }
arrayOf(view.noBtn, view.unknownBtn).forEach { arrayOf(view.noBtn, view.unknownBtnNumber).forEach {
it.setTextColor(view.root.sres.getColor(R.attr.contrast60)) it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
} }
arrayOf(view.yesBtn, view.noBtn, view.skipBtn, view.unknownBtn).forEach { arrayOf(view.yesBtn, view.noBtn, view.unknownBtnNumber).forEach {
it.typeface = InterfaceUtils.getFontAwesome(requireContext()) it.typeface = InterfaceUtils.getFontAwesome(requireContext())
} }
if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = View.GONE if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = View.GONE
if (!prefs.areQuestionMarksEnabled) view.unknownBtnNumber.visibility = View.GONE
view.numberButtons.visibility = View.VISIBLE view.numberButtons.visibility = View.VISIBLE
fixDecimalSeparator(view) fixDecimalSeparator(view)
originalNotes = requireArguments().getString("notes")!! originalNotes = requireArguments().getString("notes")!!
@@ -71,6 +73,12 @@ class NumberDialog : AppCompatDialogFragment() {
view.value.setText(DecimalFormat("#.###").format((Entry.SKIP.toDouble() / 1000))) view.value.setText(DecimalFormat("#.###").format((Entry.SKIP.toDouble() / 1000)))
save() save()
} }
view.unknownBtnNumber.setOnClickListener {
view.value.setText(DecimalFormat("#.###").format((Entry.UNKNOWN.toDouble() / 1000)))
save()
}
view.notes.setOnEditorActionListener { v, actionId, event -> view.notes.setOnEditorActionListener { v, actionId, event ->
save() save()
true true

5
uhabits-android/src/main/res/layout/checkmark_popup.xml
View File

@@ -98,6 +98,11 @@
style="@style/NumericalPopupBtn" style="@style/NumericalPopupBtn"
android:text="@string/skip_day" /> android:text="@string/skip_day" />
<TextView
android:id="@+id/unknownBtnNumber"
style="@style/CheckmarkPopupBtn"
android:text="@string/fa_question" />
<TextView <TextView
android:id="@+id/saveBtn" android:id="@+id/saveBtn"
style="@style/NumericalPopupBtn" style="@style/NumericalPopupBtn"