From 8fa618ea757374bfa389c349e5b65640e1162dc9 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 11:10:40 +0900 Subject: [PATCH 01/27] [add] added a setting to change first day of the week --- .../android/lightcalendarview/CalendarSettings.kt | 1 + .../co/recruit_mp/android/lightcalendarview/DayLayout.kt | 5 +++-- .../jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt | 8 +++++++- .../recruit_mp/android/lightcalendarview/WeekDayLayout.kt | 7 ++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index 9cc2419..b90fce7 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -30,6 +30,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { val weekDayView = WeekDayView(observer) val dayView = DayView(observer) + var firstDayOfWeek: WeekDay = WeekDay.SUNDAY /** * Settings for {@link jp.co.recruit_mp.android.lightcalendarview.WeekDayView} diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index 4230ca2..964c109 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -51,8 +51,9 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : thisYear = cal[Calendar.YEAR] thisMonth = cal[Calendar.MONTH] - // 左上セルの日付を計算 - cal.add(Calendar.DAY_OF_YEAR, -cal[Calendar.DAY_OF_WEEK] + 1) + // calculate the date of the top-left cell + val weekDayOffset = WeekDay.values().indexOf(settings.firstDayOfWeek) + cal.add(Calendar.DAY_OF_YEAR, -cal[Calendar.DAY_OF_WEEK] + weekDayOffset + 1) firstDate = cal.time // 7 x 6 マスの DayView を追加する diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt index 3cf6c32..6568bd4 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt @@ -34,9 +34,15 @@ enum class WeekDay { companion object { val ordinals = values() fun fromOrdinal(ordinal: Int) = ordinals[ordinal] + + /** + * Returns the rearranged WeekDay values by sliding elements by n times + * + * @param n number of times to slide elements + */ + fun getPermutation(n: Int) = values().let { it.slice((0..it.size - 1).map { i -> (i + n) % it.size }) } } fun getShortLabel(context: Context): String = context.getStringArray(R.array.week_days_short)[ordinal] fun getLabel(context: Context): String = context.getStringArray(R.array.week_days_full)[ordinal] - } diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt index aae4583..a4c6dcc 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt @@ -33,10 +33,11 @@ class WeekDayLayout(context: Context, settings: CalendarSettings) : CellLayout(c get() = DEFAULT_DAYS_IN_WEEK init { - // 7 x 1 マスの WeekDayView を追加する - WeekDay.values().forEach { weekDay -> + val weekDayOffset = WeekDay.values().indexOf(settings.firstDayOfWeek) + + // add WeekDayViews in 7x1 grid + WeekDay.getPermutation(weekDayOffset).forEach { weekDay -> addView(WeekDayView(context, settings, weekDay)) } } - } From b01c33be2e4db5187f7af9e944b4fec199edd71f Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 11:16:47 +0900 Subject: [PATCH 02/27] [add] added the feature to change first day of the week --- .../lightcalendarview/CalendarSettings.kt | 3 + .../android/lightcalendarview/DayLayout.kt | 60 +++++++++++++++---- .../lightcalendarview/LightCalendarView.kt | 15 +++++ .../lightcalendarview/WeekDayLayout.kt | 33 +++++++++- library/src/main/res/values/attrs.xml | 1 + 5 files changed, 100 insertions(+), 12 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index b90fce7..3d68685 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -32,6 +32,9 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { val dayView = DayView(observer) var firstDayOfWeek: WeekDay = WeekDay.SUNDAY + internal val weekDayOffset: Int + get() = WeekDay.values().indexOf(firstDayOfWeek) + /** * Settings for {@link jp.co.recruit_mp.android.lightcalendarview.WeekDayView} */ diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index 964c109..c1303a8 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -39,9 +39,10 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : internal var selectedDayView: DayView? = null internal var callback: Callback? = null - var firstDate: Date - val thisYear: Int - val thisMonth: Int + private var firstDate: Calendar = Calendar.getInstance() + private var weekDayOffset: Int = -1 + private val thisYear: Int + private val thisMonth: Int init { val cal: Calendar = Calendar.getInstance().apply { @@ -51,10 +52,50 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : thisYear = cal[Calendar.YEAR] thisMonth = cal[Calendar.MONTH] - // calculate the date of the top-left cell - val weekDayOffset = WeekDay.values().indexOf(settings.firstDayOfWeek) - cal.add(Calendar.DAY_OF_YEAR, -cal[Calendar.DAY_OF_WEEK] + weekDayOffset + 1) - firstDate = cal.time + // update the layout + updateLayout() + + // 今日を選択 + setSelectedDay(Date()) + } + + private val observer = Observer { observable, any -> + updateLayout() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + settings.addObserver(observer) + } + + override fun onDetachedFromWindow() { + settings.deleteObserver(observer) + super.onDetachedFromWindow() + } + + private fun updateLayout() { + if (weekDayOffset != settings.weekDayOffset) { + weekDayOffset = settings.weekDayOffset + + val cal: Calendar = Calendar.getInstance().apply { + time = month + set(Calendar.DAY_OF_MONTH, 1) + } + + // calculate the date of top-left cell + cal.add(Calendar.DAY_OF_YEAR, -cal[Calendar.DAY_OF_WEEK] + weekDayOffset + 1) + firstDate = cal + + // remove all children + removeAllViews() + + // populate children + populateViews() + } + } + + private fun populateViews() { + val cal = firstDate // 7 x 6 マスの DayView を追加する (0..rowNum - 1).forEach { @@ -70,9 +111,6 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : cal.add(Calendar.DAY_OF_YEAR, 1) } } - - // 今日を選択 - setSelectedDay(Date()) } private fun instantiateDayView(cal: Calendar): DayView = DayView(context, settings, cal).apply { @@ -109,7 +147,7 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : /** * 日付に対応する {@link DayView} を返す */ - fun getDayView(date: Date): DayView? = childList.getOrNull(date.daysAfter(firstDate).toInt()) as? DayView + fun getDayView(date: Date): DayView? = childList.getOrNull(date.daysAfter(firstDate.time).toInt()) as? DayView interface Callback { fun onDateSelected(date: Date) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index a1bd0e5..cb14a94 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -83,6 +83,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA R.styleable.LightCalendarView_lcv_textColor -> setTextColor(a.getColorStateList(attr)) R.styleable.LightCalendarView_lcv_selectionColor -> setSelectionColor(a.getColorStateList(attr)) R.styleable.LightCalendarView_lcv_accentColor -> setAccentColor(a.getColorStateList(attr)) + R.styleable.LightCalendarView_lcv_firstDayOfWeek -> setFirstDayOfWeek(a.getInt(attr, 0)) } } a.recycle() @@ -214,6 +215,20 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA } } + /** + * Sets the first day of week + */ + fun setFirstDayOfWeek(weekDay: WeekDay) { + settings.apply { + firstDayOfWeek = weekDay + notifySettingsChanged() + } + } + + private fun setFirstDayOfWeek(n: Int) { + setFirstDayOfWeek(WeekDay.fromOrdinal(n)) + } + private inner class Adapter() : PagerAdapter() { override fun instantiateItem(container: ViewGroup?, position: Int): View { val view = MonthView(context, settings, getDateForPosition(position)).apply { diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt index a4c6dcc..f4e20a1 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt @@ -17,6 +17,7 @@ package jp.co.recruit_mp.android.lightcalendarview import android.content.Context +import java.util.* /** * 月カレンダー内の曜日ラベルを表示する {@link ViewGroup} @@ -32,9 +33,39 @@ class WeekDayLayout(context: Context, settings: CalendarSettings) : CellLayout(c override val colNum: Int get() = DEFAULT_DAYS_IN_WEEK + var weekDayOffset: Int = -1 + init { - val weekDayOffset = WeekDay.values().indexOf(settings.firstDayOfWeek) + updateLayout() + } + + private val observer = Observer { observable, any -> + updateLayout() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + settings.addObserver(observer) + } + + override fun onDetachedFromWindow() { + settings.deleteObserver(observer) + super.onDetachedFromWindow() + } + + private fun updateLayout() { + if (weekDayOffset != settings.weekDayOffset) { + weekDayOffset = settings.weekDayOffset + + // remove all children + removeAllViews() + + // populate children + populateViews() + } + } + private fun populateViews() { // add WeekDayViews in 7x1 grid WeekDay.getPermutation(weekDayOffset).forEach { weekDay -> addView(WeekDayView(context, settings, weekDay)) diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 33bf402..fad60f2 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -6,5 +6,6 @@ + \ No newline at end of file From 6d9710ae905235865cae7d7869e30ea4f3019cb7 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 11:17:29 +0900 Subject: [PATCH 03/27] [update] updated sample --- .../android/lightcalendarview/sample/MainActivity.kt | 4 ---- sample/src/main/res/layout/activity_main.xml | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt b/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt index 0dd51e8..e2c55d3 100644 --- a/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt +++ b/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt @@ -4,13 +4,10 @@ import android.os.Bundle import android.os.Handler import android.support.v7.app.AppCompatActivity import android.util.Log -import android.view.Menu -import android.widget.Button import jp.co.recruit_mp.android.lightcalendarview.LightCalendarView import jp.co.recruit_mp.android.lightcalendarview.MonthView import jp.co.recruit_mp.android.lightcalendarview.accent.Accent import jp.co.recruit_mp.android.lightcalendarview.accent.DotAccent -import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* @@ -68,6 +65,5 @@ class MainActivity : AppCompatActivity() { supportActionBar?.apply { title = formatter.format(calendarView.let { it.getDateForPosition(it.currentItem) }) } - } } diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index aa49e77..de0fbb4 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -27,7 +27,8 @@ app:lcv_dayTextSize="18sp" app:lcv_textColor="@color/calendar_day_text" app:lcv_selectionColor="@color/calendar_selection" - app:lcv_accentColor="@color/calendar_accent"/> + app:lcv_accentColor="@color/calendar_accent" + app:lcv_firstDayOfWeek="0"/> From 762e691a039048bbe53556166084f79fc722e694 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 11:23:14 +0900 Subject: [PATCH 04/27] [fix] fixed DayLayout --- .../jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index c1303a8..1e68e24 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -95,7 +95,7 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : } private fun populateViews() { - val cal = firstDate + val cal = firstDate.clone() as Calendar // 7 x 6 マスの DayView を追加する (0..rowNum - 1).forEach { From 27acfe613fde32dd8f404eec55d5e650d706f44b Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 11:32:28 +0900 Subject: [PATCH 05/27] [update] updated README.md --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b409bbf..8200e21 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,14 @@ Lightweight Calendar View can be easily customized by setting properties in the The following properties are available: -| property name | type | description | -| -------------------------- | ----------------- | ------------------------------------- | -| app:lcv_weekDayTextSize | dimension | The text size of weekdays | -| app:lcv_dayTextSize | dimension | The text size of days | -| app:lcv_textColor | color or resource | The text color of weekdays and days | -| app:lcv_selectionColor | color or resource | The background color of selections | -| app:lcv_accentColor | color or resource | The color of accents | +| property name | type | description | +| -------------------------- | ----------------- | ------------------------------------------------------------------- | +| app:lcv_weekDayTextSize | dimension | The text size of weekdays | +| app:lcv_dayTextSize | dimension | The text size of days | +| app:lcv_textColor | color or resource | The text color of weekdays and days | +| app:lcv_selectionColor | color or resource | The background color of selections | +| app:lcv_accentColor | color or resource | The color of accents | +| app:lcv_firstDayOfWeek | integer | The first day of the week (0 = Sunday, 1 = Monday, ..., 6 = Friday) | The customizations of text colors of selected days or today are done by setting <selector /> color resources to `app:lcv_textColor`, `app:lcv_selectionColor`, or `app:lcv_accentColor` with the following resource files for example. From 2681eda32610d5d9cafc9bae55b28359b33077ac Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 15:17:45 +0900 Subject: [PATCH 06/27] [refactor] reviewed and refactored --- .../android/lightcalendarview/CalendarSettings.kt | 8 ++++++-- .../android/lightcalendarview/DayLayout.kt | 11 +++++------ .../android/lightcalendarview/LightCalendarView.kt | 14 +++++++------- .../android/lightcalendarview/WeekDay.kt | 5 ++++- .../android/lightcalendarview/WeekDayLayout.kt | 8 ++++---- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index 3d68685..0a5cc4d 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -28,11 +28,15 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { private val observer = Observer { observable, any -> notifyObservers(any) } + // settings for WeekDayView val weekDayView = WeekDayView(observer) + + // settings for DayView val dayView = DayView(observer) - var firstDayOfWeek: WeekDay = WeekDay.SUNDAY - internal val weekDayOffset: Int + // settings for DayLayout and WeekDayLayout: first day of the week + var firstDayOfWeek: WeekDay = WeekDay.SUNDAY + val dayOfWeekOffset: Int get() = WeekDay.values().indexOf(firstDayOfWeek) /** diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index 1e68e24..9eec844 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -40,7 +40,7 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : internal var callback: Callback? = null private var firstDate: Calendar = Calendar.getInstance() - private var weekDayOffset: Int = -1 + private var dayOfWeekOffset: Int = -1 private val thisYear: Int private val thisMonth: Int @@ -74,16 +74,15 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : } private fun updateLayout() { - if (weekDayOffset != settings.weekDayOffset) { - weekDayOffset = settings.weekDayOffset + if (dayOfWeekOffset != settings.dayOfWeekOffset) { + dayOfWeekOffset = settings.dayOfWeekOffset + // calculate the date of top-left cell val cal: Calendar = Calendar.getInstance().apply { time = month set(Calendar.DAY_OF_MONTH, 1) + add(Calendar.DAY_OF_YEAR, -this[Calendar.DAY_OF_WEEK] + dayOfWeekOffset + 1) } - - // calculate the date of top-left cell - cal.add(Calendar.DAY_OF_YEAR, -cal[Calendar.DAY_OF_WEEK] + weekDayOffset + 1) firstDate = cal // remove all children diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index cb14a94..7d60ebf 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -216,17 +216,17 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA } /** - * Sets the first day of week + * First day of the week (e.g. Sunday, Monday, ...) */ - fun setFirstDayOfWeek(weekDay: WeekDay) { - settings.apply { - firstDayOfWeek = weekDay - notifySettingsChanged() + var firstDayOfWeek: WeekDay + get() = settings.firstDayOfWeek + set(value) { + settings.firstDayOfWeek = value + settings.notifySettingsChanged() } - } private fun setFirstDayOfWeek(n: Int) { - setFirstDayOfWeek(WeekDay.fromOrdinal(n)) + firstDayOfWeek = WeekDay.fromOrdinal(n) } private inner class Adapter() : PagerAdapter() { diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt index 6568bd4..05370f1 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDay.kt @@ -40,7 +40,10 @@ enum class WeekDay { * * @param n number of times to slide elements */ - fun getPermutation(n: Int) = values().let { it.slice((0..it.size - 1).map { i -> (i + n) % it.size }) } + fun getPermutation(n: Int): List = values().let { + val indices = it.size.let { size -> (0..size - 1).map { i -> (i + n) % size } } + return it.slice(indices) + } } fun getShortLabel(context: Context): String = context.getStringArray(R.array.week_days_short)[ordinal] diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt index f4e20a1..88c589f 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/WeekDayLayout.kt @@ -33,7 +33,7 @@ class WeekDayLayout(context: Context, settings: CalendarSettings) : CellLayout(c override val colNum: Int get() = DEFAULT_DAYS_IN_WEEK - var weekDayOffset: Int = -1 + var dayOfWeekOffset: Int = -1 init { updateLayout() @@ -54,8 +54,8 @@ class WeekDayLayout(context: Context, settings: CalendarSettings) : CellLayout(c } private fun updateLayout() { - if (weekDayOffset != settings.weekDayOffset) { - weekDayOffset = settings.weekDayOffset + if (dayOfWeekOffset != settings.dayOfWeekOffset) { + dayOfWeekOffset = settings.dayOfWeekOffset // remove all children removeAllViews() @@ -67,7 +67,7 @@ class WeekDayLayout(context: Context, settings: CalendarSettings) : CellLayout(c private fun populateViews() { // add WeekDayViews in 7x1 grid - WeekDay.getPermutation(weekDayOffset).forEach { weekDay -> + WeekDay.getPermutation(dayOfWeekOffset).forEach { weekDay -> addView(WeekDayView(context, settings, weekDay)) } } From 4b9d3d15f4a5544a50de370f8903a5b10636c5d9 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Sun, 11 Dec 2016 20:15:29 +0900 Subject: [PATCH 07/27] [refactor] reviewed and refactored --- library/src/main/res/values/integers.xml | 10 ++++++++++ sample/src/main/res/layout/activity_main.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 library/src/main/res/values/integers.xml diff --git a/library/src/main/res/values/integers.xml b/library/src/main/res/values/integers.xml new file mode 100644 index 0000000..b3f7a57 --- /dev/null +++ b/library/src/main/res/values/integers.xml @@ -0,0 +1,10 @@ + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + \ No newline at end of file diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index de0fbb4..a5a00a7 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -28,7 +28,7 @@ app:lcv_textColor="@color/calendar_day_text" app:lcv_selectionColor="@color/calendar_selection" app:lcv_accentColor="@color/calendar_accent" - app:lcv_firstDayOfWeek="0"/> + app:lcv_firstDayOfWeek="@integer/lcv_monday"/> From 70119798add4255b0f05a1fe5c45f76c7d734745 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Tue, 13 Dec 2016 15:04:59 +0900 Subject: [PATCH 08/27] [add] added feature to set the text color of each day of the week --- .../lightcalendarview/CalendarSettings.kt | 41 ++++++++++++++----- .../lightcalendarview/LightCalendarView.kt | 20 +++++++++ 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index 9cc2419..f9c9d45 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -51,6 +51,14 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { defaultTextPaints.values.forEach { it.textSize = value } } + private val textFilterColorMap: MutableMap = WeekDay.values().map { + it to when (it) { + WeekDay.SUNDAY -> context.getColorCompat(R.color.light_calendar_view__week_day_sunday_text_color) + WeekDay.SATURDAY -> context.getColorCompat(R.color.light_calendar_view__week_day_saturday_text_color) + else -> null + } + }.toMutableMap() + // ------------- Base -------------------------------------------------------------------------------------- var basePaint: Paint = Paint().textSize(this@WeekDayView.textSize).color(this@WeekDayView.textColor).typeface(Typeface.DEFAULT).isAntiAlias(true) set(value) { @@ -65,17 +73,18 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { internal var defaultTextPaints: Map = initializedDefaultTextPaints() private fun initializedDefaultTextPaints() = WeekDay.values().map { - it to basePaint.copy().colorFilter(when (it) { - WeekDay.SUNDAY -> PorterDuffColorFilter(context.getColorCompat(R.color.light_calendar_view__week_day_sunday_text_color), PorterDuff.Mode.SRC_ATOP) - WeekDay.SATURDAY -> PorterDuffColorFilter(context.getColorCompat(R.color.light_calendar_view__week_day_saturday_text_color), PorterDuff.Mode.SRC_ATOP) - else -> null - }) + it to basePaint.copy().colorFilter(textFilterColorMap[it]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) }.toMap() // --------------------------------------------------------------------------------------------------------- internal fun setTextColorStateList(colorStateList: ColorStateList) { textColor = colorStateList.getColorForState(State.DEFAULT.value, textColor) } + + internal fun setTextFilterColor(weekDay: WeekDay, color: Int?) { + textFilterColorMap[weekDay] = color + defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) + } } /** @@ -101,6 +110,14 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { selectedTodayTextPaint.textSize(value) } + private val textFilterColorMap: MutableMap = WeekDay.values().map { + it to when (it) { + WeekDay.SUNDAY -> context.getColorCompat(R.color.light_calendar_view__day_sunday_text_color) + WeekDay.SATURDAY -> context.getColorCompat(R.color.light_calendar_view__day_saturday_text_color) + else -> null + } + }.toMutableMap() + // ------------- Base -------------------------------------------------------------------------------------- var baseCirclePaint: Paint = Paint().isAntiAlias(true).style(Paint.Style.FILL) set(value) { @@ -148,11 +165,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { internal var selectedTodayTextPaint: Paint = initializedSelectedTodayTextPaint() private fun initializedDefaultTextPaints() = WeekDay.values().map { - it to baseTextPaint.copy().colorFilter(when (it) { - WeekDay.SUNDAY -> PorterDuffColorFilter(context.getColorCompat(R.color.light_calendar_view__day_sunday_text_color), PorterDuff.Mode.SRC_ATOP) - WeekDay.SATURDAY -> PorterDuffColorFilter(context.getColorCompat(R.color.light_calendar_view__day_saturday_text_color), PorterDuff.Mode.SRC_ATOP) - else -> null - }) + it to baseTextPaint.copy().colorFilter(textFilterColorMap[it]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) }.toMap() private fun initializedTodayTextPaint() = baseTextPaint.copy().color(context.getStyledColor(android.R.attr.textColorPrimary, context.getColorCompat(R.color.light_calendar_view__day_today_text_color))) @@ -184,6 +197,11 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { selectedTodayTextPaint.color(colorStateList, State.SELECTED_TODAY) } + internal fun setTextFilterColor(weekDay: WeekDay, color: Int?) { + textFilterColorMap[weekDay] = color + defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) + } + internal fun setAccentColorStateList(colorStateList: ColorStateList) { defaultAccentPaint.color(colorStateList, State.DEFAULT) todayAccentPaint.color(colorStateList, State.TODAY) @@ -233,4 +251,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { * {@see http://stackoverflow.com/questions/12155553/android-typeface-not-copied-into-new-paint} */ private fun Paint.copy(): Paint = Paint(this).apply { typeface = this@copy.typeface } + + /** Converts a map to a mutable map */ + private fun Iterable>.toMutableMap(): MutableMap = mutableMapOf().apply { putAll(this@toMutableMap) } } diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index a1bd0e5..a0ba462 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -214,6 +214,26 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA } } + /** + * Sets color of a weekday of the week + */ + fun setWeekDayFilterColor(weekDay: WeekDay, color: Int?) { + settings.weekDayView.apply { + setTextFilterColor(weekDay, color) + notifySettingsChanged() + } + } + + /** + * Sets color of a day of the week + */ + fun setDayFilterColor(weekDay: WeekDay, color: Int?) { + settings.dayView.apply { + setTextFilterColor(weekDay, color) + notifySettingsChanged() + } + } + private inner class Adapter() : PagerAdapter() { override fun instantiateItem(container: ViewGroup?, position: Int): View { val view = MonthView(context, settings, getDateForPosition(position)).apply { From 7d6202125af9cac0d27c94683104f585da676daa Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Thu, 15 Dec 2016 18:52:42 +0900 Subject: [PATCH 09/27] [add] added feature to set TimeZone and Locale to use in LightCalendarView --- .../lightcalendarview/CalendarSettings.kt | 2 ++ .../lightcalendarview/DateExtensions.kt | 21 ++++++----- .../android/lightcalendarview/DayLayout.kt | 2 +- .../lightcalendarview/LightCalendarView.kt | 36 ++++++++++++++++--- .../LightCalendarViewTest.kt | 16 +++++---- 5 files changed, 53 insertions(+), 24 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index 9cc2419..0810f83 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -30,6 +30,8 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { val weekDayView = WeekDayView(observer) val dayView = DayView(observer) + var timeZone: TimeZone = TimeZone.getDefault() + var locale: Locale = Locale.getDefault() /** * Settings for {@link jp.co.recruit_mp.android.lightcalendarview.WeekDayView} diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt index 2704b64..d5a5448 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt @@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit */ /** 日付が一致するかどうかを返す */ -internal fun Date.isSameDay(date: Date): Boolean { - val thisCal = Calendar.getInstance().apply { time = this@isSameDay } - val thatCal = Calendar.getInstance().apply { time = date } +internal fun Date.isSameDay(settings: CalendarSettings, date: Date): Boolean { + val thisCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@isSameDay } + val thatCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = date } return (thisCal[Calendar.YEAR] == thatCal[Calendar.YEAR] && thisCal[Calendar.DAY_OF_YEAR] == thatCal[Calendar.DAY_OF_YEAR]) } @@ -34,24 +34,23 @@ internal fun Date.isSameDay(date: Date): Boolean { internal fun Date.daysAfter(date: Date): Long = ((this.time - date.time) / TimeUnit.DAYS.toMillis(1)) /** 自身が date の何ヶ月後かを返す */ -internal fun Date.monthsAfter(date: Date): Long { - val thisCal = Calendar.getInstance().apply { time = this@monthsAfter } - val thatCal = Calendar.getInstance().apply { time = date } +internal fun Date.monthsAfter(settings: CalendarSettings, date: Date): Long { + val thisCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@monthsAfter } + val thatCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = date } return ((thisCal[Calendar.YEAR] - thatCal[Calendar.YEAR]) * Month.values().size + (thisCal[Calendar.MONTH] - thatCal[Calendar.MONTH])).toLong() } /** 日付が一致する {@link Date} がリストに含まれているかどうかを返す */ -internal fun List.containsSameDay(date: Date): Boolean = any { it.isSameDay(date) } +internal fun List.containsSameDay(settings: CalendarSettings, date: Date): Boolean = any { it.isSameDay(settings, date) } /** 日付の計算 */ -internal fun Date.add(field: Int, value: Int) = Calendar.getInstance().apply { +internal fun Date.add(settings: CalendarSettings, field: Int, value: Int) = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@add add(field, value) }.time /** 年度の取得 */ -internal val Date.fiscalYear: Int - get() = Calendar.getInstance().apply { time = this@fiscalYear }.let { +internal fun Date.getFiscalYear(settings: CalendarSettings): Int = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@getFiscalYear }.let { if (it[Calendar.MONTH] < 3) { it[Calendar.YEAR] - 1 } else { @@ -60,4 +59,4 @@ internal val Date.fiscalYear: Int } /** {@link Calendar} への変換 */ -internal fun Date.toCalendar(): Calendar = Calendar.getInstance().apply { time = this@toCalendar } +internal fun Date.toCalendar(settings: CalendarSettings): Calendar = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@toCalendar } \ No newline at end of file diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index 4230ca2..f96f0af 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -44,7 +44,7 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : val thisMonth: Int init { - val cal: Calendar = Calendar.getInstance().apply { + val cal: Calendar = Calendar.getInstance(settings.locale).apply { time = month set(Calendar.DAY_OF_MONTH, 1) } diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index a1bd0e5..25afe29 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -58,12 +58,12 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA setCurrentItem(getPositionForDate(value)) } - var monthFrom: Date = Calendar.getInstance().apply { set(Date().fiscalYear, Calendar.APRIL, 1) }.time + var monthFrom: Date = Calendar.getInstance(settings.locale).apply { set(Date().getFiscalYear(settings), Calendar.APRIL, 1) }.time set(value) { field = value adapter.notifyDataSetChanged() } - var monthTo: Date = Calendar.getInstance().apply { set(monthFrom.fiscalYear + 1, Calendar.MARCH, 1) }.time + var monthTo: Date = Calendar.getInstance(settings.locale).apply { set(monthFrom.getFiscalYear(settings) + 1, Calendar.MARCH, 1) }.time set(value) { field = value adapter.notifyDataSetChanged() @@ -119,12 +119,12 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA /** * {@link ViewPager} のページに対応する月を返す */ - fun getDateForPosition(position: Int): Date = monthFrom.add(Calendar.MONTH, position) + fun getDateForPosition(position: Int): Date = monthFrom.add(settings, Calendar.MONTH, position) /** * 月に対応する {@link ViewPager} のページを返す */ - fun getPositionForDate(date: Date): Int = date.monthsAfter(monthFrom).toInt() + fun getPositionForDate(date: Date): Int = date.monthsAfter(settings, monthFrom).toInt() /** * {@link ViewPager} の特定のページにある {@link MonthView} を返す @@ -214,6 +214,32 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA } } + /** + * Sets the timezone to use in LightCalendarView. + * Set null to use TimeZone.getDefault() + */ + var timeZone: TimeZone? + get() = settings.timeZone + set(value) { + settings.apply { + timeZone = value ?: TimeZone.getDefault() + notifySettingsChanged() + } + } + + /** + * Sets the locale to use in LightCalendarView. + * Set null to use Locale.getDefault() + */ + var locale: Locale? + get() = settings.locale + set(value) { + settings.apply { + locale = value ?: Locale.getDefault() + notifySettingsChanged() + } + } + private inner class Adapter() : PagerAdapter() { override fun instantiateItem(container: ViewGroup?, position: Int): View { val view = MonthView(context, settings, getDateForPosition(position)).apply { @@ -235,7 +261,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA override fun isViewFromObject(view: View?, obj: Any?): Boolean = view === obj - override fun getCount(): Int = Math.max(0, monthTo.monthsAfter(monthFrom).toInt() + 1) + override fun getCount(): Int = Math.max(0, monthTo.monthsAfter(settings, monthFrom).toInt() + 1) } interface OnStateUpdatedListener { diff --git a/library/src/test/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarViewTest.kt b/library/src/test/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarViewTest.kt index efbff87..29708d9 100644 --- a/library/src/test/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarViewTest.kt +++ b/library/src/test/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarViewTest.kt @@ -36,13 +36,15 @@ class LightCalendarViewTest : BaseTestCase() { @Test fun testGetPositionForDate() { - val view = LightCalendarView(context) - val thisFiscalYear = Date().fiscalYear - - assertTrue(view.getPositionForDate(Date(thisFiscalYear - 1900, 3, 1)) == 0) - assertTrue(view.getPositionForDate(Date(thisFiscalYear - 1900, 11, 1)) == 8) - assertTrue(view.getPositionForDate(Date(thisFiscalYear - 1900, 0, 1)) == 9) - assertTrue(view.getPositionForDate(Date(thisFiscalYear - 1900, 2, 1)) == 2) + val view = LightCalendarView(context).apply { + monthFrom = Date(2016 - 1900, 4, 1) + monthTo = Date(2017 - 1900, 3, 30) + } + + assertTrue(view.getPositionForDate(Date(2016 - 1900, 3, 1)) == 3) + assertTrue(view.getPositionForDate(Date(2016 - 1900, 11, 1)) == 8) + assertTrue(view.getPositionForDate(Date(2016 - 1900, 0, 1)) == 9) + assertTrue(view.getPositionForDate(Date(2016 - 1900, 2, 1)) == 2) } } From 8621ad49abdf1ff2ff06dc41911e64f2a8176cfd Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Thu, 15 Dec 2016 19:13:27 +0900 Subject: [PATCH 10/27] [update] updated README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index b409bbf..8bfa04b 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,20 @@ calendarView.setOnStateUpdatedListener(object : LightCalendarView.OnStateUpdated } ``` +### Coloring Day of The Week + +Use `LightCalendarView#setWeekDayFilterColor(weekDay: WeekDay, color: Int?)` and `LightCalendarView#setDayFilterColor(weekDay: WeekDay, color: Int?)` to set the color scheme of day of the week in WeekDayView (e.g. Sunday, Monday, ...) and DayView (e.g. 1, 2, ...) respectively. + +```kotlin +// coloring "sunday" (day of the week) in red +calendarView.setWeekDayFilterColor(WeekDay.SUNDAY, Color.RED) + +// coloring sundays (days) in red +calendarView.setDayFilterColor(WeekDay.SUNDAY, Color.RED) +``` + +Note the library internally uses these color as ColorFilter, meaning it is overlayed on top of the text color set through `LightCalendarView#setTextColor(color: Int)`. + ### Further Customizations See [the Wiki](https://github.com/recruit-mp/LightCalendarView/wiki) for more information and descriptions on futher customizations. From 62e9caacfd3c390e567096f45aaba4aecf0954b4 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 23 Dec 2016 15:30:41 +0900 Subject: [PATCH 11/27] [refactor] refactored according to the feedback in PR #20 --- .../lightcalendarview/CalendarSettings.kt | 2 +- .../lightcalendarview/LightCalendarView.kt | 30 +++++++------------ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index f9c9d45..d890255 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -253,5 +253,5 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { private fun Paint.copy(): Paint = Paint(this).apply { typeface = this@copy.typeface } /** Converts a map to a mutable map */ - private fun Iterable>.toMutableMap(): MutableMap = mutableMapOf().apply { putAll(this@toMutableMap) } + private fun Iterable>.toMutableMap(): MutableMap where K: WeekDay, V: Int? = mutableMapOf().apply { putAll(this@toMutableMap) } } diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index a0ba462..4ca32af 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -148,8 +148,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA private fun setWeekDayRawTextSize(size: Float) { settings.weekDayView.apply { textSize = size - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -162,8 +161,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA private fun setDayRawTextSize(size: Float) { settings.dayView.apply { textSize = size - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -172,12 +170,10 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA fun setTextColor(color: Int) { settings.weekDayView.apply { textColor = color - notifySettingsChanged() - } + }.notifySettingsChanged() settings.dayView.apply { textColor = color - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -186,12 +182,10 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA fun setTextColor(colorStateList: ColorStateList) { settings.weekDayView.apply { setTextColorStateList(colorStateList) - notifySettingsChanged() - } + }.notifySettingsChanged() settings.dayView.apply { setTextColorStateList(colorStateList) - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -200,8 +194,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA fun setSelectionColor(colorStateList: ColorStateList) { settings.dayView.apply { setCircleColorStateList(colorStateList) - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -210,8 +203,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA fun setAccentColor(colorStateList: ColorStateList) { settings.dayView.apply { setAccentColorStateList(colorStateList) - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -220,8 +212,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA fun setWeekDayFilterColor(weekDay: WeekDay, color: Int?) { settings.weekDayView.apply { setTextFilterColor(weekDay, color) - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -230,8 +221,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA fun setDayFilterColor(weekDay: WeekDay, color: Int?) { settings.dayView.apply { setTextFilterColor(weekDay, color) - notifySettingsChanged() - } + }.notifySettingsChanged() } private inner class Adapter() : PagerAdapter() { From a98389e0b8a034cf80beacaf2da154f3f87d8994 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 23 Dec 2016 15:36:14 +0900 Subject: [PATCH 12/27] [refactor] refactored according to the feedback in PR #21 --- .../android/lightcalendarview/LightCalendarView.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index 25afe29..dcbe293 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -223,8 +223,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA set(value) { settings.apply { timeZone = value ?: TimeZone.getDefault() - notifySettingsChanged() - } + }.notifySettingsChanged() } /** @@ -236,8 +235,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA set(value) { settings.apply { locale = value ?: Locale.getDefault() - notifySettingsChanged() - } + }.notifySettingsChanged() } private inner class Adapter() : PagerAdapter() { From 0617f104ddddfcd5495c1cd5006a5e1a3d98bdc4 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Tue, 10 Jan 2017 20:40:33 +0900 Subject: [PATCH 13/27] [refactor] refactored according to the feedback in PR #20 --- .../android/lightcalendarview/CalendarSettings.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt index 4d2e033..a958532 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt @@ -63,7 +63,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { it to when (it) { WeekDay.SUNDAY -> context.getColorCompat(R.color.light_calendar_view__week_day_sunday_text_color) WeekDay.SATURDAY -> context.getColorCompat(R.color.light_calendar_view__week_day_saturday_text_color) - else -> null + else -> 0x00000000 } }.toMutableMap() @@ -81,7 +81,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { internal var defaultTextPaints: Map = initializedDefaultTextPaints() private fun initializedDefaultTextPaints() = WeekDay.values().map { - it to basePaint.copy().colorFilter(textFilterColorMap[it]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) + it to basePaint.copy().colorFilter(textFilterColorMap[it]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: throw IllegalStateException("WeekDay color map for ${it} not found.")) }.toMap() // --------------------------------------------------------------------------------------------------------- @@ -91,7 +91,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { internal fun setTextFilterColor(weekDay: WeekDay, color: Int?) { textFilterColorMap[weekDay] = color - defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) + defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: throw IllegalStateException("WeekDay color map for ${weekDay} not found.")) } } @@ -122,7 +122,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { it to when (it) { WeekDay.SUNDAY -> context.getColorCompat(R.color.light_calendar_view__day_sunday_text_color) WeekDay.SATURDAY -> context.getColorCompat(R.color.light_calendar_view__day_saturday_text_color) - else -> null + else -> 0x00000000 } }.toMutableMap() @@ -173,7 +173,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { internal var selectedTodayTextPaint: Paint = initializedSelectedTodayTextPaint() private fun initializedDefaultTextPaints() = WeekDay.values().map { - it to baseTextPaint.copy().colorFilter(textFilterColorMap[it]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) + it to baseTextPaint.copy().colorFilter(textFilterColorMap[it]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: throw IllegalStateException("Day color map for ${it} not found.")) }.toMap() private fun initializedTodayTextPaint() = baseTextPaint.copy().color(context.getStyledColor(android.R.attr.textColorPrimary, context.getColorCompat(R.color.light_calendar_view__day_today_text_color))) @@ -207,7 +207,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { internal fun setTextFilterColor(weekDay: WeekDay, color: Int?) { textFilterColorMap[weekDay] = color - defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: null) + defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: throw IllegalStateException("Day color map for ${weekDay} not found.")) } internal fun setAccentColorStateList(colorStateList: ColorStateList) { @@ -261,5 +261,5 @@ class CalendarSettings(private val context: Context) : ObservableSettings() { private fun Paint.copy(): Paint = Paint(this).apply { typeface = this@copy.typeface } /** Converts a map to a mutable map */ - private fun Iterable>.toMutableMap(): MutableMap where K: WeekDay, V: Int? = mutableMapOf().apply { putAll(this@toMutableMap) } + private fun Iterable>.toMutableMap(): MutableMap where K : WeekDay, V : Int? = mutableMapOf().apply { putAll(this@toMutableMap) } } From fc20ed3c06d023f519014dae210617b843d5a74c Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Tue, 10 Jan 2017 20:43:51 +0900 Subject: [PATCH 14/27] [fix] fixed compilation error --- .../recruit_mp/android/lightcalendarview/LightCalendarView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index 2759204..53ffa22 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -58,12 +58,12 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA setCurrentItem(getPositionForDate(value)) } - var monthFrom: Date = Calendar.getInstance(settings.locale).apply { set(Date().fiscalYear, Calendar.APRIL, 1) }.time + var monthFrom: Date = Calendar.getInstance(settings.locale).apply { set(Date().getFiscalYear(settings), Calendar.APRIL, 1) }.time set(value) { field = value adapter.notifyDataSetChanged() } - var monthTo: Date = Calendar.getInstance(settings.locale).apply { set(monthFrom.fiscalYear + 1, Calendar.MARCH, 1) }.time + var monthTo: Date = Calendar.getInstance(settings.locale).apply { set(monthFrom.getFiscalYear(settings) + 1, Calendar.MARCH, 1) }.time set(value) { field = value adapter.notifyDataSetChanged() From 1937d1474076335c35418c0e988a46c640b48ded Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 18:59:50 +0900 Subject: [PATCH 15/27] [refactor] refactored calendar settings --- .../android/lightcalendarview/CalendarKt.kt | 12 ++++++++++ .../lightcalendarview/DateExtensions.kt | 24 +++++++++---------- .../android/lightcalendarview/DayLayout.kt | 6 ++--- .../lightcalendarview/LightCalendarView.kt | 4 ++-- 4 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarKt.kt diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarKt.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarKt.kt new file mode 100644 index 0000000..2af23da --- /dev/null +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarKt.kt @@ -0,0 +1,12 @@ +package jp.co.recruit_mp.android.lightcalendarview + +import java.util.* + +/** + * Created by recruit-mahayash on 2017/01/13. + */ +class CalendarKt : GregorianCalendar() { + companion object { + fun getInstance(settings: CalendarSettings) = getInstance(settings.timeZone, settings.locale) + } +} \ No newline at end of file diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt index d5a5448..00bab49 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DateExtensions.kt @@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit /** 日付が一致するかどうかを返す */ internal fun Date.isSameDay(settings: CalendarSettings, date: Date): Boolean { - val thisCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@isSameDay } - val thatCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = date } + val thisCal = CalendarKt.getInstance(settings).apply { time = this@isSameDay } + val thatCal = CalendarKt.getInstance(settings).apply { time = date } return (thisCal[Calendar.YEAR] == thatCal[Calendar.YEAR] && thisCal[Calendar.DAY_OF_YEAR] == thatCal[Calendar.DAY_OF_YEAR]) } @@ -35,8 +35,8 @@ internal fun Date.daysAfter(date: Date): Long = ((this.time - date.time) / TimeU /** 自身が date の何ヶ月後かを返す */ internal fun Date.monthsAfter(settings: CalendarSettings, date: Date): Long { - val thisCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@monthsAfter } - val thatCal = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = date } + val thisCal = CalendarKt.getInstance(settings).apply { time = this@monthsAfter } + val thatCal = CalendarKt.getInstance(settings).apply { time = date } return ((thisCal[Calendar.YEAR] - thatCal[Calendar.YEAR]) * Month.values().size + (thisCal[Calendar.MONTH] - thatCal[Calendar.MONTH])).toLong() } @@ -44,19 +44,19 @@ internal fun Date.monthsAfter(settings: CalendarSettings, date: Date): Long { internal fun List.containsSameDay(settings: CalendarSettings, date: Date): Boolean = any { it.isSameDay(settings, date) } /** 日付の計算 */ -internal fun Date.add(settings: CalendarSettings, field: Int, value: Int) = Calendar.getInstance(settings.timeZone, settings.locale).apply { +internal fun Date.add(settings: CalendarSettings, field: Int, value: Int) = CalendarKt.getInstance(settings).apply { time = this@add add(field, value) }.time /** 年度の取得 */ -internal fun Date.getFiscalYear(settings: CalendarSettings): Int = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@getFiscalYear }.let { - if (it[Calendar.MONTH] < 3) { - it[Calendar.YEAR] - 1 - } else { - it[Calendar.YEAR] - } +internal fun Date.getFiscalYear(settings: CalendarSettings): Int = CalendarKt.getInstance(settings).apply { time = this@getFiscalYear }.let { + if (it[Calendar.MONTH] < 3) { + it[Calendar.YEAR] - 1 + } else { + it[Calendar.YEAR] } +} /** {@link Calendar} への変換 */ -internal fun Date.toCalendar(settings: CalendarSettings): Calendar = Calendar.getInstance(settings.timeZone, settings.locale).apply { time = this@toCalendar } \ No newline at end of file +internal fun Date.toCalendar(settings: CalendarSettings): Calendar = CalendarKt.getInstance(settings).apply { time = this@toCalendar } \ No newline at end of file diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index 5dcdc97..13af29c 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -39,13 +39,13 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : internal var selectedDayView: DayView? = null internal var callback: Callback? = null - private var firstDate: Calendar = Calendar.getInstance() + private var firstDate: Calendar = CalendarKt.getInstance(settings) private var dayOfWeekOffset: Int = -1 private val thisYear: Int private val thisMonth: Int init { - val cal: Calendar = Calendar.getInstance(settings.locale).apply { + val cal: Calendar = CalendarKt.getInstance(settings).apply { time = month set(Calendar.DAY_OF_MONTH, 1) } @@ -78,7 +78,7 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : dayOfWeekOffset = settings.dayOfWeekOffset // calculate the date of top-left cell - val cal: Calendar = Calendar.getInstance().apply { + val cal: Calendar = CalendarKt.getInstance(settings).apply { time = month set(Calendar.DAY_OF_MONTH, 1) add(Calendar.DAY_OF_YEAR, -this[Calendar.DAY_OF_WEEK] + dayOfWeekOffset + 1) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt index 3dbcc81..3047e6b 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt @@ -58,12 +58,12 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA setCurrentItem(getPositionForDate(value)) } - var monthFrom: Date = Calendar.getInstance(settings.locale).apply { set(Date().getFiscalYear(settings), Calendar.APRIL, 1) }.time + var monthFrom: Date = CalendarKt.getInstance(settings).apply { set(Date().getFiscalYear(settings), Calendar.APRIL, 1) }.time set(value) { field = value adapter.notifyDataSetChanged() } - var monthTo: Date = Calendar.getInstance(settings.locale).apply { set(monthFrom.getFiscalYear(settings) + 1, Calendar.MARCH, 1) }.time + var monthTo: Date = CalendarKt.getInstance(settings).apply { set(monthFrom.getFiscalYear(settings) + 1, Calendar.MARCH, 1) }.time set(value) { field = value adapter.notifyDataSetChanged() From bacdb19734684e46af3f208c35f58d6018afeb8e Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 19:27:21 +0900 Subject: [PATCH 16/27] [fix] fixed issue #25 --- .../jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index 9eec844..bb96738 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -81,7 +81,7 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : val cal: Calendar = Calendar.getInstance().apply { time = month set(Calendar.DAY_OF_MONTH, 1) - add(Calendar.DAY_OF_YEAR, -this[Calendar.DAY_OF_WEEK] + dayOfWeekOffset + 1) + add(Calendar.DAY_OF_YEAR, (-this[Calendar.DAY_OF_WEEK] + dayOfWeekOffset + 1).let { if (it > 0) (it - WeekDay.values().size) else it }) } firstDate = cal From 18e03e9490da1bde0162f21df5c650210987b0c2 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 19:56:09 +0900 Subject: [PATCH 17/27] [refactor] refactored DayLayout --- .../jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt index d2fb0d7..0ddcfc5 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt @@ -81,7 +81,9 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) : val cal: Calendar = CalendarKt.getInstance(settings).apply { time = month set(Calendar.DAY_OF_MONTH, 1) - add(Calendar.DAY_OF_YEAR, (-this[Calendar.DAY_OF_WEEK] + dayOfWeekOffset + 1).let { if (it > 0) (it - WeekDay.values().size) else it }) + add(Calendar.DAY_OF_YEAR, (-this[Calendar.DAY_OF_WEEK] + dayOfWeekOffset + 1).let { offset -> + if (offset > 0) (offset - WeekDay.values().size) else offset + }) } firstDate = cal From 9cdcf331030129e47a7315aaa91454368c730523 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 19:54:25 +0900 Subject: [PATCH 18/27] [add] added Java MainActivity --- sample/src/main/AndroidManifest.xml | 2 +- .../sample/JavaMainActivity.java | 87 +++++++++++++++++++ ...{MainActivity.kt => KotlinMainActivity.kt} | 10 +-- sample/src/main/res/layout/activity_main.xml | 2 +- 4 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java rename sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/{MainActivity.kt => KotlinMainActivity.kt} (88%) diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index dd5bd8e..3967f83 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java b/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java new file mode 100644 index 0000000..06b8af7 --- /dev/null +++ b/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java @@ -0,0 +1,87 @@ +package jp.co.recruit_mp.android.lightcalendarview.sample; + +import android.os.Bundle; +import android.os.Handler; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; + +import org.jetbrains.annotations.NotNull; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; + +import jp.co.recruit_mp.android.lightcalendarview.LightCalendarView; +import jp.co.recruit_mp.android.lightcalendarview.MonthView; +import jp.co.recruit_mp.android.lightcalendarview.accent.Accent; +import jp.co.recruit_mp.android.lightcalendarview.accent.DotAccent; + +/** + * Created by recruit-mahayash on 2017/01/13. + */ + +public class JavaMainActivity extends AppCompatActivity { + + private SimpleDateFormat formatter = new SimpleDateFormat("MMMM yyyy", Locale.getDefault()); + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + Calendar calFrom = Calendar.getInstance(); + Calendar calTo = Calendar.getInstance(); + Calendar calNow = Calendar.getInstance(); + calFrom.set(Calendar.MONTH, 0); + calTo.set(Calendar.MONTH, 11); + + LightCalendarView calendarView = (LightCalendarView) findViewById(R.id.calendarView); + calendarView.setMonthFrom(calFrom.getTime()); + calendarView.setMonthTo(calTo.getTime()); + calendarView.setMonthCurrent(calNow.getTime()); + + // set the calendar view callbacks + calendarView.setOnStateUpdatedListener(new LightCalendarView.OnStateUpdatedListener() { + + @Override + public void onMonthSelected(@NotNull Date date, @NotNull final MonthView view) { + getSupportActionBar().setTitle(formatter.format(date)); + + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + Calendar cal = Calendar.getInstance(); + List dates = new ArrayList(); + for (int i = 0; i < 31; i++) { + cal.set(view.getMonth().getYear(), view.getMonth().getMonth(), i); + dates.add(cal.getTime()); + } + HashMap> map = new HashMap<>(); + for (Date date : dates) { + List accents = new ArrayList<>(); + for (int i = 0; i < (date.getDay() % 3); i++) { + accents.add(new DotAccent(10f, null, formatter.format(date) + "-" + i)); + } + map.put(date, accents); + } + } + }, 1000); + + Log.i("KotlinMainActivity", "onMonthSelected: date = " + date); + } + + @Override + public void onDateSelected(@NotNull Date date) { + Log.i("KotlinMainActivity", "onDateSelected: date = " + date); + } + }); + + // change the actionbar title + getSupportActionBar().setTitle(formatter.format(calendarView.getMonthCurrent())); + } +} diff --git a/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt b/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt similarity index 88% rename from sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt rename to sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt index e2c55d3..2336bff 100644 --- a/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt +++ b/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt @@ -11,7 +11,7 @@ import jp.co.recruit_mp.android.lightcalendarview.accent.DotAccent import java.text.SimpleDateFormat import java.util.* -class MainActivity : AppCompatActivity() { +class KotlinMainActivity : AppCompatActivity() { lateinit var calendarView: LightCalendarView @@ -53,17 +53,15 @@ class MainActivity : AppCompatActivity() { view.setAccents(map) }, 1000) - Log.i("MainActivity", "onMonthSelected: date = ${date}") + Log.i("KotlinMainActivity", "onMonthSelected: date = ${date}") } override fun onDateSelected(date: Date) { - Log.i("MainActivity", "onDateSelected: date = ${date}") + Log.i("KotlinMainActivity", "onDateSelected: date = ${date}") } }) // change the actionbar title - supportActionBar?.apply { - title = formatter.format(calendarView.let { it.getDateForPosition(it.currentItem) }) - } + supportActionBar?.title = formatter.format(calendarView.monthCurrent) } } diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index a5a00a7..5ad2317 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context=".MainActivity"> + tools:context=".KotlinMainActivity"> Date: Fri, 13 Jan 2017 20:24:28 +0900 Subject: [PATCH 19/27] [update] updated JavaMainActivity --- .../android/lightcalendarview/sample/JavaMainActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java b/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java index 06b8af7..7215924 100644 --- a/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java +++ b/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java @@ -72,12 +72,12 @@ public void run() { } }, 1000); - Log.i("KotlinMainActivity", "onMonthSelected: date = " + date); + Log.i("JavaMainActivity", "onMonthSelected: date = " + date); } @Override public void onDateSelected(@NotNull Date date) { - Log.i("KotlinMainActivity", "onDateSelected: date = " + date); + Log.i("JavaMainActivity", "onDateSelected: date = " + date); } }); From 7b35ac595b3a4a2d5c1c8916d6a251eb06943ba3 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 20:58:16 +0900 Subject: [PATCH 20/27] [fix] fixed ContextExtensions to support api levels lower than 19 (Kitkat) --- .../lightcalendarview/ContextExtensions.kt | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt index 58bd0da..02fe721 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt @@ -18,25 +18,27 @@ package jp.co.recruit_mp.android.lightcalendarview import android.content.Context import android.content.res.ColorStateList +import android.content.res.TypedArray +import android.os.Build import android.support.v4.content.res.ResourcesCompat /** * Created by recruit-mahayash on 10/16/16. */ /** Returns a themed color */ -internal fun Context.getStyledColor(attrResId: Int, defaultColor: Int): Int { - val a = obtainStyledAttributes(intArrayOf(attrResId)) - val color = a.getColor(0, defaultColor) - a.recycle() - return color +internal fun Context.getStyledColor(attrResId: Int, defaultColor: Int): Int = when { + Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP -> defaultColor + else -> obtainStyledAttributes(intArrayOf(attrResId)).use { + it.getColor(0, defaultColor) + } } /** Returns a themed dimension */ -internal fun Context.getStyledDimension(attrResId: Int, defaultValue: Float): Float { - val a = obtainStyledAttributes(intArrayOf(attrResId)) - val dimen = a.getDimension(0, defaultValue) - a.recycle() - return dimen +internal fun Context.getStyledDimension(attrResId: Int, defaultValue: Float): Float = when { + Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP -> defaultValue + else -> obtainStyledAttributes(intArrayOf(attrResId)).use { + it.getDimension(0, defaultValue) + } } /** Returns a resourced dimension */ @@ -49,4 +51,10 @@ internal fun Context.getColorCompat(resId: Int) = ResourcesCompat.getColor(resou internal fun Context.getColorStateListCompat(resId: Int): ColorStateList = ResourcesCompat.getColorStateList(resources, resId, theme) ?: throw IllegalStateException("Resource not found ${resId}") /** Returns a resourced string array */ -internal fun Context.getStringArray(resId: Int): Array = resources.getStringArray(resId) \ No newline at end of file +internal fun Context.getStringArray(resId: Int): Array = resources.getStringArray(resId) + +private fun TypedArray.use(block: (a: TypedArray) -> T): T { + val result = block(this) + recycle() + return result +} \ No newline at end of file From d6e55ab06e473485809277fd7de04f73bd11752b Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 21:02:37 +0900 Subject: [PATCH 21/27] [add] added JavaSample module --- javasample/.gitignore | 1 + javasample/build.gradle | 33 +++++++ javasample/proguard-rules.pro | 17 ++++ javasample/src/main/AndroidManifest.xml | 16 ++++ .../co/recruit/javasample/MainActivity.java | 83 ++++++++++++++++++ .../src/main/res/color/calendar_accent.xml | 7 ++ .../src/main/res/color/calendar_day_text.xml | 7 ++ .../src/main/res/color/calendar_selection.xml | 5 ++ .../src/main/res/layout/activity_main.xml | 36 ++++++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../src/main/res/values-w820dp/dimens.xml | 6 ++ javasample/src/main/res/values/colors.xml | 6 ++ javasample/src/main/res/values/dimens.xml | 5 ++ javasample/src/main/res/values/strings.xml | 3 + javasample/src/main/res/values/styles.xml | 11 +++ settings.gradle | 2 +- 20 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 javasample/.gitignore create mode 100644 javasample/build.gradle create mode 100644 javasample/proguard-rules.pro create mode 100644 javasample/src/main/AndroidManifest.xml create mode 100644 javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java create mode 100644 javasample/src/main/res/color/calendar_accent.xml create mode 100644 javasample/src/main/res/color/calendar_day_text.xml create mode 100644 javasample/src/main/res/color/calendar_selection.xml create mode 100644 javasample/src/main/res/layout/activity_main.xml create mode 100644 javasample/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 javasample/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 javasample/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 javasample/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 javasample/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 javasample/src/main/res/values-w820dp/dimens.xml create mode 100644 javasample/src/main/res/values/colors.xml create mode 100644 javasample/src/main/res/values/dimens.xml create mode 100644 javasample/src/main/res/values/strings.xml create mode 100644 javasample/src/main/res/values/styles.xml diff --git a/javasample/.gitignore b/javasample/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/javasample/.gitignore @@ -0,0 +1 @@ +/build diff --git a/javasample/build.gradle b/javasample/build.gradle new file mode 100644 index 0000000..4509c44 --- /dev/null +++ b/javasample/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "24.0.1" + + defaultConfig { + applicationId "jp.co.recruit.javasample" + minSdkVersion 15 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:23.4.0' + compile project(":library") + testCompile 'junit:junit:4.12' +} diff --git a/javasample/proguard-rules.pro b/javasample/proguard-rules.pro new file mode 100644 index 0000000..2027e04 --- /dev/null +++ b/javasample/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/masayuki-recruit/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/javasample/src/main/AndroidManifest.xml b/javasample/src/main/AndroidManifest.xml new file mode 100644 index 0000000..db515f4 --- /dev/null +++ b/javasample/src/main/AndroidManifest.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java b/javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java new file mode 100644 index 0000000..66251a7 --- /dev/null +++ b/javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java @@ -0,0 +1,83 @@ +package jp.co.recruit.javasample; + +import android.os.Bundle; +import android.os.Handler; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; + +import org.jetbrains.annotations.NotNull; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; + +import jp.co.recruit_mp.android.lightcalendarview.LightCalendarView; +import jp.co.recruit_mp.android.lightcalendarview.MonthView; +import jp.co.recruit_mp.android.lightcalendarview.accent.Accent; +import jp.co.recruit_mp.android.lightcalendarview.accent.DotAccent; + +public class MainActivity extends AppCompatActivity { + + private SimpleDateFormat formatter = new SimpleDateFormat("MMMM yyyy", Locale.getDefault()); + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + Calendar calFrom = Calendar.getInstance(); + Calendar calTo = Calendar.getInstance(); + Calendar calNow = Calendar.getInstance(); + calFrom.set(Calendar.MONTH, 0); + calTo.set(Calendar.MONTH, 11); + + LightCalendarView calendarView = (LightCalendarView) findViewById(R.id.calendarView); + calendarView.setMonthFrom(calFrom.getTime()); + calendarView.setMonthTo(calTo.getTime()); + calendarView.setMonthCurrent(calNow.getTime()); + + // set the calendar view callbacks + calendarView.setOnStateUpdatedListener(new LightCalendarView.OnStateUpdatedListener() { + + @Override + public void onMonthSelected(@NotNull Date date, @NotNull final MonthView view) { + getSupportActionBar().setTitle(formatter.format(date)); + + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + Calendar cal = Calendar.getInstance(); + List dates = new ArrayList(); + for (int i = 0; i < 31; i++) { + cal.set(view.getMonth().getYear(), view.getMonth().getMonth(), i); + dates.add(cal.getTime()); + } + HashMap> map = new HashMap<>(); + for (Date date : dates) { + List accents = new ArrayList<>(); + for (int i = 0; i < (date.getDay() % 3); i++) { + accents.add(new DotAccent(10f, null, formatter.format(date) + "-" + i)); + } + map.put(date, accents); + } + } + }, 1000); + + Log.i("JavaMainActivity", "onMonthSelected: date = " + date); + } + + @Override + public void onDateSelected(@NotNull Date date) { + Log.i("JavaMainActivity", "onDateSelected: date = " + date); + } + }); + + // change the actionbar title + getSupportActionBar().setTitle(formatter.format(calendarView.getMonthCurrent())); + } +} diff --git a/javasample/src/main/res/color/calendar_accent.xml b/javasample/src/main/res/color/calendar_accent.xml new file mode 100644 index 0000000..32fe4a7 --- /dev/null +++ b/javasample/src/main/res/color/calendar_accent.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/javasample/src/main/res/color/calendar_day_text.xml b/javasample/src/main/res/color/calendar_day_text.xml new file mode 100644 index 0000000..6d81fd7 --- /dev/null +++ b/javasample/src/main/res/color/calendar_day_text.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/javasample/src/main/res/color/calendar_selection.xml b/javasample/src/main/res/color/calendar_selection.xml new file mode 100644 index 0000000..ed37a80 --- /dev/null +++ b/javasample/src/main/res/color/calendar_selection.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/javasample/src/main/res/layout/activity_main.xml b/javasample/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..a5a00a7 --- /dev/null +++ b/javasample/src/main/res/layout/activity_main.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + diff --git a/javasample/src/main/res/mipmap-hdpi/ic_launcher.png b/javasample/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c GIT binary patch literal 3418 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 literal 0 HcmV?d00001 diff --git a/javasample/src/main/res/mipmap-xhdpi/ic_launcher.png b/javasample/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d GIT binary patch literal 4842 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 literal 0 HcmV?d00001 diff --git a/javasample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/javasample/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7 GIT binary patch literal 7718 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 literal 0 HcmV?d00001 diff --git a/javasample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/javasample/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3 GIT binary patch literal 10486 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 + + 64dp + diff --git a/javasample/src/main/res/values/colors.xml b/javasample/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/javasample/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/javasample/src/main/res/values/dimens.xml b/javasample/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/javasample/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/javasample/src/main/res/values/strings.xml b/javasample/src/main/res/values/strings.xml new file mode 100644 index 0000000..1b9463a --- /dev/null +++ b/javasample/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + JavaSample + diff --git a/javasample/src/main/res/values/styles.xml b/javasample/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/javasample/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/settings.gradle b/settings.gradle index 52baf7e..0ea82d4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':sample', ':library' +include ':kotlinsample', ':library', ':javasample' From d30b305bb749de25640395cb230346efa42a90ff Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 21:06:06 +0900 Subject: [PATCH 22/27] [refactor] renamed sample to kotlinsample --- {sample => kotlinsample}/.gitignore | 0 {sample => kotlinsample}/build.gradle | 0 {sample => kotlinsample}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 2 +- .../lightcalendarview/sample/MainActivity.kt | 6 +++--- .../src/main/res/color/calendar_accent.xml | 0 .../src/main/res/color/calendar_day_text.xml | 0 .../src/main/res/color/calendar_selection.xml | 0 .../src/main/res/drawable/calendar_day_text.xml | 0 .../src/main/res/drawable/calendar_selection.xml | 0 .../src/main/res/layout/activity_main.xml | 2 +- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../src/main/res/values-w820dp/dimens.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 21 files changed, 5 insertions(+), 5 deletions(-) rename {sample => kotlinsample}/.gitignore (100%) rename {sample => kotlinsample}/build.gradle (100%) rename {sample => kotlinsample}/proguard-rules.pro (100%) rename {sample => kotlinsample}/src/main/AndroidManifest.xml (94%) rename sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt => kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt (92%) rename {sample => kotlinsample}/src/main/res/color/calendar_accent.xml (100%) rename {sample => kotlinsample}/src/main/res/color/calendar_day_text.xml (100%) rename {sample => kotlinsample}/src/main/res/color/calendar_selection.xml (100%) rename {sample => kotlinsample}/src/main/res/drawable/calendar_day_text.xml (100%) rename {sample => kotlinsample}/src/main/res/drawable/calendar_selection.xml (100%) rename {sample => kotlinsample}/src/main/res/layout/activity_main.xml (97%) rename {sample => kotlinsample}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {sample => kotlinsample}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {sample => kotlinsample}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {sample => kotlinsample}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {sample => kotlinsample}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {sample => kotlinsample}/src/main/res/values-w820dp/dimens.xml (100%) rename {sample => kotlinsample}/src/main/res/values/colors.xml (100%) rename {sample => kotlinsample}/src/main/res/values/dimens.xml (100%) rename {sample => kotlinsample}/src/main/res/values/strings.xml (100%) rename {sample => kotlinsample}/src/main/res/values/styles.xml (100%) diff --git a/sample/.gitignore b/kotlinsample/.gitignore similarity index 100% rename from sample/.gitignore rename to kotlinsample/.gitignore diff --git a/sample/build.gradle b/kotlinsample/build.gradle similarity index 100% rename from sample/build.gradle rename to kotlinsample/build.gradle diff --git a/sample/proguard-rules.pro b/kotlinsample/proguard-rules.pro similarity index 100% rename from sample/proguard-rules.pro rename to kotlinsample/proguard-rules.pro diff --git a/sample/src/main/AndroidManifest.xml b/kotlinsample/src/main/AndroidManifest.xml similarity index 94% rename from sample/src/main/AndroidManifest.xml rename to kotlinsample/src/main/AndroidManifest.xml index 3967f83..dd5bd8e 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/kotlinsample/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt b/kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt similarity index 92% rename from sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt rename to kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt index 2336bff..e329f82 100644 --- a/sample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/KotlinMainActivity.kt +++ b/kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt @@ -11,7 +11,7 @@ import jp.co.recruit_mp.android.lightcalendarview.accent.DotAccent import java.text.SimpleDateFormat import java.util.* -class KotlinMainActivity : AppCompatActivity() { +class MainActivity : AppCompatActivity() { lateinit var calendarView: LightCalendarView @@ -53,11 +53,11 @@ class KotlinMainActivity : AppCompatActivity() { view.setAccents(map) }, 1000) - Log.i("KotlinMainActivity", "onMonthSelected: date = ${date}") + Log.i("MainActivity", "onMonthSelected: date = ${date}") } override fun onDateSelected(date: Date) { - Log.i("KotlinMainActivity", "onDateSelected: date = ${date}") + Log.i("MainActivity", "onDateSelected: date = ${date}") } }) diff --git a/sample/src/main/res/color/calendar_accent.xml b/kotlinsample/src/main/res/color/calendar_accent.xml similarity index 100% rename from sample/src/main/res/color/calendar_accent.xml rename to kotlinsample/src/main/res/color/calendar_accent.xml diff --git a/sample/src/main/res/color/calendar_day_text.xml b/kotlinsample/src/main/res/color/calendar_day_text.xml similarity index 100% rename from sample/src/main/res/color/calendar_day_text.xml rename to kotlinsample/src/main/res/color/calendar_day_text.xml diff --git a/sample/src/main/res/color/calendar_selection.xml b/kotlinsample/src/main/res/color/calendar_selection.xml similarity index 100% rename from sample/src/main/res/color/calendar_selection.xml rename to kotlinsample/src/main/res/color/calendar_selection.xml diff --git a/sample/src/main/res/drawable/calendar_day_text.xml b/kotlinsample/src/main/res/drawable/calendar_day_text.xml similarity index 100% rename from sample/src/main/res/drawable/calendar_day_text.xml rename to kotlinsample/src/main/res/drawable/calendar_day_text.xml diff --git a/sample/src/main/res/drawable/calendar_selection.xml b/kotlinsample/src/main/res/drawable/calendar_selection.xml similarity index 100% rename from sample/src/main/res/drawable/calendar_selection.xml rename to kotlinsample/src/main/res/drawable/calendar_selection.xml diff --git a/sample/src/main/res/layout/activity_main.xml b/kotlinsample/src/main/res/layout/activity_main.xml similarity index 97% rename from sample/src/main/res/layout/activity_main.xml rename to kotlinsample/src/main/res/layout/activity_main.xml index 5ad2317..a5a00a7 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/kotlinsample/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context=".KotlinMainActivity"> + tools:context=".MainActivity"> Date: Fri, 13 Jan 2017 21:09:12 +0900 Subject: [PATCH 23/27] [refactor] renamed package names --- javasample/src/main/AndroidManifest.xml | 2 +- .../javasample/MainActivity.java | 2 +- kotlinsample/src/main/AndroidManifest.xml | 4 +- .../{sample => kotlinsample}/MainActivity.kt | 2 +- .../sample/JavaMainActivity.java | 87 ------------------- 5 files changed, 5 insertions(+), 92 deletions(-) rename javasample/src/main/java/jp/co/{recruit => recruit_mp/android/lightcalendarview}/javasample/MainActivity.java (98%) rename kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/{sample => kotlinsample}/MainActivity.kt (97%) delete mode 100644 sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java diff --git a/javasample/src/main/AndroidManifest.xml b/javasample/src/main/AndroidManifest.xml index db515f4..e700867 100644 --- a/javasample/src/main/AndroidManifest.xml +++ b/javasample/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="jp.co.recruit_mp.android.lightcalendarview.javasample"> diff --git a/javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java b/javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java similarity index 98% rename from javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java rename to javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java index 66251a7..b94dc7e 100644 --- a/javasample/src/main/java/jp/co/recruit/javasample/MainActivity.java +++ b/javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java @@ -1,4 +1,4 @@ -package jp.co.recruit.javasample; +package jp.co.recruit_mp.android.lightcalendarview.javasample; import android.os.Bundle; import android.os.Handler; diff --git a/kotlinsample/src/main/AndroidManifest.xml b/kotlinsample/src/main/AndroidManifest.xml index dd5bd8e..915d49b 100644 --- a/kotlinsample/src/main/AndroidManifest.xml +++ b/kotlinsample/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="jp.co.recruit_mp.android.lightcalendarview.kotlinsample"> - + diff --git a/kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt b/kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/kotlinsample/MainActivity.kt similarity index 97% rename from kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt rename to kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/kotlinsample/MainActivity.kt index e329f82..a1420ea 100644 --- a/kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/sample/MainActivity.kt +++ b/kotlinsample/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/kotlinsample/MainActivity.kt @@ -1,4 +1,4 @@ -package jp.co.recruit_mp.android.lightcalendarview.sample +package jp.co.recruit_mp.android.lightcalendarview.kotlinsample import android.os.Bundle import android.os.Handler diff --git a/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java b/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java deleted file mode 100644 index 7215924..0000000 --- a/sample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/sample/JavaMainActivity.java +++ /dev/null @@ -1,87 +0,0 @@ -package jp.co.recruit_mp.android.lightcalendarview.sample; - -import android.os.Bundle; -import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.util.Log; - -import org.jetbrains.annotations.NotNull; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; - -import jp.co.recruit_mp.android.lightcalendarview.LightCalendarView; -import jp.co.recruit_mp.android.lightcalendarview.MonthView; -import jp.co.recruit_mp.android.lightcalendarview.accent.Accent; -import jp.co.recruit_mp.android.lightcalendarview.accent.DotAccent; - -/** - * Created by recruit-mahayash on 2017/01/13. - */ - -public class JavaMainActivity extends AppCompatActivity { - - private SimpleDateFormat formatter = new SimpleDateFormat("MMMM yyyy", Locale.getDefault()); - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - Calendar calFrom = Calendar.getInstance(); - Calendar calTo = Calendar.getInstance(); - Calendar calNow = Calendar.getInstance(); - calFrom.set(Calendar.MONTH, 0); - calTo.set(Calendar.MONTH, 11); - - LightCalendarView calendarView = (LightCalendarView) findViewById(R.id.calendarView); - calendarView.setMonthFrom(calFrom.getTime()); - calendarView.setMonthTo(calTo.getTime()); - calendarView.setMonthCurrent(calNow.getTime()); - - // set the calendar view callbacks - calendarView.setOnStateUpdatedListener(new LightCalendarView.OnStateUpdatedListener() { - - @Override - public void onMonthSelected(@NotNull Date date, @NotNull final MonthView view) { - getSupportActionBar().setTitle(formatter.format(date)); - - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - Calendar cal = Calendar.getInstance(); - List dates = new ArrayList(); - for (int i = 0; i < 31; i++) { - cal.set(view.getMonth().getYear(), view.getMonth().getMonth(), i); - dates.add(cal.getTime()); - } - HashMap> map = new HashMap<>(); - for (Date date : dates) { - List accents = new ArrayList<>(); - for (int i = 0; i < (date.getDay() % 3); i++) { - accents.add(new DotAccent(10f, null, formatter.format(date) + "-" + i)); - } - map.put(date, accents); - } - } - }, 1000); - - Log.i("JavaMainActivity", "onMonthSelected: date = " + date); - } - - @Override - public void onDateSelected(@NotNull Date date) { - Log.i("JavaMainActivity", "onDateSelected: date = " + date); - } - }); - - // change the actionbar title - getSupportActionBar().setTitle(formatter.format(calendarView.getMonthCurrent())); - } -} From 1cdbd12a3a60fdecf8c3aadc1d6cefd9c99e922f Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 21:12:53 +0900 Subject: [PATCH 24/27] [refactor] renamed app_name --- javasample/src/main/res/values/strings.xml | 2 +- kotlinsample/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/javasample/src/main/res/values/strings.xml b/javasample/src/main/res/values/strings.xml index 1b9463a..ad0ab62 100644 --- a/javasample/src/main/res/values/strings.xml +++ b/javasample/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - JavaSample + LightCalendarViewJava diff --git a/kotlinsample/src/main/res/values/strings.xml b/kotlinsample/src/main/res/values/strings.xml index 134b177..d13d4be 100644 --- a/kotlinsample/src/main/res/values/strings.xml +++ b/kotlinsample/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - LightCalendarAndroid + LightCalendarViewKotlin From 9ca84c2349a47221bdcb60fa5dae0fe1e0ed01fa Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 21:14:31 +0900 Subject: [PATCH 25/27] [update] updated build.gradle --- javasample/build.gradle | 2 +- kotlinsample/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/javasample/build.gradle b/javasample/build.gradle index 4509c44..b146c65 100644 --- a/javasample/build.gradle +++ b/javasample/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "24.0.1" defaultConfig { - applicationId "jp.co.recruit.javasample" + applicationId "jp.co.recruit.android.lightcalendarview.javasample" minSdkVersion 15 targetSdkVersion 23 versionCode 1 diff --git a/kotlinsample/build.gradle b/kotlinsample/build.gradle index d8bee3a..a22d6f0 100644 --- a/kotlinsample/build.gradle +++ b/kotlinsample/build.gradle @@ -6,7 +6,7 @@ android { buildToolsVersion "23.0.3" defaultConfig { - applicationId "jp.co.recruit.android.lightcalendarview.sample" + applicationId "" minSdkVersion 15 targetSdkVersion 23 versionCode 1 From 6c2215e3b665cd0b8bb73eb24f2733784dc2d512 Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 21:26:34 +0900 Subject: [PATCH 26/27] [fix] fixed Java MainActivity --- .../lightcalendarview/javasample/MainActivity.java | 9 ++++++--- javasample/src/main/res/color/calendar_accent.xml | 4 ++-- javasample/src/main/res/color/calendar_day_text.xml | 2 +- javasample/src/main/res/color/calendar_selection.xml | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java b/javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java index b94dc7e..95c385a 100644 --- a/javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java +++ b/javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java @@ -54,17 +54,20 @@ public void run() { Calendar cal = Calendar.getInstance(); List dates = new ArrayList(); for (int i = 0; i < 31; i++) { - cal.set(view.getMonth().getYear(), view.getMonth().getMonth(), i); - dates.add(cal.getTime()); + if (i % 2 == 0) { + cal.set(view.getMonth().getYear() + 1900, view.getMonth().getMonth(), i); + dates.add(cal.getTime()); + } } HashMap> map = new HashMap<>(); for (Date date : dates) { List accents = new ArrayList<>(); - for (int i = 0; i < (date.getDay() % 3); i++) { + for (int i = 0; i <= (date.getDate() % 3); i++) { accents.add(new DotAccent(10f, null, formatter.format(date) + "-" + i)); } map.put(date, accents); } + view.setAccents(map); } }, 1000); diff --git a/javasample/src/main/res/color/calendar_accent.xml b/javasample/src/main/res/color/calendar_accent.xml index 32fe4a7..851ca10 100644 --- a/javasample/src/main/res/color/calendar_accent.xml +++ b/javasample/src/main/res/color/calendar_accent.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/javasample/src/main/res/color/calendar_day_text.xml b/javasample/src/main/res/color/calendar_day_text.xml index 6d81fd7..d08b34f 100644 --- a/javasample/src/main/res/color/calendar_day_text.xml +++ b/javasample/src/main/res/color/calendar_day_text.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/javasample/src/main/res/color/calendar_selection.xml b/javasample/src/main/res/color/calendar_selection.xml index ed37a80..a6a7f57 100644 --- a/javasample/src/main/res/color/calendar_selection.xml +++ b/javasample/src/main/res/color/calendar_selection.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file From f7bceeb03bd3c06b04e4141fc8302f34b7e8982a Mon Sep 17 00:00:00 2001 From: recruit-mahayash Date: Fri, 13 Jan 2017 21:51:29 +0900 Subject: [PATCH 27/27] [refactor] refactored ContextExtensions --- .../lightcalendarview/ContextExtensions.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt index 02fe721..252bce0 100644 --- a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt +++ b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/ContextExtensions.kt @@ -26,19 +26,17 @@ import android.support.v4.content.res.ResourcesCompat * Created by recruit-mahayash on 10/16/16. */ /** Returns a themed color */ -internal fun Context.getStyledColor(attrResId: Int, defaultColor: Int): Int = when { - Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP -> defaultColor - else -> obtainStyledAttributes(intArrayOf(attrResId)).use { - it.getColor(0, defaultColor) - } +internal fun Context.getStyledColor(attrResId: Int, defaultColor: Int): Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + obtainStyledAttributes(intArrayOf(attrResId)).use { it.getColor(0, defaultColor) } +} else { + defaultColor } /** Returns a themed dimension */ -internal fun Context.getStyledDimension(attrResId: Int, defaultValue: Float): Float = when { - Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP -> defaultValue - else -> obtainStyledAttributes(intArrayOf(attrResId)).use { - it.getDimension(0, defaultValue) - } +internal fun Context.getStyledDimension(attrResId: Int, defaultValue: Float): Float = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + obtainStyledAttributes(intArrayOf(attrResId)).use { it.getDimension(0, defaultValue) } +} else { + defaultValue } /** Returns a resourced dimension */