Modification set and ready for using.

Author: shahzadafridi

.idea/codeStyles/Project.xml

@@ -2,7 +2,8 @@ package com.shahzadafridi.calendarview
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.Typeface
+import android.graphics.drawable.ShapeDrawable
+import android.graphics.drawable.shapes.RoundRectShape
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,76 +14,89 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
 import java.util.*
 
+
 class CalendarAdapter(
     context: Context,
     private val days: ArrayList<Calendar>, // days with events
     private val eventDays: HashSet<Calendar>?,
     private var eventsHandler: CalenderViewInterface.EventHandler?,
-    private var cellConfig: CellConfiguration?
+    private var dayConfig: DayConfiguration?,
+    monthNumber: Int
 ) : RecyclerView.Adapter<CalendarAdapter.MyViewHolder>() {
 
     // for view inflation
     private val inflater: LayoutInflater
     private val mContext: Context
+    private val mMonthNumber = monthNumber
 
-    //Cell Configuration
-    private var cell_font: Int? = null
-    private var cell_size: Int? = null
-    private var cell_bg: Int? = null
-    private var cell_txt_clr: Int? = null
-    private var cell_txt_size: Int? = null
-    private var cell_selected_txt_clr: Int? = null
-    private var cell_select_bg: Int? = null
+    //Day Configuration
+    private var day_font: Int? = null
+    private var day_bg: Int? = null
+    private var day_txt_clr: Int? = null
+    private var day_txt_size: Int? = null
+    private var day_selected_txt_clr: Int? = null
+    private var day_selected_bg: Int? = null
+    private var event_dot_clr: Int? = null
 
     init {
         inflater = LayoutInflater.from(context)
         mContext = context
-        cellConfig?.let {
-            cell_font = it.cellFont
-            cell_size = it.cellSize
-            cell_bg = it.cellBg
-            cell_txt_clr = it.cellTxtClr
-            cell_txt_size = it.cellTxtSize
-            cell_selected_txt_clr = it.cellSelectedClr
-            cell_select_bg = it.cellSelectBg
+        dayConfig?.let {
+            day_font = it.dayFont
+            day_bg = it.dayBg
+            day_txt_clr = it.dayTxtClr
+            day_txt_size = it.dayTxtSize
+            day_selected_txt_clr = it.daySelectedClr
+            day_selected_bg = it.daySelectedBg
+            event_dot_clr = it.eventDotColor
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CalendarAdapter.MyViewHolder {
-        val view = LayoutInflater.from(mContext).inflate(R.layout.row_calendar_day_layout, parent, false)
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): CalendarAdapter.MyViewHolder {
+        val view =
+            LayoutInflater.from(mContext).inflate(R.layout.row_calendar_day_layout, parent, false)
         return MyViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: CalendarAdapter.MyViewHolder, position: Int) {
-        holder.updateUi(holder,days[position])
+        holder.updateUi(holder, days[position])
     }
 
     override fun getItemCount(): Int {
         return days.size
     }
 
-    inner class MyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener {
+    inner class MyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
+        View.OnClickListener, View.OnLongClickListener {
 
         var textView: TextView
+        var textViewEvent: TextView
         var rowLayout: RelativeLayout
 
         init {
             textView = itemView.findViewById(R.id.control_calendar_day)
+            textViewEvent = itemView.findViewById(R.id.control_calendar_event)
             rowLayout = itemView.findViewById(R.id.row_calendar_layout)
             rowLayout.setOnClickListener(this)
             rowLayout.setOnLongClickListener(this)
-            cell_txt_size?.let {
+            day_txt_size?.let {
                 textView.textSize = it.toFloat()
             }
-            cell_txt_clr?.let {
+            day_txt_clr?.let {
                 textView.setTextColor(ContextCompat.getColor(mContext, it))
             }
-            cell_font?.let {
+            day_font?.let {
                 textView.typeface = ResourcesCompat.getFont(mContext, it)
             }
-            cell_bg?.let {
+            day_bg?.let {
                 rowLayout.setBackgroundResource(it)
             }
+            event_dot_clr?.let {
+                eventShape(textViewEvent,it)
+            }
         }
 
         fun updateUi(holder: MyViewHolder, date: Calendar) {
@@ -98,47 +112,59 @@ class CalendarAdapter(
             holder.textView.text = date.get(Calendar.DATE).toString()
 
 
-            if (month != today.get(Calendar.MONTH) || year != today.get(Calendar.YEAR)) {
+            if (month != mMonthNumber || year != today.get(Calendar.YEAR)) {
                 // if this day is outside current month, grey it out
                 holder.textView.setTextColor(ContextCompat.getColor(mContext, R.color.greyed_out))
-            } else if (day == today.get(Calendar.DATE)) {
+            } else if (today.get(Calendar.DATE) == day && today.get(Calendar.MONTH) == month && today.get(Calendar.YEAR) == year) {
                 // if it is today, set it to blue/bold
-                cell_selected_txt_clr?.let {
+                day_selected_txt_clr?.let {
                     holder.textView.setTextColor(ContextCompat.getColor(mContext, it))
+                } ?: run{
+                    holder.textView.setTextColor(ContextCompat.getColor(mContext, R.color.cwhite))
                 }
-                cell_select_bg?.let {
+                day_selected_bg?.let {
                     holder.rowLayout.setBackgroundResource(it)
+                } ?:run {
+                    holder.rowLayout.setBackgroundResource(R.drawable.ic_black_oval)
                 }
             }
 
+            textViewEvent.visibility = View.GONE
+
             if (eventDays != null) {
                 for (eventDate in eventDays) {
                     if (eventDate.get(Calendar.DATE) == day && eventDate.get(Calendar.MONTH) == month && eventDate.get(Calendar.YEAR) == year) {
                         // mark this day for event
-                        cell_select_bg?.let {
-                            holder.rowLayout.setBackgroundResource(it)
-                        }
-                        cell_selected_txt_clr?.let {
-                            holder.textView.setTextColor(ContextCompat.getColor(mContext, it))
-                        }
+                        textViewEvent.visibility = View.VISIBLE
                         break
                     }
                 }
             }
         }
 
         override fun onClick(v: View?) {
-            eventsHandler?.onCellClick(view = v,date = days[adapterPosition].time,adapterPosition)
+            eventsHandler?.onDayClick(view = v, date = days[adapterPosition].time, adapterPosition)
         }
 
         override fun onLongClick(v: View?): Boolean {
-            eventsHandler?.onCellLongClick(view = v,date = days[adapterPosition].time,adapterPosition)
+            eventsHandler?.onDayLongClick(
+                view = v,
+                date = days[adapterPosition].time,
+                adapterPosition
+            )
             return true
         }
     }
 
-    fun setEventHandler(mEventsHandler: CalenderViewInterface.EventHandler){
+    fun setEventHandler(mEventsHandler: CalenderViewInterface.EventHandler) {
         this.eventsHandler = mEventsHandler
     }
 
+    fun eventShape(v: View, backgroundColor: Int) {
+        val r = 8f
+        val shape = ShapeDrawable(RoundRectShape(floatArrayOf(r, r, r, r, r, r, r, r), null, null))
+        shape.paint.color = backgroundColor
+        v.setBackground(shape)
+    }
+
 }