Reyclerview added and other modification done.

Author: shahzadafridi

CalendarView/build.gradle

@@ -20,4 +20,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'com.google.android.material:material:1.3.0'
 }

CalendarView/src/main/java/com/shahzadafridi/calendarview/CalendarAdapter.kt

@@ -5,19 +5,21 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewDebug
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
+import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
+import androidx.recyclerview.widget.RecyclerView
 import java.util.*
 
 class CalendarAdapter(
-        context: Context,
-        days: ArrayList<Calendar>, // days with events
-        private val eventDays: HashSet<Calendar>?
-) : ArrayAdapter<Calendar>(context, R.layout.control_calendar_day, days) {
+    context: Context,
+    private val days: ArrayList<Calendar>, // days with events
+    private val eventDays: HashSet<Calendar>?,
+    private var eventsHandler: CalenderViewInterface.EventHandler?,
+    private var cellConfig: CellConfiguration?
+) : RecyclerView.Adapter<CalendarAdapter.MyViewHolder>() {
 
     // for view inflation
     private val inflater: LayoutInflater
@@ -35,80 +37,108 @@ class CalendarAdapter(
     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
+        }
     }
 
-    override fun getView(position: Int, view: View?, parent: ViewGroup): View {
-
-        // day in question
-        var view = view
-        val date = getItem(position)
-
-        val day = date!!.get(Calendar.DATE)
-        val month = date.get(Calendar.MONTH)
-        val year = date.get(Calendar.YEAR)
-
-        // today
-        val today = Calendar.getInstance()
-
-        // inflate item if it does not exist yet
-        if (view == null) view = inflater.inflate(R.layout.control_calendar_day, parent, false)
-
-        var textView = view as TextView
-        // clear styling
-        textView.setTypeface(null, Typeface.NORMAL)
-        textView.setTextColor(Color.BLACK)
-        if (month != today.get(Calendar.MONTH) || year != today.get(Calendar.YEAR)) {
-            // if this day is outside current month, grey it out
-            textView.setTextColor(ContextCompat.getColor(mContext, R.color.greyed_out))
-        } else if (day == today.get(Calendar.DATE)) {
-            // if it is today, set it to blue/bold
-            textView.setTypeface(null, Typeface.BOLD)
-            textView.setTextColor(ContextCompat.getColor(mContext, R.color.today))
-        }
+    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)
+    }
 
-        cell_txt_size?.let {
-            textView.textSize = it.toFloat()
-        }
-        cell_txt_clr?.let {
-            textView.setTextColor(ContextCompat.getColor(mContext, it))
-        }
-        cell_font?.let {
-            textView.typeface = ResourcesCompat.getFont(context, it)
-        }
-        // set text
-        textView.text = date.get(Calendar.DATE).toString()
+    override fun onBindViewHolder(holder: CalendarAdapter.MyViewHolder, position: Int) {
+        holder.updateUi(holder,days[position])
+    }
 
-        // if this day has an event, specify event image
-        cell_bg?.let {
-            view.setBackgroundResource(it)
+    override fun getItemCount(): Int {
+        return days.size
+    }
+
+    inner class MyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener {
+
+        var textView: TextView
+        var rowLayout: RelativeLayout
+
+        init {
+            textView = itemView.findViewById(R.id.control_calendar_day)
+            rowLayout = itemView.findViewById(R.id.row_calendar_layout)
+            rowLayout.setOnClickListener(this)
+            rowLayout.setOnLongClickListener(this)
+            cell_txt_size?.let {
+                textView.textSize = it.toFloat()
+            }
+            cell_txt_clr?.let {
+                textView.setTextColor(ContextCompat.getColor(mContext, it))
+            }
+            cell_font?.let {
+                textView.typeface = ResourcesCompat.getFont(mContext, it)
+            }
+            cell_bg?.let {
+                rowLayout.setBackgroundResource(it)
+            }
         }
 
-        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 {
-                        view.setBackgroundResource(it)
-                    }
-                    cell_selected_txt_clr?.let {
-                        textView.setTextColor(ContextCompat.getColor(mContext, it))
+        fun updateUi(holder: MyViewHolder, date: Calendar) {
+
+            val day = date.get(Calendar.DATE)
+            val month = date.get(Calendar.MONTH)
+            val year = date.get(Calendar.YEAR)
+
+            // today
+            val today = Calendar.getInstance()
+
+            // set text
+            holder.textView.text = date.get(Calendar.DATE).toString()
+
+
+            if (month != today.get(Calendar.MONTH) || 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)) {
+                // if it is today, set it to blue/bold
+                cell_selected_txt_clr?.let {
+                    holder.textView.setTextColor(ContextCompat.getColor(mContext, it))
+                }
+                cell_select_bg?.let {
+                    holder.rowLayout.setBackgroundResource(it)
+                }
+            }
+
+            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))
+                        }
+                        break
                     }
