Skip to content

Commit

Permalink
Update v3.2.0
Browse files Browse the repository at this point in the history
*Update support dependencies to v3.2.0.
*Version bump to v2.5.1.
  • Loading branch information
rayliverified committed Sep 27, 2018
1 parent 41ecc86 commit d1b7473
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 22 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies {
}
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':customalert')
implementation 'com.github.searchy2:CustomButton:1.8.0'
implementation 'com.github.searchy2:CustomButton:1.8.2'

implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
implementation 'com.google.android.material:material:1.0.0-rc01'
implementation 'androidx.cardview:cardview:1.0.0-rc01'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0-beta05'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
}
}
Expand Down
5 changes: 2 additions & 3 deletions customalert/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'

group='com.github.searchy2'
version = '2.5.0'
version = '2.5.1'

android {
compileSdkVersion 28
buildToolsVersion "27.0.3"

defaultConfig {
minSdkVersion 15
Expand All @@ -26,7 +25,7 @@ dependencies {
maven { url "https://maven.google.com" }
}
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.android.material:material:1.0.0-rc01'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.github.Dimezis.BlurView:blurview:version-1.4.0'
}

Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,14 @@ public static CustomAlertDialogue getInstance() {

@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
Log.d("Builder", "Restore");

if (savedInstanceState != null) {
if (builder == null) {
builder = savedInstanceState.getParcelable(Builder.class.getSimpleName());
Log.d("Builder", "Restore Not Null");
}
}
setStyle(DialogFragment.STYLE_NO_TITLE, R.style.CustomDialog);
setRetainInstance(true);
if (builder != null)
{
if (!builder.getCancelable())
{
this.setCancelable(false);
}
else
{
this.setCancelable(true);
}
}
super.onCreate(savedInstanceState);
}

Expand Down Expand Up @@ -145,6 +132,14 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {

window.setAttributes(wlp);

if (builder != null) {
if (!builder.getCancelable()) {
setCancelable(false);
} else {
setCancelable(true);
}
}

return dialog;
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

0 comments on commit d1b7473

Please sign in to comment.