From fe694368e9a229b41867cf22d170a69793916608 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 9 Nov 2018 17:12:02 +0100 Subject: [PATCH] append package name with .pro --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../calendar/interfaces/WeeklyCalendar.kt | 7 ----- .../calendar/models/ListItem.kt | 3 -- .../calendar/{ => pro}/App.kt | 2 +- .../{ => pro}/activities/EventActivity.kt | 16 +++++------ .../{ => pro}/activities/MainActivity.kt | 28 +++++++++---------- .../activities/ManageEventTypesActivity.kt | 14 +++++----- .../{ => pro}/activities/SettingsActivity.kt | 18 ++++++------ .../{ => pro}/activities/SimpleActivity.kt | 4 +-- .../activities/SnoozeReminderActivity.kt | 10 +++---- .../{ => pro}/activities/SplashActivity.kt | 4 +-- .../activities/WidgetListConfigureActivity.kt | 20 ++++++------- .../WidgetMonthlyConfigureActivity.kt | 20 ++++++------- .../{ => pro}/adapters/DayEventsAdapter.kt | 26 ++++++++--------- .../{ => pro}/adapters/EventListAdapter.kt | 26 ++++++++--------- .../adapters/EventListWidgetAdapter.kt | 24 ++++++++-------- .../adapters/FilterEventTypeAdapter.kt | 10 +++---- .../adapters/ManageEventTypesAdapter.kt | 16 +++++------ .../{ => pro}/adapters/MyDayPagerAdapter.kt | 8 +++--- .../{ => pro}/adapters/MyMonthPagerAdapter.kt | 8 +++--- .../{ => pro}/adapters/MyWeekPagerAdapter.kt | 8 +++--- .../{ => pro}/adapters/MyYearPagerAdapter.kt | 6 ++-- .../CustomEventRepeatIntervalDialog.kt | 12 ++++---- .../{ => pro}/dialogs/DeleteEventDialog.kt | 10 +++---- .../{ => pro}/dialogs/EditEventTypeDialog.kt | 10 +++---- .../dialogs/EditRepeatingEventDialog.kt | 6 ++-- .../{ => pro}/dialogs/ExportEventsDialog.kt | 10 +++---- .../dialogs/FilterEventTypesDialog.kt | 12 ++++---- .../{ => pro}/dialogs/ImportEventsDialog.kt | 16 +++++------ .../dialogs/RepeatLimitTypePickerDialog.kt | 12 ++++---- .../dialogs/RepeatRuleWeeklyDialog.kt | 6 ++-- .../dialogs/SelectCalendarsDialog.kt | 10 +++---- .../dialogs/SelectEventCalendarDialog.kt | 12 ++++---- .../dialogs/SelectEventTypeColorDialog.kt | 10 +++---- .../dialogs/SelectEventTypeDialog.kt | 10 +++---- .../calendar/{ => pro}/extensions/Activity.kt | 10 +++---- .../calendar/{ => pro}/extensions/Context.kt | 22 +++++++-------- .../calendar/{ => pro}/extensions/DateTime.kt | 2 +- .../calendar/{ => pro}/extensions/Int.kt | 12 ++++---- .../calendar/{ => pro}/extensions/String.kt | 2 +- .../calendar/{ => pro}/extensions/TextView.kt | 2 +- .../{ => pro}/fragments/DayFragment.kt | 26 ++++++++--------- .../{ => pro}/fragments/DayFragmentsHolder.kt | 16 +++++------ .../{ => pro}/fragments/EventListFragment.kt | 24 ++++++++-------- .../{ => pro}/fragments/MonthFragment.kt | 26 ++++++++--------- .../fragments/MonthFragmentsHolder.kt | 18 ++++++------ .../{ => pro}/fragments/MyFragmentHolder.kt | 2 +- .../{ => pro}/fragments/WeekFragment.kt | 24 ++++++++-------- .../fragments/WeekFragmentsHolder.kt | 20 ++++++------- .../{ => pro}/fragments/YearFragment.kt | 20 ++++++------- .../fragments/YearFragmentsHolder.kt | 14 +++++----- .../{ => pro}/helpers/CalDAVHandler.kt | 18 ++++++------ .../calendar/{ => pro}/helpers/Config.kt | 6 ++-- .../calendar/{ => pro}/helpers/Constants.kt | 2 +- .../calendar/{ => pro}/helpers/DBHelper.kt | 14 +++++----- .../calendar/{ => pro}/helpers/Formatter.kt | 10 +++---- .../calendar/{ => pro}/helpers/IcsExporter.kt | 10 +++---- .../calendar/{ => pro}/helpers/IcsImporter.kt | 14 +++++----- .../{ => pro}/helpers/MonthlyCalendarImpl.kt | 14 +++++----- .../{ => pro}/helpers/MyWidgetListProvider.kt | 12 ++++---- .../helpers/MyWidgetMonthlyProvider.kt | 14 +++++----- .../calendar/{ => pro}/helpers/Parser.kt | 14 +++++----- .../{ => pro}/helpers/WeeklyCalendarImpl.kt | 8 +++--- .../{ => pro}/helpers/YearlyCalendarImpl.kt | 12 ++++---- .../interfaces/DeleteEventTypesListener.kt | 4 +-- .../{ => pro}/interfaces/MonthlyCalendar.kt | 4 +-- .../interfaces/NavigationListener.kt | 2 +- .../interfaces/WeekFragmentListener.kt | 2 +- .../calendar/pro/interfaces/WeeklyCalendar.kt | 7 +++++ .../{ => pro}/interfaces/YearlyCalendar.kt | 4 +-- .../{ => pro}/models/CalDAVCalendar.kt | 2 +- .../calendar/{ => pro}/models/DayMonthly.kt | 2 +- .../calendar/{ => pro}/models/DayYearly.kt | 2 +- .../calendar/{ => pro}/models/Event.kt | 8 +++--- .../calendar/{ => pro}/models/EventType.kt | 2 +- .../calendar/{ => pro}/models/ListEvent.kt | 2 +- .../calendar/pro/models/ListItem.kt | 3 ++ .../calendar/{ => pro}/models/ListSection.kt | 2 +- .../{ => pro}/models/MonthViewEvent.kt | 2 +- .../calendar/{ => pro}/models/RepeatRule.kt | 2 +- .../receivers/BootCompletedReceiver.kt | 8 +++--- .../{ => pro}/receivers/CalDAVSyncReceiver.kt | 6 ++-- .../receivers/NotificationReceiver.kt | 14 +++++----- .../{ => pro}/services/SnoozeService.kt | 10 +++---- .../{ => pro}/services/WidgetService.kt | 4 +-- .../calendar/{ => pro}/views/MonthView.kt | 18 ++++++------ .../{ => pro}/views/MonthViewWrapper.kt | 8 +++--- .../calendar/{ => pro}/views/MyScrollView.kt | 2 +- .../{ => pro}/views/SmallMonthView.kt | 10 +++---- .../{ => pro}/views/WeeklyViewGrid.kt | 4 +-- .../main/res/layout-land/fragment_year.xml | 24 ++++++++-------- app/src/main/res/layout/fragment_month.xml | 2 +- app/src/main/res/layout/fragment_week.xml | 6 ++-- .../main/res/layout/fragment_week_holder.xml | 4 +-- app/src/main/res/layout/fragment_year.xml | 24 ++++++++-------- app/src/main/res/layout/month_view.xml | 2 +- app/src/main/res/xml/widget_list_info.xml | 2 +- app/src/main/res/xml/widget_monthly_info.xml | 2 +- 99 files changed, 503 insertions(+), 503 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeeklyCalendar.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/calendar/models/ListItem.kt rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/App.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/EventActivity.kt (98%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/MainActivity.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/ManageEventTypesActivity.kt (82%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/SettingsActivity.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/SimpleActivity.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/SnoozeReminderActivity.kt (72%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/SplashActivity.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/WidgetListConfigureActivity.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/activities/WidgetMonthlyConfigureActivity.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/DayEventsAdapter.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/EventListAdapter.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/EventListWidgetAdapter.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/FilterEventTypeAdapter.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/ManageEventTypesAdapter.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/MyDayPagerAdapter.kt (79%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/MyMonthPagerAdapter.kt (79%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/MyWeekPagerAdapter.kt (80%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/adapters/MyYearPagerAdapter.kt (82%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/CustomEventRepeatIntervalDialog.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/DeleteEventDialog.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/EditEventTypeDialog.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/EditRepeatingEventDialog.kt (86%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/ExportEventsDialog.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/FilterEventTypesDialog.kt (78%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/ImportEventsDialog.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/RepeatLimitTypePickerDialog.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/RepeatRuleWeeklyDialog.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/SelectCalendarsDialog.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/SelectEventCalendarDialog.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/SelectEventTypeColorDialog.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/dialogs/SelectEventTypeDialog.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/extensions/Activity.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/extensions/Context.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/extensions/DateTime.kt (60%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/extensions/Int.kt (55%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/extensions/String.kt (56%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/extensions/TextView.kt (92%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/DayFragment.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/DayFragmentsHolder.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/EventListFragment.kt (89%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/MonthFragment.kt (88%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/MonthFragmentsHolder.kt (87%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/MyFragmentHolder.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/WeekFragment.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/WeekFragmentsHolder.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/YearFragment.kt (86%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/fragments/YearFragmentsHolder.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/CalDAVHandler.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/Config.kt (97%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/Constants.kt (99%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/DBHelper.kt (99%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/Formatter.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/IcsExporter.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/IcsImporter.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/MonthlyCalendarImpl.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/MyWidgetListProvider.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/MyWidgetMonthlyProvider.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/Parser.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/WeeklyCalendarImpl.kt (67%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/helpers/YearlyCalendarImpl.kt (84%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/interfaces/DeleteEventTypesListener.kt (57%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/interfaces/MonthlyCalendar.kt (67%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/interfaces/NavigationListener.kt (72%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/interfaces/WeekFragmentListener.kt (71%) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeeklyCalendar.kt rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/interfaces/YearlyCalendar.kt (59%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/CalDAVCalendar.kt (85%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/DayMonthly.kt (80%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/DayYearly.kt (71%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/Event.kt (95%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/EventType.kt (86%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/ListEvent.kt (85%) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListItem.kt rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/ListSection.kt (71%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/MonthViewEvent.kt (82%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/models/RepeatRule.kt (64%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/receivers/BootCompletedReceiver.kt (60%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/receivers/CalDAVSyncReceiver.kt (61%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/receivers/NotificationReceiver.kt (71%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/services/SnoozeService.kt (52%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/services/WidgetService.kt (63%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/views/MonthView.kt (96%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/views/MonthViewWrapper.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/views/MyScrollView.kt (94%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/views/SmallMonthView.kt (91%) rename app/src/main/kotlin/com/simplemobiletools/calendar/{ => pro}/views/WeeklyViewGrid.kt (91%) diff --git a/app/build.gradle b/app/build.gradle index 45fa21eb3..e3c5322bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { buildToolsVersion "28.0.3" defaultConfig { - applicationId "com.simplemobiletools.calendar" + applicationId "com.simplemobiletools.calendar.pro" minSdkVersion 21 targetSdkVersion 28 versionCode 134 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3b7fd718f..6de6d8621 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeeklyCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeeklyCalendar.kt deleted file mode 100644 index 6c7501506..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeeklyCalendar.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.simplemobiletools.calendar.interfaces - -import com.simplemobiletools.calendar.models.Event - -interface WeeklyCalendar { - fun updateWeeklyCalendar(events: ArrayList) -} diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListItem.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListItem.kt deleted file mode 100644 index 41e2ece59..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListItem.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.simplemobiletools.calendar.models - -open class ListItem diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/App.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/App.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/calendar/App.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/App.kt index 2a9ba0deb..2b7e6ab0c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/App.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/App.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar +package com.simplemobiletools.calendar.pro import androidx.multidex.MultiDexApplication 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/pro/activities/EventActivity.kt similarity index 98% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt index 182642ca2..8711d8522 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.app.DatePickerDialog import android.app.TimePickerDialog @@ -10,13 +10,13 @@ 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.* -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.models.CalDAVCalendar -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.dialogs.* +import com.simplemobiletools.calendar.pro.extensions.* +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.models.CalDAVCalendar +import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 0b2aeb37c..9ade70f1b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.app.SearchManager import android.content.Context @@ -16,19 +16,19 @@ 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 -import com.simplemobiletools.calendar.dialogs.ExportEventsDialog -import com.simplemobiletools.calendar.dialogs.FilterEventTypesDialog -import com.simplemobiletools.calendar.dialogs.ImportEventsDialog -import com.simplemobiletools.calendar.extensions.* -import com.simplemobiletools.calendar.fragments.* -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.EventType -import com.simplemobiletools.calendar.models.ListEvent +import com.simplemobiletools.calendar.pro.BuildConfig +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.adapters.EventListAdapter +import com.simplemobiletools.calendar.pro.dialogs.ExportEventsDialog +import com.simplemobiletools.calendar.pro.dialogs.FilterEventTypesDialog +import com.simplemobiletools.calendar.pro.dialogs.ImportEventsDialog +import com.simplemobiletools.calendar.pro.extensions.* +import com.simplemobiletools.calendar.pro.fragments.* +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.EventType +import com.simplemobiletools.calendar.pro.models.ListEvent import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/ManageEventTypesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/ManageEventTypesActivity.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/ManageEventTypesActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/ManageEventTypesActivity.kt index 2526f2560..68b006fcc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/ManageEventTypesActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/ManageEventTypesActivity.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.os.Bundle import android.view.Menu import android.view.MenuItem -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.adapters.ManageEventTypesAdapter -import com.simplemobiletools.calendar.dialogs.EditEventTypeDialog -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.interfaces.DeleteEventTypesListener -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.adapters.ManageEventTypesAdapter +import com.simplemobiletools.calendar.pro.dialogs.EditEventTypeDialog +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.interfaces.DeleteEventTypesListener +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.updateTextColors import kotlinx.android.synthetic.main.activity_manage_event_types.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt index 2f10fd462..8249e94b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.content.Intent import android.content.res.Resources import android.media.AudioManager import android.os.Bundle import android.text.TextUtils -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.dialogs.SelectCalendarsDialog -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.getSyncedCalDAVCalendars -import com.simplemobiletools.calendar.extensions.updateWidgets -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.dialogs.SelectCalendarsDialog +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.getSyncedCalDAVCalendars +import com.simplemobiletools.calendar.pro.extensions.updateWidgets +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.CustomIntervalPickerDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt index c9732a4a0..45f347eb3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities -import com.simplemobiletools.calendar.R +import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.commons.activities.BaseSimpleActivity open class SimpleActivity : BaseSimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SnoozeReminderActivity.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SnoozeReminderActivity.kt index 4499eba94..01ba3a139 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SnoozeReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SnoozeReminderActivity.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.rescheduleReminder -import com.simplemobiletools.calendar.helpers.EVENT_ID +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.rescheduleReminder +import com.simplemobiletools.calendar.pro.helpers.EVENT_ID import com.simplemobiletools.commons.extensions.showPickSecondsDialogHelper class SnoozeReminderActivity : AppCompatActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt index b89b88d15..7d4a6717c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.content.Intent -import com.simplemobiletools.calendar.helpers.* +import com.simplemobiletools.calendar.pro.helpers.* import com.simplemobiletools.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetListConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetListConfigureActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt index 253d290d4..a81560425 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetListConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.app.Activity import android.appwidget.AppWidgetManager @@ -6,15 +6,15 @@ import android.content.Intent import android.graphics.Color import android.os.Bundle import android.widget.SeekBar -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.adapters.EventListAdapter -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.MyWidgetListProvider -import com.simplemobiletools.calendar.models.ListEvent -import com.simplemobiletools.calendar.models.ListItem -import com.simplemobiletools.calendar.models.ListSection +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.adapters.EventListAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.MyWidgetListProvider +import com.simplemobiletools.calendar.pro.models.ListEvent +import com.simplemobiletools.calendar.pro.models.ListItem +import com.simplemobiletools.calendar.pro.models.ListSection import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.setFillWithStroke diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetMonthlyConfigureActivity.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetMonthlyConfigureActivity.kt index 6c15eb6b2..df3d1e1fd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetMonthlyConfigureActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.activities +package com.simplemobiletools.calendar.pro.activities import android.app.Activity import android.appwidget.AppWidgetManager @@ -10,15 +10,15 @@ import android.os.Bundle import android.widget.LinearLayout import android.widget.SeekBar import android.widget.TextView -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.addDayEvents -import com.simplemobiletools.calendar.extensions.addDayNumber -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.LOW_ALPHA -import com.simplemobiletools.calendar.helpers.MonthlyCalendarImpl -import com.simplemobiletools.calendar.helpers.MyWidgetMonthlyProvider -import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.models.DayMonthly +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.addDayEvents +import com.simplemobiletools.calendar.pro.extensions.addDayNumber +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA +import com.simplemobiletools.calendar.pro.helpers.MonthlyCalendarImpl +import com.simplemobiletools.calendar.pro.helpers.MyWidgetMonthlyProvider +import com.simplemobiletools.calendar.pro.interfaces.MonthlyCalendar +import com.simplemobiletools.calendar.pro.models.DayMonthly import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.applyColorFilter diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt index d5a5a8663..2e74d9a8e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/DayEventsAdapter.kt @@ -1,20 +1,20 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.view.Menu import android.view.View import android.view.ViewGroup -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.dialogs.DeleteEventDialog -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.handleEventDeleting -import com.simplemobiletools.calendar.extensions.shareEvents -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.ITEM_EVENT -import com.simplemobiletools.calendar.helpers.ITEM_EVENT_SIMPLE -import com.simplemobiletools.calendar.helpers.LOW_ALPHA -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.dialogs.DeleteEventDialog +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.handleEventDeleting +import com.simplemobiletools.calendar.pro.extensions.shareEvents +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.ITEM_EVENT +import com.simplemobiletools.calendar.pro.helpers.ITEM_EVENT_SIMPLE +import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA +import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.applyColorFilter diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt index db7280446..c2a3ed984 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt @@ -1,20 +1,20 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.view.Menu import android.view.View import android.view.ViewGroup -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.dialogs.DeleteEventDialog -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.handleEventDeleting -import com.simplemobiletools.calendar.extensions.shareEvents -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.models.ListEvent -import com.simplemobiletools.calendar.models.ListItem -import com.simplemobiletools.calendar.models.ListSection +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.dialogs.DeleteEventDialog +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.handleEventDeleting +import com.simplemobiletools.calendar.pro.extensions.shareEvents +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.models.ListEvent +import com.simplemobiletools.calendar.pro.models.ListItem +import com.simplemobiletools.calendar.pro.models.ListSection import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.applyColorFilter diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListWidgetAdapter.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListWidgetAdapter.kt index a6a0966f9..fc4b31fc2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListWidgetAdapter.kt @@ -1,21 +1,21 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.content.Context import android.content.Intent import android.view.View import android.widget.RemoteViews import android.widget.RemoteViewsService -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.R.id.event_item_holder -import com.simplemobiletools.calendar.R.id.event_section_title -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.models.ListEvent -import com.simplemobiletools.calendar.models.ListItem -import com.simplemobiletools.calendar.models.ListSection +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.R.id.event_item_holder +import com.simplemobiletools.calendar.pro.R.id.event_section_title +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.models.ListEvent +import com.simplemobiletools.calendar.pro.models.ListItem +import com.simplemobiletools.calendar.pro.models.ListSection import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.setBackgroundColor import com.simplemobiletools.commons.extensions.setText diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/FilterEventTypeAdapter.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/FilterEventTypeAdapter.kt index 64d15ba24..843881f6e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/FilterEventTypeAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/FilterEventTypeAdapter.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters 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.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.setFillWithStroke import kotlinx.android.synthetic.main.filter_event_type_view.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/ManageEventTypesAdapter.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/ManageEventTypesAdapter.kt index caf946efe..7f1d7d6cf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/ManageEventTypesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/ManageEventTypesAdapter.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.view.Menu import android.view.View import android.view.ViewGroup -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.helpers.DBHelper -import com.simplemobiletools.calendar.interfaces.DeleteEventTypesListener -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.helpers.DBHelper +import com.simplemobiletools.calendar.pro.interfaces.DeleteEventTypesListener +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyDayPagerAdapter.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyDayPagerAdapter.kt index 94f82ca18..a661173e6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyDayPagerAdapter.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.os.Bundle 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 +import com.simplemobiletools.calendar.pro.fragments.DayFragment +import com.simplemobiletools.calendar.pro.helpers.DAY_CODE +import com.simplemobiletools.calendar.pro.interfaces.NavigationListener class MyDayPagerAdapter(fm: FragmentManager, private val mCodes: List, private val mListener: NavigationListener) : FragmentStatePagerAdapter(fm) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyMonthPagerAdapter.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyMonthPagerAdapter.kt index 00e35ce8f..49fd913bc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyMonthPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyMonthPagerAdapter.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.os.Bundle 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 +import com.simplemobiletools.calendar.pro.fragments.MonthFragment +import com.simplemobiletools.calendar.pro.helpers.DAY_CODE +import com.simplemobiletools.calendar.pro.interfaces.NavigationListener class MyMonthPagerAdapter(fm: FragmentManager, private val mCodes: List, private val mListener: NavigationListener) : FragmentStatePagerAdapter(fm) { private val mFragments = SparseArray() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyWeekPagerAdapter.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyWeekPagerAdapter.kt index 6f9b0dacc..e6d1a2533 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyWeekPagerAdapter.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.os.Bundle 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 +import com.simplemobiletools.calendar.pro.fragments.WeekFragment +import com.simplemobiletools.calendar.pro.helpers.WEEK_START_TIMESTAMP +import com.simplemobiletools.calendar.pro.interfaces.WeekFragmentListener class MyWeekPagerAdapter(fm: FragmentManager, val mWeekTimestamps: List, val mListener: WeekFragmentListener) : FragmentStatePagerAdapter(fm) { private val mFragments = SparseArray() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyYearPagerAdapter.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyYearPagerAdapter.kt index c93d6613a..58448c25d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/MyYearPagerAdapter.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.adapters +package com.simplemobiletools.calendar.pro.adapters import android.os.Bundle 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 +import com.simplemobiletools.calendar.pro.fragments.YearFragment +import com.simplemobiletools.calendar.pro.helpers.YEAR_LABEL class MyYearPagerAdapter(fm: FragmentManager, val mYears: List) : FragmentStatePagerAdapter(fm) { private val mFragments = SparseArray() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/CustomEventRepeatIntervalDialog.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/CustomEventRepeatIntervalDialog.kt index 6545a0727..9c9cb919a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/CustomEventRepeatIntervalDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/CustomEventRepeatIntervalDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.view.ViewGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.helpers.DAY -import com.simplemobiletools.calendar.helpers.MONTH -import com.simplemobiletools.calendar.helpers.WEEK -import com.simplemobiletools.calendar.helpers.YEAR +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.helpers.DAY +import com.simplemobiletools.calendar.pro.helpers.MONTH +import com.simplemobiletools.calendar.pro.helpers.WEEK +import com.simplemobiletools.calendar.pro.helpers.YEAR import com.simplemobiletools.commons.extensions.hideKeyboard import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.showKeyboard diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/DeleteEventDialog.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/DeleteEventDialog.kt index deaefd849..cbc592a8a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/DeleteEventDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/DeleteEventDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.view.ViewGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.helpers.DELETE_ALL_OCCURRENCES -import com.simplemobiletools.calendar.helpers.DELETE_FUTURE_OCCURRENCES -import com.simplemobiletools.calendar.helpers.DELETE_SELECTED_OCCURRENCE +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.helpers.DELETE_ALL_OCCURRENCES +import com.simplemobiletools.calendar.pro.helpers.DELETE_FUTURE_OCCURRENCES +import com.simplemobiletools.calendar.pro.helpers.DELETE_SELECTED_OCCURRENCE import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.setupDialogStuff import kotlinx.android.synthetic.main.dialog_delete_event.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditEventTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditEventTypeDialog.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditEventTypeDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditEventTypeDialog.kt index 8b9b88a4b..a8b5fe1df 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditEventTypeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditEventTypeDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.widget.ImageView import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.* import kotlinx.android.synthetic.main.dialog_event_type.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditRepeatingEventDialog.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditRepeatingEventDialog.kt index 7c64cde60..f9530aaea 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/EditRepeatingEventDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/EditRepeatingEventDialog.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.view.ViewGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity import com.simplemobiletools.commons.extensions.hideKeyboard import com.simplemobiletools.commons.extensions.setupDialogStuff import kotlinx.android.synthetic.main.dialog_edit_repeating_event.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt index ad4defc50..148fe397a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ExportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs 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 -import com.simplemobiletools.calendar.extensions.dbHelper +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.adapters.FilterEventTypeAdapter +import com.simplemobiletools.calendar.pro.extensions.dbHelper import com.simplemobiletools.commons.extensions.* import kotlinx.android.synthetic.main.dialog_export_events.view.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/FilterEventTypesDialog.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/FilterEventTypesDialog.kt index 559ededca..5af9b9c26 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/FilterEventTypesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/FilterEventTypesDialog.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.adapters.FilterEventTypeAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper import com.simplemobiletools.commons.extensions.setupDialogStuff import kotlinx.android.synthetic.main.dialog_filter_event_types.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ImportEventsDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ImportEventsDialog.kt index 51c8afed8..7cab39f2b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/ImportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ImportEventsDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.view.ViewGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.helpers.DBHelper -import com.simplemobiletools.calendar.helpers.IcsImporter -import com.simplemobiletools.calendar.helpers.IcsImporter.ImportResult.* +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.helpers.DBHelper +import com.simplemobiletools.calendar.pro.helpers.IcsImporter +import com.simplemobiletools.calendar.pro.helpers.IcsImporter.ImportResult.* import com.simplemobiletools.commons.extensions.setFillWithStroke import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.toast diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt index e14b1dec8..6f3261674 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatLimitTypePickerDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.app.DatePickerDialog 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 -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.getNowSeconds +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.getNowSeconds import com.simplemobiletools.commons.extensions.getDialogTheme import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.value diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatRuleWeeklyDialog.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatRuleWeeklyDialog.kt index 06c852633..ded9e3be9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/RepeatRuleWeeklyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatRuleWeeklyDialog.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.views.MyAppCompatCheckbox import kotlinx.android.synthetic.main.dialog_vertical_linear_layout.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectCalendarsDialog.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectCalendarsDialog.kt index 12c7ec603..0fa312659 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectCalendarsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectCalendarsDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.text.TextUtils import android.view.ViewGroup import android.widget.RelativeLayout import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.SwitchCompat -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.CalDAVHandler +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.CalDAVHandler import com.simplemobiletools.commons.extensions.setupDialogStuff import kotlinx.android.synthetic.main.calendar_item_account.view.* import kotlinx.android.synthetic.main.calendar_item_calendar.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventCalendarDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventCalendarDialog.kt index f7e182f22..7ea673d7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventCalendarDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventCalendarDialog.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.graphics.Color @@ -6,11 +6,11 @@ import android.view.ViewGroup import android.widget.RadioButton import android.widget.RadioGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.helpers.STORED_LOCALLY_ONLY -import com.simplemobiletools.calendar.models.CalDAVCalendar +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.helpers.STORED_LOCALLY_ONLY +import com.simplemobiletools.calendar.pro.models.CalDAVCalendar import com.simplemobiletools.commons.extensions.setFillWithStroke import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.updateTextColors diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventTypeColorDialog.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventTypeColorDialog.kt index 468cd9da3..ed2e3843b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeColorDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventTypeColorDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.view.ViewGroup import android.widget.RadioButton import android.widget.RadioGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.CalDAVHandler -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.CalDAVHandler +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.setFillWithStroke import com.simplemobiletools.commons.extensions.setupDialogStuff diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventTypeDialog.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventTypeDialog.kt index ecdda2f5f..c4f9f7f17 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/dialogs/SelectEventTypeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectEventTypeDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.calendar.dialogs +package com.simplemobiletools.calendar.pro.dialogs import android.app.Activity import android.graphics.Color import android.view.ViewGroup import android.widget.RadioGroup import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.extensions.hideKeyboard import com.simplemobiletools.commons.extensions.setFillWithStroke import com.simplemobiletools.commons.extensions.setupDialogStuff diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Activity.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Activity.kt index d0605eacc..6949d4d6e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Activity.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.calendar.extensions +package com.simplemobiletools.calendar.pro.extensions import android.app.Activity -import com.simplemobiletools.calendar.BuildConfig -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.dialogs.CustomEventRepeatIntervalDialog -import com.simplemobiletools.calendar.helpers.* +import com.simplemobiletools.calendar.pro.BuildConfig +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.dialogs.CustomEventRepeatIntervalDialog +import com.simplemobiletools.calendar.pro.helpers.* import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.hideKeyboard diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt index db932745c..d5952aec8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.extensions +package com.simplemobiletools.calendar.pro.extensions import android.accounts.Account import android.annotation.SuppressLint @@ -21,16 +21,16 @@ 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 -import com.simplemobiletools.calendar.activities.SnoozeReminderActivity -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.models.* -import com.simplemobiletools.calendar.receivers.CalDAVSyncReceiver -import com.simplemobiletools.calendar.receivers.NotificationReceiver -import com.simplemobiletools.calendar.services.SnoozeService +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.EventActivity +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.activities.SnoozeReminderActivity +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.models.* +import com.simplemobiletools.calendar.pro.receivers.CalDAVSyncReceiver +import com.simplemobiletools.calendar.pro.receivers.NotificationReceiver +import com.simplemobiletools.calendar.pro.services.SnoozeService import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.SILENT import com.simplemobiletools.commons.helpers.WEEK_SECONDS diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/DateTime.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/DateTime.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/calendar/extensions/DateTime.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/DateTime.kt index d0110f8cc..622c8a476 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/DateTime.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/DateTime.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.extensions +package com.simplemobiletools.calendar.pro.extensions import org.joda.time.DateTime diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Int.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Int.kt similarity index 55% rename from app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Int.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Int.kt index e26cf4d5e..ce43cd970 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Int.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Int.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.calendar.extensions +package com.simplemobiletools.calendar.pro.extensions -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.MONTH -import com.simplemobiletools.calendar.helpers.WEEK -import com.simplemobiletools.calendar.helpers.YEAR -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.MONTH +import com.simplemobiletools.calendar.pro.helpers.WEEK +import com.simplemobiletools.calendar.pro.helpers.YEAR +import com.simplemobiletools.calendar.pro.models.Event fun Int.isTsOnProperDay(event: Event): Boolean { val dateTime = Formatter.getDateTimeFromTS(this) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/String.kt similarity index 56% rename from app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/String.kt index c7da55791..71cd1be33 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/String.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.calendar.extensions +package com.simplemobiletools.calendar.pro.extensions fun String.getMonthCode() = if (length == 8) substring(0, 6) else "" diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/TextView.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/TextView.kt index 41f9a9a52..a0adf4c8e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/TextView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.extensions +package com.simplemobiletools.calendar.pro.extensions import android.content.res.Resources import android.graphics.Bitmap diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragment.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragment.kt index 94fe46231..ef39deb11 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.content.Intent import android.os.Bundle @@ -9,18 +9,18 @@ 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 -import com.simplemobiletools.calendar.adapters.DayEventsAdapter -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.helpers.DAY_CODE -import com.simplemobiletools.calendar.helpers.EVENT_ID -import com.simplemobiletools.calendar.helpers.EVENT_OCCURRENCE_TS -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.interfaces.NavigationListener -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.EventActivity +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.adapters.DayEventsAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.helpers.DAY_CODE +import com.simplemobiletools.calendar.pro.helpers.EVENT_ID +import com.simplemobiletools.calendar.pro.helpers.EVENT_OCCURRENCE_TS +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.interfaces.NavigationListener +import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.getDialogTheme import com.simplemobiletools.commons.extensions.setupDialogStuff diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt index 6d53d763f..f7cf5a36c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle @@ -6,13 +6,13 @@ 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 -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.DAY_CODE -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.interfaces.NavigationListener +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.adapters.MyDayPagerAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.DAY_CODE +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.interfaces.NavigationListener import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_days_holder.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt index 087064724..26800ec94 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.content.Intent import android.graphics.drawable.ColorDrawable @@ -6,17 +6,17 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.EventActivity -import com.simplemobiletools.calendar.activities.MainActivity -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.adapters.EventListAdapter -import com.simplemobiletools.calendar.extensions.* -import com.simplemobiletools.calendar.helpers.EVENT_ID -import com.simplemobiletools.calendar.helpers.EVENT_OCCURRENCE_TS -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.ListEvent +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.EventActivity +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.adapters.EventListAdapter +import com.simplemobiletools.calendar.pro.extensions.* +import com.simplemobiletools.calendar.pro.helpers.EVENT_ID +import com.simplemobiletools.calendar.pro.helpers.EVENT_OCCURRENCE_TS +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.ListEvent import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.MONTH_SECONDS import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragment.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragment.kt index 3d5e4762b..dacca33e8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragment.kt @@ -1,25 +1,25 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.content.Context import android.content.res.Resources import android.os.Bundle -import androidx.fragment.app.Fragment -import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.DatePicker import android.widget.RelativeLayout -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.MainActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.Config -import com.simplemobiletools.calendar.helpers.DAY_CODE -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.MonthlyCalendarImpl -import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.interfaces.NavigationListener -import com.simplemobiletools.calendar.models.DayMonthly +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.Fragment +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.Config +import com.simplemobiletools.calendar.pro.helpers.DAY_CODE +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.MonthlyCalendarImpl +import com.simplemobiletools.calendar.pro.interfaces.MonthlyCalendar +import com.simplemobiletools.calendar.pro.interfaces.NavigationListener +import com.simplemobiletools.calendar.pro.models.DayMonthly import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beGone import com.simplemobiletools.commons.extensions.getDialogTheme diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt index 8e634f487..4fc125c97 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle @@ -6,14 +6,14 @@ 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.MyMonthPagerAdapter -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.getMonthCode -import com.simplemobiletools.calendar.helpers.DAY_CODE -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.interfaces.NavigationListener +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.adapters.MyMonthPagerAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.getMonthCode +import com.simplemobiletools.calendar.pro.helpers.DAY_CODE +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.interfaces.NavigationListener import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_months_holder.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MyFragmentHolder.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MyFragmentHolder.kt index cc4d8452c..49dcb46a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MyFragmentHolder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import androidx.fragment.app.Fragment diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt index f2b75a78a..29b8860de 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.content.Intent import android.content.res.Resources @@ -14,17 +14,17 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import androidx.fragment.app.Fragment -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.EventActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.interfaces.WeekFragmentListener -import com.simplemobiletools.calendar.interfaces.WeeklyCalendar -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.views.MyScrollView +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.EventActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.interfaces.WeekFragmentListener +import com.simplemobiletools.calendar.pro.interfaces.WeeklyCalendar +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.views.MyScrollView import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.DAY_SECONDS import com.simplemobiletools.commons.helpers.WEEK_SECONDS diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt index 049cd03eb..6db03433b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle @@ -7,15 +7,15 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.viewpager.widget.ViewPager -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.MainActivity -import com.simplemobiletools.calendar.adapters.MyWeekPagerAdapter -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.WEEK_START_DATE_TIME -import com.simplemobiletools.calendar.interfaces.WeekFragmentListener -import com.simplemobiletools.calendar.views.MyScrollView +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.adapters.MyWeekPagerAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.WEEK_START_DATE_TIME +import com.simplemobiletools.calendar.pro.interfaces.WeekFragmentListener +import com.simplemobiletools.calendar.pro.views.MyScrollView import com.simplemobiletools.commons.extensions.updateActionBarSubtitle import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.helpers.WEEK_SECONDS diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragment.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragment.kt index d17350ab9..14ec7ad2b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragment.kt @@ -1,21 +1,21 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.content.res.Resources import android.os.Bundle -import androidx.fragment.app.Fragment import android.util.SparseArray import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.MainActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.YEAR_LABEL -import com.simplemobiletools.calendar.helpers.YearlyCalendarImpl -import com.simplemobiletools.calendar.interfaces.YearlyCalendar -import com.simplemobiletools.calendar.models.DayYearly -import com.simplemobiletools.calendar.views.SmallMonthView +import androidx.fragment.app.Fragment +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.YEAR_LABEL +import com.simplemobiletools.calendar.pro.helpers.YearlyCalendarImpl +import com.simplemobiletools.calendar.pro.interfaces.YearlyCalendar +import com.simplemobiletools.calendar.pro.models.DayYearly +import com.simplemobiletools.calendar.pro.views.SmallMonthView import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.updateTextColors import kotlinx.android.synthetic.main.fragment_year.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt index 7e6e69cf9..2fd6f8478 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.calendar.fragments +package com.simplemobiletools.calendar.pro.fragments import android.graphics.drawable.ColorDrawable import android.os.Bundle -import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.MainActivity -import com.simplemobiletools.calendar.adapters.MyYearPagerAdapter -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.Formatter +import androidx.viewpager.widget.ViewPager +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.MainActivity +import com.simplemobiletools.calendar.pro.adapters.MyYearPagerAdapter +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.Formatter import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_years_holder.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHandler.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHandler.kt index fd999139f..93f4faf6e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVHandler.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHandler.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.ContentUris import android.content.ContentValues @@ -7,14 +7,14 @@ import android.database.Cursor import android.provider.CalendarContract import android.provider.CalendarContract.Reminders import android.util.SparseIntArray -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.refreshCalDAVCalendars -import com.simplemobiletools.calendar.extensions.scheduleCalDAVSync -import com.simplemobiletools.calendar.models.CalDAVCalendar -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.refreshCalDAVCalendars +import com.simplemobiletools.calendar.pro.extensions.scheduleCalDAVSync +import com.simplemobiletools.calendar.pro.models.CalDAVCalendar +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_READ_CALENDAR import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CALENDAR diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt index f020cd363..a670f8e0d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.Context import android.media.AudioManager -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.scheduleCalDAVSync +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.scheduleCalDAVSync import com.simplemobiletools.commons.extensions.getDefaultAlarmTitle import com.simplemobiletools.commons.extensions.getDefaultAlarmUri import com.simplemobiletools.commons.helpers.ALARM_SOUND_TYPE_NOTIFICATION diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt index af6b78735..faf28a163 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers const val LOW_ALPHA = .3f const val MEDIUM_ALPHA = .6f diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/DBHelper.kt similarity index 99% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/DBHelper.kt index d1879c862..99e9039f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/DBHelper.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.ContentValues import android.content.Context @@ -9,11 +9,11 @@ import android.database.sqlite.SQLiteOpenHelper import android.database.sqlite.SQLiteQueryBuilder import android.text.TextUtils import android.util.SparseIntArray -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.extensions.* -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.* +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.extensions.getIntValue import com.simplemobiletools.commons.extensions.getLongValue import com.simplemobiletools.commons.extensions.getStringValue @@ -570,7 +570,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont fun deleteEventTypes(eventTypes: ArrayList, deleteEvents: Boolean, callback: (deletedCnt: Int) -> Unit) { var deleteIds = eventTypes.asSequence().filter { it.caldavCalendarId == 0 }.map { it.id }.toList() - deleteIds = deleteIds.filter { it != DBHelper.REGULAR_EVENT_TYPE_ID } as ArrayList + deleteIds = deleteIds.filter { it != REGULAR_EVENT_TYPE_ID } as ArrayList val deletedSet = HashSet() deleteIds.map { deletedSet.add(it.toString()) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Formatter.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Formatter.kt index 352dbdb56..fd94181b9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Formatter.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.Context -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.seconds +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.seconds import org.joda.time.DateTime import org.joda.time.DateTimeZone import org.joda.time.LocalDate @@ -58,7 +58,7 @@ object Formatter { return "$month $day $year" } - fun getTodayCode() = Formatter.getDayCodeFromTS(getNowSeconds()) + fun getTodayCode() = getDayCodeFromTS(getNowSeconds()) fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context)) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsExporter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsExporter.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsExporter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsExporter.kt index 631424c1d..095290045 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsExporter.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.helpers.IcsExporter.ExportResult.* -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.helpers.IcsExporter.ExportResult.* +import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.getFileOutputStream import com.simplemobiletools.commons.extensions.toast diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt index d9a5b2c9d..cd28af350 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/IcsImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/IcsImporter.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.Context import android.widget.Toast -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SimpleActivity -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.helpers.IcsImporter.ImportResult.* -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SimpleActivity +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.helpers.IcsImporter.ImportResult.* +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.EventType import com.simplemobiletools.commons.extensions.areDigitsOnly import com.simplemobiletools.commons.extensions.showErrorToast import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MonthlyCalendarImpl.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MonthlyCalendarImpl.kt index ab30af79b..55dc68ac2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MonthlyCalendarImpl.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.Context -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.models.DayMonthly -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.interfaces.MonthlyCalendar +import com.simplemobiletools.calendar.pro.models.DayMonthly +import com.simplemobiletools.calendar.pro.models.Event import org.joda.time.DateTime import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetListProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetListProvider.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt index 320aaca6a..2cfbda094 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetListProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -8,11 +8,11 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.widget.RemoteViews -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SplashActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.launchNewEventIntent -import com.simplemobiletools.calendar.services.WidgetService +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SplashActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.launchNewEventIntent +import com.simplemobiletools.calendar.pro.services.WidgetService import com.simplemobiletools.commons.extensions.* import org.joda.time.DateTime diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt index ce1b699cf..dce554934 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -9,12 +9,12 @@ import android.content.Intent import android.content.res.Resources import android.view.View import android.widget.RemoteViews -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.activities.SplashActivity -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.launchNewEventIntent -import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.models.DayMonthly +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.activities.SplashActivity +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.launchNewEventIntent +import com.simplemobiletools.calendar.pro.interfaces.MonthlyCalendar +import com.simplemobiletools.calendar.pro.models.DayMonthly import com.simplemobiletools.commons.extensions.* import org.joda.time.DateTime diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Parser.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Parser.kt index f70989897..86ab41e41 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Parser.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers -import com.simplemobiletools.calendar.extensions.isXMonthlyRepetition -import com.simplemobiletools.calendar.extensions.isXWeeklyRepetition -import com.simplemobiletools.calendar.extensions.isXYearlyRepetition -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.RepeatRule +import com.simplemobiletools.calendar.pro.extensions.isXMonthlyRepetition +import com.simplemobiletools.calendar.pro.extensions.isXWeeklyRepetition +import com.simplemobiletools.calendar.pro.extensions.isXYearlyRepetition +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.RepeatRule import com.simplemobiletools.commons.helpers.* import org.joda.time.DateTimeZone import org.joda.time.format.DateTimeFormat diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/WeeklyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/WeeklyCalendarImpl.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/WeeklyCalendarImpl.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/WeeklyCalendarImpl.kt index 3b2dfd4e6..638f5cb58 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/WeeklyCalendarImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/WeeklyCalendarImpl.kt @@ -1,9 +1,9 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.Context -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.interfaces.WeeklyCalendar -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.interfaces.WeeklyCalendar +import com.simplemobiletools.calendar.pro.models.Event import com.simplemobiletools.commons.helpers.WEEK_SECONDS import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/YearlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/YearlyCalendarImpl.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/calendar/helpers/YearlyCalendarImpl.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/YearlyCalendarImpl.kt index 3b8e34d5e..32291282b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/YearlyCalendarImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/YearlyCalendarImpl.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.helpers +package com.simplemobiletools.calendar.pro.helpers import android.content.Context import android.util.SparseArray -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.interfaces.YearlyCalendar -import com.simplemobiletools.calendar.models.DayYearly -import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.interfaces.YearlyCalendar +import com.simplemobiletools.calendar.pro.models.DayYearly +import com.simplemobiletools.calendar.pro.models.Event import org.joda.time.DateTime import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/DeleteEventTypesListener.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/DeleteEventTypesListener.kt similarity index 57% rename from app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/DeleteEventTypesListener.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/DeleteEventTypesListener.kt index f6b5475e9..83cf1f6f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/DeleteEventTypesListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/DeleteEventTypesListener.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.calendar.interfaces +package com.simplemobiletools.calendar.pro.interfaces -import com.simplemobiletools.calendar.models.EventType +import com.simplemobiletools.calendar.pro.models.EventType import java.util.* interface DeleteEventTypesListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/MonthlyCalendar.kt similarity index 67% rename from app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/MonthlyCalendar.kt index 62e0bdbd7..1a33eba54 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/MonthlyCalendar.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.calendar.interfaces +package com.simplemobiletools.calendar.pro.interfaces import android.content.Context -import com.simplemobiletools.calendar.models.DayMonthly +import com.simplemobiletools.calendar.pro.models.DayMonthly import org.joda.time.DateTime interface MonthlyCalendar { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/NavigationListener.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/NavigationListener.kt similarity index 72% rename from app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/NavigationListener.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/NavigationListener.kt index d8a071d02..036c72de1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/NavigationListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/NavigationListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.interfaces +package com.simplemobiletools.calendar.pro.interfaces import org.joda.time.DateTime diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeekFragmentListener.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeekFragmentListener.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeekFragmentListener.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeekFragmentListener.kt index ba8050983..61e74d8d6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeekFragmentListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeekFragmentListener.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.interfaces +package com.simplemobiletools.calendar.pro.interfaces interface WeekFragmentListener { fun scrollTo(y: Int) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeeklyCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeeklyCalendar.kt new file mode 100644 index 000000000..0b50a5175 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/WeeklyCalendar.kt @@ -0,0 +1,7 @@ +package com.simplemobiletools.calendar.pro.interfaces + +import com.simplemobiletools.calendar.pro.models.Event + +interface WeeklyCalendar { + fun updateWeeklyCalendar(events: ArrayList) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/YearlyCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/YearlyCalendar.kt similarity index 59% rename from app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/YearlyCalendar.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/YearlyCalendar.kt index cf6ad5da6..90c1832f9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/YearlyCalendar.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/YearlyCalendar.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.calendar.interfaces +package com.simplemobiletools.calendar.pro.interfaces import android.util.SparseArray -import com.simplemobiletools.calendar.models.DayYearly +import com.simplemobiletools.calendar.pro.models.DayYearly import java.util.* interface YearlyCalendar { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/CalDAVCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/CalDAVCalendar.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/CalDAVCalendar.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/CalDAVCalendar.kt index 618cfd252..2b53fd851 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/CalDAVCalendar.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/CalDAVCalendar.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class CalDAVCalendar(val id: Int, val displayName: String, val accountName: String, val accountType: String, val ownerName: String, var color: Int, val accessLevel: Int) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/DayMonthly.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/DayMonthly.kt similarity index 80% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/DayMonthly.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/DayMonthly.kt index 303b1e923..06ed13492 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/DayMonthly.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/DayMonthly.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class DayMonthly(val value: Int, val isThisMonth: Boolean, val isToday: Boolean, val code: String, val weekOfYear: Int, var dayEvents: ArrayList, var indexOnMonthView: Int) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/DayYearly.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/DayYearly.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/DayYearly.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/DayYearly.kt index 5a965a3c6..f7a89aa43 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/DayYearly.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/DayYearly.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class DayYearly(var eventColors: HashSet = HashSet()) { fun addColor(color: Int) = eventColors.add(color) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/Event.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/Event.kt index cb59a70fa..715c2cc18 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/Event.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.helpers.* -import com.simplemobiletools.calendar.helpers.Formatter +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.* +import com.simplemobiletools.calendar.pro.helpers.Formatter import org.joda.time.DateTime import java.io.Serializable import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/EventType.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/EventType.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/EventType.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/EventType.kt index 77d063a2b..c2bd205a4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/EventType.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/EventType.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class EventType(var id: Int = 0, var title: String, var color: Int, var caldavCalendarId: Int = 0, var caldavDisplayName: String = "", var caldavEmail: String = "") { fun getDisplayTitle() = if (caldavCalendarId == 0) title else "$caldavDisplayName ($caldavEmail)" diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListEvent.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListEvent.kt similarity index 85% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/ListEvent.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListEvent.kt index 1e60d1571..d1f5e06f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListEvent.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListEvent.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class ListEvent(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var title: String = "", var description: String = "", var isAllDay: Boolean, var color: Int, var location: String = "", var isPastEvent: Boolean = false, var isRepeatable: Boolean = false) : ListItem() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListItem.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListItem.kt new file mode 100644 index 000000000..73e9a3605 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListItem.kt @@ -0,0 +1,3 @@ +package com.simplemobiletools.calendar.pro.models + +open class ListItem diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListSection.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListSection.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/ListSection.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListSection.kt index c4aeb7392..13803956a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/ListSection.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListSection.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class ListSection(val title: String, val code: String, val isToday: Boolean, val isPastSection: Boolean) : ListItem() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/MonthViewEvent.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/MonthViewEvent.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/MonthViewEvent.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/MonthViewEvent.kt index 0d9d8c8ab..36573a5b9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/MonthViewEvent.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/MonthViewEvent.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class MonthViewEvent(val id: Int, val title: String, val startTS: Int, val color: Int, val startDayIndex: Int, val daysCnt: Int, val originalStartDayIndex: Int, val isAllDay: Boolean, val isPastEvent: Boolean) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/RepeatRule.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/RepeatRule.kt similarity index 64% rename from app/src/main/kotlin/com/simplemobiletools/calendar/models/RepeatRule.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/RepeatRule.kt index 2e6c20223..3dc78e83c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/RepeatRule.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/RepeatRule.kt @@ -1,3 +1,3 @@ -package com.simplemobiletools.calendar.models +package com.simplemobiletools.calendar.pro.models data class RepeatRule(val repeatInterval: Int, val repeatRule: Int, val repeatLimit: Int) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/BootCompletedReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/BootCompletedReceiver.kt similarity index 60% rename from app/src/main/kotlin/com/simplemobiletools/calendar/receivers/BootCompletedReceiver.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/BootCompletedReceiver.kt index d6aec0c36..20a73617e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/BootCompletedReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/BootCompletedReceiver.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.calendar.receivers +package com.simplemobiletools.calendar.pro.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.calendar.extensions.notifyRunningEvents -import com.simplemobiletools.calendar.extensions.recheckCalDAVCalendars -import com.simplemobiletools.calendar.extensions.scheduleAllEvents +import com.simplemobiletools.calendar.pro.extensions.notifyRunningEvents +import com.simplemobiletools.calendar.pro.extensions.recheckCalDAVCalendars +import com.simplemobiletools.calendar.pro.extensions.scheduleAllEvents class BootCompletedReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/CalDAVSyncReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/CalDAVSyncReceiver.kt similarity index 61% rename from app/src/main/kotlin/com/simplemobiletools/calendar/receivers/CalDAVSyncReceiver.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/CalDAVSyncReceiver.kt index f30cbe17c..5441b9f2e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/CalDAVSyncReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/CalDAVSyncReceiver.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.calendar.receivers +package com.simplemobiletools.calendar.pro.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.simplemobiletools.calendar.extensions.recheckCalDAVCalendars -import com.simplemobiletools.calendar.extensions.updateWidgets +import com.simplemobiletools.calendar.pro.extensions.recheckCalDAVCalendars +import com.simplemobiletools.calendar.pro.extensions.updateWidgets class CalDAVSyncReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/NotificationReceiver.kt similarity index 71% rename from app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/NotificationReceiver.kt index 93a7589b5..9da49cb6d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/receivers/NotificationReceiver.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.calendar.receivers +package com.simplemobiletools.calendar.pro.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.PowerManager -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.notifyEvent -import com.simplemobiletools.calendar.extensions.scheduleNextEventReminder -import com.simplemobiletools.calendar.extensions.updateListWidget -import com.simplemobiletools.calendar.helpers.EVENT_ID -import com.simplemobiletools.calendar.helpers.Formatter +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.notifyEvent +import com.simplemobiletools.calendar.pro.extensions.scheduleNextEventReminder +import com.simplemobiletools.calendar.pro.extensions.updateListWidget +import com.simplemobiletools.calendar.pro.helpers.EVENT_ID +import com.simplemobiletools.calendar.pro.helpers.Formatter class NotificationReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/services/SnoozeService.kt similarity index 52% rename from app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/services/SnoozeService.kt index a16cbe568..22617cedf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/services/SnoozeService.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/services/SnoozeService.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.calendar.services +package com.simplemobiletools.calendar.pro.services import android.app.IntentService import android.content.Intent -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.dbHelper -import com.simplemobiletools.calendar.extensions.rescheduleReminder -import com.simplemobiletools.calendar.helpers.EVENT_ID +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.dbHelper +import com.simplemobiletools.calendar.pro.extensions.rescheduleReminder +import com.simplemobiletools.calendar.pro.helpers.EVENT_ID class SnoozeService : IntentService("Snooze") { override fun onHandleIntent(intent: Intent) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/services/WidgetService.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/services/WidgetService.kt similarity index 63% rename from app/src/main/kotlin/com/simplemobiletools/calendar/services/WidgetService.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/services/WidgetService.kt index d0f80454e..e2216733c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/services/WidgetService.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/services/WidgetService.kt @@ -1,8 +1,8 @@ -package com.simplemobiletools.calendar.services +package com.simplemobiletools.calendar.pro.services import android.content.Intent import android.widget.RemoteViewsService -import com.simplemobiletools.calendar.adapters.EventListWidgetAdapter +import com.simplemobiletools.calendar.pro.adapters.EventListWidgetAdapter class WidgetService : RemoteViewsService() { override fun onGetViewFactory(intent: Intent) = EventListWidgetAdapter(applicationContext) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt similarity index 96% rename from app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt index 5605953d8..43c782952 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.views +package com.simplemobiletools.calendar.pro.views import android.content.Context import android.graphics.Canvas @@ -9,14 +9,14 @@ import android.text.TextUtils import android.util.AttributeSet import android.util.SparseIntArray import android.view.View -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.extensions.seconds -import com.simplemobiletools.calendar.helpers.Formatter -import com.simplemobiletools.calendar.helpers.LOW_ALPHA -import com.simplemobiletools.calendar.models.DayMonthly -import com.simplemobiletools.calendar.models.Event -import com.simplemobiletools.calendar.models.MonthViewEvent +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.extensions.seconds +import com.simplemobiletools.calendar.pro.helpers.Formatter +import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA +import com.simplemobiletools.calendar.pro.models.DayMonthly +import com.simplemobiletools.calendar.pro.models.Event +import com.simplemobiletools.calendar.pro.models.MonthViewEvent import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getContrastColor diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthViewWrapper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthViewWrapper.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthViewWrapper.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthViewWrapper.kt index a1ccea43e..de291cb25 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MonthViewWrapper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthViewWrapper.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.calendar.views +package com.simplemobiletools.calendar.pro.views import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.widget.FrameLayout -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.models.DayMonthly +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.models.DayMonthly import com.simplemobiletools.commons.extensions.onGlobalLayout import kotlinx.android.synthetic.main.month_view.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MyScrollView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MyScrollView.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/calendar/views/MyScrollView.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MyScrollView.kt index 54c850882..f0fd8b125 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/views/MyScrollView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MyScrollView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.views +package com.simplemobiletools.calendar.pro.views import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/views/SmallMonthView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/SmallMonthView.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/views/SmallMonthView.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/SmallMonthView.kt index 1ec5c8bfc..098c2d3d8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/views/SmallMonthView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/SmallMonthView.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.calendar.views +package com.simplemobiletools.calendar.pro.views import android.content.Context import android.content.res.Configuration @@ -6,10 +6,10 @@ import android.graphics.Canvas import android.graphics.Paint import android.util.AttributeSet import android.view.View -import com.simplemobiletools.calendar.R -import com.simplemobiletools.calendar.extensions.config -import com.simplemobiletools.calendar.helpers.MEDIUM_ALPHA -import com.simplemobiletools.calendar.models.DayYearly +import com.simplemobiletools.calendar.pro.R +import com.simplemobiletools.calendar.pro.extensions.config +import com.simplemobiletools.calendar.pro.helpers.MEDIUM_ALPHA +import com.simplemobiletools.calendar.pro.models.DayYearly import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/views/WeeklyViewGrid.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/WeeklyViewGrid.kt similarity index 91% rename from app/src/main/kotlin/com/simplemobiletools/calendar/views/WeeklyViewGrid.kt rename to app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/WeeklyViewGrid.kt index df5b8d135..4b7db7db5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/views/WeeklyViewGrid.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/WeeklyViewGrid.kt @@ -1,11 +1,11 @@ -package com.simplemobiletools.calendar.views +package com.simplemobiletools.calendar.pro.views import android.content.Context import android.graphics.Canvas import android.graphics.Paint import android.util.AttributeSet import android.view.View -import com.simplemobiletools.calendar.R +import com.simplemobiletools.calendar.pro.R class WeeklyViewGrid(context: Context, attrs: AttributeSet, defStyle: Int) : View(context, attrs, defStyle) { private val ROWS_CNT = 24 diff --git a/app/src/main/res/layout-land/fragment_year.xml b/app/src/main/res/layout-land/fragment_year.xml index bf36cbba7..87694bbd3 100644 --- a/app/src/main/res/layout-land/fragment_year.xml +++ b/app/src/main/res/layout-land/fragment_year.xml @@ -26,7 +26,7 @@ android:textAllCaps="true" android:textSize="@dimen/normal_text_size"/> - - - - - - - - - - - - - - - @@ -75,7 +75,7 @@ - + - - + - - - - - - - - - - - - -