Jelajahi Sumber

0.0.46.beta2
- 修复 WaitDialog 在 iOS 主题下的动画颜色问题;
- 新增 WaitDialog 可以通过 build() 方法在同一个界面额外新建实例,且可以通过 setMessageContent(...) 等方法单独指定内容;

kongzue 3 tahun lalu
induk
melakukan
47b466f12d

TEMPAT SAMPAH
DialogX/libs/DialogXInterface.jar


+ 27 - 7
DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -213,7 +213,7 @@ public class WaitDialog extends BaseDialog {
                 if (getDialogImpl() != null) {
                     getDialogImpl().lazyCreate();
                     if (getWaitDialogView() != null) {
-                        getWaitDialogView().setTag(me.get());
+                        getWaitDialogView().setTag(WaitDialog.this);
                         show(getWaitDialogView());
                     }
                 }
@@ -712,8 +712,7 @@ public class WaitDialog extends BaseDialog {
     }
     
     protected void setTip(TYPE type) {
-        readyTipType = type;
-        showTip(readyTipType);
+        showTip(type);
     }
     
     protected void setTip(CharSequence message, TYPE type) {
@@ -773,13 +772,13 @@ public class WaitDialog extends BaseDialog {
      * @return me
      */
     protected WaitDialog preMessage(CharSequence message) {
-        me().message = message;
-        return me();
+        this.message = message;
+        return this;
     }
     
     protected WaitDialog preMessage(int messageResId) {
-        me().message = getString(messageResId);
-        return me();
+        this.message = getString(messageResId);
+        return this;
     }
     
     public DialogLifecycleCallback<WaitDialog> getDialogLifecycleCallback() {
@@ -1007,4 +1006,25 @@ public class WaitDialog extends BaseDialog {
         refreshUI();
         return this;
     }
+    
+    public WaitDialog setMessageContent(CharSequence message){
+        this.message = message;
+        refreshUI();
+        return this;
+    }
+    
+    public WaitDialog setMessageContent(int messageResId){
+        this.message = getString(messageResId);
+        refreshUI();
+        return this;
+    }
+    
+    public CharSequence getMessageContent(){
+        return message;
+    }
+    
+    public WaitDialog setTipType(TYPE type){
+        showTip(type);
+        return this;
+    }
 }

+ 2 - 1
DialogXIOSStyle/src/main/java/com/kongzue/dialogx/style/views/ProgressView.java

@@ -14,6 +14,7 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -203,7 +204,7 @@ public class ProgressView extends View implements ProgressViewInterface {
     }
     
     private Bitmap getLoadingBitmap() {
-        Bitmap origin = BitmapFactory.decodeResource(getResources(), isLightMode ? R.mipmap.img_progress_ios_dark : R.mipmap.img_progress_ios_light);
+        Bitmap origin = BitmapFactory.decodeResource(getResources(), isLightMode ? R.mipmap.img_progress_ios_light : R.mipmap.img_progress_ios_dark);
         Matrix matrix = new Matrix();
         matrix.setRotate(45 * ((int) currentRotateDegrees));
         Bitmap rotatedBitmap = Bitmap.createBitmap(origin, 0, 0, origin.getWidth(), origin.getHeight(), matrix, false);

TEMPAT SAMPAH
app/release/app-release.apk


+ 2 - 2
app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 44,
-      "versionName": "0.0.45.beta19",
+      "versionCode": 45,
+      "versionName": "0.0.46.beta1",
       "outputFile": "app-release.apk"
     }
   ]

+ 1 - 1
gradle.properties

@@ -19,5 +19,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.46.beta1
+BUILD_VERSION=0.0.46.beta2
 BUILD_VERSION_INT=45