Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug Fix] Fix wrong value when choosing custom reminder date #4273

Merged
merged 1 commit into from
Sep 27, 2024
Merged

[Bug Fix] Fix wrong value when choosing custom reminder date #4273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,9 @@ class DateTimePickerFragment : DialogFragment() {

val year = calendar.get(Calendar.YEAR)
val month = calendar.get(Calendar.MONTH)
val day = calendar.get(Calendar.DAY_OF_WEEK)
val weekInYear = calendar.get(Calendar.WEEK_OF_YEAR)
val day = calendar.get(Calendar.DAY_OF_YEAR)

setUpTimePicker(year, month, day, weekInYear)
setUpTimePicker(year, month, day)
}
datePicker.show(this.parentFragmentManager, TAG)
}
Expand All @@ -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 timePicker = MaterialTimePicker.Builder()
.setTitleText(R.string.nc_remind)
Expand All @@ -240,7 +239,6 @@ class DateTimePickerFragment : DialogFragment() {
day,
timePicker.hour,
timePicker.minute,
weekInYear = weekInYear
)
setTimeStamp(getTimeFromTimeStamp(timestamp))
currentTimeStamp = timestamp / ONE_SEC
Expand All @@ -260,14 +258,16 @@ class DateTimePickerFragment : DialogFragment() {
hour: Int = Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
minute: Int = Calendar.getInstance().get(Calendar.MINUTE),
daysToAdd: Int = 0,
weekInYear: Int = Calendar.getInstance().get(Calendar.WEEK_OF_YEAR),
weekInYear: Int = -1,
weekDay: Int = -1
): Long {
val calendar: Calendar = Calendar.getInstance().apply {
set(Calendar.YEAR, year)
set(Calendar.MONTH, month)
if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay) else set(Calendar.DAY_OF_YEAR, day)
if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd) else set(Calendar.WEEK_OF_YEAR, weekInYear)
set(Calendar.DAY_OF_YEAR,day)
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.MINUTE, minute)
set(Calendar.SECOND, 0)
Expand Down
Loading