完善警告弹窗，增加独立确定按钮样式；

Author: FanChael

README.md

@@ -70,11 +70,12 @@ implementation 'com.hl:poplibrary:1.0.2'
 implementation 'com.hl:poplibrary:1.0.3'
 //1.0.4 自定义+分享弹窗+注册登录弹窗+更新弹窗
 implementation 'com.hl:poplibrary:1.0.4'
-//1.0.1.4 App更新请移步传送门
+//1.0.1.4 App更新模块(请移步传送门)
+implementation 'com.hl:poplibrary:1.0.1.4'
 //1.0.6.1 自定义+分享弹窗+注册登录弹窗+更新弹窗+垂直列表弹窗 + 增加了伸缩显示动画 - 下一版决定整合完善为一个版本！
 implementation 'com.hl:poplibrary:1.0.6.1'
 //1.0.6.2 自定义+分享弹窗+注册登录弹窗+更新弹窗+垂直列表弹窗+警告类弹窗A
-implementation 'com.hl:poplibrary:1.0.6.2'
+implementation 'com.hl:poplibrary:1.0.6.3'
 
 //依赖过可以忽略（使用分享弹窗需要依赖）/1.0.2
 implementation 'com.android.support:recyclerview-v7:28.0.0'//看你版本

app/src/main/java/pop/hl/com/commonpopupwindow/MainActivity.java

