diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1dbd8cc09..2e9923f8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 19 19:16:06 BDT 2014 +#Tue May 31 09:21:50 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.java b/library/src/main/java/com/alamkanak/weekview/WeekView.java index da3fa71a0..2537eefb9 100755 --- a/library/src/main/java/com/alamkanak/weekview/WeekView.java +++ b/library/src/main/java/com/alamkanak/weekview/WeekView.java @@ -144,6 +144,7 @@ private enum Direction { private boolean mVerticalFlingEnabled = true; private int mAllDayEventHeight = 100; private int mScrollDuration = 250; + private Typeface mTypeface = Typeface.DEFAULT_BOLD; // Listeners. private EventClickListener mEventClickListener; @@ -386,7 +387,8 @@ private void init() { mHeaderTextPaint.setTextSize(mTextSize); mHeaderTextPaint.getTextBounds("00 PM", 0, "00 PM".length(), rect); mHeaderTextHeight = rect.height(); - mHeaderTextPaint.setTypeface(Typeface.DEFAULT_BOLD); + mHeaderTextPaint.setTypeface(mTypeface); + // Prepare header background paint. mHeaderBackgroundPaint = new Paint(); @@ -423,7 +425,8 @@ private void init() { mTodayHeaderTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG); mTodayHeaderTextPaint.setTextAlign(Paint.Align.CENTER); mTodayHeaderTextPaint.setTextSize(mTextSize); - mTodayHeaderTextPaint.setTypeface(Typeface.DEFAULT_BOLD); + mTodayHeaderTextPaint.setTypeface(mTypeface); + mTodayHeaderTextPaint.setColor(mTodayHeaderTextColor); // Prepare event background color. @@ -1439,6 +1442,16 @@ public void setHeaderColumnTextColor(int headerColumnTextColor) { invalidate(); } + public void setTypeface(Typeface typeface){ + if(typeface!=null){ + mEventTextPaint.setTypeface(typeface); + mTodayHeaderTextPaint.setTypeface(typeface); + mTimeTextPaint.setTypeface(typeface); + mTypeface = typeface; + init(); + } + } + public int getHeaderRowPadding() { return mHeaderRowPadding; } diff --git a/sample/src/main/assets/fonts/Raleway/Raleway-Black.ttf b/sample/src/main/assets/fonts/Raleway/Raleway-Black.ttf new file mode 100644 index 000000000..6805f4f58 Binary files /dev/null and b/sample/src/main/assets/fonts/Raleway/Raleway-Black.ttf differ diff --git a/sample/src/main/assets/fonts/Raleway/Raleway-Medium.ttf b/sample/src/main/assets/fonts/Raleway/Raleway-Medium.ttf new file mode 100644 index 000000000..7a71a6ff0 Binary files /dev/null and b/sample/src/main/assets/fonts/Raleway/Raleway-Medium.ttf differ diff --git a/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.java b/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.java index e311d1943..c5603e2bc 100644 --- a/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.java +++ b/sample/src/main/java/com/alamkanak/weekview/sample/BaseActivity.java @@ -1,6 +1,7 @@ package com.alamkanak.weekview.sample; import android.graphics.RectF; +import android.graphics.Typeface; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.util.TypedValue; @@ -55,6 +56,9 @@ protected void onCreate(Bundle savedInstanceState) { // Set up a date time interpreter to interpret how the date and time will be formatted in // the week view. This is optional. setupDateTimeInterpreter(false); + + Typeface customTypeface = Typeface.createFromAsset(this.getAssets(), "fonts/Raleway/Raleway-Medium.ttf"); + mWeekView.setTypeface(customTypeface); }