From 8425a5c2945c35f41d8dafceb4457a2d096e6a06 Mon Sep 17 00:00:00 2001 From: Leonardo Aramaki Date: Fri, 13 Oct 2017 16:39:02 -0300 Subject: [PATCH 1/5] Add .iml files --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bba431a..c2a368c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,7 @@ Thumbs.db .idea #.idea/workspace.xml - remove # and delete .idea if it better suit your needs. .gradle -build/ \ No newline at end of file +build/ + +# Intellij +*.iml \ No newline at end of file From 64b7afd96c43c5d895136cdecdf347cc792cd973 Mon Sep 17 00:00:00 2001 From: Leonardo Aramaki Date: Fri, 13 Oct 2017 16:40:23 -0300 Subject: [PATCH 2/5] Update versions and add jitpack config --- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 11 +++++++---- sample/build.gradle | 2 +- settings.gradle | 5 +---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 3a8a17e..aac9a1f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae048bb..1e61995 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jan 04 21:42:37 SGT 2015 +#Fri Oct 13 16:22:02 BRT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/library/build.gradle b/library/build.gradle index ed83687..8bf7feb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,14 +1,17 @@ apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' + +group='com.github.RocketChat' android { - compileSdkVersion 21 - buildToolsVersion "21.1.1" + compileSdkVersion 26 + buildToolsVersion '25.0.3' defaultConfig { minSdkVersion 10 - targetSdkVersion 21 + targetSdkVersion 26 versionCode 2 - versionName "1.1" + versionName "1.2" } buildTypes { release { diff --git a/sample/build.gradle b/sample/build.gradle index 85e0728..53b9832 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion '25.0.3' defaultConfig { applicationId "com.amulyakhare.td" diff --git a/settings.gradle b/settings.gradle index 2b99c92..1c52b4c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1 @@ -include ':sample' - -include 'library' -project(':library').projectDir = new File('library') +include ':sample', ':library' \ No newline at end of file From ba41d04dd4f9b31f4e1c1afabcfc721b4e037ce5 Mon Sep 17 00:00:00 2001 From: Leonardo Aramaki Date: Fri, 13 Oct 2017 16:44:10 -0300 Subject: [PATCH 3/5] Add empty RectF to avoid crash on android api versions 4.1.x --- .../amulyakhare/textdrawable/TextDrawable.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java b/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java index db42f8b..ae8d9e3 100644 --- a/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java +++ b/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java @@ -137,29 +137,18 @@ public static IShapeBuilder builder() { } public static class Builder implements IConfigBuilder, IShapeBuilder, IBuilder { - + private static final RectF EMPTY_RECT = new RectF(); + public int textColor; private String text; - private int color; - private int borderThickness; - private int width; - private int height; - private Typeface font; - private RectShape shape; - - public int textColor; - private int fontSize; - private boolean isBold; - private boolean toUpperCase; - public float radius; private Builder() { @@ -242,7 +231,7 @@ public IBuilder round() { public IBuilder roundRect(int radius) { this.radius = radius; float[] radii = {radius, radius, radius, radius, radius, radius, radius, radius}; - this.shape = new RoundRectShape(radii, null, null); + this.shape = new RoundRectShape(radii, EMPTY_RECT, null); return this; } From 68fb72cf381fe82b089bc4f049fffccb72400b26 Mon Sep 17 00:00:00 2001 From: Leonardo Aramaki Date: Fri, 13 Oct 2017 16:47:19 -0300 Subject: [PATCH 4/5] Remove iml files from modules --- library/library.iml | 90 -------------------------------------------- sample/sample.iml | 92 --------------------------------------------- 2 files changed, 182 deletions(-) delete mode 100644 library/library.iml delete mode 100644 sample/sample.iml diff --git a/library/library.iml b/library/library.iml deleted file mode 100644 index fd9647f..0000000 --- a/library/library.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sample/sample.iml b/sample/sample.iml deleted file mode 100644 index b303902..0000000 --- a/sample/sample.iml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0b0d26c5e1663001b8c611036a98960e88f94a2b Mon Sep 17 00:00:00 2001 From: Leonardo Aramaki Date: Fri, 13 Oct 2017 17:21:29 -0300 Subject: [PATCH 5/5] Increment versions properly --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 8bf7feb..b3d4291 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -10,8 +10,8 @@ android { defaultConfig { minSdkVersion 10 targetSdkVersion 26 - versionCode 2 - versionName "1.2" + versionCode 3 + versionName "1.0.2" } buildTypes { release {