From 2e243d5a0c3ec3b5a936e37a506c9ab015c24b65 Mon Sep 17 00:00:00 2001 From: hss01248 Date: Fri, 9 Dec 2022 10:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7Androidx,=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + app/build.gradle | 17 +- .../hss01248/dialogutildemo/BadTokenActy.java | 4 +- .../dialogutildemo/BadTokenAfterActy.java | 4 +- .../dialogutildemo/BadTokenBeforeActy.java | 4 +- .../hss01248/dialogutildemo/BaseActivity.java | 9 +- .../com/hss01248/dialogutildemo/BaseApp.java | 44 +-- .../hss01248/dialogutildemo/MainActivity.java | 6 +- app/src/main/res/layout/activity_main.xml | 4 +- build.gradle | 3 + dialog/build.gradle | 11 +- dialog/src/main/AndroidManifest.xml | 17 +- .../hss01248/dialog/ActivityStackManager.java | 325 +++++++++++++----- .../hss01248/dialog/InitForStytleDialog.java | 32 ++ .../main/java/com/hss01248/dialog/Tool.java | 10 +- .../dialog/adapter/SuperLvHolder.java | 4 +- .../dialog/adapter/SuperPagerAdapter.java | 2 +- .../dialog/adapter/SuperPagerHolder.java | 2 +- .../dialog/adapter/SuperRcvAdapter.java | 4 +- .../dialog/adapter/SuperRcvHolder.java | 2 +- .../dialog/bottomsheet/BottomSheetBean.java | 2 +- .../dialog/bottomsheet/BottomSheetHolder.java | 6 +- .../bottomsheet/BottomSheetPagerHolder.java | 2 +- .../dialog/bottomsheet/BottomViewPager.java | 2 +- .../bottomsheet/BottomVpIndicatorHolder.java | 2 +- .../bottomsheet/RightMdBottomSheetDialog.java | 4 +- .../dialog/building/DialogViewBuilder.java | 4 +- .../dialog/building/MyDialogBuilder.java | 4 +- .../dialog/config/BottomSheetStyle.java | 2 +- .../dialog/config/ButtonsStyleConfig.java | 4 +- .../hss01248/dialog/config/ConfigBean.java | 12 +- .../hss01248/dialog/config/DefaultConfig.java | 2 +- .../dialog/config/InputStyleConfig.java | 6 +- .../dialog/config/OtherStyleConfig.java | 2 +- .../hss01248/dialog/config/WindowConfig.java | 2 +- .../hss01248/dialog/interfaces/Styleable.java | 4 +- .../dialog/material/MaterialDialogHolder.java | 2 +- .../dialog/material/MultiChooseHolder.java | 2 +- .../dialog/material/SingleChooseHolder.java | 2 +- .../com/hss01248/dialog/view/AdXHolder.java | 2 +- .../dialog/view/DialogUtilDialogFragment.java | 6 +- .../view/DialogUtil_DialogActivity.java | 2 +- .../src/main/res/layout/dialog_ios_alert.xml | 16 +- .../res/layout/dialog_ios_alert_vertical.xml | 9 +- .../main/res/layout/dialogutil_md_input.xml | 4 +- .../main/res/layout/item_btn_bottomalert.xml | 2 +- .../res/layout/layout_material_dialog.xml | 5 +- gradle.properties | 4 +- jitpack.yml | 2 + .../android/support/graphics/drawable/R.java | 2 +- .../support/graphics/drawable/animated/R.java | 2 +- .../debug/android/support/transition/R.java | 2 +- .../debug/android/support/v4/R.java | 2 +- .../debug/android/support/v7/appcompat/R.java | 2 +- .../android/support/v7/recyclerview/R.java | 2 +- .../android/support/graphics/drawable/R.java | 2 +- .../support/graphics/drawable/animated/R.java | 2 +- .../r/debug/android/support/transition/R.java | 2 +- .../source/r/debug/android/support/v4/R.java | 2 +- .../debug/android/support/v7/appcompat/R.java | 2 +- .../android/support/v7/recyclerview/R.java | 2 +- .../android/support/graphics/drawable/R.java | 2 +- .../support/graphics/drawable/animated/R.java | 2 +- .../release/android/support/transition/R.java | 2 +- .../r/release/android/support/v4/R.java | 2 +- .../android/support/v7/appcompat/R.java | 2 +- .../android/support/v7/recyclerview/R.java | 2 +- old/MyIosloadingImageView.java | 2 +- old/SuperHolder.java | 2 +- 69 files changed, 424 insertions(+), 239 deletions(-) create mode 100644 dialog/src/main/java/com/hss01248/dialog/InitForStytleDialog.java create mode 100644 jitpack.yml diff --git a/.gitignore b/.gitignore index e5da392..4bab7aa 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ misc.xml .idea/ +*.hprof \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3889fc9..2ae5bf1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,10 +6,11 @@ android { defaultConfig { applicationId "com.hss01248.dialogutildemo" - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion 32 versionCode 1 versionName "1.0" + multiDexEnabled true } buildTypes { release { @@ -21,6 +22,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } @@ -44,11 +49,11 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:recyclerview-v7:26.1.0' - implementation 'com.android.support:design:26.1.0' - compile 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + compile 'com.jakewharton:butterknife:10.2.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' //compile 'com.github.rubensousa:BottomSheetBuilder:1.3' compile project(path: ':dialog') debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' diff --git a/app/src/main/java/com/hss01248/dialogutildemo/BadTokenActy.java b/app/src/main/java/com/hss01248/dialogutildemo/BadTokenActy.java index 77f219f..1aeaf68 100644 --- a/app/src/main/java/com/hss01248/dialogutildemo/BadTokenActy.java +++ b/app/src/main/java/com/hss01248/dialogutildemo/BadTokenActy.java @@ -2,8 +2,8 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/com/hss01248/dialogutildemo/BadTokenAfterActy.java b/app/src/main/java/com/hss01248/dialogutildemo/BadTokenAfterActy.java index 67241ab..7bbd905 100644 --- a/app/src/main/java/com/hss01248/dialogutildemo/BadTokenAfterActy.java +++ b/app/src/main/java/com/hss01248/dialogutildemo/BadTokenAfterActy.java @@ -3,8 +3,8 @@ import android.app.AlertDialog; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; /** * Created by huangshuisheng on 2017/9/30. diff --git a/app/src/main/java/com/hss01248/dialogutildemo/BadTokenBeforeActy.java b/app/src/main/java/com/hss01248/dialogutildemo/BadTokenBeforeActy.java index f7311a9..87a9834 100644 --- a/app/src/main/java/com/hss01248/dialogutildemo/BadTokenBeforeActy.java +++ b/app/src/main/java/com/hss01248/dialogutildemo/BadTokenBeforeActy.java @@ -3,8 +3,8 @@ import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Button; import android.widget.TextView; diff --git a/app/src/main/java/com/hss01248/dialogutildemo/BaseActivity.java b/app/src/main/java/com/hss01248/dialogutildemo/BaseActivity.java index eaaf9bd..7f6f7a4 100644 --- a/app/src/main/java/com/hss01248/dialogutildemo/BaseActivity.java +++ b/app/src/main/java/com/hss01248/dialogutildemo/BaseActivity.java @@ -1,10 +1,9 @@ package com.hss01248.dialogutildemo; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; -import com.hss01248.dialog.ActivityStackManager; /** * Created by huangshuisheng on 2017/11/17. @@ -20,12 +19,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { @Override public void onAttachedToWindow() { super.onAttachedToWindow(); - ActivityStackManager.getInstance().setTopAttached(this); + //ActivityStackManager.getInstance().setTopAttached(this); } @Override public void onDetachedFromWindow() { super.onDetachedFromWindow(); - ActivityStackManager.getInstance().removeTopAttached(this); + //ActivityStackManager.getInstance().removeActivity(this); } } diff --git a/app/src/main/java/com/hss01248/dialogutildemo/BaseApp.java b/app/src/main/java/com/hss01248/dialogutildemo/BaseApp.java index ba0587a..382fbf6 100644 --- a/app/src/main/java/com/hss01248/dialogutildemo/BaseApp.java +++ b/app/src/main/java/com/hss01248/dialogutildemo/BaseApp.java @@ -4,6 +4,8 @@ import android.app.Application; import android.os.Bundle; +import androidx.multidex.MultiDexApplication; + import com.alibaba.fastjson.JSON; import com.hss01248.dialog.ActivityStackManager; import com.hss01248.dialog.DialogsMaintainer; @@ -16,14 +18,13 @@ * Created by Administrator on 2017/2/15 0015. */ -public class BaseApp extends Application { +public class BaseApp extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); LeakCanary.install(this); - StyledDialog.init(getApplicationContext()); - registCallback(); + //StyledDialog.init(getApplicationContext()); initlog(); //TestTool.openStickModeIfIsDebug(); } @@ -37,42 +38,5 @@ public String toJson(Object o) { }); } - private void registCallback() { - registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { - @Override - public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - ActivityStackManager.getInstance().addActivity(activity); - } - - @Override - public void onActivityStarted(Activity activity) { - - } - - @Override - public void onActivityResumed(Activity activity) { - } - - @Override - public void onActivityPaused(Activity activity) { - DialogsMaintainer.onPause(activity); - - } - - @Override - public void onActivityStopped(Activity activity) { - - } - - @Override - public void onActivitySaveInstanceState(Activity activity, Bundle outState) { - } - - @Override - public void onActivityDestroyed(Activity activity) { - ActivityStackManager.getInstance().removeActivity(activity); - } - }); - } } diff --git a/app/src/main/java/com/hss01248/dialogutildemo/MainActivity.java b/app/src/main/java/com/hss01248/dialogutildemo/MainActivity.java index 9be2d45..332b3a0 100644 --- a/app/src/main/java/com/hss01248/dialogutildemo/MainActivity.java +++ b/app/src/main/java/com/hss01248/dialogutildemo/MainActivity.java @@ -7,9 +7,9 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0aee34d..11d1803 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:orientation="vertical" > - @@ -173,7 +173,7 @@ - + diff --git a/build.gradle b/build.gradle index ed2f267..ba84f68 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/remote3.gradle' + apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/master/deps/depsLastestChecker.gradle' + apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/z_config/git_branch_info.gradle' repositories { mavenCentral() diff --git a/dialog/build.gradle b/dialog/build.gradle index 8fd72ee..62050ef 100644 --- a/dialog/build.gradle +++ b/dialog/build.gradle @@ -16,6 +16,10 @@ android { //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } repositories { @@ -37,9 +41,10 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:recyclerview-v7:26.1.0' - implementation 'com.android.support:design:26.1.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + api "androidx.startup:startup-runtime:1.1.0" //compile 'com.github.hss01248:SuperAdapter:1.0.4' //compile 'com.github.wangjiegulu:ShadowViewhelper:1.0.4' //compile 'com.github.wangjiegulu:ShadowViewHelper:1.0.2' diff --git a/dialog/src/main/AndroidManifest.xml b/dialog/src/main/AndroidManifest.xml index 8535c1b..9bec0d6 100644 --- a/dialog/src/main/AndroidManifest.xml +++ b/dialog/src/main/AndroidManifest.xml @@ -1,8 +1,17 @@ - - - + + + + + diff --git a/dialog/src/main/java/com/hss01248/dialog/ActivityStackManager.java b/dialog/src/main/java/com/hss01248/dialog/ActivityStackManager.java index d579e0d..e911eb9 100644 --- a/dialog/src/main/java/com/hss01248/dialog/ActivityStackManager.java +++ b/dialog/src/main/java/com/hss01248/dialog/ActivityStackManager.java @@ -1,19 +1,33 @@ package com.hss01248.dialog; import android.app.Activity; -import android.content.DialogInterface; +import android.app.Application; +import android.content.Context; +import android.content.pm.ApplicationInfo; import android.os.Build; +import android.os.Bundle; + import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; + import java.lang.ref.WeakReference; -import java.util.HashMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; import java.util.List; import java.util.Stack; + + /** * Created by Administrator on 2017/2/15 0015. * * 参考:https://zhuanlan.zhihu.com/p/25221428 + * + * */ public class ActivityStackManager { @@ -22,7 +36,67 @@ public class ActivityStackManager { private static ActivityStackManager sInstance = new ActivityStackManager(); private WeakReference topAttachedActivityWeakRef; private static Stack mActivityStack = new Stack<>(); + private static boolean isDebug; + static boolean hasInit = false; + + public static boolean isApkInDebug(Context context) { + try { + ApplicationInfo info = context.getApplicationInfo(); + return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } catch (Exception e) { + return false; + } + } + public static void init(Application application){ + ActivityStackManager.isDebug = isApkInDebug(application); + if(hasInit){ + return; + } + hasInit = true; + application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() { + @Override + public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { + ActivityStackManager.getInstance().addActivity(activity); + ActivityStackManager.getInstance().setTopAttached(activity); + } + + @Override + public void onActivityStarted(@NonNull Activity activity) { + + } + + @Override + public void onActivityResumed(@NonNull Activity activity) { + ActivityStackManager.getInstance().setTopAttached(activity); + } + + @Override + public void onActivityPaused(@NonNull Activity activity) { + if(activity.isFinishing()){ + ActivityStackManager.getInstance().removeActivity(activity); + } + DialogsMaintainer.onPause(activity); + + } + + @Override + public void onActivityStopped(@NonNull Activity activity) { + + } + + @Override + public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { + + } + + @Override + public void onActivityDestroyed(@NonNull Activity activity) { + ActivityStackManager.getInstance().removeActivity(activity); + + } + }); + } private ActivityStackManager() { @@ -33,45 +107,70 @@ public static ActivityStackManager getInstance() { return sInstance; } + public Stack getActivityStack(){ + if(mActivityStack != null){ + return mActivityStack; + } + return null; + } /** * activity from oncreate callback is useable for dialog ,but not usable for popupwindow + * + * 几个情况: + * 启动系统的activity: topAttachedActivityWeakRef被置为 null,那就从mActivityStack里拿 + * 启动应用内的activity后: topAttachedActivityWeakRef就是真正在上面的activity. + * 退出应用后: topAttachedActivityWeakRef= null, mActivityStack也是null,拿到的是null + * + * A启动B,B调用setResult(),finish()-> A onActivityResult()回调执行->B onPause()执行->A OnResume()执行 + * + * 如果是在某个Activity的onActivityResult回调里,拿到这个activity,用于startActivityForResult启动另一个activity, + * 由于onActivityResult先于onResume回调,如果立刻去getTopActivity(),拿到的是上一个即将finish的activity. + * 所以需要判断isFinishing + * + 2021-01-18 13:01:03.463 8377-8377/com.hss01248.dialogutildemo D/onresult: com.hss01248.dialogutildemo.ActivityResultActivity@3be12ac,Intent { (has extras) }, top activity:com.hss01248.dialogutildemo.ActivityResultActivity@3be12ac + 2021-01-18 13:01:03.494 8377-8377/com.hss01248.dialogutildemo D/onresult: com.hss01248.dialogutildemo.ActivityResultActivity@464fba1,Intent { (has extras) }, top activity:com.hss01248.dialogutildemo.ActivityResultActivity@464fba1 + 2021-01-18 13:01:03.527 8377-8377/com.hss01248.dialogutildemo D/onresult: com.hss01248.dialogutildemo.ActivityResultActivity@3ccc2b7,Intent { (has extras) }, top activity:com.hss01248.dialogutildemo.ActivityResultActivity@3ccc2b7 + 2021-01-18 13:01:03.555 8377-8377/com.hss01248.dialogutildemo D/onresult: com.hss01248.dialogutildemo.MainActivity@6144e8a,Intent { (has extras) }, top activity:com.hss01248.dialogutildemo.MainActivity@6144e8a + * @return */ public Activity getTopActivity() { Activity currentActivity = null; - if(mActivityStack.size()>0){ - currentActivity = mActivityStack.get(mActivityStack.size()-1); - } - /*Activity currentActivity = null; - if (sCurrentActivityWeakRef != null) { - currentActivity = sCurrentActivityWeakRef.get(); - if(currentActivity ==null){ - if(mActivityStack.size()>0){ - currentActivity = mActivityStack.get(mActivityStack.size()-1); - } - } - if(currentActivity !=null && currentActivity.isFinishing()){ - currentActivity = null; + if (topAttachedActivityWeakRef != null && topAttachedActivityWeakRef.get() != null) { + currentActivity = topAttachedActivityWeakRef.get(); + if(isUsable(currentActivity)){ + return currentActivity; } - }else { - if(mActivityStack.size()>0){ - currentActivity = mActivityStack.get(mActivityStack.size()-1); - } - if(currentActivity !=null && currentActivity.isFinishing()){ - currentActivity = null; - } - }*/ + } + if(mActivityStack.size()>0){ + currentActivity = getUsableActivity(mActivityStack); + + } return currentActivity; } + private Activity getUsableActivity(Stack mActivityStack) { + for (int i = mActivityStack.size() - 1; i >= 0; i--) { + Activity activity = mActivityStack.get(i); + if(isUsable(activity)){ + return activity; + } + } + return null; + } + public Activity getTopActivity(Class activityExpected){ - Activity activity = getTopActivity(); - if(activity !=null && activity.getClass().equals(activityExpected)){ - return activity; - }else { - return null; + for (int i = mActivityStack.size() - 1; i >= 0; i--) { + Activity activity = mActivityStack.get(i); + if(isUsable(activity)){ + if(activity.getClass().equals(activityExpected)){ + return activity; + } + + } } + return null; } public Activity getActivity(Class activityExpected){ @@ -86,10 +185,20 @@ public Activity getActivity(Class activityExpected){ return null; } + public Activity getActivityAt(int index){ + Activity activity = null; + if (mActivityStack == null) { + return null; + } + if(mActivityStack.size() >= index){ + activity = mActivityStack.get(index); + } + return activity; + } + /** + * 获取指定位置的activity * - * @param idxTop 从上往下的index,从1开始 - * @return */ public boolean finishActivityByIdx(int idxTop){ if(mActivityStack.isEmpty()){ @@ -109,41 +218,10 @@ public boolean finishActivityByIdx(int idxTop){ * 在基类activity 的 onAttachToWindow时调用 * @param activity */ - public void setTopAttached(Activity activity) { + public void setTopAttached(Activity activity) { topAttachedActivityWeakRef = new WeakReference(activity); } - /** - * 在基类activity 的 onDetachToWindow时调用 - * @param activity - */ - public void removeTopAttached(Activity activity){ - if(activity ==null){ - return; - } - if(topAttachedActivityWeakRef!=null){ - Activity activity1 = topAttachedActivityWeakRef.get(); - if(activity.equals(activity1)){ - topAttachedActivityWeakRef = null; - } - - } - } - - /** - * if return in not null,then it can be used for a popupwindow - * @return - */ - public Activity getTopAttached(){ - if(topAttachedActivityWeakRef!=null){ - Activity activity = topAttachedActivityWeakRef.get(); - if(isUsable(activity)){ - return activity; - } - } - return null; - } - public static boolean isUsable(Activity activity) { if(activity ==null){ return false; @@ -157,15 +235,6 @@ public static boolean isUsable(Activity activity) { return false; } } - - //是否attached - /*if(activity.getWindowManager() ==null){ - return false; - } - if(!activity.getWindow().isActive()){ - return false; - }*/ - return true; } @@ -182,23 +251,46 @@ public int size() { /** * 添加Activity到堆栈 */ - public void addActivity(Activity activity) { + public void addActivity(Activity activity) { if (mActivityStack == null) { mActivityStack = new Stack<>(); } if (activity != null) { - mActivityStack.add(activity); - Log.e("dialog","mActivityStack.size()--addActivity:"+activity.getClass().getSimpleName()+mActivityStack.size()); + if(!mActivityStack.contains(activity)){ + mActivityStack.add(activity); + } + + // Log.i("dialog","mActivityStack.size()--addActivity:"+activity.getClass().getSimpleName()+mActivityStack.size()); } + printStack("onCreate:\n"); } /** * 移除activity */ public void removeActivity(Activity activity) { - mActivityStack.remove(activity); - DialogsMaintainer.onDestory(activity); - Log.e("dialog","mActivityStack.size()--removeActivity:"+activity.getClass().getSimpleName()+mActivityStack.size()); + if(mActivityStack == null){ + return; + } + if(mActivityStack.contains(activity)){ + mActivityStack.remove(activity); + } + // Log.i("dialog"," mActivityStack.size()--removeActivity:"+activity.getClass().getSimpleName()+mActivityStack.size()); + printStack("onDestory:\n"); + } + + private void printStack(String time) { + if (!isDebug){ + return; + } + StringBuilder builder = new StringBuilder(); + for (int i = mActivityStack.size()-1; i >=0; i--) { + builder.append(mActivityStack.get(i).getClass().getSimpleName()) + .append("-:") + .append(i) + .append("\n"); + } + Log.i("printStack dialog",time+builder.toString()); } /** @@ -243,10 +335,83 @@ public void finishActivity(Class cls) { return; } - for (Activity activity : mActivityStack) { - if (activity.getClass().equals(cls)) { - finishActivity(activity); + try { + Iterator iterator = mActivityStack.iterator(); + List destoryedActivities = new ArrayList<>(); + while (iterator.hasNext()){ + Activity activity = iterator.next(); + if(activity.getClass().equals(cls)){ + iterator.remove(); + destoryedActivities.add(activity); + } + } + if(destoryedActivities.size()>0){ + for (Activity activity:destoryedActivities) { + if(activity.isFinishing()){ + return; + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + if(activity.isDestroyed()){ + return; + } + } + activity.finish(); + } } + + }catch (Exception e){ + e.printStackTrace(); + } + } + + + + /** + * finish除了指定activity类型之外的其他所有activity + * @param cls 不需要移除的activity的Class类型 + */ + public void finishActivitiesExcept(Class... cls){ + if(mActivityStack.isEmpty()){ + return; + } + if(cls.length==0){ + return; + } + List list = Arrays.asList(cls); + Iterator iterator = mActivityStack.iterator(); + while (iterator.hasNext()){ + Activity activity = iterator.next(); + Class clazz = activity.getClass(); + if(!list.contains(clazz)){ + iterator.remove(); + activity.finish(); + } + } + } + + /** + * 清除栈内所有的实例并退出app + */ + public void finishAllActivityAndExit () { + if (null != mActivityStack) { + for (int i = 0, size = mActivityStack.size(); i < size; i++) { + if (null != mActivityStack.get(i)) { + try { + ActivityCompat.finishAfterTransition(mActivityStack.get(i)); + } catch (Exception ignored) {} + } + } +// clean (); +// android.os.Process.killProcess(android.os.Process.myPid()); +// System.exit(1); + } + } + + public void clean () { + if (sInstance != null) { + mActivityStack.clear(); + mActivityStack = null; + sInstance = null; } } } diff --git a/dialog/src/main/java/com/hss01248/dialog/InitForStytleDialog.java b/dialog/src/main/java/com/hss01248/dialog/InitForStytleDialog.java new file mode 100644 index 0000000..11d7781 --- /dev/null +++ b/dialog/src/main/java/com/hss01248/dialog/InitForStytleDialog.java @@ -0,0 +1,32 @@ +package com.hss01248.dialog; + +import android.app.Application; +import android.content.Context; + +import androidx.startup.Initializer; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Despciption todo + * @Author hss + * @Date 09/12/2022 10:43 + * @Version 1.0 + */ +public class InitForStytleDialog implements Initializer { + @Override + public String create(Context context) { + StyledDialog.init(context); + + ActivityStackManager.init((Application) context); + return "InitForStytleDialog"; + } + + + + @Override + public List>> dependencies() { + return new ArrayList<>(); + } +} diff --git a/dialog/src/main/java/com/hss01248/dialog/Tool.java b/dialog/src/main/java/com/hss01248/dialog/Tool.java index ad8f473..9754b4d 100644 --- a/dialog/src/main/java/com/hss01248/dialog/Tool.java +++ b/dialog/src/main/java/com/hss01248/dialog/Tool.java @@ -13,10 +13,10 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.BottomSheetDialog; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.util.Log; import android.view.Gravity; @@ -807,7 +807,7 @@ public boolean onTouch(View v, MotionEvent event) { */ public static void setBottomSheetDialogPeekHeight(final ConfigBean bean){ if(bean.hasBehaviour && bean.dialog instanceof BottomSheetDialog){ - View view = bean.dialog.getWindow().findViewById(android.support.design.R.id.design_bottom_sheet); + View view = bean.dialog.getWindow().findViewById(R.id.design_bottom_sheet); if(view ==null){ return; diff --git a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperLvHolder.java b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperLvHolder.java index 531130c..e43b4e5 100644 --- a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperLvHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperLvHolder.java @@ -1,8 +1,8 @@ package com.hss01248.dialog.adapter; import android.content.Context; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; import android.view.View; import java.util.List; diff --git a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerAdapter.java b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerAdapter.java index 75ae771..e1cb7df 100644 --- a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerAdapter.java +++ b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerAdapter.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.adapter; import android.content.Context; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.util.Log; import android.view.View; import android.view.ViewGroup; diff --git a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerHolder.java b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerHolder.java index 5ec7434..7b64a19 100644 --- a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperPagerHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.adapter; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; diff --git a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvAdapter.java b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvAdapter.java index 169fbfc..f713707 100644 --- a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvAdapter.java +++ b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvAdapter.java @@ -1,8 +1,8 @@ package com.hss01248.dialog.adapter; import android.app.Activity; -import android.support.annotation.LayoutRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvHolder.java b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvHolder.java index a47fd98..7ba4f6f 100644 --- a/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/adapter/SuperRcvHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.adapter; import android.app.Activity; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import java.util.List; diff --git a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetBean.java b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetBean.java index 22ef42b..0660873 100644 --- a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetBean.java +++ b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetBean.java @@ -1,6 +1,6 @@ package com.hss01248.dialog.bottomsheet; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; /** * Created by Administrator on 2016/10/19. diff --git a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetHolder.java b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetHolder.java index 4c03cc4..454f8ab 100644 --- a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetHolder.java @@ -1,9 +1,9 @@ package com.hss01248.dialog.bottomsheet; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetDialog; -import android.support.v4.view.ViewPager; +import androidx.annotation.Nullable; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.viewpager.widget.ViewPager; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetPagerHolder.java b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetPagerHolder.java index f1675f3..0976ee1 100644 --- a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetPagerHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomSheetPagerHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.bottomsheet; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; diff --git a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomViewPager.java b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomViewPager.java index fa1b781..79916fe 100644 --- a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomViewPager.java +++ b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomViewPager.java @@ -1,6 +1,6 @@ package com.hss01248.dialog.bottomsheet; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.view.View; import android.view.ViewGroup; diff --git a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomVpIndicatorHolder.java b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomVpIndicatorHolder.java index a96f5f6..cc4ec39 100644 --- a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomVpIndicatorHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/BottomVpIndicatorHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.bottomsheet; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; diff --git a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/RightMdBottomSheetDialog.java b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/RightMdBottomSheetDialog.java index 5b1e9d6..0137b73 100644 --- a/dialog/src/main/java/com/hss01248/dialog/bottomsheet/RightMdBottomSheetDialog.java +++ b/dialog/src/main/java/com/hss01248/dialog/bottomsheet/RightMdBottomSheetDialog.java @@ -2,8 +2,8 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomSheetDialog; +import androidx.annotation.NonNull; +import com.google.android.material.bottomsheet.BottomSheetDialog; import android.view.ViewGroup; import android.view.WindowManager; diff --git a/dialog/src/main/java/com/hss01248/dialog/building/DialogViewBuilder.java b/dialog/src/main/java/com/hss01248/dialog/building/DialogViewBuilder.java index 207c5b1..76eec12 100644 --- a/dialog/src/main/java/com/hss01248/dialog/building/DialogViewBuilder.java +++ b/dialog/src/main/java/com/hss01248/dialog/building/DialogViewBuilder.java @@ -6,8 +6,8 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.graphics.drawable.AnimationDrawable; -import android.support.design.widget.BottomSheetDialog; -import android.support.v7.app.AlertDialog; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.appcompat.app.AlertDialog; import android.view.Gravity; import android.view.View; import android.view.Window; diff --git a/dialog/src/main/java/com/hss01248/dialog/building/MyDialogBuilder.java b/dialog/src/main/java/com/hss01248/dialog/building/MyDialogBuilder.java index fbf1359..30d803d 100644 --- a/dialog/src/main/java/com/hss01248/dialog/building/MyDialogBuilder.java +++ b/dialog/src/main/java/com/hss01248/dialog/building/MyDialogBuilder.java @@ -6,8 +6,8 @@ import android.app.ProgressDialog; import android.content.DialogInterface; import android.graphics.drawable.AnimationDrawable; -import android.support.design.widget.BottomSheetDialog; -import android.support.v7.app.AlertDialog; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.appcompat.app.AlertDialog; import android.view.Gravity; import android.view.View; import android.view.Window; diff --git a/dialog/src/main/java/com/hss01248/dialog/config/BottomSheetStyle.java b/dialog/src/main/java/com/hss01248/dialog/config/BottomSheetStyle.java index 66136a6..85bbd8e 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/BottomSheetStyle.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/BottomSheetStyle.java @@ -1,6 +1,6 @@ package com.hss01248.dialog.config; -import android.support.annotation.ColorRes; +import androidx.annotation.ColorRes; import com.hss01248.dialog.R; diff --git a/dialog/src/main/java/com/hss01248/dialog/config/ButtonsStyleConfig.java b/dialog/src/main/java/com/hss01248/dialog/config/ButtonsStyleConfig.java index 251afb9..7364571 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/ButtonsStyleConfig.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/ButtonsStyleConfig.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.config; -import android.support.annotation.ColorRes; -import android.support.annotation.StringRes; +import androidx.annotation.ColorRes; +import androidx.annotation.StringRes; /** * Created by Administrator on 2017/12/7. diff --git a/dialog/src/main/java/com/hss01248/dialog/config/ConfigBean.java b/dialog/src/main/java/com/hss01248/dialog/config/ConfigBean.java index 42d738a..db0fa5d 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/ConfigBean.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/ConfigBean.java @@ -6,12 +6,12 @@ import android.content.Context; import android.content.Intent; import android.os.Looper; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.FloatRange; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.FloatRange; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.view.Gravity; import android.view.View; diff --git a/dialog/src/main/java/com/hss01248/dialog/config/DefaultConfig.java b/dialog/src/main/java/com/hss01248/dialog/config/DefaultConfig.java index d2106e9..e914517 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/DefaultConfig.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/DefaultConfig.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.config; import android.content.Context; -import android.support.annotation.ColorRes; +import androidx.annotation.ColorRes; import com.hss01248.dialog.R; diff --git a/dialog/src/main/java/com/hss01248/dialog/config/InputStyleConfig.java b/dialog/src/main/java/com/hss01248/dialog/config/InputStyleConfig.java index c6f7275..3d346f8 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/InputStyleConfig.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/InputStyleConfig.java @@ -1,8 +1,8 @@ package com.hss01248.dialog.config; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.StringRes; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.StringRes; /** * Created by Administrator on 2017/12/7. diff --git a/dialog/src/main/java/com/hss01248/dialog/config/OtherStyleConfig.java b/dialog/src/main/java/com/hss01248/dialog/config/OtherStyleConfig.java index 4eb8684..3dd0c0e 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/OtherStyleConfig.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/OtherStyleConfig.java @@ -1,6 +1,6 @@ package com.hss01248.dialog.config; -import android.support.annotation.ColorRes; +import androidx.annotation.ColorRes; /** * Created by Administrator on 2017/12/7. diff --git a/dialog/src/main/java/com/hss01248/dialog/config/WindowConfig.java b/dialog/src/main/java/com/hss01248/dialog/config/WindowConfig.java index 9e40a9e..8bba3c9 100644 --- a/dialog/src/main/java/com/hss01248/dialog/config/WindowConfig.java +++ b/dialog/src/main/java/com/hss01248/dialog/config/WindowConfig.java @@ -1,6 +1,6 @@ package com.hss01248.dialog.config; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import android.view.View; /** diff --git a/dialog/src/main/java/com/hss01248/dialog/interfaces/Styleable.java b/dialog/src/main/java/com/hss01248/dialog/interfaces/Styleable.java index 3905843..445d22b 100644 --- a/dialog/src/main/java/com/hss01248/dialog/interfaces/Styleable.java +++ b/dialog/src/main/java/com/hss01248/dialog/interfaces/Styleable.java @@ -1,8 +1,8 @@ package com.hss01248.dialog.interfaces; import android.app.Dialog; -import android.support.annotation.ColorRes; -import android.support.annotation.Nullable; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; import com.hss01248.dialog.config.ConfigBean; diff --git a/dialog/src/main/java/com/hss01248/dialog/material/MaterialDialogHolder.java b/dialog/src/main/java/com/hss01248/dialog/material/MaterialDialogHolder.java index 06f43a2..8f37f9c 100644 --- a/dialog/src/main/java/com/hss01248/dialog/material/MaterialDialogHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/material/MaterialDialogHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.material; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.SparseBooleanArray; import android.view.View; diff --git a/dialog/src/main/java/com/hss01248/dialog/material/MultiChooseHolder.java b/dialog/src/main/java/com/hss01248/dialog/material/MultiChooseHolder.java index 6f26163..1d189e4 100644 --- a/dialog/src/main/java/com/hss01248/dialog/material/MultiChooseHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/material/MultiChooseHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.material; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.widget.CheckedTextView; import com.hss01248.dialog.R; diff --git a/dialog/src/main/java/com/hss01248/dialog/material/SingleChooseHolder.java b/dialog/src/main/java/com/hss01248/dialog/material/SingleChooseHolder.java index c827f84..c8fd749 100644 --- a/dialog/src/main/java/com/hss01248/dialog/material/SingleChooseHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/material/SingleChooseHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.material; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.widget.CheckedTextView; import com.hss01248.dialog.R; diff --git a/dialog/src/main/java/com/hss01248/dialog/view/AdXHolder.java b/dialog/src/main/java/com/hss01248/dialog/view/AdXHolder.java index b9673fa..81304ea 100644 --- a/dialog/src/main/java/com/hss01248/dialog/view/AdXHolder.java +++ b/dialog/src/main/java/com/hss01248/dialog/view/AdXHolder.java @@ -1,7 +1,7 @@ package com.hss01248.dialog.view; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Gravity; import android.view.View; import android.widget.FrameLayout; diff --git a/dialog/src/main/java/com/hss01248/dialog/view/DialogUtilDialogFragment.java b/dialog/src/main/java/com/hss01248/dialog/view/DialogUtilDialogFragment.java index 3ac2b49..47044dc 100644 --- a/dialog/src/main/java/com/hss01248/dialog/view/DialogUtilDialogFragment.java +++ b/dialog/src/main/java/com/hss01248/dialog/view/DialogUtilDialogFragment.java @@ -6,9 +6,9 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; diff --git a/dialog/src/main/java/com/hss01248/dialog/view/DialogUtil_DialogActivity.java b/dialog/src/main/java/com/hss01248/dialog/view/DialogUtil_DialogActivity.java index 6c49de7..385f931 100644 --- a/dialog/src/main/java/com/hss01248/dialog/view/DialogUtil_DialogActivity.java +++ b/dialog/src/main/java/com/hss01248/dialog/view/DialogUtil_DialogActivity.java @@ -2,7 +2,7 @@ import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.hss01248.dialog.WindowAdjuster; diff --git a/dialog/src/main/res/layout/dialog_ios_alert.xml b/dialog/src/main/res/layout/dialog_ios_alert.xml index 3e4ddc7..aa039ec 100644 --- a/dialog/src/main/res/layout/dialog_ios_alert.xml +++ b/dialog/src/main/res/layout/dialog_ios_alert.xml @@ -91,7 +91,7 @@ android:layout_width="match_parent" android:minHeight="48dp" android:layout_height="wrap_content"> -