From 513002607e2e58e1049bb08fbd325dd9e21b2d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alaric=20Quach=C3=A9ro?= Date: Fri, 13 Apr 2018 13:36:51 +0200 Subject: [PATCH] Change time text color independently to headerColumnTextColor --- .../java/com/alamkanak/weekview/WeekView.java | 15 +++++++++++++-- library/src/main/res/values/attrs.xml | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.java b/library/src/main/java/com/alamkanak/weekview/WeekView.java index f6685e020..f7210b5a4 100755 --- a/library/src/main/java/com/alamkanak/weekview/WeekView.java +++ b/library/src/main/java/com/alamkanak/weekview/WeekView.java @@ -122,6 +122,7 @@ private enum Direction { private int mTextSize = 12; private int mHeaderColumnPadding = 10; private int mHeaderColumnTextColor = Color.BLACK; + private int mHeaderLineTextColor = Color.BLACK; private int mNumberOfVisibleDays = 3; private int mHeaderRowPadding = 10; private int mHeaderRowBackgroundColor = Color.WHITE; @@ -447,6 +448,7 @@ public WeekView(Context context, AttributeSet attrs, int defStyleAttr) { mHeaderColumnPadding = a.getDimensionPixelSize(R.styleable.WeekView_headerColumnPadding, mHeaderColumnPadding); mColumnGap = a.getDimensionPixelSize(R.styleable.WeekView_columnGap, mColumnGap); mHeaderColumnTextColor = a.getColor(R.styleable.WeekView_headerColumnTextColor, mHeaderColumnTextColor); + mHeaderLineTextColor = a.getColor(R.styleable.WeekView_headerLineTextColor, mHeaderLineTextColor); mNumberOfVisibleDays = a.getInteger(R.styleable.WeekView_noOfVisibleDays, mNumberOfVisibleDays); mShowFirstDayOfWeekFirst = a.getBoolean(R.styleable.WeekView_showFirstDayOfWeekFirst, mShowFirstDayOfWeekFirst); mHeaderRowPadding = a.getDimensionPixelSize(R.styleable.WeekView_headerRowPadding, mHeaderRowPadding); @@ -515,7 +517,7 @@ private void init() { mTimeTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG); mTimeTextPaint.setTextAlign(Paint.Align.RIGHT); mTimeTextPaint.setTextSize(mTextSize); - mTimeTextPaint.setColor(mHeaderColumnTextColor); + mTimeTextPaint.setColor(mHeaderLineTextColor); Rect rect = new Rect(); final String exampleTime = (mTimeColumnResolution % 60 != 0) ? "00:00 PM" : "00 PM"; @@ -1785,7 +1787,16 @@ public int getHeaderColumnTextColor() { public void setHeaderColumnTextColor(int headerColumnTextColor) { mHeaderColumnTextColor = headerColumnTextColor; mHeaderTextPaint.setColor(mHeaderColumnTextColor); - mTimeTextPaint.setColor(mHeaderColumnTextColor); + invalidate(); + } + + public int getHeaderLineTextColor() { + return mHeaderLineTextColor; + } + + public void setHeaderLineTextColor(int headerLineTextColor) { + mHeaderLineTextColor = headerLineTextColor; + mTimeTextPaint.setColor(mHeaderLineTextColor); invalidate(); } diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 516f90227..4eb486d79 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -28,6 +28,7 @@ +