From 00b18fe9b837276d3102315ca790ce4d2728534b Mon Sep 17 00:00:00 2001 From: Diego Rivera Date: Mon, 23 Nov 2020 20:10:39 -0600 Subject: [PATCH 1/4] update in event item --- .idea/gradle.xml | 3 ++- .idea/vcs.xml | 6 ++++++ .../src/main/res/drawable/ic_calendar_event.xml | 12 ++++++++++++ .../src/main/res/layout/day_layout.xml | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 636a4be..a91da73 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index e69de29..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml b/collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml new file mode 100644 index 0000000..d2098e0 --- /dev/null +++ b/collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml @@ -0,0 +1,12 @@ + + + diff --git a/collapsiblecalendarview2/src/main/res/layout/day_layout.xml b/collapsiblecalendarview2/src/main/res/layout/day_layout.xml index 7caba7e..199a9b4 100644 --- a/collapsiblecalendarview2/src/main/res/layout/day_layout.xml +++ b/collapsiblecalendarview2/src/main/res/layout/day_layout.xml @@ -28,7 +28,7 @@ android:id="@+id/img_event_tag" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:srcCompat="@drawable/dot_icon" + app:srcCompat="@drawable/ic_calendar_event" android:visibility="gone" /> From aec57f2bfb74f7a95e36de1192a28272bbe5340e Mon Sep 17 00:00:00 2001 From: Diego Rivera Date: Sat, 28 Nov 2020 17:51:57 -0600 Subject: [PATCH 2/4] Allow customization for collapse/expand feature to be turned on or off use method shouldLockView to custom your calendar as needed --- .../widget/CollapsibleCalendar.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt index 7f1cad4..13a0a3e 100644 --- a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt +++ b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt @@ -59,6 +59,7 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener { private var mListener: CalendarListener? = null var expanded = false + var lockView = false private var mInitHeight = 0 @@ -194,10 +195,12 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener { expandIconView.setOnClickListener { - if (expanded) { - collapse(400) - } else { - expand(400) + if (!lockView) { + if (expanded) { + collapse(400) + } else { + expand(400) + } } } @@ -566,6 +569,10 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener { } } + fun shouldLockView(locked: Boolean) { + lockView = locked + } + fun expand(duration: Int) { if (state == STATE_COLLAPSED) { state = STATE_PROCESSING From 9da3fc03df66bba80a4344e0e7185d44c453a22f Mon Sep 17 00:00:00 2001 From: Diego Rivera Date: Sat, 28 Nov 2020 18:11:20 -0600 Subject: [PATCH 3/4] added a function to get the events list --- .../collapsiblecalendarview/data/CalendarAdapter.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt index e9bcf6a..1debc6f 100644 --- a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt +++ b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt @@ -38,6 +38,10 @@ class CalendarAdapter(context: Context, cal: Calendar) { refresh() } + fun getEvents(): ArrayList { + return mEventList; + } + fun getItem(position: Int): Day { return mItemList[position] } From 9d6be9d1295de6a98d11017742f80b52f186caa5 Mon Sep 17 00:00:00 2001 From: Diego Rivera Date: Sat, 28 Nov 2020 18:14:50 -0600 Subject: [PATCH 4/4] get events now from calendar --- .../collapsiblecalendarview/widget/CollapsibleCalendar.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt index 13a0a3e..232c117 100644 --- a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt +++ b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt @@ -43,6 +43,10 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener { setAdapter(calenderAdapter) } + fun getEvents(): ArrayList { + return mAdapter!!.getEvents() + } + override fun onClick(view: View?) { view?.let { mListener.let { mListener ->