isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse Source
pull/1103/head
Bindu 4 years ago
parent 7cc4b66dfd
commit af7f60fc4d
16 changed files with 138 additions and 99 deletions
Show Stats Download Patch File Download Diff File

10
uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
Unescape View File

@ -116,15 +116,7 @@ class NumberButtonViewTest : BaseViewTest() {
} }
@Test @Test
fun testClick_shortToggleDisabled() { fun testClick() {
prefs.isShortToggleEnabled = false
view.performClick()
assertTrue(edited)
}
@Test
fun testClick_shortToggleEnabled() {
prefs.isShortToggleEnabled = true
view.performClick() view.performClick()
assertTrue(edited) assertTrue(edited)
} }

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
Unescape View File

@ -66,7 +66,7 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
hasNotes = emptyList(), hasNotes = emptyList(),
theme = themeSwitcher.currentTheme, theme = themeSwitcher.currentTheme,
today = DateUtils.getTodayWithOffset().toLocalDate(), today = DateUtils.getTodayWithOffset().toLocalDate(),
onDateClickedListener = onDateClickedListener ?: OnDateClickedListener { _, _ -> }, onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {},
padding = 10.0, padding = 10.0,
) )
dataView = AndroidDataView(context!!, null) dataView = AndroidDataView(context!!, null)

12
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
Unescape View File

@ -38,6 +38,7 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.inject.ActivityContext import org.isoron.uhabits.inject.ActivityContext
import org.isoron.uhabits.utils.dim import org.isoron.uhabits.utils.dim
import org.isoron.uhabits.utils.drawNotesIndicator
import org.isoron.uhabits.utils.getFontAwesome import org.isoron.uhabits.utils.getFontAwesome
import org.isoron.uhabits.utils.sres import org.isoron.uhabits.utils.sres
import org.isoron.uhabits.utils.toMeasureSpec import org.isoron.uhabits.utils.toMeasureSpec
@ -104,7 +105,8 @@ class CheckmarkButtonView(
} }
override fun onLongClick(v: View): Boolean { override fun onLongClick(v: View): Boolean {
performToggle() if (preferences.isShortToggleEnabled) onEdit()
else performToggle()
return true return true
} }
@ -134,8 +136,6 @@ class CheckmarkButtonView(
textAlign = Paint.Align.CENTER textAlign = Paint.Align.CENTER
} }
private val pNotesIndicator: Paint = Paint()
fun draw(canvas: Canvas) { fun draw(canvas: Canvas) {
paint.color = when (value) { paint.color = when (value) {
YES_MANUAL, YES_AUTO, SKIP -> color YES_MANUAL, YES_AUTO, SKIP -> color
@ -145,7 +145,6 @@ class CheckmarkButtonView(
} }
else -> lowContrastColor else -> lowContrastColor
} }
pNotesIndicator.color = color
val id = when (value) { val id = when (value) {
SKIP -> R.string.fa_skipped SKIP -> R.string.fa_skipped
NO -> R.string.fa_times NO -> R.string.fa_times
@ -181,10 +180,7 @@ class CheckmarkButtonView(
canvas.drawText(label, rect.centerX(), rect.centerY(), paint) canvas.drawText(label, rect.centerX(), rect.centerY(), paint)
} }
if (hasNotes) { drawNotesIndicator(canvas, color, em, hasNotes)
val cy = 0.8f * em
canvas.drawCircle(width.toFloat() - cy, cy, 8f, pNotesIndicator)
}
} }
} }
} }

4
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
Unescape View File

