mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-06 01:08:50 -06:00
SubtitleCard: Show at-most icon
This commit is contained in:
@@ -53,8 +53,6 @@ class SubtitleCardViewTest : BaseViewTest() {
|
|||||||
isNumerical = false,
|
isNumerical = false,
|
||||||
question = "Did you meditate this morning?",
|
question = "Did you meditate this morning?",
|
||||||
reminder = Reminder(8, 30, EVERY_DAY),
|
reminder = Reminder(8, 30, EVERY_DAY),
|
||||||
unit = "",
|
|
||||||
targetValue = 0.0,
|
|
||||||
theme = LightTheme(),
|
theme = LightTheme(),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import org.isoron.platform.gui.toInt
|
|||||||
import org.isoron.uhabits.R
|
import org.isoron.uhabits.R
|
||||||
import org.isoron.uhabits.activities.habits.edit.formatFrequency
|
import org.isoron.uhabits.activities.habits.edit.formatFrequency
|
||||||
import org.isoron.uhabits.activities.habits.list.views.toShortString
|
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.core.ui.screens.habits.show.views.SubtitleCardState
|
||||||
import org.isoron.uhabits.databinding.ShowHabitSubtitleBinding
|
import org.isoron.uhabits.databinding.ShowHabitSubtitleBinding
|
||||||
import org.isoron.uhabits.utils.InterfaceUtils
|
import org.isoron.uhabits.utils.InterfaceUtils
|
||||||
@@ -65,7 +66,12 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
|
|||||||
binding.questionLabel.visibility = View.VISIBLE
|
binding.questionLabel.visibility = View.VISIBLE
|
||||||
binding.targetIcon.visibility = View.VISIBLE
|
binding.targetIcon.visibility = View.VISIBLE
|
||||||
binding.targetText.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.targetIcon.visibility = View.GONE
|
||||||
binding.targetText.visibility = View.GONE
|
binding.targetText.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,6 @@
|
|||||||
android:id="@+id/targetIcon"
|
android:id="@+id/targetIcon"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/fa_arrow_circle_up"
|
|
||||||
android:textColor="?attr/contrast60"
|
android:textColor="?attr/contrast60"
|
||||||
android:textSize="16sp" />
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<string translatable="false" name="fa_star_half_o"></string>
|
<string translatable="false" name="fa_star_half_o"></string>
|
||||||
<string translatable="false" name="fa_arrow_circle_up"></string>
|
<string translatable="false" name="fa_arrow_circle_up"></string>
|
||||||
|
<string translatable="false" name="fa_arrow_circle_down"></string>
|
||||||
<string translatable="false" name="fa_check"></string>
|
<string translatable="false" name="fa_check"></string>
|
||||||
<string translatable="false" name="fa_times"></string>
|
<string translatable="false" name="fa_times"></string>
|
||||||
<string translatable="false" name="fa_skipped"></string>
|
<string translatable="false" name="fa_skipped"></string>
|
||||||
@@ -181,7 +182,6 @@
|
|||||||
<!--<string translatable="false" name="fa_hand_o_down"></string>-->
|
<!--<string translatable="false" name="fa_hand_o_down"></string>-->
|
||||||
<!--<string translatable="false" name="fa_arrow_circle_left"></string>-->
|
<!--<string translatable="false" name="fa_arrow_circle_left"></string>-->
|
||||||
<!--<string translatable="false" name="fa_arrow_circle_right"></string>-->
|
<!--<string translatable="false" name="fa_arrow_circle_right"></string>-->
|
||||||
<!--<string translatable="false" name="fa_arrow_circle_down"></string>-->
|
|
||||||
<!--<string translatable="false" name="fa_globe"></string>-->
|
<!--<string translatable="false" name="fa_globe"></string>-->
|
||||||
<!--<string translatable="false" name="fa_wrench"></string>-->
|
<!--<string translatable="false" name="fa_wrench"></string>-->
|
||||||
<!--<string translatable="false" name="fa_tasks"></string>-->
|
<!--<string translatable="false" name="fa_tasks"></string>-->
|
||||||
|
|||||||
@@ -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.Frequency
|
||||||
import org.isoron.uhabits.core.models.Habit
|
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.PaletteColor
|
||||||
import org.isoron.uhabits.core.models.Reminder
|
import org.isoron.uhabits.core.models.Reminder
|
||||||
import org.isoron.uhabits.core.ui.views.Theme
|
import org.isoron.uhabits.core.ui.views.Theme
|
||||||
@@ -31,8 +32,9 @@ data class SubtitleCardState(
|
|||||||
val isNumerical: Boolean,
|
val isNumerical: Boolean,
|
||||||
val question: String,
|
val question: String,
|
||||||
val reminder: Reminder?,
|
val reminder: Reminder?,
|
||||||
val targetValue: Double,
|
val targetValue: Double = 0.0,
|
||||||
val unit: String,
|
val targetType: NumericalHabitType = NumericalHabitType.AT_LEAST,
|
||||||
|
val unit: String = "",
|
||||||
val theme: Theme,
|
val theme: Theme,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -48,6 +50,7 @@ class SubtitleCardPresenter {
|
|||||||
question = habit.question,
|
question = habit.question,
|
||||||
reminder = habit.reminder,
|
reminder = habit.reminder,
|
||||||
targetValue = habit.targetValue,
|
targetValue = habit.targetValue,
|
||||||
|
targetType = habit.targetType,
|
||||||
unit = habit.unit,
|
unit = habit.unit,
|
||||||
theme = theme,
|
theme = theme,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user