-                    break
                 }
             }
         }
 
-        return view
+        override fun onClick(v: View?) {
+            eventsHandler?.onCellClick(view = v,date = days[adapterPosition].time,adapterPosition)
+        }
+
+        override fun onLongClick(v: View?): Boolean {
+            eventsHandler?.onCellLongClick(view = v,date = days[adapterPosition].time,adapterPosition)
+            return true
+        }
     }
 
-    fun setCellConfig(cellTxtClr: Int?, cellBg: Int?, cellSelectedClr: Int?, cellSelectBg: Int?, cellFont: Int?, cellSize: Int?, cellTxtSize: Int?) {
-        cell_txt_clr = cellTxtClr
-        cell_bg = cellBg
-        cell_selected_txt_clr = cellSelectedClr
-        cell_select_bg = cellSelectBg
-        cell_font = cellFont
-        cell_size = cellSize
-        cell_txt_size = cellTxtSize
-        notifyDataSetChanged()
+    fun setEventHandler(mEventsHandler: CalenderViewInterface.EventHandler){
+        this.eventsHandler = mEventsHandler
     }
-}
+
+}

CalendarView/src/main/java/com/shahzadafridi/calendarview/CalendarView.kt

@@ -4,13 +4,12 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.*
-import android.widget.AdapterView.OnItemLongClickListener
-import android.widget.AdapterView.OnItemClickListener
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.children
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -52,8 +51,9 @@ class CalendarView : LinearLayout, CalenderViewInterface {
     private var btnNext: ImageView? = null
     private var txtDate: TextView? = null
     private var dateRl: RelativeLayout? = null
-    private var grid: GridView? = null
+    private var recyclerView: RecyclerView? = null
     private var adapter: CalendarAdapter? = null
+    private var cellConfig: CellConfiguration? = null
 
     // seasons' rainbow
     var rainbow = intArrayOf(
@@ -175,7 +175,9 @@ class CalendarView : LinearLayout, CalenderViewInterface {
         btnNext = findViewById<View>(R.id.calendar_next_button) as ImageView
         txtDate = findViewById<View>(R.id.calendar_date_display) as TextView
         dateRl = findViewById<RelativeLayout>(R.id.calendar_date_rl)
-        grid = findViewById<View>(R.id.calendar_grid) as GridView
+        recyclerView = findViewById<View>(R.id.calendar_recyclerView) as RecyclerView
+        recyclerView!!.setHasFixedSize(true)
+        recyclerView!!.layoutManager = GridLayoutManager(context,7)
     }
 
     private fun assignClickHandlers() {
@@ -192,18 +194,6 @@ class CalendarView : LinearLayout, CalenderViewInterface {
             updateCalendar()
             eventHandler!!.onPreviousClick(it)
         }
-
-        // long-pressing a day
-        grid!!.onItemLongClickListener = OnItemLongClickListener { view, cell, position, id -> // handle long-press
-            if (eventHandler == null) return@OnItemLongClickListener false
-            eventHandler!!.onCellLongClick(view, view.getItemAtPosition(position) as Date, position, id)
-            true
-        }
-
-        grid!!.onItemClickListener = OnItemClickListener { view, cell, position, id ->
-            if (eventHandler == null) return@OnItemClickListener
-            eventHandler!!.onCellClick(view, view.getItemAtPosition(position) as Date, position, id)
-        }
     }
 
     /**
@@ -215,23 +205,23 @@ class CalendarView : LinearLayout, CalenderViewInterface {
         val calendar = currentDate.clone() as Calendar
 
         // determine the cell for current month's beginning
-        calendar[Calendar.DAY_OF_MONTH] = 1
+        calendar[Calendar.DATE] = 1
         val monthBeginningCell = calendar[Calendar.DAY_OF_WEEK] - 1
 
         // move calendar backwards to the beginning of the week
-        calendar.add(Calendar.DAY_OF_MONTH, -monthBeginningCell)
+        calendar.add(Calendar.DATE, -monthBeginningCell)
 
         // fill cells
         while (cells.size < DAYS_COUNT) {
             cells.add(Calendar.getInstance().apply {
                 this.time = calendar.time
             })
-            calendar.add(Calendar.DAY_OF_MONTH, 1)
+            calendar.add(Calendar.DATE, 1)
         }
 
         // update grid
-        adapter = CalendarAdapter(context, cells, events)
-        grid!!.adapter = adapter
+        adapter = CalendarAdapter(context, cells, events,eventHandler,cellConfig)
+        recyclerView!!.adapter = adapter
 
         // update title
         val sdf = SimpleDateFormat(headerDateFormat)
@@ -251,6 +241,7 @@ class CalendarView : LinearLayout, CalenderViewInterface {
      */
     fun setEventHandler(eventHandler: CalenderViewInterface.EventHandler?) {
         this.eventHandler = eventHandler
+        adapter!!.setEventHandler(eventHandler!!)
     }
 
 
@@ -341,6 +332,7 @@ class CalendarView : LinearLayout, CalenderViewInterface {
             textSize: Int,
             selectedTextColor: Int,
             selectedBackground: Int,
+            cellSize: Int?,
             background: Int?
     ): CalendarView {
         cell_font = font
@@ -349,7 +341,15 @@ class CalendarView : LinearLayout, CalenderViewInterface {
         cell_selected_txt_clr = selectedTextColor
         cell_select_bg = selectedBackground
         cell_bg = background
-        adapter!!.setCellConfig(cell_txt_clr,cell_bg,cell_selected_txt_clr,cell_select_bg,cell_font,cell_size,cell_txt_size)
+        cellConfig = CellConfiguration(
+            cellTxtClr = cell_txt_clr,
+            cellBg = cell_bg,
+            cellSelectedClr = cell_selected_txt_clr,
+            cellSelectBg = cell_select_bg,
+            cellFont = cell_font,
+            cellTxtSize = cell_txt_size,
+            cellSize = cellSize
+        )
         return this
     }
 
@@ -359,7 +359,7 @@ class CalendarView : LinearLayout, CalenderViewInterface {
             left: Int,
             right: Int
     ): CalendarView {
-        setMargin(grid!!, left, right, top, bottom)
+        setMargin(recyclerView!!, left, right, top, bottom)
         return this
     }
 

CalendarView/src/main/java/com/shahzadafridi/calendarview/CalenderViewInterface.kt

@@ -9,13 +9,13 @@ interface CalenderViewInterface {
     fun withHeaderPanleMargin(top: Int = 0,bottom: Int = 0,left: Int = 0,right: Int = 0): CalendarView
     fun withDayPanel(font: Int?, textColor: Int?, background: Int?): CalendarView
     fun withDayPanelMargin(top: Int = 0,bottom: Int = 0,left: Int = 0,right: Int = 0): CalendarView
-    fun withCellPanel(font: Int?, textColor: Int?, textSize: Int, selectedTextColor: Int, selectedBackground:Int, background: Int?): CalendarView
+    fun withCellPanel(font: Int?, textColor: Int?, textSize: Int, selectedTextColor: Int, selectedBackground:Int, cellSize: Int?, background: Int?): CalendarView
     fun withCellPanelMargin(top: Int = 0,bottom: Int = 0,left: Int = 0,right: Int = 0): CalendarView
     fun withCalenderViewBackground(background: Int?): CalendarView
     fun build(): CalendarView
     interface EventHandler{
-        fun onCellClick(view: View,date: Date, position: Int, id: Long)
-        fun onCellLongClick(view: View, date: Date, position: Int, id: Long)
+        fun onCellClick(view: View?, date: Date, position: Int)
+        fun onCellLongClick(view: View?, date: Date, position: Int)
         fun onNextClick(view: View)
         fun onPreviousClick(view: View)
     }

CalendarView/src/main/java/com/shahzadafridi/calendarview/CellConfiguration.kt

@@ -0,0 +1,11 @@
+package com.shahzadafridi.calendarview
+
+data class CellConfiguration(
+    var cellTxtClr: Int? = null,
+    var cellBg: Int? = null,
+    var cellSelectedClr: Int? = null,
+    var cellSelectBg: Int? = null,
+    var cellFont: Int? = null,
+    var cellSize: Int? = null,
+    var cellTxtSize: Int? = null,
+)

CalendarView/src/main/res/drawable-v21/custom_ripple.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cblack">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white" />
+
+</ripple>

CalendarView/src/main/res/drawable/custom_ripple.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/cblack" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+</selector>