@ -54,7 +54,7 @@ class CheckmarkPanelView(
setupButtons() setupButtons()
} }
var notes = BooleanArray(0) var notesIndicators = BooleanArray(0)
set(values) { set(values) {
field = values field = values
setupButtons() setupButtons()
@ -85,7 +85,7 @@ class CheckmarkPanelView(
else -> UNKNOWN else -> UNKNOWN
} }
button.hasNotes = when { button.hasNotes = when {
index + dataOffset < notes.size -> notes[index + dataOffset] index + dataOffset < notesIndicators.size -> notesIndicators[index + dataOffset]
else -> false else -> false
} }
button.color = color button.color = color

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
Unescape View File

@ -99,7 +99,7 @@ class HabitCardListView(
cardView.score = score cardView.score = score
cardView.unit = habit.unit cardView.unit = habit.unit
cardView.threshold = habit.targetValue / habit.frequency.denominator cardView.threshold = habit.targetValue / habit.frequency.denominator
cardView.notes = notesIndicators cardView.notesIndicators = notesIndicators
val detector = GestureDetector(context, CardViewGestureDetector(holder)) val detector = GestureDetector(context, CardViewGestureDetector(holder))
cardView.setOnTouchListener { _, ev -> cardView.setOnTouchListener { _, ev ->

8
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
Unescape View File

@ -115,11 +115,11 @@ class HabitCardView(
numberPanel.threshold = value numberPanel.threshold = value
} }
var notes var notesIndicators
get() = checkmarkPanel.notes get() = checkmarkPanel.notesIndicators
set(values) { set(values) {
checkmarkPanel.notes = values checkmarkPanel.notesIndicators = values
numberPanel.notes = values numberPanel.notesIndicators = values
} }
var checkmarkPanel: CheckmarkPanelView var checkmarkPanel: CheckmarkPanelView

9
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
Unescape View File

@ -34,6 +34,7 @@ import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.inject.ActivityContext import org.isoron.uhabits.inject.ActivityContext
import org.isoron.uhabits.utils.InterfaceUtils.getDimension import org.isoron.uhabits.utils.InterfaceUtils.getDimension
import org.isoron.uhabits.utils.dim import org.isoron.uhabits.utils.dim
import org.isoron.uhabits.utils.drawNotesIndicator
import org.isoron.uhabits.utils.getFontAwesome import org.isoron.uhabits.utils.getFontAwesome
import org.isoron.uhabits.utils.sres import org.isoron.uhabits.utils.sres
import java.lang.Double.max import java.lang.Double.max
@ -156,8 +157,6 @@ class NumberButtonView(
textAlign = Paint.Align.CENTER textAlign = Paint.Align.CENTER
} }
private val pNotesIndicator: Paint = Paint()
init { init {
em = pNumber.measureText("m") em = pNumber.measureText("m")
lowContrast = sres.getColor(R.attr.contrast40) lowContrast = sres.getColor(R.attr.contrast40)
@ -205,7 +204,6 @@ class NumberButtonView(
pNumber.color = activeColor pNumber.color = activeColor
pNumber.typeface = typeface pNumber.typeface = typeface
pUnit.color = activeColor pUnit.color = activeColor
pNotesIndicator.color = color
if (units.isBlank()) { if (units.isBlank()) {
rect.set(0f, 0f, width.toFloat(), height.toFloat()) rect.set(0f, 0f, width.toFloat(), height.toFloat())
@ -218,10 +216,7 @@ class NumberButtonView(
canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit) canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit)
} }
if (hasNotes) { drawNotesIndicator(canvas, color, em, hasNotes)
val cy = 0.8f * em
canvas.drawCircle(width.toFloat() - cy, cy, 8f, pNotesIndicator)
}
} }
} }
} }

4
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
Unescape View File

