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

Fix logic for date time retrieval

Browse Source 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
This commit is contained in:
parneet-guraya 2024-09-25 22:04:11 +05:30
parent a463e95f0b
commit 856c0761c9
No known key found for this signature in database
GPG Key ID: 63B807C4B2A9064B
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,10 +200,9 @@ class DateTimePickerFragment : DialogFragment() {
val year = calendar.get(Calendar.YEAR) val year = calendar.get(Calendar.YEAR)
val month = calendar.get(Calendar.MONTH) val month = calendar.get(Calendar.MONTH)
val day = calendar.get(Calendar.DAY_OF_WEEK) val day = calendar.get(Calendar.DAY_OF_YEAR)
val weekInYear = calendar.get(Calendar.WEEK_OF_YEAR)
setUpTimePicker(year, month, day, weekInYear) setUpTimePicker(year, month, day)
} }
datePicker.show(this.parentFragmentManager, TAG) datePicker.show(this.parentFragmentManager, TAG)
} }
@ -226,7 +225,7 @@ class DateTimePickerFragment : DialogFragment() {
} }
} }
private fun setUpTimePicker(year: Int, month: Int, day: Int, weekInYear: Int) { private fun setUpTimePicker(year: Int, month: Int, day: Int) {
val locale = if (DateFormat.is24HourFormat(requireContext())) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H val locale = if (DateFormat.is24HourFormat(requireContext())) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H
val timePicker = MaterialTimePicker.Builder() val timePicker = MaterialTimePicker.Builder()
.setTitleText(R.string.nc_remind) .setTitleText(R.string.nc_remind)
@ -240,7 +239,6 @@ class DateTimePickerFragment : DialogFragment() {
day, day,
timePicker.hour, timePicker.hour,
timePicker.minute, timePicker.minute,
weekInYear = weekInYear
) )
setTimeStamp(getTimeFromTimeStamp(timestamp)) setTimeStamp(getTimeFromTimeStamp(timestamp))
currentTimeStamp = timestamp / ONE_SEC currentTimeStamp = timestamp / ONE_SEC
@ -260,14 +258,16 @@ class DateTimePickerFragment : DialogFragment() {
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 = -1,
weekDay: Int = -1 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)
if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay) else set(Calendar.DAY_OF_YEAR, day) set(Calendar.DAY_OF_YEAR,day)
if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd) else set(Calendar.WEEK_OF_YEAR, weekInYear) if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay)
if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd)
if (weekInYear != -1) 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)