From a9e7dec84f07a574f55c55e882ee8344ae95e0eb Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 16 Oct 2018 13:03:29 +0200 Subject: [PATCH] update Commons to 5.1.0, min Android OS version to 5 + adapter changes --- app/build.gradle | 6 +-- app/src/main/AndroidManifest.xml | 2 +- .../com/simplemobiletools/calendar/App.kt | 2 +- .../calendar/activities/EventActivity.kt | 12 ++--- .../calendar/activities/MainActivity.kt | 8 +-- .../activities/SnoozeReminderActivity.kt | 2 +- .../calendar/adapters/DayEventsAdapter.kt | 40 ++++++--------- .../calendar/adapters/EventListAdapter.kt | 42 +++++----------- .../adapters/FilterEventTypeAdapter.kt | 50 ++++++------------- .../adapters/ManageEventTypesAdapter.kt | 43 ++++++++-------- .../calendar/adapters/MyDayPagerAdapter.kt | 6 +-- .../calendar/adapters/MyMonthPagerAdapter.kt | 6 +-- .../calendar/adapters/MyWeekPagerAdapter.kt | 6 +-- .../calendar/adapters/MyYearPagerAdapter.kt | 6 +-- .../CustomEventRepeatIntervalDialog.kt | 2 +- .../calendar/dialogs/DeleteEventDialog.kt | 2 +- .../dialogs/EditRepeatingEventDialog.kt | 2 +- .../calendar/dialogs/ExportEventsDialog.kt | 4 +- .../dialogs/FilterEventTypesDialog.kt | 4 +- .../calendar/dialogs/ImportEventsDialog.kt | 2 +- .../dialogs/RepeatLimitTypePickerDialog.kt | 8 +-- .../dialogs/RepeatRuleWeeklyDialog.kt | 2 +- .../calendar/dialogs/SelectCalendarsDialog.kt | 4 +- .../dialogs/SelectEventCalendarDialog.kt | 2 +- .../dialogs/SelectEventTypeColorDialog.kt | 2 +- .../calendar/dialogs/SelectEventTypeDialog.kt | 2 +- .../calendar/dialogs/UpdateEventTypeDialog.kt | 2 +- .../calendar/extensions/Activity.kt | 4 +- .../calendar/extensions/Context.kt | 4 +- .../calendar/fragments/DayFragment.kt | 4 +- .../calendar/fragments/DayFragmentsHolder.kt | 2 +- .../calendar/fragments/MonthFragment.kt | 4 +- .../fragments/MonthFragmentsHolder.kt | 2 +- .../calendar/fragments/MyFragmentHolder.kt | 2 +- .../calendar/fragments/WeekFragment.kt | 2 +- .../calendar/fragments/WeekFragmentsHolder.kt | 2 +- .../calendar/fragments/YearFragment.kt | 2 +- .../calendar/fragments/YearFragmentsHolder.kt | 2 +- app/src/main/res/layout/activity_day.xml | 4 +- app/src/main/res/layout/activity_main.xml | 4 +- .../main/res/layout/dialog_export_events.xml | 20 ++++---- .../res/layout/dialog_filter_event_types.xml | 2 +- app/src/main/res/menu/menu_main.xml | 2 +- build.gradle | 2 +- 44 files changed, 137 insertions(+), 196 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8586953e2..9b05da1c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.simplemobiletools.calendar" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 28 versionCode 129 versionName "4.2.1" @@ -42,10 +42,10 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:4.8.8' + implementation 'com.simplemobiletools:commons:5.1.0' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.multidex:multidex:2.0.0' } Properties props = new Properties() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e0025a967..3b7fd718f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -184,7 +184,7 @@ diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/App.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/App.kt index 48f52c694..40a843618 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/App.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/App.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.calendar -import android.support.multidex.MultiDexApplication +import androidx.multidex.MultiDexApplication import com.facebook.stetho.Stetho import com.simplemobiletools.commons.extensions.checkUseEnglish diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index c3dc37a78..bad804ba4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -6,11 +6,11 @@ import android.app.TimePickerDialog import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.app.NotificationManagerCompat import android.text.method.LinkMovementMethod import android.view.Menu import android.view.MenuItem import android.view.WindowManager +import androidx.core.app.NotificationManagerCompat import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.dialogs.* import com.simplemobiletools.calendar.extensions.* @@ -863,10 +863,7 @@ class EventActivity : SimpleActivity() { val datepicker = DatePickerDialog(this, mDialogTheme, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1, mEventStartDateTime.dayOfMonth) - if (isLollipopPlus()) { - datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY - } - + datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY datepicker.show() } @@ -881,10 +878,7 @@ class EventActivity : SimpleActivity() { val datepicker = DatePickerDialog(this, mDialogTheme, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1, mEventEndDateTime.dayOfMonth) - if (isLollipopPlus()) { - datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY - } - + datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY datepicker.show() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index d4ed72a8e..e737cdb53 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -11,11 +11,11 @@ import android.net.Uri import android.os.Bundle import android.os.Handler import android.provider.ContactsContract -import android.support.v4.view.MenuItemCompat -import android.support.v7.widget.SearchView import android.view.Menu import android.view.MenuItem import android.widget.Toast +import androidx.appcompat.widget.SearchView +import androidx.core.view.MenuItemCompat import com.simplemobiletools.calendar.BuildConfig import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.adapters.EventListAdapter @@ -612,7 +612,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private fun refreshViewPager() { runOnUiThread { - if (!isActivityDestroyed()) { + if (!isDestroyed) { currentFragments.last().refreshEvents() } } @@ -695,7 +695,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun launchAbout() { - val licenses = LICENSE_JODA or LICENSE_STETHO or LICENSE_MULTISELECT or LICENSE_LEAK_CANARY + val licenses = LICENSE_JODA or LICENSE_STETHO or LICENSE_LEAK_CANARY val faqItems = arrayListOf( FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons), diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt index 455a6313d..4499eba94 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.activities import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.rescheduleReminder diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt index a2b94f3f9..dc3a65712 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt @@ -38,12 +38,6 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r override fun prepareActionMode(menu: Menu) {} - override fun prepareItemSelection(viewHolder: ViewHolder) {} - - override fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?) { - viewHolder?.itemView?.event_item_frame?.isSelected = select - } - override fun actionItemPressed(id: Int) { when (id) { R.id.cab_share -> shareEvents() @@ -55,6 +49,10 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r override fun getIsItemSelectable(position: Int) = true + override fun getItemSelectionKey(position: Int) = events.getOrNull(position)?.id + + override fun getItemKeyPosition(key: Int) = events.indexOfFirst { it.id == key } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyRecyclerViewAdapter.ViewHolder { val layoutId = when (viewType) { ITEM_EVENT -> R.layout.event_item_day_view @@ -65,10 +63,10 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) { val event = events[position] - val view = holder.bindView(event, true, true) { itemView, layoutPosition -> + holder.bindView(event, true, true) { itemView, layoutPosition -> setupView(itemView, event) } - bindViewHolder(holder, position, view) + bindViewHolder(holder) } override fun getItemCount() = events.size @@ -85,6 +83,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r private fun setupView(view: View, event: Event) { view.apply { + event_item_frame.isSelected = selectedKeys.contains(event.id) event_item_title.text = event.title event_item_description?.text = if (replaceDescriptionWithLocation) event.location else event.description event_item_start.text = if (event.getIsAllDay()) allDayString else Formatter.getTimeFromTS(context, event.startTS) @@ -121,27 +120,16 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r } } - private fun shareEvents() { - val eventIds = ArrayList(selectedPositions.size) - selectedPositions.forEach { - eventIds.add(events[it].id) - } - activity.shareEvents(eventIds.distinct()) - } + private fun shareEvents() = activity.shareEvents(selectedKeys.distinct()) private fun askConfirmDelete() { - val eventIds = ArrayList(selectedPositions.size) - val timestamps = ArrayList(selectedPositions.size) - val eventsToDelete = ArrayList(selectedPositions.size) - selectedPositions.forEach { - val event = events[it] - eventsToDelete.add(event) - eventIds.add(event.id) - timestamps.add(event.startTS) - } + val eventIds = selectedKeys.toList() + val eventsToDelete = events.filter { selectedKeys.contains(it.id) } + val timestamps = eventsToDelete.map { it.startTS } + val positions = getSelectedItemPositions() val hasRepeatableEvent = eventsToDelete.any { it.repeatInterval > 0 } - DeleteEventDialog(activity, eventIds, hasRepeatableEvent) { + DeleteEventDialog(activity, eventIds, hasRepeatableEvent) { it -> events.removeAll(eventsToDelete) val nonRepeatingEventIDs = eventsToDelete.filter { it.repeatInterval == 0 }.map { it.id.toString() }.toTypedArray() @@ -149,7 +137,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r val repeatingEventIDs = eventsToDelete.filter { it.repeatInterval != 0 }.map { it.id } activity.handleEventDeleting(repeatingEventIDs, timestamps, it) - removeSelectedItems() + removeSelectedItems(positions) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt index 98429174d..78b028690 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt @@ -38,6 +38,7 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList if (firstNonPastSectionIndex == -1 && listItem is ListSection) { @@ -58,12 +59,6 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList shareEvents() @@ -75,6 +70,10 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList R.layout.event_list_item @@ -86,14 +85,14 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList + holder.bindView(listItem, true, allowLongClick) { itemView, layoutPosition -> if (listItem is ListSection) { setupListSection(itemView, listItem, position) } else if (listItem is ListEvent) { setupListEvent(itemView, listItem) } } - bindViewHolder(holder, position, view) + bindViewHolder(holder) } override fun getItemCount() = listItems.size @@ -127,6 +126,7 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList(selectedPositions.size) - selectedPositions.forEach { - val item = listItems[it] - if (item is ListEvent) { - eventIds.add(item.id) - } - } - activity.shareEvents(eventIds.distinct()) - } + private fun shareEvents() = activity.shareEvents(selectedKeys.distinct()) private fun askConfirmDelete() { - val eventIds = ArrayList(selectedPositions.size) - val timestamps = ArrayList(selectedPositions.size) - val eventsToDelete = ArrayList(selectedPositions.size) - - selectedPositions.sortedDescending().forEach { - val item = listItems[it] - if (item is ListEvent) { - eventIds.add(item.id) - timestamps.add(item.startTS) - eventsToDelete.add(item) - } - } + val eventIds = selectedKeys.toList() + val eventsToDelete = listItems.filter { selectedKeys.contains((it as? ListEvent)?.id) } as List + val timestamps = eventsToDelete.map { (it as? ListEvent)?.startTS }.filterNotNull() val hasRepeatableEvent = eventsToDelete.any { it.isRepeatable } DeleteEventDialog(activity, eventIds, hasRepeatableEvent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt index 30f9006ff..64d15ba24 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt @@ -1,87 +1,69 @@ package com.simplemobiletools.calendar.adapters -import android.support.v7.widget.RecyclerView -import android.util.SparseArray import android.view.View import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.SimpleActivity import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.models.EventType import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.setFillWithStroke -import com.simplemobiletools.commons.interfaces.MyAdapterListener import kotlinx.android.synthetic.main.filter_event_type_view.view.* import java.util.* class FilterEventTypeAdapter(val activity: SimpleActivity, val eventTypes: List, val displayEventTypes: Set) : RecyclerView.Adapter() { - private val itemViews = SparseArray() - private val selectedPositions = HashSet() + private val selectedKeys = HashSet() init { eventTypes.forEachIndexed { index, eventType -> if (displayEventTypes.contains(eventType.id.toString())) { - selectedPositions.add(index) + selectedKeys.add(eventType.id) } } } - private fun toggleItemSelection(select: Boolean, pos: Int) { + private fun toggleItemSelection(select: Boolean, eventType: EventType, pos: Int) { if (select) { - if (itemViews[pos] != null) { - selectedPositions.add(pos) - } + selectedKeys.add(eventType.id) } else { - selectedPositions.remove(pos) + selectedKeys.remove(eventType.id) } - itemViews[pos]?.filter_event_type_checkbox?.isChecked = select + notifyItemChanged(pos) } - private val adapterListener = object : MyAdapterListener { - override fun toggleItemSelectionAdapter(select: Boolean, position: Int) { - toggleItemSelection(select, position) - } - - override fun getSelectedPositions() = selectedPositions - - override fun itemLongClicked(position: Int) {} - } - - fun getSelectedItemsSet(): HashSet { - val selectedItemsSet = HashSet(selectedPositions.size) - selectedPositions.forEach { selectedItemsSet.add(eventTypes[it].id.toString()) } - return selectedItemsSet - } + fun getSelectedItemsSet() = selectedKeys.asSequence().map { it.toString() }.toHashSet() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val view = activity.layoutInflater.inflate(R.layout.filter_event_type_view, parent, false) - return ViewHolder(view, adapterListener, activity) + return ViewHolder(view) } override fun onBindViewHolder(holder: ViewHolder, position: Int) { val eventType = eventTypes[position] - itemViews.put(position, holder.bindView(eventType)) - toggleItemSelection(selectedPositions.contains(position), position) + holder.bindView(eventType) } override fun getItemCount() = eventTypes.size - class ViewHolder(view: View, val adapterListener: MyAdapterListener, val activity: SimpleActivity) : RecyclerView.ViewHolder(view) { + inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { fun bindView(eventType: EventType): View { + val isSelected = selectedKeys.contains(eventType.id) itemView.apply { + filter_event_type_checkbox.isChecked = isSelected filter_event_type_checkbox.setColors(activity.config.textColor, activity.getAdjustedPrimaryColor(), activity.config.backgroundColor) filter_event_type_checkbox.text = eventType.getDisplayTitle() filter_event_type_color.setFillWithStroke(eventType.color, activity.config.backgroundColor) - filter_event_type_holder.setOnClickListener { viewClicked(!filter_event_type_checkbox.isChecked) } + filter_event_type_holder.setOnClickListener { viewClicked(!isSelected, eventType) } } return itemView } - private fun viewClicked(select: Boolean) { - adapterListener.toggleItemSelectionAdapter(select, adapterPosition) + private fun viewClicked(select: Boolean, eventType: EventType) { + toggleItemSelection(select, eventType, adapterPosition) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt index d8fcf08bb..caf946efe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt @@ -31,12 +31,6 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis override fun prepareActionMode(menu: Menu) {} - override fun prepareItemSelection(viewHolder: ViewHolder) {} - - override fun markViewHolderSelection(select: Boolean, viewHolder: ViewHolder?) { - viewHolder?.itemView?.event_item_frame?.isSelected = select - } - override fun actionItemPressed(id: Int) { when (id) { R.id.cab_delete -> askConfirmDelete() @@ -47,20 +41,29 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis override fun getIsItemSelectable(position: Int) = true + override fun getItemSelectionKey(position: Int) = eventTypes.getOrNull(position)?.id + + override fun getItemKeyPosition(key: Int) = eventTypes.indexOfFirst { it.id == key } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_event_type, parent) override fun onBindViewHolder(holder: ViewHolder, position: Int) { val eventType = eventTypes[position] - val view = holder.bindView(eventType, true, true) { itemView, layoutPosition -> + holder.bindView(eventType, true, true) { itemView, layoutPosition -> setupView(itemView, eventType) } - bindViewHolder(holder, position, view) + bindViewHolder(holder) } override fun getItemCount() = eventTypes.size + private fun getItemWithKey(key: Int): EventType? = eventTypes.firstOrNull { it.id == key } + + private fun getSelectedItems() = eventTypes.filter { selectedKeys.contains(it.id) } as ArrayList + private fun setupView(view: View, eventType: EventType) { view.apply { + event_item_frame.isSelected = selectedKeys.contains(eventType.id) event_type_title.text = eventType.getDisplayTitle() event_type_color.setFillWithStroke(eventType.color, activity.config.backgroundColor) event_type_title.setTextColor(textColor) @@ -68,8 +71,7 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis } private fun askConfirmDelete() { - val eventTypes = ArrayList(selectedPositions.size) - selectedPositions.forEach { eventTypes.add(this.eventTypes[it]) } + val eventTypes = eventTypes.filter { selectedKeys.contains(it.id) } as ArrayList if (activity.dbHelper.doEventTypesContainEvent(eventTypes)) { val MOVE_EVENTS = 0 @@ -90,25 +92,22 @@ class ManageEventTypesAdapter(activity: SimpleActivity, val eventTypes: ArrayLis } private fun deleteEventTypes(deleteEvents: Boolean) { - val eventTypesToDelete = ArrayList(selectedPositions.size) + val eventTypesToDelete = getSelectedItems() - for (pos in selectedPositions) { - if (eventTypes[pos].id == DBHelper.REGULAR_EVENT_TYPE_ID) { + for (key in selectedKeys) { + val type = getItemWithKey(key) ?: continue + if (type.id == DBHelper.REGULAR_EVENT_TYPE_ID) { activity.toast(R.string.cannot_delete_default_type) - selectedPositions.remove(pos) - toggleItemSelection(false, pos) + eventTypesToDelete.remove(type) + toggleItemSelection(false, getItemKeyPosition(type.id)) break } } - selectedPositions.sortedDescending().forEach { - val eventType = eventTypes[it] - eventTypesToDelete.add(eventType) - } - - eventTypes.removeAll(eventTypesToDelete) if (listener?.deleteEventTypes(eventTypesToDelete, deleteEvents) == true) { - removeSelectedItems() + val positions = getSelectedItemPositions() + eventTypes.removeAll(eventTypesToDelete) + removeSelectedItems(positions) } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt index f81e802df..94f82ca18 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.calendar.adapters import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter import android.util.SparseArray +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter import com.simplemobiletools.calendar.fragments.DayFragment import com.simplemobiletools.calendar.helpers.DAY_CODE import com.simplemobiletools.calendar.interfaces.NavigationListener diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt index 17ed299cb..00e35ce8f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.calendar.adapters import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter import android.util.SparseArray +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter import com.simplemobiletools.calendar.fragments.MonthFragment import com.simplemobiletools.calendar.helpers.DAY_CODE import com.simplemobiletools.calendar.interfaces.NavigationListener diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt index b403dbc58..6f9b0dacc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.calendar.adapters import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter import android.util.SparseArray +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter import com.simplemobiletools.calendar.fragments.WeekFragment import com.simplemobiletools.calendar.helpers.WEEK_START_TIMESTAMP import com.simplemobiletools.calendar.interfaces.WeekFragmentListener diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt index 8434a056e..c93d6613a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.calendar.adapters import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter import android.util.SparseArray +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter import com.simplemobiletools.calendar.fragments.YearFragment import com.simplemobiletools.calendar.helpers.YEAR_LABEL 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 18d1fd8b0..a8ac4d6a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.helpers.DAY 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 dde07d6d7..fd4fe1b8e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.helpers.DELETE_ALL_OCCURRENCES diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt index 8edae6610..1b768d712 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.calendar.dialogs -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.SimpleActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt index 37f487556..0abc3d725 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt @@ -1,8 +1,8 @@ package com.simplemobiletools.calendar.dialogs -import android.support.v7.app.AlertDialog import android.view.ViewGroup import android.widget.LinearLayout +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.SimpleActivity import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter @@ -21,7 +21,7 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val cal activity.dbHelper.getEventTypes { val eventTypes = HashSet() - it.mapTo(eventTypes, { it.id.toString() }) + it.mapTo(eventTypes) { it.id.toString() } activity.runOnUiThread { export_events_types_list.adapter = FilterEventTypeAdapter(activity, it, eventTypes) 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 7ca3bb924..559ededca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.calendar.dialogs -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.SimpleActivity import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter @@ -19,7 +19,7 @@ class FilterEventTypesDialog(val activity: SimpleActivity, val callback: () -> U view.filter_event_types_list.adapter = FilterEventTypeAdapter(activity, eventTypes, displayEventTypes) dialog = AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, { dialogInterface, i -> confirmEventTypes() }) + .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmEventTypes() } .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this, R.string.filter_events_by_type) 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 b74a93420..b36e3ad54 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.calendar.dialogs -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.SimpleActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt index e7cbe8e98..7e796262b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt @@ -3,8 +3,8 @@ package com.simplemobiletools.calendar.dialogs import android.annotation.SuppressLint import android.app.Activity import android.app.DatePickerDialog -import android.support.v7.app.AlertDialog import android.view.View +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.seconds @@ -13,7 +13,6 @@ import com.simplemobiletools.calendar.helpers.getNowSeconds import com.simplemobiletools.commons.extensions.getDialogTheme import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.value -import com.simplemobiletools.commons.helpers.isLollipopPlus import kotlinx.android.synthetic.main.dialog_repeat_limit_type_picker.view.* import org.joda.time.DateTime import java.util.* @@ -86,10 +85,7 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Int, val datepicker = DatePickerDialog(activity, activity.getDialogTheme(), repetitionLimitDateSetListener, repeatLimitDateTime.year, repeatLimitDateTime.monthOfYear - 1, repeatLimitDateTime.dayOfMonth) - if (isLollipopPlus()) { - datepicker.datePicker.firstDayOfWeek = if (activity.config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY - } - + datepicker.datePicker.firstDayOfWeek = if (activity.config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY datepicker.show() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt index b6d303990..06c852633 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.commons.extensions.setupDialogStuff diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt index 44b9915e1..4de36793e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.dialogs -import android.support.v7.app.AlertDialog -import android.support.v7.widget.SwitchCompat +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.widget.SwitchCompat import android.text.TextUtils import android.view.ViewGroup import android.widget.RelativeLayout diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt index c8d175f49..d8aa61539 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.graphics.Color -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import android.widget.RadioButton import android.widget.RadioGroup diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt index c67c69ab0..7f2ca352b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.graphics.Color -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import android.widget.RadioButton import android.widget.RadioGroup diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt index 047f3d9b8..d3212c82d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity import android.graphics.Color -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.ViewGroup import android.widget.RadioGroup import com.simplemobiletools.calendar.R diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt index 5fcecafd5..2c8de0792 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/UpdateEventTypeDialog.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.dialogs import android.app.Activity -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.widget.ImageView import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.extensions.config diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt index 600770afb..d0605eacc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt @@ -55,9 +55,9 @@ fun Activity.showEventRepeatIntervalDialog(curSeconds: Int, callback: (minutes: } val items = ArrayList(seconds.size + 1) - seconds.mapIndexedTo(items, { index, value -> + seconds.mapIndexedTo(items) { index, value -> RadioItem(index, getRepetitionText(value), value) - }) + } var selectedIndex = 0 seconds.forEachIndexed { index, value -> diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt index c03dde088..a4fa132a1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt @@ -14,13 +14,13 @@ import android.media.AudioAttributes import android.net.Uri import android.os.Bundle import android.provider.CalendarContract -import android.support.v4.app.AlarmManagerCompat -import android.support.v4.app.NotificationCompat import android.view.Gravity import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView +import androidx.core.app.AlarmManagerCompat +import androidx.core.app.NotificationCompat import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.EventActivity import com.simplemobiletools.calendar.activities.SimpleActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt index 84ede6be3..3463d4575 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -2,13 +2,13 @@ package com.simplemobiletools.calendar.fragments import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.DatePicker import android.widget.RelativeLayout +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.Fragment import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.EventActivity import com.simplemobiletools.calendar.activities.SimpleActivity diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt index dd39768f5..6d53d763f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt @@ -2,10 +2,10 @@ package com.simplemobiletools.calendar.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.view.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.viewpager.widget.ViewPager import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.activities.MainActivity import com.simplemobiletools.calendar.adapters.MyDayPagerAdapter diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt index 00bb4c80f..3d5e4762b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt @@ -3,8 +3,8 @@ package com.simplemobiletools.calendar.fragments import android.content.Context import android.content.res.Resources import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.app.AlertDialog +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt index 6d9d22815..0149d24d0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt index f8c477db7..cc4d8452c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.calendar.fragments -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment abstract class MyFragmentHolder : Fragment() { abstract fun goToToday() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt index 8105e60f7..ae91bdd1e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt @@ -5,7 +5,7 @@ import android.content.res.Resources import android.graphics.Rect import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.util.SparseIntArray import android.view.* import android.widget.ImageView diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt index a2e431d24..4efda1f6b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt index 38d9a2ce6..d17350ab9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.fragments import android.content.res.Resources import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.util.SparseArray import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt index d2740d8a5..7e6e69cf9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.calendar.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/res/layout/activity_day.xml b/app/src/main/res/layout/activity_day.xml index b484be2ad..84de6d093 100644 --- a/app/src/main/res/layout/activity_day.xml +++ b/app/src/main/res/layout/activity_day.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e486b4871..d8c752957 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/dialog_export_events.xml b/app/src/main/res/layout/dialog_export_events.xml index 7a6623400..ea3cca152 100644 --- a/app/src/main/res/layout/dialog_export_events.xml +++ b/app/src/main/res/layout/dialog_export_events.xml @@ -12,8 +12,8 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" - android:paddingTop="@dimen/activity_margin"> + android:paddingTop="@dimen/activity_margin" + android:paddingRight="@dimen/activity_margin"> + android:paddingBottom="@dimen/small_margin"/> @@ -80,7 +80,7 @@ android:text="@string/include_event_types" android:textSize="@dimen/smaller_text_size"/> - -