bug fixed.

Author: Muhammad-Javad

.idea/vcs.xml

@@ -129,7 +129,6 @@ class JCalendarAdapter(
             backgroundRes: Drawable
         ) = with(itemView) {
 
-            Log.i(TAG, "onBind: triggered")
 
             daysOfMonth = textView_days_of_month_selected
             daysOfWeek = textView_day_of_week_selected
@@ -238,92 +237,22 @@ class JCalendarAdapter(
             backgroundRes: Drawable
         ) = with(itemView) {
 
-            daysOfMonth = textView_days_of_month_normal
-            daysOfWeek = textView_day_of_week_normal
-            model = jModel
-
-            textView_days_of_month_normal.text = jModel.dayOfMonth.toString()
             textView_day_of_week_normal.text = jModel.dayOfWeek
+            textView_days_of_month_normal.text = jModel.dayOfMonth.toString()
 
-            textView_days_of_month_normal.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    dayOfMonthTextColor
-                )
-            )
-            textView_day_of_week_normal.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    nameOfWeekTextColor
-                )
-            )
+            textView_day_of_week_normal.setTextColor(ContextCompat.getColor(context, nameOfWeekTextColor))
+            textView_days_of_month_normal.setTextColor(ContextCompat.getColor(context, dayOfMonthTextColor))
             background = backgroundRes
 
-            var holder = this@NormalViewHolder
             setOnClickListener {
-                //when user double tap on item
-                if (jModel !== selected) {
-                    jModel.selected = true
-                    selected.selected = false
-                    selected = jModel
-
-                    //send model into callback
-                    onJItemClickListener.invoke(jModel)
 
-                    //set ui of selecting item
-                    textView_days_of_month_normal.setTextColor(
-                        androidx.core.content.ContextCompat.getColor(
-                            context,
-                            dayOfMonthTextColorSelected
-                        )
-                    )
-                    textView_day_of_week_normal.setTextColor(
-                        androidx.core.content.ContextCompat.getColor(
-                            context,
-                            nameOfWeekTextColorSelected
-                        )
-                    )
-                    background = backgroundResSelected
+                jModel.selected = true
+                selected.selected = false
+                selected = jModel
 
-                    //set ui of previous selected item
-                    if (selectedViewHolder is NormalViewHolder) {
-                        with(selectedViewHolder.itemView) {
-
-                            textView_days_of_month_normal.setTextColor(
-                                ContextCompat.getColor(
-                                    context,
-                                    dayOfMonthTextColorNormal
-                                )
-                            )
-                            textView_day_of_week_normal.setTextColor(
-                                ContextCompat.getColor(
-                                    context,
-                                    nameOfWeekTextColorNormal
-                                )
-                            )
-                            background = backgroundResNormal
-                        }
-                    } else if (selectedViewHolder is SelectedViewHolder) {
-                        with(selectedViewHolder.itemView) {
+                onJItemClickListener.invoke(selected)
+                notifyDataSetChanged()
 
-                            textView_days_of_month_selected.setTextColor(
-                                ContextCompat.getColor(
-                                    context,
-                                    dayOfMonthTextColorNormal
-                                )
-                            )
-                            textView_day_of_week_selected.setTextColor(
-                                ContextCompat.getColor(
-                                    context,
-                                    nameOfWeekTextColorNormal
-                                )
-                            )
-                            background = backgroundResNormal
-                        }
-                    }
-                    selectedViewHolder = holder
-                    notifyDataSetChanged()
-                }
             }
 
 

JCalendar/src/main/java/com/javadsh98/jcalendar/JCalendarAdapter.kt

@@ -3,6 +3,7 @@ package com.javadsh98.jcalendar
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import android.util.Log
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
@@ -91,12 +92,15 @@ class JCalendarView :ConstraintLayout {
 
                 nameOfMonth.text = model.monthName
 
+                val gregorian = model.intoGregorian()
+                val jalali = model.intoJalali()
+
                 jalaliListener?.let {
-                    it.onJalali(model.intoJalali())
+                    it.onJalali(jalali)
                 }
 
                 gregorianListener?.let {
-                    it.onGregorian(model.intoGregorian())
+                    it.onGregorian(gregorian)
                 }
 
             }

JCalendar/src/main/java/com/javadsh98/jcalendar/JCalendarView.kt

@@ -1,13 +1,17 @@
 package com.javadsh98.jcalendarexample
 
+import android.nfc.Tag
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
 import androidx.core.content.res.ResourcesCompat
 import com.javadsh98.jcalendar.JGregorianListener
 import com.javadsh98.jcalendar.JJalaliListener
 import kotlinx.android.synthetic.main.activity_main.*
-
 class MainActivity : AppCompatActivity() {
+
+    val Tag = "my date"
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)