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

Should be fixed for good , need to test though

Browse Source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
rapterjet2004 2024-09-03 07:59:16 -05:00
parent fa4bfbc235
commit 08d5d41229
No known key found for this signature in database
GPG Key ID: 3AA5FDFED7944099
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,8 +103,6 @@ class DateTimePickerFragment : DialogFragment() {
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
@ -117,7 +115,7 @@ class DateTimePickerFragment : DialogFragment() {
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
@ -255,18 +253,18 @@ class DateTimePickerFragment : DialogFragment() {
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)