diff --git a/sample/build.gradle b/sample/build.gradle
index 9d01834..81bb513 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -42,14 +42,12 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     implementation project(':crunchycalendar')
 
     // Kotlin language standard lib
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$libs.kotlin_version"
 
     // Support libraries
-    implementation "com.android.support:appcompat-v7:$libs.support_lib_version"
-    implementation "com.android.support:recyclerview-v7:$libs.support_lib_version"
+    implementation "androidx.appcompat:appcompat:$libs.supportX"
+    implementation "androidx.recyclerview:recyclerview:$libs.supportX"
 }
diff --git a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/CustomStyleSampleFragment.kt b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/CustomStyleSampleFragment.kt
index 710f8fa..693f9b2 100644
--- a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/CustomStyleSampleFragment.kt
+++ b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/CustomStyleSampleFragment.kt
@@ -1,11 +1,11 @@
 package ru.cleverpumpkin.calendar.sample
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.Toolbar
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
 import ru.cleverpumpkin.calendar.CalendarDate
 import ru.cleverpumpkin.calendar.CalendarView
 import ru.cleverpumpkin.calendar.CalendarView.SelectionMode
diff --git a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DateIndicatorsSampleFragment.kt b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DateIndicatorsSampleFragment.kt
index f979af7..c8561cb 100644
--- a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DateIndicatorsSampleFragment.kt
+++ b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DateIndicatorsSampleFragment.kt
@@ -2,14 +2,14 @@ package ru.cleverpumpkin.calendar.sample
 
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.Toolbar
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
 import ru.cleverpumpkin.calendar.CalendarDate
 import ru.cleverpumpkin.calendar.CalendarView
 import ru.cleverpumpkin.calendar.utils.getColorInt
@@ -63,7 +63,7 @@ class DateIndicatorsSampleFragment : Fragment() {
         }
 
         if (savedInstanceState == null) {
-            calendarView.setupCalendar(selectionMode = CalendarView.SelectionMode.NON)
+            calendarView.setupCalendar(selectionMode = CalendarView.SelectionMode.NONE)
         }
     }
 
@@ -131,8 +131,11 @@ class DateIndicatorsSampleFragment : Fragment() {
             }
 
             val event = getItem(position)
-            view.findViewById<View>(R.id.color_view).setBackgroundColor(event.color)
-            view.findViewById<TextView>(R.id.event_name_view).text = event.eventName
+
+            if (event != null) {
+                view.findViewById<View>(R.id.color_view).setBackgroundColor(event.color)
+                view.findViewById<TextView>(R.id.event_name_view).text = event.eventName
+            }
 
             return view
         }
