Merge branch 'master' into dev

sample/src/androidTest/java/com/kizitonwose/calenderviewsample/CalenderViewTests.kt

@@ -20,9 +20,9 @@ import com.kizitonwose.calendarview.ui.ViewContainer
 import com.kizitonwose.calendarview.utils.yearMonth
 import com.kizitonwose.calendarviewsample.*
 import kotlinx.android.synthetic.main.example_6_fragment.*
-import kotlinx.android.synthetic.main.exmaple_1_fragment.*
-import kotlinx.android.synthetic.main.exmaple_2_fragment.*
-import kotlinx.android.synthetic.main.exmaple_5_fragment.*
+import kotlinx.android.synthetic.main.example_1_fragment.*
+import kotlinx.android.synthetic.main.example_2_fragment.*
+import kotlinx.android.synthetic.main.example_5_fragment.*
 import org.junit.After
 import org.junit.Assert.assertTrue
 import org.junit.Before

sample/src/main/java/com/kizitonwose/calendarviewsample/Example1Fragment.kt

@@ -20,7 +20,7 @@ import com.kizitonwose.calendarview.utils.next
 import com.kizitonwose.calendarview.utils.yearMonth
 import kotlinx.android.synthetic.main.calendar_day_legend.*
 import kotlinx.android.synthetic.main.example_1_calendar_day.view.*
-import kotlinx.android.synthetic.main.exmaple_1_fragment.*
+import kotlinx.android.synthetic.main.example_1_fragment.*
 import org.threeten.bp.LocalDate
 import org.threeten.bp.YearMonth
 import org.threeten.bp.format.DateTimeFormatter
@@ -36,7 +36,7 @@ class Example1Fragment : BaseFragment(), HasToolbar {
     override val titleRes: Int = R.string.example_1_title
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.exmaple_1_fragment, container, false)
+        return inflater.inflate(R.layout.example_1_fragment, container, false)
     }
 
     private val selectedDates = mutableSetOf<LocalDate>()

sample/src/main/java/com/kizitonwose/calendarviewsample/Example2Fragment.kt

@@ -16,7 +16,7 @@ import com.kizitonwose.calendarview.ui.MonthHeaderFooterBinder
 import com.kizitonwose.calendarview.ui.ViewContainer
 import kotlinx.android.synthetic.main.calendar_day_legend.*
 import kotlinx.android.synthetic.main.example_2_calendar_header.view.*
-import kotlinx.android.synthetic.main.exmaple_2_fragment.*
+import kotlinx.android.synthetic.main.example_2_fragment.*
 import org.threeten.bp.LocalDate
 import org.threeten.bp.YearMonth
 import org.threeten.bp.format.DateTimeFormatter
@@ -31,7 +31,7 @@ class Example2Fragment : BaseFragment(), HasToolbar, HasBackButton {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         setHasOptionsMenu(true)
-        return inflater.inflate(R.layout.exmaple_2_fragment, container, false)
+        return inflater.inflate(R.layout.example_2_fragment, container, false)
     }
 
     private var selectedDate: LocalDate? = null

sample/src/main/java/com/kizitonwose/calendarviewsample/Example3Fragment.kt

@@ -30,7 +30,7 @@ import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.calendar_day_legend.view.*
 import kotlinx.android.synthetic.main.example_3_calendar_day.view.*
 import kotlinx.android.synthetic.main.example_3_event_item_view.*
-import kotlinx.android.synthetic.main.exmaple_3_fragment.*
+import kotlinx.android.synthetic.main.example_3_fragment.*
 import kotlinx.android.synthetic.main.home_activity.*
 import org.threeten.bp.LocalDate
 import org.threeten.bp.YearMonth
@@ -128,7 +128,7 @@ class Example3Fragment : BaseFragment(), HasBackButton {
     private val events = mutableMapOf<LocalDate, List<Event>>()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.exmaple_3_fragment, container, false)
+        return inflater.inflate(R.layout.example_3_fragment, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

sample/src/main/java/com/kizitonwose/calendarviewsample/Example4Fragment.kt

@@ -22,7 +22,7 @@ import com.kizitonwose.calendarview.ui.ViewContainer
 import kotlinx.android.synthetic.main.calendar_day_legend.*
 import kotlinx.android.synthetic.main.example_4_calendar_day.view.*
 import kotlinx.android.synthetic.main.example_4_calendar_header.view.*
-import kotlinx.android.synthetic.main.exmaple_4_fragment.*
+import kotlinx.android.synthetic.main.example_4_fragment.*
 import org.threeten.bp.LocalDate
 import org.threeten.bp.YearMonth
 import org.threeten.bp.format.DateTimeFormatter
@@ -53,7 +53,7 @@ class Example4Fragment : BaseFragment(), HasToolbar, HasBackButton {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         setHasOptionsMenu(true)
-        return inflater.inflate(R.layout.exmaple_4_fragment, container, false)
+        return inflater.inflate(R.layout.example_4_fragment, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

sample/src/main/java/com/kizitonwose/calendarviewsample/Example5Fragment.kt

@@ -25,7 +25,7 @@ import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.calendar_day_legend.view.*
 import kotlinx.android.synthetic.main.example_5_calendar_day.view.*
 import kotlinx.android.synthetic.main.example_5_event_item_view.*
-import kotlinx.android.synthetic.main.exmaple_5_fragment.*
+import kotlinx.android.synthetic.main.example_5_fragment.*
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.YearMonth
@@ -79,7 +79,7 @@ class Example5Fragment : BaseFragment(), HasToolbar {
     override val titleRes: Int = R.string.example_5_title
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.exmaple_5_fragment, container, false)
+        return inflater.inflate(R.layout.example_5_fragment, container, false)
     }
 
     private var selectedDate: LocalDate? = null