gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4135 from nextcloud/issue-4099-time-picker-bug

Browse Source 
Fixing remind-me-later options
This commit is contained in:
Julius Linus 2024-09-04 08:03:24 -05:00 committed by GitHub
commit 7b63d0b432
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
View File

@ -102,22 +102,20 @@ class DateTimePickerFragment : DialogFragment() {
tomorrowTimeStamp = getTimeFromCalendar( tomorrowTimeStamp = getTimeFromCalendar(
hour = HOUR_EIGHT_AM, hour = HOUR_EIGHT_AM,
minute = 0, minute = 0,
daysToAdd = 1, daysToAdd = 1
weekInYear =
currentWeekInYear + 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)
nextWeekTimeStamp = getTimeFromCalendar( nextWeekTimeStamp = getTimeFromCalendar(
hour = HOUR_EIGHT_AM, hour = HOUR_EIGHT_AM,
day = Calendar.MONDAY, weekDay = Calendar.MONDAY,
minute = 0, minute = 0,
weekInYear = weekInYear =
currentWeekInYear + 1 currentWeekInYear + 1
@ -251,22 +249,25 @@ 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),
month: Int = Calendar.getInstance().get(Calendar.MONTH), month: Int = Calendar.getInstance().get(Calendar.MONTH),
day: Int = Calendar.getInstance().get(Calendar.DAY_OF_WEEK), day: Int = Calendar.getInstance().get(Calendar.DAY_OF_YEAR),
hour: Int = Calendar.getInstance().get(Calendar.HOUR_OF_DAY), hour: Int = Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
minute: Int = Calendar.getInstance().get(Calendar.MINUTE), minute: Int = Calendar.getInstance().get(Calendar.MINUTE),
daysToAdd: Int = 0, daysToAdd: Int = 0,
weekInYear: Int = Calendar.getInstance().get(Calendar.WEEK_OF_YEAR) weekInYear: Int = Calendar.getInstance().get(Calendar.WEEK_OF_YEAR),
weekDay: Int = -1
): Long { ): Long {
val calendar: Calendar = Calendar.getInstance().apply { val calendar: Calendar = Calendar.getInstance().apply {
set(Calendar.YEAR, year) set(Calendar.YEAR, year)
set(Calendar.MONTH, month) set(Calendar.MONTH, month)
set(Calendar.DAY_OF_WEEK, day) if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay) else set(Calendar.DAY_OF_YEAR, day)
add(Calendar.DAY_OF_WEEK, daysToAdd) if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd) else set(Calendar.WEEK_OF_YEAR, weekInYear)
set(Calendar.WEEK_OF_YEAR, weekInYear)
set(Calendar.HOUR_OF_DAY, hour) set(Calendar.HOUR_OF_DAY, hour)
set(Calendar.MINUTE, minute) set(Calendar.MINUTE, minute)
set(Calendar.SECOND, 0) set(Calendar.SECOND, 0)