@ -72,7 +72,7 @@ class NumberPanelView(
setupButtons() setupButtons()
} }
var notes = BooleanArray(0) var notesIndicators = BooleanArray(0)
set(values) { set(values) {
field = values field = values
setupButtons() setupButtons()
@ -97,7 +97,7 @@ class NumberPanelView(
else -> 0.0 else -> 0.0
} }
button.hasNotes = when { button.hasNotes = when {
index + dataOffset < notes.size -> notes[index + dataOffset] index + dataOffset < notesIndicators.size -> notesIndicators[index + dataOffset]
else -> false else -> false
} }
button.color = color button.color = color

12
uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt
Unescape View File

@ -22,7 +22,9 @@ package org.isoron.uhabits.utils
import android.app.Activity import android.app.Activity
import android.content.ActivityNotFoundException import android.content.ActivityNotFoundException
import android.content.Intent import android.content.Intent
import android.graphics.Canvas
import android.graphics.Color import android.graphics.Color
import android.graphics.Paint
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.os.Handler import android.os.Handler
import android.view.LayoutInflater import android.view.LayoutInflater
@ -199,5 +201,15 @@ fun View.dim(id: Int) = InterfaceUtils.getDimension(context, id)
fun View.sp(value: Float) = InterfaceUtils.spToPixels(context, value) fun View.sp(value: Float) = InterfaceUtils.spToPixels(context, value)
fun View.dp(value: Float) = InterfaceUtils.dpToPixels(context, value) fun View.dp(value: Float) = InterfaceUtils.dpToPixels(context, value)
fun View.str(id: Int) = resources.getString(id) fun View.str(id: Int) = resources.getString(id)
fun View.drawNotesIndicator(canvas: Canvas, color: Int, size: Float, hasNotes: Boolean) {
val pNotesIndicator = Paint()
pNotesIndicator.color = color
if (hasNotes) {
val cy = 0.8f * size
canvas.drawCircle(width.toFloat() - cy, cy, 8f, pNotesIndicator)
}
}
val View.sres: StyledResources val View.sres: StyledResources
get() = StyledResources(context) get() = StyledResources(context)

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
Unescape View File

@ -100,7 +100,7 @@ open class EntryList {
val intervals = buildIntervals(frequency, original) val intervals = buildIntervals(frequency, original)
snapIntervalsTogether(intervals) snapIntervalsTogether(intervals)
val computed = buildEntriesFromInterval(original, intervals) val computed = buildEntriesFromInterval(original, intervals)
computed.filter { it.value != UNKNOWN }.forEach { add(it) } computed.filter { it.value != UNKNOWN || it.notes.isNotEmpty() }.forEach { add(it) }
} }
} }

6
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.kt
Unescape View File

@ -298,14 +298,14 @@ class HabitCardListCache @Inject constructor(
if (targetId != null && targetId != habit.id) continue if (targetId != null && targetId != habit.id) continue
newData.scores[habit.id] = habit.scores[today].value newData.scores[habit.id] = habit.scores[today].value
val list: MutableList<Int> = ArrayList() val list: MutableList<Int> = ArrayList()
val notesList: MutableList<Boolean> = ArrayList() val notesIndicators: MutableList<Boolean> = ArrayList()
for ((_, value, note) in habit.computedEntries.getByInterval(dateFrom, today)) { for ((_, value, note) in habit.computedEntries.getByInterval(dateFrom, today)) {
list.add(value) list.add(value)
if (note.isNotEmpty()) notesList.add(true) else notesList.add(false) notesIndicators.add(note.isNotEmpty())
} }
val entries = list.toTypedArray() val entries = list.toTypedArray()
newData.checkmarks[habit.id] = ArrayUtils.toPrimitive(entries) newData.checkmarks[habit.id] = ArrayUtils.toPrimitive(entries)
newData.notesIndicators[habit.id] = notesList.toBooleanArray() newData.notesIndicators[habit.id] = notesIndicators.toBooleanArray()
runner!!.publishProgress(this, position) runner!!.publishProgress(this, position)
} }
} }

12
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
Unescape View File

