diff --git a/app/src/main/res/layout/common_textview_layout.xml b/app/src/main/res/layout/common_textview_layout.xml index d371a15..e8c3887 100644 --- a/app/src/main/res/layout/common_textview_layout.xml +++ b/app/src/main/res/layout/common_textview_layout.xml @@ -1,6 +1,7 @@ @@ -121,7 +122,20 @@ ctv:cShowDividerLineType="both" ctv:cUseRipple="true" /> + + + diff --git a/build.gradle b/build.gradle index 204e7b5..3ae2069 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.2.3' //classpath 'com.novoda:bintray-release:0.3.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/library/build.gradle b/library/build.gradle index 805f5bf..67132b9 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -12,8 +12,8 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 24 - versionCode 107 - versionName "1.0.7" + versionCode 108 + versionName "1.0.8" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/library/src/main/java/com/allen/library/CommonTextView.java b/library/src/main/java/com/allen/library/CommonTextView.java index 61ca35d..16f98c2 100644 --- a/library/src/main/java/com/allen/library/CommonTextView.java +++ b/library/src/main/java/com/allen/library/CommonTextView.java @@ -307,13 +307,13 @@ private void init() { // if (mRight_IV_drawable!=null){ // initRightImageView(); // } - if (mLeftTextString != null) { + if (mLeftTextString != null||mLeft_drawableLeft!=null||mLeft_drawableRight!=null) { initLeftText(); } if (mCenterTextString != null) { initCenterText(); } - if (mRightTextString != null) { + if (mRightTextString != null||mRight_drawableLeft!=null||mRight_drawableRight!=null) { initRightText(); } @@ -487,6 +487,14 @@ private void initLeftText() { leftTextView.setText(mLeftTextString); leftTextView.setLineSpacing(mLeftTextViewLineSpacingExtra, 1.0f); setTextViewGravity(leftTextView, mLeftTextViewGravity); + leftTextView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (onCommonTextViewClickListener!=null){ + onCommonTextViewClickListener.onLeftViewClick(); + } + } + }); } setDrawable(leftTextView, mLeft_drawableLeft, mLeft_drawableTop, mLeft_drawableRight, mLeft_drawableBottom, mLeftIconDrawablePadding); @@ -550,6 +558,14 @@ private void initCenterText() { centerTextView.setText(mCenterTextString); centerTextView.setLineSpacing(mCenterTextViewLineSpacingExtra, 1.0f); setTextViewGravity(centerTextView, mCenterTextViewGravity); + centerTextView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (onCommonTextViewClickListener!=null){ + onCommonTextViewClickListener.onCenterViewClick(); + } + } + }); } setDrawable(centerTextView, mCenter_drawableLeft, mCenter_drawableTop, mCenter_drawableRight, mCenter_drawableBottom, mCenterIconDrawablePadding); @@ -615,6 +631,14 @@ private void initRightText() { // rightTextView.setGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT); rightTextView.setLineSpacing(mRightTextViewLineSpacingExtra, 1.0f); setTextViewGravity(rightTextView, mRightTextViewGravity); + rightTextView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (onCommonTextViewClickListener!=null){ + onCommonTextViewClickListener.onRightViewClick(); + } + } + }); } setDrawable(rightTextView, mRight_drawableLeft, mRight_drawableTop, mRight_drawableRight, mRight_drawableBottom, mRightIconDrawablePadding);