0.0.48.beta30 ready

- PopTip 异步线程问题修复；

DialogXIOSStyle/src/main/java/com/kongzue/dialogx/style/views/ProgressView.java

@@ -14,7 +14,6 @@ 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;
@@ -95,9 +94,9 @@ public class ProgressView extends View implements ProgressViewInterface {
             }
             isInited = true;
             if (attrs != null) {
-                TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ProgressView);
-                width = a.getDimensionPixelSize(R.styleable.ProgressView_progressStrokeWidth, dip2px(2));
-                color = a.getDimensionPixelSize(R.styleable.ProgressView_progressStrokeColor, color);
+                TypedArray a = getContext().obtainStyledAttributes(attrs, com.kongzue.dialogx.R.styleable.ProgressView);
+                width = a.getDimensionPixelSize(com.kongzue.dialogx.R.styleable.ProgressView_progressStrokeWidth, dip2px(2));
+                color = a.getDimensionPixelSize(com.kongzue.dialogx.R.styleable.ProgressView_progressStrokeColor, color);
                 
                 a.recycle();
             }

DialogXMIUIStyle/src/main/java/com/kongzue/dialogx/style/MIUIStyle.java

@@ -208,12 +208,12 @@ public class MIUIStyle extends DialogXStyle {
 
         @Override
         public int enterAnimResId(boolean light) {
-            return R.anim.anim_dialogx_notification_enter;
+            return com.kongzue.dialogx.R.anim.anim_dialogx_notification_enter;
         }
 
         @Override
         public int exitAnimResId(boolean light) {
-            return R.anim.anim_dialogx_notification_exit;
+            return com.kongzue.dialogx.R.anim.anim_dialogx_notification_exit;
         }
 
         @Override

DialogXMaterialYou/src/main/java/com/kongzue/dialogxmaterialyou/style/MaterialYouStyle.java

@@ -2,10 +2,8 @@ package com.kongzue.dialogxmaterialyou.style;
 
 import android.content.Context;
 
-import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.interfaces.DialogXStyle;
 import com.kongzue.dialogx.interfaces.ProgressViewInterface;
-import com.kongzue.dialogx.util.TextInfo;
 import com.kongzue.dialogx.util.views.ProgressView;
 import com.kongzue.dialogxmaterialyou.R;
 
@@ -29,12 +27,12 @@ public class MaterialYouStyle extends DialogXStyle {
     
     @Override
     public int enterAnimResId() {
-        return R.anim.anim_dialogx_default_enter;
+        return com.kongzue.dialogx.R.anim.anim_dialogx_default_enter;
     }
     
     @Override
     public int exitAnimResId() {
-        return R.anim.anim_dialogx_default_exit;
+        return com.kongzue.dialogx.R.anim.anim_dialogx_default_exit;
     }
     
     @Override
@@ -114,7 +112,7 @@ public class MaterialYouStyle extends DialogXStyle {
     public class DefaultWaitTipRes extends WaitTipRes{
         @Override
         public int overrideWaitLayout(boolean light) {
-            return R.layout.layout_dialogx_wait;
+            return com.kongzue.dialogx.R.layout.layout_dialogx_wait;
         }
 
         @Override
@@ -134,7 +132,7 @@ public class MaterialYouStyle extends DialogXStyle {
 
         @Override
         public int overrideTextColorRes(boolean light) {
-            return light ? R.color.white : R.color.black;
+            return light ? com.kongzue.dialogx.R.color.white : com.kongzue.dialogx.R.color.black;
         }
 
         @Override
@@ -161,7 +159,7 @@ public class MaterialYouStyle extends DialogXStyle {
 
         @Override
         public int overrideMenuDividerDrawableRes(boolean light) {
-            return light ? R.drawable.rect_dialogx_material_menu_split_divider : R.drawable.rect_dialogx_material_menu_split_divider_night;
+            return light ? com.kongzue.dialogx.R.drawable.rect_dialogx_material_menu_split_divider : com.kongzue.dialogx.R.drawable.rect_dialogx_material_menu_split_divider_night;
         }
 
         @Override
@@ -171,7 +169,7 @@ public class MaterialYouStyle extends DialogXStyle {
 
         @Override
         public int overrideMenuTextColor(boolean light) {
-            return light ? R.color.black90 : R.color.white90;
+            return light ? com.kongzue.dialogx.R.color.black90 : com.kongzue.dialogx.R.color.white90;
         }
 
         @Override
@@ -196,12 +194,12 @@ public class MaterialYouStyle extends DialogXStyle {
 
         @Override
         public int overrideSelectionImage(boolean light, boolean isSelected) {
-            return isSelected ? R.mipmap.img_dialogx_bottom_menu_material_item_selection : R.mipmap.img_dialogx_bottom_menu_material_item_non_select;
+            return isSelected ? com.kongzue.dialogx.R.mipmap.img_dialogx_bottom_menu_material_item_selection : com.kongzue.dialogx.R.mipmap.img_dialogx_bottom_menu_material_item_non_select;
         }
 
         @Override
         public int overrideMultiSelectionImage(boolean light, boolean isSelected) {
-            return isSelected ? R.mipmap.img_dialogx_bottom_menu_material_item_multi_selection : R.mipmap.img_dialogx_bottom_menu_material_item_non_multi_select;
+            return isSelected ? com.kongzue.dialogx.R.mipmap.img_dialogx_bottom_menu_material_item_multi_selection : com.kongzue.dialogx.R.mipmap.img_dialogx_bottom_menu_material_item_non_multi_select;
         }
     }
     
@@ -223,12 +221,12 @@ public class MaterialYouStyle extends DialogXStyle {
 
         @Override
         public int enterAnimResId(boolean light) {
-            return R.anim.anim_dialogx_default_enter;
+            return com.kongzue.dialogx.R.anim.anim_dialogx_default_enter;
         }
 
         @Override
         public int exitAnimResId(boolean light) {
-            return R.anim.anim_dialogx_default_exit;
+            return com.kongzue.dialogx.R.anim.anim_dialogx_default_exit;
         }
 
         @Override
@@ -317,12 +315,12 @@ public class MaterialYouStyle extends DialogXStyle {
 
         @Override
         public int enterAnimResId(boolean light) {
-            return R.anim.anim_dialogx_notification_enter;
+            return com.kongzue.dialogx.R.anim.anim_dialogx_notification_enter;
         }
 
         @Override
         public int exitAnimResId(boolean light) {
-            return R.anim.anim_dialogx_notification_exit;
+            return com.kongzue.dialogx.R.anim.anim_dialogx_notification_exit;
         }
 
         @Override

app/src/main/java/com/kongzue/dialogxdemo/activity/MainActivity.java

@@ -6,45 +6,34 @@ import android.animation.ValueAnimator;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.AdapterView;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -52,7 +41,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.button.MaterialButtonToggleGroup;
 import com.kongzue.baseframework.BaseActivity;
-import com.kongzue.baseframework.BaseApp;
 import com.kongzue.baseframework.interfaces.DarkNavigationBarTheme;
 import com.kongzue.baseframework.interfaces.DarkStatusBarTheme;
 import com.kongzue.baseframework.interfaces.Layout;
@@ -76,7 +64,6 @@ import com.kongzue.dialogx.interfaces.BaseDialog;
 import com.kongzue.dialogx.interfaces.BottomDialogSlideEventLifecycleCallback;
 import com.kongzue.dialogx.interfaces.DialogLifecycleCallback;
 import com.kongzue.dialogx.interfaces.DialogXAnimInterface;
-import com.kongzue.dialogx.interfaces.DialogXStyle;
 import com.kongzue.dialogx.interfaces.MenuItemTextInfoInterceptor;
 import com.kongzue.dialogx.interfaces.OnBackPressedListener;
 import com.kongzue.dialogx.interfaces.OnBackgroundMaskClickListener;
@@ -86,15 +73,12 @@ import com.kongzue.dialogx.interfaces.OnIconChangeCallBack;
 import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnMenuItemClickListener;
 import com.kongzue.dialogx.interfaces.OnMenuItemSelectListener;
-import com.kongzue.dialogx.interfaces.OnSafeInsetsChangeListener;
 import com.kongzue.dialogx.style.IOSStyle;
 import com.kongzue.dialogx.style.KongzueStyle;
 import com.kongzue.dialogx.style.MIUIStyle;
 import com.kongzue.dialogx.style.MaterialStyle;
 import com.kongzue.dialogx.util.InputInfo;
 import com.kongzue.dialogx.util.TextInfo;
-import com.kongzue.dialogx.util.views.ActivityScreenShotImageView;
-import com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout;
 import com.kongzue.dialogxdemo.BuildConfig;
 import com.kongzue.dialogxdemo.R;
 import com.kongzue.dialogxdemo.custom.recycleview.CustomRecycleViewAdapter;
@@ -1084,7 +1068,7 @@ public class MainActivity extends BaseActivity {
                             }
                         })
                         //.setAnimResId(R.anim.anim_right_in, R.anim.anim_right_out)
-                        .setMaskColor(getResources().getColor(R.color.black30))
+                        .setMaskColor(getResources().getColor(com.kongzue.dialogx.iostheme.R.color.black30))
                 //实现完全自定义动画效果
 //                        .setDialogXAnimImpl(new DialogXAnimInterface<CustomDialog>() {
 //                            @Override
@@ -1159,7 +1143,7 @@ public class MainActivity extends BaseActivity {
                             }
                         })
                         .setCancelable(false)
-                        .setMaskColor(getResources().getColor(R.color.black30))
+                        .setMaskColor(getResources().getColor(com.kongzue.dialogx.iostheme.R.color.black30))
                         .setEnterAnimResId(R.anim.anim_custom_pop_enter)
                         .setExitAnimResId(R.anim.anim_custom_pop_exit)
                         .setAlignBaseViewGravity(btnCustomDialogAlign, Gravity.TOP | Gravity.CENTER_HORIZONTAL)

gradle.properties

@@ -22,3 +22,4 @@ android.enableJetifier=true
 BUILD_VERSION=0.0.48.beta29
 BUILD_VERSION_INT=47
 DIALOGX_STYLE_VERSION=5
+android.nonTransitiveRClass=true