Merge branch 'master' into feature/add-setting-for-display-outside-this-month

opst-miyatay · web-flow · commit 3397c110670a · 2017-04-03T14:03:43.000+09:00
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
@@ -46,6 +46,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         // 前月・翌月を表示する
         calendarView.setDisplayOutside(true);
+        // 当日の強調表示固定
+        calendarView.setFixToday(true);
 
         calendarView.setOnMonthSelected(new Function2<Date, MonthView, Unit>() {
             @Override
@@ -57,11 +59,16 @@ public Unit invoke(Date date, final MonthView monthView) {
                     public void run() {
                         Calendar cal = Calendar.getInstance();
                         List<Date> dates = new ArrayList<Date>();
+                        List<Date> holidays = new ArrayList<Date>();
                         for (int i = 0; i < 31; i++) {
                             if (i % 2 == 0) {
                                 cal.set(monthView.getMonth().getYear() + 1900, monthView.getMonth().getMonth(), i);
                                 dates.add(cal.getTime());
                             }
+                            if (i < 7) {
+                                cal.set(monthView.getMonth().getYear() + 1900, monthView.getMonth().getMonth(), i);
+                                holidays.add(cal.getTime());
+                            }
                         }
                         HashMap<Date, List<Accent>> map = new HashMap<>();
                         for (Date date : dates) {
@@ -72,6 +79,8 @@ public void run() {
                             map.put(date, accents);
                         }
                         monthView.setAccents(map);
+                        // 祝日を設定
+                        monthView.setHolidays(holidays);
                     }
                 }, 1000);
 
diff --git a/javasample/src/main/res/layout/activity_main.xml b/javasample/src/main/res/layout/activity_main.xml
@@ -29,6 +29,7 @@
                 app:lcv_selectionColor="@color/calendar_selection"
                 app:lcv_accentColor="@color/calendar_accent"
                 app:lcv_outsideTextColor="#ccc"
+                app:lcv_holidayTextColor="#CD0303"
                 app:lcv_firstDayOfWeek="@integer/lcv_monday"/>
 
         </LinearLayout>
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
@@ -37,6 +37,9 @@ class CalendarSettings(private val context: Context) : ObservableSettings() {
     var locale: Locale = Locale.getDefault()
     var displayOutside: Boolean = false
 
+    // 当日を常に強調表示
+    var fixToday: Boolean = false
+
     // settings for DayLayout and WeekDayLayout: first day of the week
     var firstDayOfWeek: WeekDay = WeekDay.SUNDAY
     val dayOfWeekOffset: Int
@@ -171,6 +174,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() {
         internal fun defaultTextPaint(weekDay: WeekDay): Paint = defaultTextPaints[weekDay] ?: throw IllegalStateException("cannot find default Paint with weekDay - $weekDay")
 
         internal var outsideTextPaint: Paint = initializeOutsideTextPaint()
+        internal var holidayTextPaint: Paint = initializeHolidayTextPaint()
         internal var defaultTextPaints: Map<WeekDay, Paint> = initializedDefaultTextPaints()
         internal var todayTextPaint: Paint = initializedTodayTextPaint()
         internal var selectedTextPaint: Paint = initializeSelectedTextPaint()
@@ -181,6 +185,7 @@ class CalendarSettings(private val context: Context) : ObservableSettings() {
         }.toMap()
 
         private fun initializeOutsideTextPaint() = baseTextPaint.copy().color(context.getStyledColor(android.R.attr.textColorPrimary, context.getColorCompat(R.color.light_calendar_view__day_today_text_color)))
+        private fun initializeHolidayTextPaint() = baseTextPaint.copy().color(context.getStyledColor(android.R.attr.textColorPrimary, context.getColorCompat(R.color.light_calendar_view__day_today_text_color)))
         private fun initializedTodayTextPaint() = baseTextPaint.copy().color(context.getStyledColor(android.R.attr.textColorPrimary, context.getColorCompat(R.color.light_calendar_view__day_today_text_color)))
         private fun initializeSelectedTextPaint() = baseTextPaint.copy().typeface(Typeface.DEFAULT_BOLD).color(context.getStyledColor(android.R.attr.textColorPrimaryInverse, context.getColorCompat(R.color.light_calendar_view__day_selected_text_color)))
         private fun initializedSelectedTodayTextPaint() = baseTextPaint.copy().typeface(Typeface.DEFAULT_BOLD).color(context.getStyledColor(android.R.attr.textColorPrimaryInverse, context.getColorCompat(R.color.light_calendar_view__day_selected_today_text_color)))
@@ -213,6 +218,10 @@ class CalendarSettings(private val context: Context) : ObservableSettings() {
             outsideTextPaint.color = color
         }
 
+        internal fun setHolidayTextColorStateList(color: Int) {
+            holidayTextPaint.color = color
+        }
+
         internal fun setTextFilterColor(weekDay: WeekDay, color: Int?) {
             textFilterColorMap[weekDay] = color
             defaultTextPaints[weekDay]?.colorFilter(textFilterColorMap[weekDay]?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) } ?: throw IllegalStateException("Day color map for $weekDay not found."))
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
@@ -18,7 +18,7 @@ package jp.co.recruit_mp.android.lightcalendarview
 
 import android.content.Context
 import android.support.v4.view.ViewCompat
-import android.util.Log
+import android.text.format.DateUtils
 import java.util.*
 
 /**
@@ -140,8 +140,11 @@ class DayLayout(context: Context, settings: CalendarSettings, var month: Date) :
 
     private fun setSelectedDay(view: DayView?) {
         selectedDayView?.apply {
-            isSelected = false
-            updateState()
+            if (!settings.fixToday || !DateUtils.isToday(selectedDayView?.date!!.time)) {
+                // 今日の場合は常に丸を表示させる
+                isSelected = false
+                updateState()
+            }
         }
         selectedDayView = view?.apply {
             isSelected = true
diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayView.kt
@@ -55,6 +55,7 @@ class DayView(context: Context, settings: CalendarSettings, cal: Calendar) : Cel
 
     private var drawCircle: Boolean = false
     private var isOutside: Boolean = false
+    private var isHoliday: Boolean = false
 
     private var radius: Float = 0f
     private var currentRadius: Float = 0f
@@ -114,6 +115,10 @@ class DayView(context: Context, settings: CalendarSettings, cal: Calendar) : Cel
     fun setOutside():DayView {
         this.isOutside = true
         return this
+    // 祝日に設定
+    fun setHoliday() {
+        this.isHoliday = true
+        updatePaint();
     }
     // 各アクセントの位置を設定する
     private fun layoutAccents() {
@@ -215,6 +220,9 @@ class DayView(context: Context, settings: CalendarSettings, cal: Calendar) : Cel
             }
             isOutside -> {
                 textPaint = settings.dayView.outsideTextPaint
+            // 祝日の設定
+            isHoliday -> {
+                textPaint = settings.dayView.holidayTextPaint
                 accentPaint = settings.dayView.defaultAccentPaint
             }
             else -> {
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
@@ -80,6 +80,7 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA
                 R.styleable.LightCalendarView_lcv_accentColor -> setAccentColor(a.getColorStateList(attr))
                 R.styleable.LightCalendarView_lcv_firstDayOfWeek -> setFirstDayOfWeek(a.getInt(attr, 0))
                 R.styleable.LightCalendarView_lcv_outsideTextColor -> setOutsideTextColor(a.getColor(attr, 0))
+                R.styleable.LightCalendarView_lcv_holidayTextColor -> setHolidayTextColor(a.getColor(attr, 0))
             }
         }
         a.recycle()
@@ -186,6 +187,14 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA
             setOutsideTextColorStateList(color)
         }.notifySettingsChanged()
     }
+    /**
+     * 祝日の文字色を設定する
+     */
+    fun setHolidayTextColor(color: Int) {
+        settings.dayView.apply {
+            setHolidayTextColorStateList(color)
+        }.notifySettingsChanged()
+    }
 
     /**
      * 日付ビューの選択時の背景色を設定する
@@ -256,6 +265,13 @@ class LightCalendarView(context: Context, attrs: AttributeSet? = null, defStyleA
             }.notifySettingsChanged()
         }
 
+    var fixToday: Boolean
+        get() = settings.fixToday
+        set(value) {
+            settings.apply {
+                fixToday = value
+            }.notifySettingsChanged()
+        }
     /**
      * Sets the locale to use in LightCalendarView.
      * Set null to use Locale.getDefault()
diff --git a/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/MonthView.kt b/library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/MonthView.kt
@@ -59,6 +59,13 @@ class MonthView(context: Context, settings: CalendarSettings, var month: Date) :
         dayLayout.invalidateDayViews()
     }
 
+    // 祝日追加
+    fun setHolidays(map: Collection<Date>) {
+        map.forEach { it ->
+            val date = it
+            dayLayout.getDayView(date)?.setHoliday();
+        }
+    }
 
     override fun toString(): String = "MonthView($month)"
 }
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -8,5 +8,6 @@
         <attr name="lcv_accentColor" format="reference|color" />
         <attr name="lcv_firstDayOfWeek" format="integer" />
         <attr name="lcv_outsideTextColor" format="reference|color" />
+        <attr name="lcv_holidayTextColor" format="reference|color" />
     </declare-styleable>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,13 @@ class MonthView(context: Context, settings: CalendarSettings, var month: Date) :`
`59`	`59`	`dayLayout.invalidateDayViews()`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ // 祝日追加`
	`63`	`+ fun setHolidays(map: Collection<Date>) {`
	`64`	`+ map.forEach { it ->`
	`65`	`+ val date = it`
	`66`	`+ dayLayout.getDayView(date)?.setHoliday();`
	`67`	`+ }`
	`68`	`+ }`
`62`	`69`
`63`	`70`	`override fun toString(): String = "MonthView($month)"`
`64`	`71`	`}`