@ -48,24 +48,22 @@ open class ListHabitsBehavior @Inject constructor(
} }
fun onEdit(habit: Habit, timestamp: Timestamp?) { fun onEdit(habit: Habit, timestamp: Timestamp?) {
val entries = habit.computedEntries.get(timestamp!!) val entry = habit.computedEntries.get(timestamp!!)
val notes = entries.notes
if (habit.type == HabitType.NUMERICAL) { if (habit.type == HabitType.NUMERICAL) {
val oldValue = entries.value.toDouble() val oldValue = entry.value.toDouble()
screen.showNumberPicker( screen.showNumberPicker(
oldValue / 1000, oldValue / 1000,
habit.unit, habit.unit,
notes entry.notes
) { newValue: Double, newNotes: String, -> ) { newValue: Double, newNotes: String, ->
val value = (newValue * 1000).roundToInt() val value = (newValue * 1000).roundToInt()
commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes)) commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes))
} }
} else { } else {
val value = entries.value
screen.showCheckmarkDialog( screen.showCheckmarkDialog(
notes entry.notes
) { newNotes -> ) { newNotes ->
commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes)) commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, entry.value, newNotes))
} }
} }
} }

87
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
Unescape View File

@ -59,50 +59,44 @@ class HistoryCardPresenter(
val screen: Screen, val screen: Screen,
) : OnDateClickedListener { ) : OnDateClickedListener {
override fun onDateClicked(date: LocalDate, isLongClick: Boolean) { override fun onDateShortPress(date: LocalDate) {
val timestamp = Timestamp.fromLocalDate(date) val timestamp = Timestamp.fromLocalDate(date)
screen.showFeedback() screen.showFeedback()
val entries = habit.computedEntries
val oldValue = entries.get(timestamp).value
val notes = entries.get(timestamp).notes
if (habit.isNumerical) { if (habit.isNumerical) {
screen.showNumberPicker(oldValue / 1000.0, habit.unit, notes) { newValue: Double, newNotes: String -> showNumberPicker(timestamp)
val thousands = (newValue * 1000).roundToInt()
commandRunner.run(
CreateRepetitionCommand(
habitList,
habit,
timestamp,
thousands,
newNotes,
),
)
}
} else { } else {
if (!isLongClick) { val entry = habit.computedEntries.get(timestamp)
val nextValue = Entry.nextToggleValue( val nextValue = Entry.nextToggleValue(
value = oldValue, value = entry.value,
isSkipEnabled = preferences.isSkipEnabled, isSkipEnabled = preferences.isSkipEnabled,
areQuestionMarksEnabled = preferences.areQuestionMarksEnabled areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
) )
commandRunner.run( commandRunner.run(
CreateRepetitionCommand( CreateRepetitionCommand(
habitList, habitList,
habit, habit,
timestamp, timestamp,
nextValue, nextValue,
notes, entry.notes,
), ),
) )
return }
} }
screen.showCheckmarkDialog(notes) { newNotes ->
override fun onDateLongPress(date: LocalDate) {
val timestamp = Timestamp.fromLocalDate(date)
screen.showFeedback()
if (habit.isNumerical) {
showNumberPicker(timestamp)
} else {
val entry = habit.computedEntries.get(timestamp)
screen.showCheckmarkDialog(entry.notes) { newNotes ->
commandRunner.run( commandRunner.run(
CreateRepetitionCommand( CreateRepetitionCommand(
habitList, habitList,
habit, habit,
timestamp, timestamp,
oldValue, entry.value,
newNotes, newNotes,
), ),
) )
@ -110,6 +104,27 @@ class HistoryCardPresenter(
} }
} }
private fun showNumberPicker(timestamp: Timestamp) {
val entry = habit.computedEntries.get(timestamp)
val oldValue = entry.value
screen.showNumberPicker(
oldValue / 1000.0,
habit.unit,
entry.notes
) { newValue: Double, newNotes: String ->
val thousands = (newValue * 1000).roundToInt()
commandRunner.run(
CreateRepetitionCommand(
habitList,
habit,
timestamp,
thousands,
newNotes,
),
)
}
}
fun onClickEditButton() { fun onClickEditButton() {
screen.showHistoryEditorDialog(this) screen.showHistoryEditorDialog(this)
} }
@ -167,7 +182,7 @@ class HistoryCardPresenter(
today = today.toLocalDate(), today = today.toLocalDate(),
theme = theme, theme = theme,
series = series, series = series,
defaultSquare = defaultSquare defaultSquare = defaultSquare,
hasNotes = hasNotes, hasNotes = hasNotes,
) )
} }

13
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt
Unescape View File

@ -32,8 +32,9 @@ import kotlin.math.max
import kotlin.math.min import kotlin.math.min
import kotlin.math.round import kotlin.math.round
fun interface OnDateClickedListener { interface OnDateClickedListener {
fun onDateClicked(date: LocalDate, isLongClick: Boolean) fun onDateShortPress(date: LocalDate) {}
fun onDateLongPress(date: LocalDate) {}
} }
class HistoryChart( class HistoryChart(
@ -45,7 +46,7 @@ class HistoryChart(
var hasNotes: List<Boolean>, var hasNotes: List<Boolean>,
var theme: Theme, var theme: Theme,
var today: LocalDate, var today: LocalDate,
var onDateClickedListener: OnDateClickedListener = OnDateClickedListener { _, _ -> }, var onDateClickedListener: OnDateClickedListener = object : OnDateClickedListener {},
var padding: Double = 0.0, var padding: Double = 0.0,
) : DataView { ) : DataView {
@ -88,7 +89,11 @@ class HistoryChart(
if (row == 0 || col == nColumns) return if (row == 0 || col == nColumns) return
val clickedDate = topLeftDate.plus(offset) val clickedDate = topLeftDate.plus(offset)
if (clickedDate.isNewerThan(today)) return if (clickedDate.isNewerThan(today)) return
onDateClickedListener.onDateClicked(clickedDate, isLongClick) if (isLongClick) {
onDateClickedListener.onDateLongPress(clickedDate)
} else {
onDateClickedListener.onDateShortPress(clickedDate)
}
} }
override fun draw(canvas: Canvas) { override fun draw(canvas: Canvas) {

15
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.kt
Unescape View File

@ -38,43 +38,38 @@ class WidgetBehavior @Inject constructor(
fun onAddRepetition(habit: Habit, timestamp: Timestamp?) { fun onAddRepetition(habit: Habit, timestamp: Timestamp?) {
notificationTray.cancel(habit) notificationTray.cancel(habit)
val entry = habit.originalEntries.get(timestamp!!) val entry = habit.originalEntries.get(timestamp!!)
val notes = entry.notes setValue(habit, timestamp, Entry.YES_MANUAL, entry.notes)
setValue(habit, timestamp, Entry.YES_MANUAL, notes)
} }
fun onRemoveRepetition(habit: Habit, timestamp: Timestamp?) { fun onRemoveRepetition(habit: Habit, timestamp: Timestamp?) {
notificationTray.cancel(habit) notificationTray.cancel(habit)
val entry = habit.originalEntries.get(timestamp!!) val entry = habit.originalEntries.get(timestamp!!)
val notes = entry.notes setValue(habit, timestamp, Entry.NO, entry.notes)
setValue(habit, timestamp, Entry.NO, notes)
} }
fun onToggleRepetition(habit: Habit, timestamp: Timestamp) { fun onToggleRepetition(habit: Habit, timestamp: Timestamp) {
val entry = habit.originalEntries.get(timestamp) val entry = habit.originalEntries.get(timestamp)
val currentValue = entry.value val currentValue = entry.value
val notes = entry.notes
val newValue = nextToggleValue( val newValue = nextToggleValue(
value = currentValue, value = currentValue,
isSkipEnabled = preferences.isSkipEnabled, isSkipEnabled = preferences.isSkipEnabled,
areQuestionMarksEnabled = preferences.areQuestionMarksEnabled areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
) )
setValue(habit, timestamp, newValue, notes) setValue(habit, timestamp, newValue, entry.notes)
notificationTray.cancel(habit) notificationTray.cancel(habit)
} }
fun onIncrement(habit: Habit, timestamp: Timestamp, amount: Int) { fun onIncrement(habit: Habit, timestamp: Timestamp, amount: Int) {
val entry = habit.computedEntries.get(timestamp) val entry = habit.computedEntries.get(timestamp)
val currentValue = entry.value val currentValue = entry.value
val notes = entry.notes setValue(habit, timestamp, currentValue + amount, entry.notes)
setValue(habit, timestamp, currentValue + amount, notes)
notificationTray.cancel(habit) notificationTray.cancel(habit)
} }
fun onDecrement(habit: Habit, timestamp: Timestamp, amount: Int) { fun onDecrement(habit: Habit, timestamp: Timestamp, amount: Int) {
val entry = habit.computedEntries.get(timestamp) val entry = habit.computedEntries.get(timestamp)
val currentValue = entry.value val currentValue = entry.value
val notes = entry.notes setValue(habit, timestamp, currentValue - amount, entry.notes)
setValue(habit, timestamp, currentValue - amount, notes)
notificationTray.cancel(habit) notificationTray.cancel(habit)
} }

39
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
Unescape View File

@ -90,20 +90,20 @@ class HistoryChartTest {
// Click top left date // Click top left date
view.onClick(20.0, 46.0) view.onClick(20.0, 46.0)
verify(dateClickedListener).onDateClicked(LocalDate(2014, 10, 26), false) verify(dateClickedListener).onDateShortPress(LocalDate(2014, 10, 26))
reset(dateClickedListener) reset(dateClickedListener)
view.onClick(2.0, 28.0) view.onClick(2.0, 28.0)
verify(dateClickedListener).onDateClicked(LocalDate(2014, 10, 26), false) verify(dateClickedListener).onDateShortPress(LocalDate(2014, 10, 26))
reset(dateClickedListener) reset(dateClickedListener)
// Click date in the middle // Click date in the middle
view.onClick(163.0, 113.0) view.onClick(163.0, 113.0)
verify(dateClickedListener).onDateClicked(LocalDate(2014, 12, 10), false) verify(dateClickedListener).onDateShortPress(LocalDate(2014, 12, 10))
reset(dateClickedListener) reset(dateClickedListener)
// Click today // Click today
view.onClick(336.0, 37.0) view.onClick(336.0, 37.0)
verify(dateClickedListener).onDateClicked(LocalDate(2015, 1, 25), false) verify(dateClickedListener).onDateShortPress(LocalDate(2015, 1, 25))
reset(dateClickedListener) reset(dateClickedListener)
// Click header // Click header
@ -115,6 +115,37 @@ class HistoryChartTest {
verifyNoMoreInteractions(dateClickedListener) verifyNoMoreInteractions(dateClickedListener)
} }
@Test
fun testLongClick() = runBlocking {
assertRenders(400, 200, "$base/base.png", view)
// Click top left date
view.onLongClick(20.0, 46.0)
verify(dateClickedListener).onDateLongPress(LocalDate(2014, 10, 26))
reset(dateClickedListener)
view.onLongClick(2.0, 28.0)
verify(dateClickedListener).onDateLongPress(LocalDate(2014, 10, 26))
reset(dateClickedListener)
// Click date in the middle
view.onLongClick(163.0, 113.0)
verify(dateClickedListener).onDateLongPress(LocalDate(2014, 12, 10))
reset(dateClickedListener)
// Click today
view.onLongClick(336.0, 37.0)
verify(dateClickedListener).onDateLongPress(LocalDate(2015, 1, 25))
reset(dateClickedListener)
// Click header
view.onLongClick(160.0, 15.0)
verifyNoMoreInteractions(dateClickedListener)
// Click right axis
view.onLongClick(360.0, 60.0)
verifyNoMoreInteractions(dateClickedListener)
}
@Test @Test
fun testDrawWeekDay() = runBlocking { fun testDrawWeekDay() = runBlocking {
view.firstWeekday = DayOfWeek.MONDAY view.firstWeekday = DayOfWeek.MONDAY

Write Preview
Loading…
Cancel
Save