From f09a1bbda9a4fd92c4a1362eca88fe812737267f Mon Sep 17 00:00:00 2001
From: jxr202 <jxr202@foxmail.com>
Date: Mon, 2 Jul 2018 18:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90Jiang=E3=80=91=EF=BC=9A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9A=84=E4=BB=8A=E6=97=A5?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E5=8F=98=E6=88=90=E4=BA=86=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/activity_main.xml      |   5 +----
 .../com/jxr202/colorful_ui/DateSelectView.java |  17 +++--------------
 .../src/main/res/mipmap-xxhdpi/date_today.png  | Bin 0 -> 2032 bytes
 colorful-ui/src/main/res/values/attrs.xml      |   8 +++-----
 4 files changed, 7 insertions(+), 23 deletions(-)
 create mode 100644 colorful-ui/src/main/res/mipmap-xxhdpi/date_today.png

diff --git a/colorful-ui-example/src/main/res/layout/activity_main.xml b/colorful-ui-example/src/main/res/layout/activity_main.xml
index 4c023f0..271995c 100644
--- a/colorful-ui-example/src/main/res/layout/activity_main.xml
+++ b/colorful-ui-example/src/main/res/layout/activity_main.xml
@@ -32,10 +32,7 @@
         jxr202:mTitleViewText="@string/date_title"
         jxr202:mTitleViewTextColor="#2C9BB6"
         jxr202:mTitleViewTextSize="16dp"
-        jxr202:mTodayText="@string/date_today"
-        jxr202:mTodayTextBackground="#50D2C2"
-        jxr202:mTodayTextColor="#ffffff"
-        jxr202:mTodayTextSize="16dp" />
+        jxr202:mTodayViewSrc="@mipmap/date_today" />
 
     <TextView
         android:id="@+id/tv_date"
diff --git a/colorful-ui/src/main/java/com/jxr202/colorful_ui/DateSelectView.java b/colorful-ui/src/main/java/com/jxr202/colorful_ui/DateSelectView.java
index 3b72339..8af6496 100644
--- a/colorful-ui/src/main/java/com/jxr202/colorful_ui/DateSelectView.java
+++ b/colorful-ui/src/main/java/com/jxr202/colorful_ui/DateSelectView.java
@@ -28,7 +28,7 @@ public class DateSelectView extends RelativeLayout {
     private ImageView mDateLeft;
     private ImageView mDateRight;
     private TextView mDateTitle;
-    private TextView mDateToday;
+    private ImageView mDateToday;
 
     private int mDateTitleId;
     private Context mContext;
@@ -63,12 +63,13 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         mDateLeft = new ImageView(context);
         mDateRight = new ImageView(context);
         mDateTitle = new TextView(context);
-        mDateToday = new TextView(context);
+        mDateToday = new ImageView(context);
 
         TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.DateSelectView, defStyleAttr, 0);
 
         mDateLeft.setImageDrawable(array.getDrawable(R.styleable.DateSelectView_mLeftViewSrc));
         mDateRight.setImageDrawable(array.getDrawable(R.styleable.DateSelectView_mRightViewSrc));
+        mDateToday.setImageDrawable(array.getDrawable(R.styleable.DateSelectView_mTodayViewSrc));
 
         mDateTitleId = array.getResourceId(R.styleable.DateSelectView_mTitleViewId, R.id.date_title);
         mDateTitle.setId(mDateTitleId);
@@ -76,18 +77,6 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         mDateTitle.setTextSize(px2dip(array.getDimension(R.styleable.DateSelectView_mTitleViewTextSize, 16)));
         mDateTitle.setTextColor(array.getColor(R.styleable.DateSelectView_mTitleViewTextColor, 0xff2C9BB6));
 
-        mDateToday.setGravity(Gravity.CENTER);
-        mDateToday.setText(array.getString(R.styleable.DateSelectView_mTodayText));
-        mDateToday.setTextSize(px2dip(array.getDimension(R.styleable.DateSelectView_mTodayTextSize, 16)));
-        mDateToday.setTextColor(array.getColor(R.styleable.DateSelectView_mTodayTextColor, 0xffffffff));
-
-        int backgroundColor = array.getColor(R.styleable.DateSelectView_mTodayTextBackground, 0xff3e6373);
-        GradientDrawable drawable = new GradientDrawable();//创建drawable
-        drawable.setColor(backgroundColor);
-        drawable.setCornerRadius(dp2px(25));
-        drawable.setStroke(dp2px(1), backgroundColor);
-        mDateToday.setBackground(drawable);
-
         array.recycle();
 
         initCalendar();
diff --git a/colorful-ui/src/main/res/mipmap-xxhdpi/date_today.png b/colorful-ui/src/main/res/mipmap-xxhdpi/date_today.png
new file mode 100644
index 0000000000000000000000000000000000000000..d408b4b21ca817557284e0750d29baca4678c28a
GIT binary patch
literal 2032
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
X*6`le=7j<Ff3Scr;++lu_>=zv9Tzuj

literal 0
HcmV?d00001

diff --git a/colorful-ui/src/main/res/values/attrs.xml b/colorful-ui/src/main/res/values/attrs.xml
index 9c1c7f3..ef2c680 100644
--- a/colorful-ui/src/main/res/values/attrs.xml
+++ b/colorful-ui/src/main/res/values/attrs.xml
@@ -67,11 +67,9 @@
             <enum name="visible" value="0" />
         </attr>
 
-        <attr name="mTodayText" format="color|reference"/>
-        <attr name="mTodayTextSize" format="dimension"/>
-        <attr name="mTodayTextColor" format="color"/>
-        <attr name="mTodayTextBackground" format="color|reference"/>
-        <attr name="mTodayTextVisibility">
+        <attr name="mTodayViewId" format="reference|integer"/>
+        <attr name="mTodayViewSrc" format="color|reference"/>
+        <attr name="mTodayViewVisibility">
             <enum name="gone" value="8" />
             <enum name="invisible" value="4" />
             <enum name="visible" value="0" />