diff --git a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DialogSampleFragment.kt b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DialogSampleFragment.kt
index e32d1cb..ee62239 100644
--- a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DialogSampleFragment.kt
+++ b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/DialogSampleFragment.kt
@@ -1,11 +1,11 @@
 package ru.cleverpumpkin.calendar.sample
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import androidx.fragment.app.DialogFragment
 import ru.cleverpumpkin.calendar.CalendarView
 
 class DialogSampleFragment : DialogFragment() {
@@ -21,7 +21,7 @@ class DialogSampleFragment : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        dialog.window.requestFeature(Window.FEATURE_NO_TITLE)
+        dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
 
         val calendarView = view.findViewById<CalendarView>(R.id.calendar_view)
         if (savedInstanceState == null) {
diff --git a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/MainActivity.kt b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/MainActivity.kt
index 93029cc..390e6d4 100644
--- a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/MainActivity.kt
+++ b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/MainActivity.kt
@@ -1,9 +1,9 @@
 package ru.cleverpumpkin.calendar.sample
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v4.app.FragmentTransaction
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentTransaction
 import ru.cleverpumpkin.calendar.sample.SampleListFragment.SampleItem
 
 class MainActivity : AppCompatActivity(),
diff --git a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SampleListFragment.kt b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SampleListFragment.kt
index d0cde3b..3592431 100644
--- a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SampleListFragment.kt
+++ b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SampleListFragment.kt
@@ -2,15 +2,15 @@ package ru.cleverpumpkin.calendar.sample
 
 import android.content.Context
 import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.v4.app.Fragment
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 
 class SampleListFragment : Fragment() {
 
diff --git a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SelectionSampleFragment.kt b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SelectionSampleFragment.kt
index 8e657c6..d960730 100644
--- a/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SelectionSampleFragment.kt
+++ b/sample/src/main/java/ru/cleverpumpkin/calendar/sample/SelectionSampleFragment.kt
@@ -1,14 +1,14 @@
 package ru.cleverpumpkin.calendar.sample
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.Toolbar
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioGroup
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
 import ru.cleverpumpkin.calendar.CalendarDate
 import ru.cleverpumpkin.calendar.CalendarView
 import ru.cleverpumpkin.calendar.CalendarView.SelectionMode
@@ -79,10 +79,6 @@ class SelectionSampleFragment : Fragment() {
                 R.id.range_selection -> {
                     setupCalendar(SelectionMode.RANGE, preselectedDatesRange())
                 }
-                R.id.week_custom_selection -> {
-
-                    setupCalendarWithWeekSelection()
-                }
                 R.id.boundaries_selection -> {
                     setupCalendarWithBoundaries()
                 }
@@ -128,34 +124,6 @@ class SelectionSampleFragment : Fragment() {
         )
     }
 
-    private fun setupCalendarWithWeekSelection() {
-        setupCalendar(SelectionMode.RANGE, emptyList())
-
-        calendarView.onDateClickListener = { date ->
-            val weekStart = getWeekStart(date)
-            val weekEnd = getWeekEnd(date)
-
-            calendarView.updateSelectedDates(listOf(weekStart, weekEnd))
-            updateSelectedDatesView()
-        }
-    }
-
-    private fun getWeekStart(date: CalendarDate): CalendarDate {
-        val tmpCalendar = Calendar.getInstance()
-        tmpCalendar.firstDayOfWeek = calendarView.firstDayOfWeek
-        tmpCalendar.time = date.date
-        tmpCalendar.set(Calendar.DAY_OF_WEEK, tmpCalendar.firstDayOfWeek)
-        return CalendarDate(tmpCalendar.time)
-    }
-
-    private fun getWeekEnd(date: CalendarDate): CalendarDate {
-        val tmpCalendar = Calendar.getInstance()
-        tmpCalendar.firstDayOfWeek = calendarView.firstDayOfWeek
-        tmpCalendar.time = date.date
-        tmpCalendar.set(Calendar.DAY_OF_WEEK, tmpCalendar.firstDayOfWeek + 6)
-        return CalendarDate(tmpCalendar.time)
-    }
-
     private fun setupCalendarWithBoundaries() {
         val calendar = Calendar.getInstance()
         calendar.set(2018, Calendar.JUNE, 1)
diff --git a/sample/src/main/res/layout/fragment_custom_style_sample.xml b/sample/src/main/res/layout/fragment_custom_style_sample.xml
index da336f1..76c9fd6 100644
--- a/sample/src/main/res/layout/fragment_custom_style_sample.xml
+++ b/sample/src/main/res/layout/fragment_custom_style_sample.xml
@@ -1,9 +1,10 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
diff --git a/sample/src/main/res/layout/fragment_dialog_sample.xml b/sample/src/main/res/layout/fragment_dialog_sample.xml
index 4a1c9f6..9b57690 100644
--- a/sample/src/main/res/layout/fragment_dialog_sample.xml
+++ b/sample/src/main/res/layout/fragment_dialog_sample.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ru.cleverpumpkin.calendar.CalendarView xmlns:android="http://schemas.android.com/apk/res/android"
+    <ru.cleverpumpkin.calendar.CalendarView
         android:id="@+id/calendar_view"
         android:layout_width="match_parent"
         android:layout_height="440dp"
diff --git a/sample/src/main/res/layout/fragment_sample.xml b/sample/src/main/res/layout/fragment_sample.xml
index 2e0255d..b3933f8 100644
--- a/sample/src/main/res/layout/fragment_sample.xml
+++ b/sample/src/main/res/layout/fragment_sample.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -13,7 +14,7 @@
         app:title="@string/app_name"
         app:titleTextColor="@android:color/white" />
 
-    <ru.cleverpumpkin.calendar.CalendarView xmlns:android="http://schemas.android.com/apk/res/android"
+    <ru.cleverpumpkin.calendar.CalendarView
         android:id="@+id/calendar_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/sample/src/main/res/layout/fragment_sample_list.xml b/sample/src/main/res/layout/fragment_sample_list.xml
index e55dd91..0583cd0 100644
--- a/sample/src/main/res/layout/fragment_sample_list.xml
+++ b/sample/src/main/res/layout/fragment_sample_list.xml
@@ -5,14 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@color/colorPrimary"
         app:title="@string/app_name"
         app:titleTextColor="@android:color/white" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/sample/src/main/res/layout/fragment_selection_sample.xml b/sample/src/main/res/layout/fragment_selection_sample.xml
index 53ecd95..9dd557c 100644
--- a/sample/src/main/res/layout/fragment_selection_sample.xml
+++ b/sample/src/main/res/layout/fragment_selection_sample.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -56,15 +56,6 @@
                 android:text="@string/range"
                 android:textAllCaps="true" />
 
-            <RadioButton
-                android:id="@+id/week_custom_selection"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
-                android:text="@string/week"
-                android:textAllCaps="true" />
-
             <RadioButton
                 android:id="@+id/boundaries_selection"
                 android:layout_width="wrap_content"