fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

show proper strings at yearly repetition

This commit is contained in:
tibbi 2018-05-10 13:59:16 +02:00
parent e33054be98
commit 6c2cbb6414
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -46,7 +46,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:4.0.1' implementation 'com.simplemobiletools:commons:4.0.2'
implementation 'joda-time:joda-time:2.9.9' implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'

10
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@ -307,7 +307,8 @@ class EventActivity : SimpleActivity() {
} }
private fun getAvailableYearlyRepetitionRules(): ArrayList<RadioItem> { private fun getAvailableYearlyRepetitionRules(): ArrayList<RadioItem> {
val items = arrayListOf(RadioItem(REPEAT_SAME_DAY, getString(R.string.repeat_on_the_same_day_monthly))) val items = arrayListOf(RadioItem(REPEAT_SAME_DAY, getString(R.string.repeat_on_the_same_day_yearly)))
items.add(RadioItem(REPEAT_ORDER_WEEKDAY, getRepeatXthDayInMonthString(true, REPEAT_ORDER_WEEKDAY)))
return items return items
} }
@ -367,6 +368,12 @@ class EventActivity : SimpleActivity() {
}) })
} }
private fun getRepeatXthDayInMonthString(includeBase: Boolean, repeatRule: Int): String {
val weekDayString = getRepeatXthDayString(includeBase, repeatRule)
val monthString = resources.getStringArray(R.array.in_months)[mEventStartDateTime.monthOfYear - 1]
return "$weekDayString $monthString"
}
private fun setRepeatRule(rule: Int) { private fun setRepeatRule(rule: Int) {
mRepeatRule = rule mRepeatRule = rule
checkRepetitionRuleText() checkRepetitionRuleText()
@ -405,6 +412,7 @@ class EventActivity : SimpleActivity() {
private fun getYearlyRepetitionRuleText() = when (mRepeatRule) { private fun getYearlyRepetitionRuleText() = when (mRepeatRule) {
REPEAT_SAME_DAY -> getString(R.string.the_same_day) REPEAT_SAME_DAY -> getString(R.string.the_same_day)
REPEAT_ORDER_WEEKDAY -> getRepeatXthDayInMonthString(false, mRepeatRule)
else -> "" else -> ""
} }

2
app/src/main/res/layout/activity_event.xml
View File

@ -304,9 +304,7 @@
android:layout_toEndOf="@+id/event_repetition_rule_label" android:layout_toEndOf="@+id/event_repetition_rule_label"
android:layout_toRightOf="@+id/event_repetition_rule_label" android:layout_toRightOf="@+id/event_repetition_rule_label"
android:clickable="false" android:clickable="false"
android:ellipsize="end"
android:gravity="end" android:gravity="end"
android:lines="1"
android:padding="@dimen/activity_margin" android:padding="@dimen/activity_margin"
android:text="@string/every_day" android:text="@string/every_day"
android:textSize="@dimen/day_text_size"/> android:textSize="@dimen/day_text_size"/>