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

allow changing the Period used for displaying past events

This commit is contained in:
tibbi 2017-05-24 19:17:47 +02:00
parent 57f246c52a
commit 9812bf56a7
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,17 +223,19 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupDisplayPastEvents() { private fun setupDisplayPastEvents() {
updatePastEventsText() var displayPastEvents = config.displayPastEvents
updatePastEventsText(displayPastEvents)
settings_display_past_events_holder.setOnClickListener { settings_display_past_events_holder.setOnClickListener {
CustomEventReminderDialog(this) { CustomEventReminderDialog(this, displayPastEvents) {
displayPastEvents = it
config.displayPastEvents = it config.displayPastEvents = it
updatePastEventsText() updatePastEventsText(it)
} }
} }
} }
private fun updatePastEventsText() { private fun updatePastEventsText(displayPastEvents: Int) {
settings_display_past_events.text = getDisplayPastEventsText(config.displayPastEvents) settings_display_past_events.text = getDisplayPastEventsText(displayPastEvents)
} }
private fun getDisplayPastEventsText(displayPastEvents: Int): String { private fun getDisplayPastEventsText(displayPastEvents: Int): String {

20
app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventReminderDialog.kt
View File

@ -2,6 +2,7 @@ package com.simplemobiletools.calendar.dialogs
import android.app.Activity import android.app.Activity
import android.support.v7.app.AlertDialog import android.support.v7.app.AlertDialog
import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.WindowManager import android.view.WindowManager
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
@ -10,13 +11,24 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.extensions.value
import kotlinx.android.synthetic.main.dialog_custom_event_reminder.view.* import kotlinx.android.synthetic.main.dialog_custom_event_reminder.view.*
class CustomEventReminderDialog(val activity: Activity, val callback: (minutes: Int) -> Unit) : AlertDialog.Builder(activity) { class CustomEventReminderDialog(val activity: Activity, val selectedMinutes: Int = 0, val callback: (minutes: Int) -> Unit) : AlertDialog.Builder(activity) {
var dialog: AlertDialog var dialog: AlertDialog
var view = activity.layoutInflater.inflate(R.layout.dialog_custom_event_reminder, null) as ViewGroup var view: View = (activity.layoutInflater.inflate(R.layout.dialog_custom_event_reminder, null) as ViewGroup).apply {
if (selectedMinutes == 0) {
dialog_radio_view.check(R.id.dialog_radio_minutes)
} else if (selectedMinutes % 1440 == 0) {
dialog_radio_view.check(R.id.dialog_radio_days)
dialog_custom_reminder_value.setText((selectedMinutes / 1440).toString())
} else if (selectedMinutes % 60 == 0) {
dialog_radio_view.check(R.id.dialog_radio_hours)
dialog_custom_reminder_value.setText((selectedMinutes / 60).toString())
} else {
dialog_radio_view.check(R.id.dialog_radio_minutes)
dialog_custom_reminder_value.setText(selectedMinutes.toString())
}
}
init { init {
view.dialog_radio_view.check(R.id.dialog_radio_minutes)
dialog = AlertDialog.Builder(activity) dialog = AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, { dialogInterface, i -> confirmReminder() }) .setPositiveButton(R.string.ok, { dialogInterface, i -> confirmReminder() })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)

6
app/src/main/res/layout/dialog_custom_event_reminder.xml
View File

@ -16,12 +16,12 @@
<com.simplemobiletools.commons.views.MyEditText <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/dialog_custom_reminder_value" android:id="@+id/dialog_custom_reminder_value"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:digits="0123456789" android:digits="0123456789"
android:ems="3" android:ems="6"
android:inputType="number" android:inputType="number"
android:maxLength="4" android:maxLength="5"
android:textCursorDrawable="@null"/> android:textCursorDrawable="@null"/>
<RadioGroup <RadioGroup

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

@ -21,7 +21,7 @@
android:id="@+id/snooze_picker" android:id="@+id/snooze_picker"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="5" android:ems="6"
android:inputType="number" android:inputType="number"
android:maxLength="5" android:maxLength="5"
android:paddingTop="@dimen/normal_margin"/> android:paddingTop="@dimen/normal_margin"/>