append package name with .pro

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

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.calendar"
+    package="com.simplemobiletools.calendar.pro"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/WeeklyCalendar.kt

@@ -1,7 +0,0 @@
-package com.simplemobiletools.calendar.interfaces
-
-import com.simplemobiletools.calendar.models.Event
-
-interface WeeklyCalendar {
-    fun updateWeeklyCalendar(events: ArrayList<Event>)
-}

app/src/main/kotlin/com/simplemobiletools/calendar/models/ListItem.kt

@@ -1,3 +0,0 @@
-package com.simplemobiletools.calendar.models
-
-open class ListItem

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

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.*

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.*

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.*

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

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() {

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() {

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() {

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

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

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

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

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

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.*

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

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<String>, private val mListener: NavigationListener) :
         FragmentStatePagerAdapter(fm) {

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<String>, private val mListener: NavigationListener) : FragmentStatePagerAdapter(fm) {
     private val mFragments = SparseArray<MonthFragment>()

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<Int>, val mListener: WeekFragmentListener) : FragmentStatePagerAdapter(fm) {
     private val mFragments = SparseArray<WeekFragment>()

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<Int>) : FragmentStatePagerAdapter(fm) {
     private val mFragments = SparseArray<YearFragment>()

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

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.*

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.*

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.*

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

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.*
 

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

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

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.*

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.*

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

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

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

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

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

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
 

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)

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 ""

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

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

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.*

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

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

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.*

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
 

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

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

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.*

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.*

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

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

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

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<EventType>, 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<Int>
+        deleteIds = deleteIds.filter { it != REGULAR_EVENT_TYPE_ID } as ArrayList<Int>
 
         val deletedSet = HashSet<String>()
         deleteIds.map { deletedSet.add(it.toString()) }

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))
 

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

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

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

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
 

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
 

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

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.*
 

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.*
 

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 {

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 {

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
 

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)

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<Event>)
+}

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 {

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) {

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<Event>,
                       var indexOnMonthView: Int)

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<Int> = HashSet()) {
     fun addColor(color: Int) = eventColors.add(color)

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.*

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)"

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()

app/src/main/kotlin/com/simplemobiletools/calendar/pro/models/ListItem.kt

@@ -0,0 +1,3 @@
+package com.simplemobiletools.calendar.pro.models
+
+open class ListItem

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()

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)

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)

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() {
 

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) {

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) {

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) {

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)

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

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.*
 

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

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.*

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

app/src/main/res/layout-land/fragment_year.xml

@@ -26,7 +26,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_4"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -136,7 +136,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_5"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -163,7 +163,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_6"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -190,7 +190,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_7"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -216,7 +216,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_8"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -246,7 +246,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_9"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -273,7 +273,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_10"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -299,7 +299,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_11"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -326,7 +326,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_12"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

app/src/main/res/layout/fragment_month.xml

@@ -8,7 +8,7 @@
 
     <include layout="@layout/top_navigation"/>
 
-    <com.simplemobiletools.calendar.views.MonthViewWrapper
+    <com.simplemobiletools.calendar.pro.views.MonthViewWrapper
         android:id="@+id/month_view_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/fragment_week.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.calendar.views.MyScrollView
+    <com.simplemobiletools.calendar.pro.views.MyScrollView
         android:id="@+id/week_events_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -19,7 +19,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <com.simplemobiletools.calendar.views.WeeklyViewGrid
+            <com.simplemobiletools.calendar.pro.views.WeeklyViewGrid
                 android:id="@+id/week_horizontal_grid_holder"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/weekly_view_events_height"/>
@@ -75,7 +75,7 @@
 
             </LinearLayout>
         </RelativeLayout>
-    </com.simplemobiletools.calendar.views.MyScrollView>
+    </com.simplemobiletools.calendar.pro.views.MyScrollView>
 
     <RelativeLayout
         android:id="@+id/week_top_holder"

app/src/main/res/layout/fragment_week_holder.xml

@@ -20,7 +20,7 @@
             android:background="@drawable/stroke_bottom_right"
             android:importantForAccessibility="no"/>
 
-        <com.simplemobiletools.calendar.views.MyScrollView
+        <com.simplemobiletools.calendar.pro.views.MyScrollView
             android:id="@+id/week_view_hours_scrollview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
                 android:orientation="vertical"
                 android:paddingBottom="@dimen/weekly_view_row_height"/>
 
-        </com.simplemobiletools.calendar.views.MyScrollView>
+        </com.simplemobiletools.calendar.pro.views.MyScrollView>
 
         <com.simplemobiletools.commons.views.MyViewPager
             android:id="@+id/week_view_view_pager"

app/src/main/res/layout/fragment_year.xml

@@ -26,7 +26,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,7 +77,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_4"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -131,7 +131,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_5"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -156,7 +156,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_6"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -184,7 +184,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_7"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -208,7 +208,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_8"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -233,7 +233,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_9"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -262,7 +262,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_10"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -287,7 +287,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_11"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -314,7 +314,7 @@
                 android:textAllCaps="true"
                 android:textSize="@dimen/normal_text_size"/>
 
-            <com.simplemobiletools.calendar.views.SmallMonthView
+            <com.simplemobiletools.calendar.pro.views.SmallMonthView
                 android:id="@+id/month_12"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

app/src/main/res/layout/month_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.calendar.views.MonthView
+<com.simplemobiletools.calendar.pro.views.MonthView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/month_view"
     android:layout_width="match_parent"

app/src/main/res/xml/widget_list_info.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="com.simplemobiletools.calendar.activities.WidgetListConfigureActivity"
+    android:configure="com.simplemobiletools.calendar.pro.activities.WidgetListConfigureActivity"
     android:initialLayout="@layout/widget_event_list"
     android:minHeight="@dimen/min_widget_height"
     android:minResizeHeight="110dp"

app/src/main/res/xml/widget_monthly_info.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="com.simplemobiletools.calendar.activities.WidgetMonthlyConfigureActivity"
+    android:configure="com.simplemobiletools.calendar.pro.activities.WidgetMonthlyConfigureActivity"
     android:initialLayout="@layout/fragment_month"
     android:minHeight="@dimen/min_widget_height"
     android:minResizeHeight="110dp"