sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with monthly dailies. Fixes #1195

Browse source
This commit is contained in:
Phillip Thelen 2019-08-08 12:57:10 +02:00
parent 3b87c4453c
commit 3d1b26f290
3 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/values/strings.xml
View file

@ -589,7 +589,7 @@
<string name="reload_content">Reload Content</string>
<string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
<string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
<string name="repeat_summary">"Repeats %1$s every %2$s %3$s %4$s"</string>
<string name="repeat_summary" translatable="false">"Repeats %1$s every %2$s%3$s %4$s"</string>
<string name="no_billing_gems">Your device does not have any of the supported payment methods. Please use the habitica website if you want to purchase gems.</string>
<string name="no_billing_subscriptions">Your device does not have any of the supported payment methods. Please use the habitica website if you want to purchase a subscription.</string>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -338,12 +338,12 @@ class TaskFormActivity : BaseActivity() {
}
Task.TYPE_DAILY -> {
taskSchedulingControls.startDate = task.startDate ?: Date()
taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
taskSchedulingControls.everyX = task.everyX ?: 1
task.repeat?.let { taskSchedulingControls.weeklyRepeat = it }
taskSchedulingControls.daysOfMonth = task.getDaysOfMonth()
taskSchedulingControls.weeksOfMonth = task.getWeeksOfMonth()
habitAdjustPositiveStreakView.setText((task.streak ?: 0).toString())
taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
}
Task.TYPE_TODO -> taskSchedulingControls.dueDate = task.dueDate
Task.TYPE_REWARD -> rewardValueFormView.value = task.value

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

@ -3,6 +3,8 @@ package com.habitrpg.android.habitica.ui.views.tasks.form
import android.app.DatePickerDialog
import android.content.Context
import android.content.DialogInterface
import android.icu.text.MessageFormat
import android.os.Build
import android.text.TextUtils
import android.util.AttributeSet
import android.view.View
@ -288,52 +290,62 @@ class TaskSchedulingControls @JvmOverloads constructor(
var frequencyQualifier = ""
when (frequency) {
"daily" -> frequencyQualifier = "day(s)"
"weekly" -> frequencyQualifier = "week(s)"
"monthly" -> frequencyQualifier = "month(s)"
"yearly" -> frequencyQualifier = "year(s)"
"daily" -> frequencyQualifier = if (everyX == 1) "day" else "days"
"weekly" -> frequencyQualifier = if (everyX == 1) "week" else "weeks"
"monthly" -> frequencyQualifier = if (everyX == 1) "month" else "months"
"yearly" -> frequencyQualifier = if (everyX == 1) "year" else "years"
}
var weekdays: String
val weekdayStrings = ArrayList<String>()
if (weeklyRepeat.m) {
weekdayStrings.add("Monday")
}
if (weeklyRepeat.t) {
weekdayStrings.add("Tuesday")
}
if (weeklyRepeat.w) {
weekdayStrings.add("Wednesday")
}
if (weeklyRepeat.th) {
weekdayStrings.add("Thursday")
}
if (weeklyRepeat.f) {
weekdayStrings.add("Friday")
}
if (weeklyRepeat.s) {
weekdayStrings.add("Saturday")
}
if (weeklyRepeat.su) {
weekdayStrings.add("Sunday")
}
weekdays = " on " + TextUtils.join(", ", weekdayStrings)
if (frequency != "weekly") {
weekdays = ""
var weekdays = if (frequency == "weekly") {
val weekdayStrings = ArrayList<String>()
if (weeklyRepeat.m) {
weekdayStrings.add("Monday")
}
if (weeklyRepeat.t) {
weekdayStrings.add("Tuesday")
}
if (weeklyRepeat.w) {
weekdayStrings.add("Wednesday")
}
if (weeklyRepeat.th) {
weekdayStrings.add("Thursday")
}
if (weeklyRepeat.f) {
weekdayStrings.add("Friday")
}
if (weeklyRepeat.s) {
weekdayStrings.add("Saturday")
}
if (weeklyRepeat.su) {
weekdayStrings.add("Sunday")
}
" on " + TextUtils.join(", ", weekdayStrings)
} else {
""
}
if (frequency == "monthly") {
weekdays = if (daysOfMonth != null) {
weekdays = if (daysOfMonth?.isNotEmpty() == true) {
val date = startDateCalendar.get(Calendar.DATE)
" on the $date"
val formattedDate = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
formatter.format(arrayOf(date))
} else date.toString()
" on the $formattedDate"
} else {
val week = startDateCalendar.get(Calendar.WEEK_OF_MONTH)
val formattedWeek = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
formatter.format(arrayOf(week))
} else week.toString()
val dayLongName = startDateCalendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.getDefault())
" on the $week week on $dayLongName"
" on the $formattedWeek week on $dayLongName"
}
}
val summary = resources.getString(R.string.repeat_summary, frequency, everyX.toString(), frequencyQualifier, weekdays)
val everyXString = if (everyX == 1) "" else "$everyX "
val summary = resources.getString(R.string.repeat_summary, frequency, everyXString, frequencyQualifier, weekdays)
summaryTextView.text = summary
}
}