add some custom dialog.

leguang · Sep 1, 2017 · 337f2d2 · 337f2d2
1 parent 3e9460c
commit 337f2d2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/app/src/main/java/cn/itsite/adialog/demo/demo/DialogActivity.java b/app/src/main/java/cn/itsite/adialog/demo/demo/DialogActivity.java
@@ -18,8 +18,8 @@
 import cn.itsite.adialog.BaseViewHolder;
 import cn.itsite.adialog.demo.R;
 import cn.itsite.adialog.dialog.BaseDialog;
+import cn.itsite.adialog.dialog.LoadingDialog;
 import cn.itsite.adialog.dialog.SelectorDialog;
-import cn.itsite.adialog.dialogfragment.BaseDialogFragment;
 
 
 public class DialogActivity extends AppCompatActivity implements View.OnClickListener {
@@ -151,11 +151,9 @@ public void onClick(View view) {
                         .show();
                 break;
             case R.id.loading:
-                new BaseDialogFragment()
-                        .setLayoutId(R.layout.loading_layout)
-                        .setWidth(100)
-                        .setHeight(100)
-                        .show(getSupportFragmentManager());
+
+                new LoadingDialog(this).setDimAmount(0).show();
+
                 break;
             case R.id.tips:
 

diff --git a/library/src/main/java/cn/itsite/adialog/dialog/LoadingDialog.java b/library/src/main/java/cn/itsite/adialog/dialog/LoadingDialog.java
@@ -1,6 +1,7 @@
 package cn.itsite.adialog.dialog;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StyleRes;
@@ -17,7 +18,7 @@
  */
 public class LoadingDialog extends BaseDialog {
     private TextView tvLoading;
-    private String text;
+    private String text = "玩命加载中…";
 
     public LoadingDialog(@NonNull Context context) {
         super(context);
@@ -36,6 +37,12 @@ public int getLayoutId() {
         return R.layout.adialog_loading;
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setCancelable(false);
+    }
+
     @Override
     public void convertView(BaseViewHolder holder, BaseDialog dialog) {
         super.convertView(holder, dialog);

diff --git a/...rc/main/res/drawable/shape_bg_loading.xml → ...res/drawable/shape_bg_adialog_loading.xml b/...rc/main/res/drawable/shape_bg_loading.xml → ...res/drawable/shape_bg_adialog_loading.xml
@@ -5,7 +5,7 @@
     <!-- rounded corner -->
     <corners android:radius="5dp" />
 
-    <solid android:color="#77000000" />
+    <solid android:color="#99000000" />
     <stroke
         android:width="1dp"
         android:color="#00000000" />

diff --git a/...c/main/res/drawable/shape_bg_selector.xml → ...es/drawable/shape_bg_adialog_selector.xml b/...c/main/res/drawable/shape_bg_selector.xml → ...es/drawable/shape_bg_adialog_selector.xml
diff --git a/library/src/main/res/layout/adialog_loading.xml b/library/src/main/res/layout/adialog_loading.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="110dp"
-    android:layout_height="110dp"
+    android:layout_width="90dp"
+    android:layout_height="90dp"
     android:layout_gravity="center"
-    android:background="@drawable/shape_bg_loading"
+    android:background="@drawable/shape_bg_adialog_loading"
     android:gravity="center"
     android:orientation="vertical">
 
     <ProgressBar
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_gravity="center"
         android:clickable="false"
         android:gravity="center" />
@@ -23,5 +23,5 @@
         android:lineSpacingExtra="3dp"
         android:text="玩命加载中…"
         android:textColor="#FFFF"
-        android:textSize="15sp" />
+        android:textSize="13sp" />
 </LinearLayout>
diff --git a/library/src/main/res/layout/adialog_selector.xml b/library/src/main/res/layout/adialog_selector.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/shape_bg_selector"
+    android:background="@drawable/shape_bg_adialog_selector"
     android:orientation="vertical">
 
     <FrameLayout