diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt index a43543936..3323f78df 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt @@ -53,8 +53,6 @@ class SubtitleCardViewTest : BaseViewTest() { isNumerical = false, question = "Did you meditate this morning?", reminder = Reminder(8, 30, EVERY_DAY), - unit = "", - targetValue = 0.0, theme = LightTheme(), ) ) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt index 49c67aae1..5bbfb46d6 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt @@ -28,6 +28,7 @@ import org.isoron.platform.gui.toInt import org.isoron.uhabits.R import org.isoron.uhabits.activities.habits.edit.formatFrequency import org.isoron.uhabits.activities.habits.list.views.toShortString +import org.isoron.uhabits.core.models.NumericalHabitType import org.isoron.uhabits.core.ui.screens.habits.show.views.SubtitleCardState import org.isoron.uhabits.databinding.ShowHabitSubtitleBinding import org.isoron.uhabits.utils.InterfaceUtils @@ -65,7 +66,12 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con binding.questionLabel.visibility = View.VISIBLE binding.targetIcon.visibility = View.VISIBLE binding.targetText.visibility = View.VISIBLE - if (!state.isNumerical) { + if (state.isNumerical) { + binding.targetIcon.text = when (state.targetType) { + NumericalHabitType.AT_LEAST -> resources.getString(R.string.fa_arrow_circle_up) + else -> resources.getString(R.string.fa_arrow_circle_down) + } + } else { binding.targetIcon.visibility = View.GONE binding.targetText.visibility = View.GONE } diff --git a/uhabits-android/src/main/res/layout/show_habit_subtitle.xml b/uhabits-android/src/main/res/layout/show_habit_subtitle.xml index f8f3924bc..7361b4565 100644 --- a/uhabits-android/src/main/res/layout/show_habit_subtitle.xml +++ b/uhabits-android/src/main/res/layout/show_habit_subtitle.xml @@ -47,7 +47,6 @@ android:id="@+id/targetIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/fa_arrow_circle_up" android:textColor="?attr/contrast60" android:textSize="16sp" /> diff --git a/uhabits-android/src/main/res/values/fontawesome.xml b/uhabits-android/src/main/res/values/fontawesome.xml index 917cf0d73..0ff190382 100644 --- a/uhabits-android/src/main/res/values/fontawesome.xml +++ b/uhabits-android/src/main/res/values/fontawesome.xml @@ -21,6 +21,7 @@ + @@ -181,7 +182,6 @@ - diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt index 525f8fc7c..4cbbd74ec 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt @@ -21,6 +21,7 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit +import org.isoron.uhabits.core.models.NumericalHabitType import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Reminder import org.isoron.uhabits.core.ui.views.Theme @@ -31,8 +32,9 @@ data class SubtitleCardState( val isNumerical: Boolean, val question: String, val reminder: Reminder?, - val targetValue: Double, - val unit: String, + val targetValue: Double = 0.0, + val targetType: NumericalHabitType = NumericalHabitType.AT_LEAST, + val unit: String = "", val theme: Theme, ) @@ -48,6 +50,7 @@ class SubtitleCardPresenter { question = habit.question, reminder = habit.reminder, targetValue = habit.targetValue, + targetType = habit.targetType, unit = habit.unit, theme = theme, )