diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ChangeViewDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ChangeViewDialog.kt index 627f5b331..bfc2f6b34 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ChangeViewDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ChangeViewDialog.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import android.widget.RadioGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.config @@ -17,7 +16,7 @@ class ChangeViewDialog(val activity: Activity, val callback: (newView: Int) -> U val dialog: AlertDialog? init { - val view = LayoutInflater.from(activity).inflate(R.layout.dialog_change_views, null).dialog_radio_view.apply { + val view = activity.layoutInflater.inflate(R.layout.dialog_change_views, null).dialog_radio_view.apply { check(getSavedItem()) setOnCheckedChangeListener(this@ChangeViewDialog) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventReminderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventReminderDialog.kt index d719909d3..e28744f97 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventReminderDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventReminderDialog.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import android.view.ViewGroup import android.view.WindowManager import com.simplemobiletools.calendar.R @@ -13,7 +12,7 @@ import kotlinx.android.synthetic.main.dialog_custom_event_reminder.view.* class CustomEventReminderDialog(val activity: Activity, val callback: (minutes: Int) -> Unit) : AlertDialog.Builder(activity) { var dialog: AlertDialog - var view: ViewGroup = LayoutInflater.from(activity).inflate(R.layout.dialog_custom_event_reminder, null) as ViewGroup + var view = activity.layoutInflater.inflate(R.layout.dialog_custom_event_reminder, null) as ViewGroup init { view.dialog_radio_view.check(R.id.dialog_radio_minutes) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt index 8c2841e0a..7b8fa55d6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import android.view.ViewGroup import android.view.WindowManager import com.simplemobiletools.calendar.R @@ -13,7 +12,7 @@ import kotlinx.android.synthetic.main.dialog_custom_event_repeat_interval.view.* class CustomEventRepeatIntervalDialog(val activity: Activity, val callback: (seconds: Int) -> Unit) : AlertDialog.Builder(activity) { var dialog: AlertDialog - var view: ViewGroup = LayoutInflater.from(activity).inflate(R.layout.dialog_custom_event_repeat_interval, null) as ViewGroup + var view = activity.layoutInflater.inflate(R.layout.dialog_custom_event_repeat_interval, null) as ViewGroup init { view.dialog_radio_view.check(R.id.dialog_radio_days) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt index f459b10fb..b43b5e1b5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import android.view.ViewGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.dbHelper @@ -17,7 +16,7 @@ class DeleteEventDialog(val activity: Activity, eventIds: List, val callbac val events = activity.dbHelper.getEventsWithIds(eventIds) val hasRepeatableEvent = events.any { it.repeatInterval > 0 } - val view = LayoutInflater.from(activity).inflate(R.layout.dialog_delete_event, null).apply { + val view = activity.layoutInflater.inflate(R.layout.dialog_delete_event, null).apply { delete_event_repeat_description.beVisibleIf(hasRepeatableEvent) delete_event_radio_view.beVisibleIf(hasRepeatableEvent) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt index 1c9a1f1e3..6feb4dc53 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.calendar.dialogs import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.SimpleActivity import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter @@ -15,7 +14,7 @@ import java.util.* class FilterEventTypesDialog(val activity: SimpleActivity, val callback: () -> Unit) : AlertDialog.Builder(activity) { var dialog: AlertDialog var eventTypes = ArrayList() - val view = LayoutInflater.from(activity).inflate(R.layout.dialog_filter_event_types, null) + val view = activity.layoutInflater.inflate(R.layout.dialog_filter_event_types, null) init { activity.dbHelper.getEventTypes { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt index 143054b38..1476bcc56 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import android.view.ViewGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.config @@ -20,7 +19,7 @@ class ImportEventsDialog(val activity: Activity, val path: String, val callback: var currEventTypeId = DBHelper.REGULAR_EVENT_TYPE_ID init { - val view = (LayoutInflater.from(activity).inflate(R.layout.dialog_import_events, null) as ViewGroup).apply { + val view = (activity.layoutInflater.inflate(R.layout.dialog_import_events, null) as ViewGroup).apply { import_events_filename.text = activity.humanizePath(path) updateEventType(this) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/NewEventTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/NewEventTypeDialog.kt index aecf2f50d..e0f84b545 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/NewEventTypeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/NewEventTypeDialog.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.support.v7.app.AlertDialog -import android.view.LayoutInflater import android.view.WindowManager import android.widget.ImageView import com.simplemobiletools.calendar.R @@ -23,7 +22,7 @@ class NewEventTypeDialog(val activity: Activity, var eventType: EventType? = nul if (eventType == null) eventType = EventType(0, "", activity.config.primaryColor) - val view = LayoutInflater.from(activity).inflate(R.layout.dialog_event_type, null).apply { + val view = activity.layoutInflater.inflate(R.layout.dialog_event_type, null).apply { setupColor(type_color) type_title.setText(eventType!!.title) type_color.setOnClickListener {