Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@ Thumbs.db
.idea
#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
.gradle
build/
build/

# Intellij
*.iml
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
13 changes: 8 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -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
versionCode 2
versionName "1.1"
targetSdkVersion 26
versionCode 3
versionName "1.0.2"
}
buildTypes {
release {
Expand Down
90 changes: 0 additions & 90 deletions library/library.iml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
92 changes: 0 additions & 92 deletions sample/sample.iml

This file was deleted.

5 changes: 1 addition & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
include ':sample'

include 'library'
project(':library').projectDir = new File('library')
include ':sample', ':library'