0.2.0 add lottieLoadingDialog

0.1.0 delete library

Author: LinweiJ

demo/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.wega.loadingdialog"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -19,12 +19,14 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.android.support:design:27.1.1'
-    testCompile 'junit:junit:4.12'
-    compile project(':loadingDialog')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':loadingDialog')
+    implementation project(':lottieLoadingDialog')
+    implementation 'com.airbnb.android:lottie:2.7.0'
 }

demo/src/main/java/com/wega/loadingDialog/MainActivity.java

@@ -1,23 +1,23 @@
 package com.wega.loadingDialog;
 
-import android.content.Intent;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 
 import com.lwj.widget.loadingdialog.LoadingDialog;
-import com.lwj.widget.loadingdialog.LottieLoadingDialog;
 import com.lwj.widget.loadingdialog.SimpleLoadingDialog;
+import com.lwj.widget.lottieloadingdialog.LottieLoadingDialog;
 
+import static com.airbnb.lottie.LottieDrawable.INFINITE;
+import static com.lwj.widget.lottieloadingdialog.LottieLoadingDialog.LLD_TYPE_CUSTOM;
+import static com.lwj.widget.lottieloadingdialog.LottieLoadingDialog.LLD_TYPE_FAIL_1;
+import static com.lwj.widget.lottieloadingdialog.LottieLoadingDialog.LLD_TYPE_LOADING_1;
+import static com.lwj.widget.lottieloadingdialog.LottieLoadingDialog.LLD_TYPE_LOADING_2;
+import static com.lwj.widget.lottieloadingdialog.LottieLoadingDialog.LLD_TYPE_SUCCESS_1;
+import static com.lwj.widget.lottieloadingdialog.LottieLoadingDialog.LLD_TYPE_SUCCESS_2;
 
-import static com.lwj.widget.loadingdialog.LottieLoadingDialog.TYPE_CUSTOM;
-import static com.lwj.widget.loadingdialog.LottieLoadingDialog.TYPE_FAIL_1;
-import static com.lwj.widget.loadingdialog.LottieLoadingDialog.TYPE_LOADING_1;
-import static com.lwj.widget.loadingdialog.LottieLoadingDialog.TYPE_LOADING_2;
-import static com.lwj.widget.loadingdialog.LottieLoadingDialog.TYPE_SUCCESS_1;
-import static com.lwj.widget.loadingdialog.LottieLoadingDialog.TYPE_SUCCESS_2;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -69,12 +69,12 @@ public void onEnd(LoadingDialog dialog) {
             case R.id.button_Lottie:
                 mLottieLoadingDialog.setCancelable(true);
                 //显示加载框
-                mLottieLoadingDialog.showFirst("加载中...", TYPE_LOADING_1, null);
+                mLottieLoadingDialog.showFirst("加载中...", LLD_TYPE_LOADING_1, null,INFINITE);
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         //显示结果
-                        mLottieLoadingDialog.showResult("加载4秒后加载成功...", TYPE_SUCCESS_1, null);
+                        mLottieLoadingDialog.showResult("加载4秒后加载成功...", LLD_TYPE_SUCCESS_1, null,0);
                         //延时消失
                         mLottieLoadingDialog.dismissDelay(2000, new LoadingDialog.DismissDelayEndCallback() {
                             @Override
@@ -88,12 +88,12 @@ public void onEnd(LoadingDialog dialog) {
             case R.id.button_Lottie_can_not_be_canceled_outside:
                 mLottieLoadingDialog.setCanceledOnTouchOutside(false);
                 //显示加载框
-                mLottieLoadingDialog.showFirst("加载中...", TYPE_LOADING_2, null);
+                mLottieLoadingDialog.showFirst("加载中...", LLD_TYPE_LOADING_2, null,INFINITE);
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         //显示结果
-                        mLottieLoadingDialog.showResult("加载8秒后加载成功...", TYPE_SUCCESS_2, null);
+                        mLottieLoadingDialog.showResult("加载8秒后加载成功...", LLD_TYPE_SUCCESS_2, null,1);
                         //延时消失
                         mLottieLoadingDialog.dismissDelay(5000, new LoadingDialog.DismissDelayEndCallback() {
                             @Override
@@ -107,12 +107,12 @@ public void onEnd(LoadingDialog dialog) {
             case R.id.button_Lottie_can_not_be_canceled:
                 mLottieLoadingDialog.setCancelable(false);
                 //显示加载框
-                mLottieLoadingDialog.showFirst("加载中...", TYPE_CUSTOM, "loading_plane.json");
+                mLottieLoadingDialog.showFirst("加载中...", LLD_TYPE_CUSTOM, "loading_plane.json",INFINITE);
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         //显示结果
-                        mLottieLoadingDialog.showResult("加载10秒后加载失败...", TYPE_FAIL_1, null);
+                        mLottieLoadingDialog.showResult("加载10秒后加载失败...", LLD_TYPE_FAIL_1, null,0);
                         //延时消失
                         mLottieLoadingDialog.dismissDelay(3000, new LoadingDialog.DismissDelayEndCallback() {
                             @Override
@@ -124,7 +124,6 @@ public void onEnd(LoadingDialog dialog) {
                 }, 10000);
                 break;
 
-
         }
     }