diff --git a/app-dialog/build.gradle b/app-dialog/build.gradle index ef8179f..a020802 100644 --- a/app-dialog/build.gradle +++ b/app-dialog/build.gradle @@ -35,8 +35,8 @@ dependencies { testImplementation deps.test.junit androidTestImplementation deps.test.runner androidTestImplementation deps.test.espresso - //support - compileOnly deps.support.appcompat + //androidx + compileOnly deps.androidx.appcompat } diff --git a/app-dialog/src/main/java/com/king/app/dialog/AppDialog.java b/app-dialog/src/main/java/com/king/app/dialog/AppDialog.java index c1c66bd..01396d1 100644 --- a/app-dialog/src/main/java/com/king/app/dialog/AppDialog.java +++ b/app-dialog/src/main/java/com/king/app/dialog/AppDialog.java @@ -10,13 +10,12 @@ import android.view.WindowManager; import com.king.app.dialog.fragment.AppDialogFragment; -import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; /** - * @author Jenly Jenly + * @author Jenly */ public enum AppDialog { @@ -28,19 +27,6 @@ public enum AppDialog { private String mTag; - //------------------------------------------- - - /** - * @param context - * @param config 弹框配置 {@link AppDialogConfig} - * @return - * @deprecated 即将废弃,下一个版本可能会移除此方法。 - */ - @Deprecated - public View createAppDialogView(@NonNull Context context,@NonNull AppDialogConfig config){ - return config.buildAppDialogView(); - } - //------------------------------------------- @@ -120,18 +106,16 @@ public enum AppDialog { * @param config 弹框配置 {@link AppDialogConfig} */ public void showDialog(AppDialogConfig config){ - showDialog(config,true); + showDialog(config.getContext(),config); } /** * 显示弹框 请使用{@link #showDialog(AppDialogConfig)} * @param context * @param config 弹框配置 {@link AppDialogConfig} - * @deprecated 即将废弃,下一个版本可能会移除此方法。 */ - @Deprecated public void showDialog(Context context,AppDialogConfig config){ - showDialog(config,true); + showDialog(context,config,true); } /** @@ -139,11 +123,9 @@ public enum AppDialog { * @param context * @param config 弹框配置 {@link AppDialogConfig} * @param isCancel 是否可取消(默认为true,false则拦截back键) - * @deprecated 即将废弃,下一个版本可能会移除此方法。 */ - @Deprecated public void showDialog(Context context,AppDialogConfig config,boolean isCancel){ - showDialog(config,isCancel); + showDialog(context,config.buildAppDialogView(),isCancel); } /** @@ -246,11 +228,9 @@ public enum AppDialog { * 创建弹框,请使用{@link #createDialog(AppDialogConfig)} * @param context * @param config 弹框配置 {@link AppDialogConfig} - * @deprecated 即将废弃,下一个版本可能会移除此方法。 */ - @Deprecated public Dialog createDialog(Context context,AppDialogConfig config){ - return createDialog(config,true); + return createDialog(context,config,true); } /** @@ -258,11 +238,9 @@ public enum AppDialog { * @param context * @param config 弹框配置 {@link AppDialogConfig} * @param isCancel 是否可取消(默认为true,false则拦截back键) - * @deprecated 即将废弃,下一个版本可能会移除此方法。 */ - @Deprecated public Dialog createDialog(Context context,AppDialogConfig config,boolean isCancel){ - return createDialog(config,isCancel); + return createDialog(context,config.buildAppDialogView(),isCancel); } /** diff --git a/app-dialog/src/main/java/com/king/app/dialog/AppDialogConfig.java b/app-dialog/src/main/java/com/king/app/dialog/AppDialogConfig.java index 5b72f6d..20e9c0a 100644 --- a/app-dialog/src/main/java/com/king/app/dialog/AppDialogConfig.java +++ b/app-dialog/src/main/java/com/king/app/dialog/AppDialogConfig.java @@ -12,7 +12,7 @@ import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; /** - * @author Jenly Jenly + * @author Jenly */ public class AppDialogConfig extends BaseDialogConfig{ @@ -38,7 +38,7 @@ public class AppDialogConfig extends BaseDialogConfig{ /** - * use {@link #getDialogView()} + * * @param context * @return * @deprecated 即将废弃,下一个版本可能会移除此方法。 @@ -48,7 +48,7 @@ public class AppDialogConfig extends BaseDialogConfig{ return getDialogView(); } - public View getDialogView(){ + private View getDialogView(){ if(view == null){ view = LayoutInflater.from(context).inflate(getLayoutId(),null); } diff --git a/app-dialog/src/main/java/com/king/app/dialog/BaseDialogConfig.java b/app-dialog/src/main/java/com/king/app/dialog/BaseDialogConfig.java index 4bf061d..9963052 100644 --- a/app-dialog/src/main/java/com/king/app/dialog/BaseDialogConfig.java +++ b/app-dialog/src/main/java/com/king/app/dialog/BaseDialogConfig.java @@ -90,6 +90,7 @@ public class BaseDialogConfig { } /** + * 此方法即将废弃,请通过构造{@link #BaseDialogConfig(int)}来初始化 * @param layoutId * @return * @deprecated 即将废弃,下一个版本可能会移除此方法 diff --git a/app/build.gradle b/app/build.gradle index f3f9649..f43b2ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,9 +27,9 @@ dependencies { testImplementation deps.test.junit androidTestImplementation deps.test.runner androidTestImplementation deps.test.espresso - //support - implementation deps.support.appcompat - implementation deps.support.constraintlayout + //androidx + implementation deps.androidx.appcompat + implementation deps.androidx.constraintlayout implementation deps.okhttp implementation project(':app-updater') diff --git a/app/src/main/java/com/king/appupdater/MainActivity.java b/app/src/main/java/com/king/appupdater/MainActivity.java index 1cf66ad..08233af 100644 --- a/app/src/main/java/com/king/appupdater/MainActivity.java +++ b/app/src/main/java/com/king/appupdater/MainActivity.java @@ -195,7 +195,7 @@ public class MainActivity extends AppCompatActivity { } }); //强制升级,拦截返回 - AppDialog.INSTANCE.showDialog(getContext(),AppDialog.INSTANCE.createAppDialogView(getContext(),config),false); + AppDialog.INSTANCE.showDialog(getContext(),config,false); } /** diff --git a/versions.gradle b/versions.gradle index 338a39b..78ab86f 100644 --- a/versions.gradle +++ b/versions.gradle @@ -14,8 +14,8 @@ ext.build_versions = build_versions // App dependencies def versions = [:] -//support -versions.supportLibrary = "1.1.0" +//androidx +versions.appcompat = "1.1.0" versions.constraintLayout = "1.1.3" //test @@ -30,11 +30,11 @@ ext.versions = versions ext.deps = [:] -//support -def support = [:] -support.appcompat = "androidx.appcompat:appcompat:$versions.supportLibrary" -support.constraintlayout = "androidx.constraintlayout:constraintlayout:$versions.constraintLayout" -deps.support = support +//androidx +def androidx = [:] +androidx.appcompat = "androidx.appcompat:appcompat:$versions.appcompat" +androidx.constraintlayout = "androidx.constraintlayout:constraintlayout:$versions.constraintLayout" +deps.androidx = androidx //test def test = [:]