Skip to content

Commit e824067

Browse files
author
shrikanth7698
committed
Bug fixes
1 parent 15455e3 commit e824067

File tree

11 files changed

+70
-144
lines changed

11 files changed

+70
-144
lines changed

‎.idea/caches/build_file_checksums.ser‎

8 Bytes
Binary file not shown.

‎.idea/codeStyles/Project.xml‎

Lines changed: 0 additions & 116 deletions
This file was deleted.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/shrikanthravi/collapsiblecalendarview/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class MainActivity : AppCompatActivity(){
6666
today.add(Calendar.DATE, 1)
6767
collapsibleCalendar.selectedDay = Day(today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DAY_OF_MONTH))
6868
collapsibleCalendar.addEventTag(today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DAY_OF_MONTH), Color.BLUE)
69-
collapsibleCalendar.params = CollapsibleCalendar.Params(-100, 100)
69+
collapsibleCalendar.params = CollapsibleCalendar.Params(0, 100)
7070
collapsibleCalendar.setCalendarListener(object : CollapsibleCalendar.CalendarListener {
7171
override fun onDayChanged() {
7272

‎app/src/main/res/values/colors.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<color name="colorPrimary">#3F51B5</color>
44
<color name="colorPrimaryDark">#303F9F</color>
55
<color name="colorAccent">#FF4081</color>
6-
<color name="google_red">#ea4335</color>
6+
<color name="google_red">#304FFE</color>
77
</resources>

‎collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener {
378378
val myAnim = AnimationUtils.loadAnimation(context, R.anim.bounce)
379379
val interpolator = BounceAnimator(0.1, 10.0)
380380
myAnim.setInterpolator(interpolator)
381-
mLayoutRoot.startAnimation(myAnim)
381+
mTableBody.startAnimation(myAnim)
382+
mTableHead.startAnimation(myAnim)
382383
return
383384
}
384385
if (cal.get(Calendar.MONTH) == cal.getActualMinimum(Calendar.MONTH)) {
@@ -401,7 +402,8 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener {
401402
val myAnim = AnimationUtils.loadAnimation(context, R.anim.bounce)
402403
val interpolator = BounceAnimator(0.1, 10.0)
403404
myAnim.setInterpolator(interpolator)
404-
this.startAnimation(myAnim)
405+
mTableBody.startAnimation(myAnim)
406+
mTableHead.startAnimation(myAnim)
405407
return
406408
}
407409
if (cal.get(Calendar.MONTH) == cal.getActualMaximum(Calendar.MONTH)) {

‎collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/UICalendar.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ abstract class UICalendar constructor(context: Context, attrs: AttributeSet? = n
4141
protected var mBtnPrevWeek: ImageView
4242
protected var mBtnNextWeek: ImageView
4343
protected var expandIconView: ExpandIconView
44-
protected var clEntireTextView: ConstraintLayout
44+
protected var clEntireTextView: LinearLayout
4545
protected var mTodayIcon : ImageView
4646
var datePattern = "MMMM"
4747
set(value: String) {
@@ -267,9 +267,9 @@ abstract class UICalendar constructor(context: Context, attrs: AttributeSet? = n
267267
R.styleable.UICalendar_selectedItem_textColor, selectedItemTextColor)
268268
var selectedItemBackgroundDrawable = attrs.getDrawable(R.styleable.UICalendar_selectedItem_background)
269269
if (selectedItemBackgroundDrawable != null) {
270-
selectedItemBackgroundDrawable = selectedItemBackgroundDrawable
270+
this.selectedItemBackgroundDrawable = selectedItemBackgroundDrawable
271271
} else {
272-
selectedItemBackgroundDrawable = this.selectedItemBackgroundDrawable
272+
this.selectedItemBackgroundDrawable = selectedItemBackgroundDrawable
273273
}
274274

275275
var buttonLeftDrawable = attrs.getDrawable(R.styleable.UICalendar_buttonLeft_drawable)

‎collapsiblecalendarview2/src/main/res/drawable/ic_calendar.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M5,4L19,4A2,2 0,0 1,21 6L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,6A2,2 0,0 1,5 4z"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="2"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#000000"
12+
android:strokeLineCap="round"/>
13+
<path
14+
android:pathData="M16,2L16,6"
15+
android:strokeLineJoin="round"
16+
android:strokeWidth="2"
17+
android:fillColor="#00000000"
18+
android:strokeColor="#000000"
19+
android:strokeLineCap="round"/>
20+
<path
21+
android:pathData="M8,2L8,6"
22+
android:strokeLineJoin="round"
23+
android:strokeWidth="2"
24+
android:fillColor="#00000000"
25+
android:strokeColor="#000000"
26+
android:strokeLineCap="round"/>
27+
<path
28+
android:pathData="M3,10L21,10"
29+
android:strokeLineJoin="round"
30+
android:strokeWidth="2"
31+
android:fillColor="#00000000"
32+
android:strokeColor="#000000"
33+
android:strokeLineCap="round"/>
34+
</vector>

0 commit comments

Comments
 (0)