mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 12:09:45 +01:00
fixed weekendTimeStamp, added a comment for clarity
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
parent
08d5d41229
commit
ece1f2ed65
@ -102,13 +102,13 @@ class DateTimePickerFragment : DialogFragment() {
|
|||||||
tomorrowTimeStamp = getTimeFromCalendar(
|
tomorrowTimeStamp = getTimeFromCalendar(
|
||||||
hour = HOUR_EIGHT_AM,
|
hour = HOUR_EIGHT_AM,
|
||||||
minute = 0,
|
minute = 0,
|
||||||
daysToAdd = 1,
|
daysToAdd = 1
|
||||||
)
|
)
|
||||||
|
|
||||||
binding.dateTimePickerWeekend.visibility = View.GONE // because today is the weekend
|
binding.dateTimePickerWeekend.visibility = View.GONE // because today is the weekend
|
||||||
} else {
|
} else {
|
||||||
tomorrowTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, minute = 0, daysToAdd = 1)
|
tomorrowTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, minute = 0, daysToAdd = 1)
|
||||||
weekendTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, day = Calendar.SATURDAY, minute = 0)
|
weekendTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, weekDay = Calendar.SATURDAY, minute = 0)
|
||||||
}
|
}
|
||||||
binding.dateTimePickerTomorrowTextview.text = getTimeFromTimeStamp(tomorrowTimeStamp)
|
binding.dateTimePickerTomorrowTextview.text = getTimeFromTimeStamp(tomorrowTimeStamp)
|
||||||
binding.dateTimePickerWeekendTextview.text = getTimeFromTimeStamp(weekendTimeStamp)
|
binding.dateTimePickerWeekendTextview.text = getTimeFromTimeStamp(weekendTimeStamp)
|
||||||
@ -249,6 +249,9 @@ class DateTimePickerFragment : DialogFragment() {
|
|||||||
timePicker.show(this.parentFragmentManager, TAG)
|
timePicker.show(this.parentFragmentManager, TAG)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* You can use `weekDay` or `daysToAdd` or neither but don't use both b/c it messes up the calendar
|
||||||
|
*/
|
||||||
@Suppress("LongParameterList")
|
@Suppress("LongParameterList")
|
||||||
private fun getTimeFromCalendar(
|
private fun getTimeFromCalendar(
|
||||||
year: Int = Calendar.getInstance().get(Calendar.YEAR),
|
year: Int = Calendar.getInstance().get(Calendar.YEAR),
|
||||||
|
Loading…
Reference in New Issue
Block a user