Skip to content

Commit 2a44792

Browse files
committed
Merge branch 'hotfix/remove_a'
2 parents 598dde8 + bb9cc98 commit 2a44792

5 files changed

Lines changed: 4 additions & 10 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
}
2121
dependencies {
2222
...
23-
compile 'com.github.NeoLSN:DialogAlchemy:1.1.1'
23+
compile 'com.github.NeoLSN:DialogAlchemy:1.1.2'
2424
}
2525
```
2626
API

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:2.1.2'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33

44
group = 'com.github.NeoLSN'
5-
version = '1.1.1'
5+
version = '1.1.2'
66

77
android {
88
compileSdkVersion 24

library/src/main/java/ui/android/dialogalchemy/stone/ProgressStone.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.support.annotation.StringRes;
1212
import android.text.Spannable;
1313
import android.text.SpannableString;
14-
import android.text.TextUtils;
1514
import android.text.style.StyleSpan;
1615
import android.widget.ProgressBar;
1716
import android.widget.TextView;
@@ -73,11 +72,6 @@ public int getLayoutResId() {
7372
@NonNull
7473
@Override
7574
public Material mergeMaterial(@NonNull Context context, @NonNull Material material) {
76-
if (TextUtils.isEmpty(material.getPositiveButtonText())) {
77-
Material.Builder builder = material.rebuild(context);
78-
builder.setPositiveButton(android.R.string.ok, null);
79-
material = builder.build();
80-
}
8175
return material;
8276
}
8377

0 commit comments

Comments
 (0)