fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor UX improvement

Browse Source
This commit is contained in:
Naveen
2023-04-30 16:18:48 +05:30
parent c4eeaeebc4
commit d7dd175bb5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,11 +647,13 @@ class EventActivity : SimpleActivity() {
event_repetition_limit_label.text = getString(R.string.repeat) event_repetition_limit_label.text = getString(R.string.repeat)
resources.getString(R.string.forever) resources.getString(R.string.forever)
} }
mRepeatLimit > 0 -> { mRepeatLimit > 0 -> {
event_repetition_limit_label.text = getString(R.string.repeat_till) event_repetition_limit_label.text = getString(R.string.repeat_till)
val repeatLimitDateTime = Formatter.getDateTimeFromTS(mRepeatLimit) val repeatLimitDateTime = Formatter.getDateTimeFromTS(mRepeatLimit)
Formatter.getFullDate(this, repeatLimitDateTime) Formatter.getFullDate(this, repeatLimitDateTime)
} }
else -> { else -> {
event_repetition_limit_label.text = getString(R.string.repeat) event_repetition_limit_label.text = getString(R.string.repeat)
"${-mRepeatLimit} ${getString(R.string.times)}" "${-mRepeatLimit} ${getString(R.string.times)}"
@@ -665,12 +667,14 @@ class EventActivity : SimpleActivity() {
mRepeatInterval.isXWeeklyRepetition() -> RepeatRuleWeeklyDialog(this, mRepeatRule) { mRepeatInterval.isXWeeklyRepetition() -> RepeatRuleWeeklyDialog(this, mRepeatRule) {
setRepeatRule(it) setRepeatRule(it)
} }
mRepeatInterval.isXMonthlyRepetition() -> { mRepeatInterval.isXMonthlyRepetition() -> {
val items = getAvailableMonthlyRepetitionRules() val items = getAvailableMonthlyRepetitionRules()
RadioGroupDialog(this, items, mRepeatRule) { RadioGroupDialog(this, items, mRepeatRule) {
setRepeatRule(it as Int) setRepeatRule(it as Int)
} }
} }
mRepeatInterval.isXYearlyRepetition() -> { mRepeatInterval.isXYearlyRepetition() -> {
val items = getAvailableYearlyRepetitionRules() val items = getAvailableYearlyRepetitionRules()
RadioGroupDialog(this, items, mRepeatRule) { RadioGroupDialog(this, items, mRepeatRule) {
@@ -787,6 +791,7 @@ class EventActivity : SimpleActivity() {
mRepeatInterval.isXWeeklyRepetition() -> { mRepeatInterval.isXWeeklyRepetition() -> {
event_repetition_rule.text = if (mRepeatRule == EVERY_DAY_BIT) getString(R.string.every_day) else getSelectedDaysString(mRepeatRule) event_repetition_rule.text = if (mRepeatRule == EVERY_DAY_BIT) getString(R.string.every_day) else getSelectedDaysString(mRepeatRule)
} }
mRepeatInterval.isXMonthlyRepetition() -> { mRepeatInterval.isXMonthlyRepetition() -> {
val repeatString = if (mRepeatRule == REPEAT_ORDER_WEEKDAY_USE_LAST || mRepeatRule == REPEAT_ORDER_WEEKDAY) val repeatString = if (mRepeatRule == REPEAT_ORDER_WEEKDAY_USE_LAST || mRepeatRule == REPEAT_ORDER_WEEKDAY)
R.string.repeat else R.string.repeat_on R.string.repeat else R.string.repeat_on
@@ -794,6 +799,7 @@ class EventActivity : SimpleActivity() {
event_repetition_rule_label.text = getString(repeatString) event_repetition_rule_label.text = getString(repeatString)
event_repetition_rule.text = getMonthlyRepetitionRuleText() event_repetition_rule.text = getMonthlyRepetitionRuleText()
} }
mRepeatInterval.isXYearlyRepetition() -> { mRepeatInterval.isXYearlyRepetition() -> {
val repeatString = if (mRepeatRule == REPEAT_ORDER_WEEKDAY_USE_LAST || mRepeatRule == REPEAT_ORDER_WEEKDAY) val repeatString = if (mRepeatRule == REPEAT_ORDER_WEEKDAY_USE_LAST || mRepeatRule == REPEAT_ORDER_WEEKDAY)
R.string.repeat else R.string.repeat_on R.string.repeat else R.string.repeat_on
@@ -1050,11 +1056,11 @@ class EventActivity : SimpleActivity() {
ensureBackgroundThread { ensureBackgroundThread {
val eventType = eventTypesDB.getEventTypeWithId(mEventTypeId) val eventType = eventTypesDB.getEventTypeWithId(mEventTypeId)
event_color_image.beVisibleIf(eventType != null)
event_color_holder.beVisibleIf(eventType != null)
event_color_divider.beVisibleIf(eventType != null)
if (eventType != null) { if (eventType != null) {
runOnUiThread { runOnUiThread {
event_color_image.beVisible()
event_color_holder.beVisible()
event_color_divider.beVisible()
updateEventColorInfo(eventType.color) updateEventColorInfo(eventType.color)
} }
} }