@@ -266,7 +266,8 @@ public void onClick(View view, int pos) {
                 break;
             case R.id.am_alertA_btn:
                 builder = AlertPopView.showALertTypeA(this, view,
-                        "提示", "是否确认删除!", "#f0008DCF", new OnEventListenner.OnAlertClickListenner() {
+                        "提示", "是否确认删除!", "#f0008DCF",
+                        true, new OnEventListenner.OnAlertClickListenner() {
                             @Override
                             public void onClick(View view, AlertPopView.CALLBACK_TYPE callback_type) {
 

doc/library/alert_guid.md

@@ -45,6 +45,22 @@
                                                      String _allColor,
                                                      OnEventListenner.OnAlertClickListenner _onAlertClickListenner) {
         }
+        /**
+          * 显示警告弹窗(A类型警告弹窗) - 只有确定按钮
+          * @param _context
+          * @param _achor
+          * @param _title - 标题
+          * @param _message - 提示消息
+          * @param _allColor - 主题颜色 - 目前针对左右按钮
+          * @param _bOkDismiss - 点击确定是否消失弹窗
+          * @param _onAlertClickListenner
+          * @return
+          */
+          public static BasePop.Builder showALertTypeA(Context _context, View _achor,
+                                                        String _title, String _message,
+                                                        String _allColor, boolean _bOkDismiss,
+                                                        OnEventListenner.OnAlertClickListenner _onAlertClickListenner) {
+          }
 ```
 # USE 
 ```Java   
@@ -55,4 +71,12 @@ BasePop.Builder builder = AlertPopView.showALertTypeA(this, view,
 
                     }
                 });
+BasePop.Builder builder2 = AlertPopView.showALertTypeA(this, view,
+                "提示", "是否确认删除!", "#f0008DCF",
+                 true, new OnEventListenner.OnAlertClickListenner() {
+                     @Override
+                     public void onClick(View view, AlertPopView.CALLBACK_TYPE callback_type) {
+                    
+                     }
+                 });
 ```

doc/library/update_guid.md

@@ -1,9 +1,15 @@
 # 更新日志
+# V 1.0.6.3(进行中)
+>警告类弹窗
+# V 1.0.6.1
+>垂直列表弹窗
+# V 1.0.1.4
+>App更新模块
 # V 1.0.4 (进行中)
 >1.添加APP更新弹窗【经典样式】
 # V 1.0.3
 >添加注册登录弹窗【常规样式】
-# V 1.0.2
+# V 1.0.2 (进行中)
 >1.添加分享弹窗，提供SharePopView调用类
 >2.PopView类修改为BasePopView类
 >3.事件处理单独提出为OnEventListenner类(提供自定义布局控件点击回调接口、弹窗消失回调接口、分享弹窗点击回调接口)

poplibrary/project.properties

@@ -14,7 +14,7 @@ project.groupId=com.hl
 #artifactId要和module的名字一致 #project.artifactId：项目ID，通常情况下如果你的包名为com.example.test，那么项目ID就是test
 project.artifactId=poplibrary
 project.packaging=aar
-project.version=1.0.6.2
+project.version=1.0.6.3
 project.siteUrl=https://github.com/FanChael/CommonPopupWindow
 project.gitUrl=https://github.com/FanChael/CommonPopupWindow.git
 

poplibrary/src/main/java/pop/hl/com/poplibrary/AlertPopView.java

@@ -44,7 +44,9 @@ public static BasePop.Builder showALertTypeA(Context _context, View _achor,
                                                  String _allColor, boolean _bCancelDismiss,
                                                  OnEventListenner.OnAlertClickListenner _onAlertClickListenner) {
         return new Builder(_context)
-                .create(_title, _message, _nagative, _positive, _allColor, _bCancelDismiss, _achor)
+                .create(_title, _message, _nagative,
+                        _positive, _allColor, _bCancelDismiss,
+                        false, _achor)
                 .showAlertA(_onAlertClickListenner);
     }
 
@@ -66,7 +68,32 @@ public static BasePop.Builder showALertTypeA(Context _context, View _achor,
                 .create(_title, _message,
                         _context.getResources().getString(R.string.cancel),
                         _context.getResources().getString(R.string.ok),
-                        _allColor, true, _achor)
+                        _allColor, true,
+                        false, _achor)
+                .showAlertA(_onAlertClickListenner);
+    }
+
+    /**
+     * 显示警告弹窗(A类型警告弹窗) - 只有确定按钮
+     * @param _context
+     * @param _achor
+     * @param _title - 标题
+     * @param _message - 提示消息
+     * @param _allColor - 主题颜色 - 目前针对左右按钮
+     * @param _bOkDismiss - 点击确定是否消失弹窗
+     * @param _onAlertClickListenner
+     * @return
+     */
+    public static BasePop.Builder showALertTypeA(Context _context, View _achor,
+                                                 String _title, String _message,
+                                                 String _allColor, boolean _bOkDismiss,
+                                                 OnEventListenner.OnAlertClickListenner _onAlertClickListenner) {
+        return new Builder(_context)
+                .create(_title, _message,
+                         "",
+                        _context.getResources().getString(R.string.ok),
+                        _allColor, true,
+                        _bOkDismiss, _achor)
                 .showAlertA(_onAlertClickListenner);
     }
 
@@ -79,9 +106,10 @@ public static class Builder {
         private WeakReference<Context> contextWeakReference;
         private BasePop.Builder builder = null;
         private String titleS, messageS;
-        private String nagativeS, positiveS;
+        private String nagativeS = "", positiveS;
         private String allColor;
         private boolean bCancelDismiss;
+        private boolean bOkDismiss;
 
         public Builder(Context _context) {
             this.contextWeakReference = new WeakReference<>(_context);
@@ -90,13 +118,15 @@ public Builder(Context _context) {
         public Builder create(String _title, String _message,
                               String _nagative, String _positive,
                               String _allColor, boolean _bCancelDismis,
+                              boolean _bOkDismiss,
                               View _achor) {
             this.allColor = _allColor;
             this.titleS = _title;
             this.messageS = _message;
             this.positiveS = _positive;
             this.nagativeS = _nagative;
             this.bCancelDismiss = _bCancelDismis;
+            this.bOkDismiss = _bOkDismiss;
             this.builder = new BasePop.Builder(contextWeakReference.get())
                     .create(_achor)
                     .setOutsideTouchable(false)
@@ -120,9 +150,15 @@ public BasePop.Builder showAlertA(final OnEventListenner.OnAlertClickListenner _
             TextView title = popView.findViewById(R.id.pa_title);
             TextView message = popView.findViewById(R.id.pa_message);
             TextView negativeTv = popView.findViewById(R.id.pa_negativeTv);
+            ConstraintLayout negative = popView.findViewById(R.id.pa_negative);
             TextView positiveTv = popView.findViewById(R.id.pa_positiveTv);
 
-            int windowW = ScreenUtil.getScreenW(contextWeakReference.get()) * 3 / 4;
+            int windowW;
+            if (null == nagativeS || nagativeS.equals("")){
+                windowW = ScreenUtil.getScreenW(contextWeakReference.get()) * 1 / 2;
+            }else{
+                windowW = ScreenUtil.getScreenW(contextWeakReference.get()) * 3 / 4;
+            }
             ///< 内容宽度为屏幕的3/4
             ScreenUtil.setConstraintLayoutWH(alertContentRoot, windowW, -1);
 
@@ -132,6 +168,10 @@ public BasePop.Builder showAlertA(final OnEventListenner.OnAlertClickListenner _
             negativeTv.setText(nagativeS);
             positiveTv.setText(positiveS);
 
+            if (null == nagativeS || nagativeS.equals("")){
+                negative.setVisibility(View.GONE);
+            }
+
             ///< 设置主题
             negativeTv.setTextColor(Color.parseColor(allColor));
             positiveTv.setTextColor(Color.parseColor(allColor));
@@ -158,6 +198,10 @@ public void onClick(View v) {
                     if (null != _onAlertClickListenner){
                         _onAlertClickListenner.onClick(v, CALLBACK_TYPE.OK);
                     }
+
+                    if (bOkDismiss && (null == nagativeS || nagativeS.equals(""))){
+                        builder.dissmiss();
+                    }
                 }
             });
             builder.show(BasePopView.SIMPLE_GRAVITY.CENTER_IN_PARENT);