sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix date issues

Browse source
This commit is contained in:
Phillip Thelen 2022-07-26 12:44:01 +02:00
parent 08980d1933
commit fa82c89ecc
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
View file

@ -56,6 +56,9 @@ open class RemindersItem : RealmObject, Parcelable {
}
fun getZonedDateTime(): ZonedDateTime? {
if (time == null) {
return null
}
val formatter: DateTimeFormatter =
DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
.appendPattern("['T'][' ']")

24
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
View file

@ -18,12 +18,12 @@ import androidx.core.content.ContextCompat
import androidx.core.view.children
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.TaskFormTaskSchedulingBinding
import com.habitrpg.android.habitica.models.tasks.Days
import com.habitrpg.android.habitica.ui.adapter.SimpleSpinnerAdapter
import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.common.habitica.extensions.layoutInflater
import com.habitrpg.android.habitica.models.tasks.Days
import com.habitrpg.common.habitica.models.tasks.Frequency
import com.habitrpg.common.habitica.models.tasks.TaskType
import com.habitrpg.android.habitica.ui.adapter.SimpleSpinnerAdapter
import java.text.DateFormat
import java.text.DateFormatSymbols
import java.util.Calendar
@ -111,16 +111,20 @@ class TaskSchedulingControls @JvmOverloads constructor(
generateSummary()
}
var firstDayOfWeek: Int? = null
var firstDayOfWeek: Int = -1
set(value) {
field = value
if (value >= 0) {
val codes = (1..7).toList()
Collections.rotate(codes, -firstDayOfWeek+1)
weekdayOrder = codes
}
}
private val weekdays: Array<String> by lazy {
DateFormatSymbols().weekdays
}
private val weekdayOrder: List<Int> by lazy {
val codes = (1..7).toList()
Collections.rotate(codes, -startDateCalendar.firstDayOfWeek)
codes
}
private var weekdayOrder: List<Int> = (1..7).toList()
init {
binding.repeatsEverySpinner.adapter = frequencyAdapter
@ -165,8 +169,8 @@ class TaskSchedulingControls @JvmOverloads constructor(
}
}
if ((firstDayOfWeek ?: -1) >= 0) {
datePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
if (firstDayOfWeek >= 0) {
datePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek
}
if (taskType == TaskType.TODO) {
datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, resources.getString(R.string.clear)) { _, _ ->

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.0
CODE=4260
CODE=4270