1.修改TextViewPlus的bug

keep2iron · Nov 27, 2018 · fa5ef6b · fa5ef6b
1 parent 479e52f
commit fa5ef6b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-buildscript {
+buildscript { 
+    ext.kotlin_version = '1.2.71'
+
     apply from: './version.gradle'
 //    addRepos(repositories)
 
     dependencies {
         classpath deps.android_gradle_plugin
         classpath deps.kotlin_gradle_plugin
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" }
     repositories {
         google()
         mavenCentral()

diff --git a/comp/src/main/java/io/github/keep2iron/android/widget/TextViewPlus.java b/comp/src/main/java/io/github/keep2iron/android/widget/TextViewPlus.java
@@ -52,7 +52,6 @@ public TextViewPlus(Context context, AttributeSet attrs, int defStyleAttr) {
                 sRightSize.width = array.getDimensionPixelSize(index, defValue);
             } else if (R.styleable.TextViewPlus_drawableRightHeight == index) {
                 sRightSize.height = array.getDimensionPixelSize(index, defValue);
-                break;
             } else if (R.styleable.TextViewPlus_drawableTopWidth == index) {
                 sTopSize.width = array.getDimensionPixelSize(index, defValue);
             } else if (R.styleable.TextViewPlus_drawableTopHeight == index) {

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':core', ':utilities', ':comp'
+include ':app', ':core', ':utilities', ':comp', ':customview'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':app', ':core', ':utilities', ':comp'
		include ':app', ':core', ':utilities', ':comp', ':customview'