diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 91ca28c8..f6b961fd 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b1340d5..4adc19d1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ -distributionBase = GRADLE_USER_HOME -distributionPath = wrapper/dists -distributionUrl = https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip -zipStoreBase = GRADLE_USER_HOME -zipStorePath = wrapper/dists +#Sat Feb 02 14:17:50 IST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerAdapter.java b/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerAdapter.java index d4c68eae..c2e9a22e 100644 --- a/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerAdapter.java +++ b/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerAdapter.java @@ -1,5 +1,6 @@ package com.prolificinteractive.materialcalendarview; +import android.graphics.Typeface; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.view.PagerAdapter; @@ -42,6 +43,7 @@ abstract class CalendarPagerAdapter extends PagerAd private List decoratorResults = null; private boolean selectionEnabled = true; boolean showWeekDays; + private Typeface typerface=null; CalendarPagerAdapter(MaterialCalendarView mcv) { this.mcv = mcv; @@ -85,6 +87,7 @@ public CalendarPagerAdapter migrateStateAndReturn(CalendarPagerAdapter new newAdapter.color = color; newAdapter.dateTextAppearance = dateTextAppearance; newAdapter.weekDayTextAppearance = weekDayTextAppearance; + newAdapter.typerface = typerface; newAdapter.showOtherDates = showOtherDates; newAdapter.minDate = minDate; newAdapter.maxDate = maxDate; @@ -151,9 +154,15 @@ public Object instantiateItem(@NonNull ViewGroup container, int position) { pagerView.setSelectionColor(color); } if (dateTextAppearance != null) { - pagerView.setDateTextAppearance(dateTextAppearance); + if (typerface !=null) + pagerView.setDateTextAppearance(dateTextAppearance,typerface); + else + pagerView.setDateTextAppearance(dateTextAppearance); } if (weekDayTextAppearance != null) { + if (typerface !=null) + pagerView.setWeekDayTextAppearance(weekDayTextAppearance,typerface); + else pagerView.setWeekDayTextAppearance(weekDayTextAppearance); } pagerView.setShowOtherDates(showOtherDates); @@ -213,10 +222,19 @@ public void setDateTextAppearance(int taId) { } this.dateTextAppearance = taId; for (V pagerView : currentViews) { + if (typerface !=null) + pagerView.setDateTextAppearance(taId,typerface); + else pagerView.setDateTextAppearance(taId); } } + public void setDateTextFontAppearance(Typeface typerface) + { + if (typerface!=null) + this.typerface=typerface; + } + public void setShowOtherDates(@ShowOtherDates int showFlags) { this.showOtherDates = showFlags; for (V pagerView : currentViews) { diff --git a/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerView.java b/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerView.java index f3a4fa9a..505ee689 100644 --- a/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerView.java +++ b/library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerView.java @@ -1,5 +1,6 @@ package com.prolificinteractive.materialcalendarview; +import android.graphics.Typeface; import android.os.Build; import android.support.annotation.NonNull; import android.util.AttributeSet; @@ -112,6 +113,16 @@ void setDayViewDecorators(List results) { invalidateDecorators(); } + + public void setWeekDayTextAppearance(int taId,Typeface typerface) { + for (WeekDayView weekDayView : weekDayViews) { + weekDayView.setTextAppearance(getContext(), taId); + if (typerface != null) { + weekDayView.setTypeface(typerface); + } + } + } + public void setWeekDayTextAppearance(int taId) { for (WeekDayView weekDayView : weekDayViews) { weekDayView.setTextAppearance(getContext(), taId); @@ -123,6 +134,14 @@ public void setDateTextAppearance(int taId) { dayView.setTextAppearance(getContext(), taId); } } + public void setDateTextAppearance(int taId,Typeface typerface) { + for (DayView dayView : dayViews) { + dayView.setTextAppearance(getContext(), taId); + if (typerface != null) { + dayView.setTypeface(typerface); + } + } + } public void setShowOtherDates(@ShowOtherDates int showFlags) { this.showOtherDates = showFlags; diff --git a/library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarView.java b/library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarView.java index 623b4a69..eac8716b 100644 --- a/library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarView.java +++ b/library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarView.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; +import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Parcel; @@ -743,6 +744,10 @@ public void setDateTextAppearance(int resourceId) { adapter.setDateTextAppearance(resourceId); } + public void setDateTextFontAppearance(Typeface typerface) { + adapter.setDateTextFontAppearance(typerface); + } + /** * @param resourceId The text appearance resource id. */ diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml index 70c5be03..4cc694fa 100644 --- a/library/src/main/res/values/styles.xml +++ b/library/src/main/res/values/styles.xml @@ -8,7 +8,7 @@ diff --git a/sample/src/main/assets/fonts/shrikhand_regular.ttf b/sample/src/main/assets/fonts/shrikhand_regular.ttf new file mode 100755 index 00000000..e52b55e4 Binary files /dev/null and b/sample/src/main/assets/fonts/shrikhand_regular.ttf differ diff --git a/sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/CustomizeCodeActivity.java b/sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/CustomizeCodeActivity.java index 2cdbda24..60eea29c 100644 --- a/sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/CustomizeCodeActivity.java +++ b/sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/CustomizeCodeActivity.java @@ -1,5 +1,6 @@ package com.prolificinteractive.materialcalendarview.sample; +import android.graphics.Typeface; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.util.TypedValue; @@ -24,12 +25,11 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); widget.setShowOtherDates(MaterialCalendarView.SHOW_ALL); + Typeface typeface = Typeface.createFromAsset(getAssets(),"fonts/shrikhand_regular.ttf"); + widget.setDateTextFontAppearance(typeface); widget.setLeftArrow(R.drawable.ic_arrow_back); widget.setRightArrow(R.drawable.ic_arrow_forward); widget.setSelectionColor(getResources().getColor(R.color.sample_primary)); - widget.setWeekDayTextAppearance(R.style.CustomTextAppearance); - widget.setHeaderTextAppearance(R.style.CustomTextAppearance); - widget.setDateTextAppearance(R.style.CustomTextAppearance); widget.setTitleFormatter(new MonthArrayTitleFormatter(getResources().getTextArray(R.array.custom_months))); widget.setWeekDayFormatter(new ArrayWeekDayFormatter(getResources().getTextArray(R.array.custom_weekdays))); widget.setTileSize((int) TypedValue.applyDimension( diff --git a/sample/src/main/res/layout/activity_customization.xml b/sample/src/main/res/layout/activity_customization.xml index 9cb5d91a..c23f1bab 100644 --- a/sample/src/main/res/layout/activity_customization.xml +++ b/sample/src/main/res/layout/activity_customization.xml @@ -19,7 +19,6 @@ app:mcv_dateTextAppearance="@style/CustomTextAppearance" app:mcv_firstDayOfWeek="thursday" app:mcv_headerTextAppearance="@style/CustomTextAppearance" - app:mcv_leftArrow="@drawable/ic_arrow_back" app:mcv_monthLabels="@array/custom_months" app:mcv_rightArrow="@drawable/ic_arrow_forward" app:mcv_selectionColor="?attr/colorPrimary"