修复无items时崩溃

mylhyl · mylhyl · commit 7b426e52dd19 · 2018-08-08T16:15:36.000+08:00
diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java b/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java
@@ -25,6 +25,8 @@
 import com.chad.library.adapter.base.BaseSectionQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.mylhyl.circledialog.CircleDialog;
+import com.mylhyl.circledialog.callback.ConfigItems;
+import com.mylhyl.circledialog.params.ItemsParams;
 import com.mylhyl.circledialog.params.ProgressParams;
 import com.mylhyl.circledialog.res.drawable.CircleDrawable;
 import com.mylhyl.circledialog.res.values.CircleColor;
@@ -406,13 +408,21 @@ protected void convert(BaseViewHolder helper, MySectionEntity item) {
                 });
                 break;
             case 14:
-                final String[] objectsR = {"item0", "item1", "item2", "item3"};
+                final String[] objectsR = {"item0", "item1", "item2", "item3", "item4", "item5"
+                        , "item6", "item7", "item8", "item9", "item10"};
                 final CheckedAdapter checkedAdapterR = new CheckedAdapter(this, objectsR, true);
 
                 new CircleDialog.Builder()
+                        .setMaxHeight(0.7f)
                         .configDialog(params -> params.backgroundColorPress = Color.CYAN)
                         .setTitle("带复选的ListView")
                         .setSubTitle("单选")
+                        .configItems(new ConfigItems() {
+                            @Override
+                            public void onConfig(ItemsParams params) {
+                                params.bottomMargin = 100;
+                            }
+                        })
                         .setItems(checkedAdapterR, (parent, view15, position15, id) ->
                                 checkedAdapterR.toggle(position15, objectsR[position15]))
                         .setItemsManualClose(true)
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/circledialog/build.gradle b/circledialog/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     compileOnly rootProject.ext.dependencies.appcompatV7
     compileOnly rootProject.ext.dependencies.recyclerview
     compileOnly rootProject.ext.dependencies.lottie
+    compileOnly rootProject.ext.dependencies.cardview
 }
 
 publish {
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/AbsCircleDialog.java b/circledialog/src/main/java/com/mylhyl/circledialog/AbsCircleDialog.java
@@ -8,7 +8,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.EditText;
 
 import com.mylhyl.circledialog.params.DialogParams;
@@ -34,6 +33,14 @@ public static AbsCircleDialog newAbsCircleDialog(CircleParams params) {
         return circleDialog;
     }
 
+    @Override
+    public View createView(Context context, LayoutInflater inflater, ViewGroup container) {
+        mController = new Controller(getContext().getApplicationContext(), mParams, this);
+        mController.createView();
+        View view = mController.getView();
+        return view;
+    }
+
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -44,14 +51,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         }
     }
 
-    @Override
-    public View createView(Context context, LayoutInflater inflater, ViewGroup container) {
-        mController = new Controller(getContext().getApplicationContext(), mParams, this);
-        mController.createView();
-        View view = mController.getView();
-        return view;
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -69,7 +68,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             setPadding(mPadding[0], mPadding[1], mPadding[2], mPadding[3]);
         setAnimations(dialogParams.animStyle);
         setDimEnabled(dialogParams.isDimEnabled);
-        //setBackgroundColor(dialogParams.backgroundColor);
         setRadius(dialogParams.radius);
         setAlpha(dialogParams.alpha);
         setX(dialogParams.xOff);
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java b/circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java
@@ -66,8 +66,7 @@ public BaseCircleDialog() {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
-            savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = createView(getContext(), inflater, container);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             view.setBackground(new CircleDrawable(mBackgroundColor, mRadius));
@@ -78,20 +77,22 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
         return view;
     }
 
+    public abstract View createView(Context context, LayoutInflater inflater, ViewGroup container);
+
     @Override
     public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if (mMaxHeight > 0) {
             mOnLayoutChangeListener = new View.OnLayoutChangeListener() {
                 @Override
-                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                public void onLayoutChange(View v, int left, int top, int right, int bottom
+                        , int oldLeft, int oldTop, int oldRight, int oldBottom) {
                     int height = v.getHeight();
                     DisplayMetrics dm = getDisplayMetrics();
                     int maxHeight = (int) (dm.heightPixels * mMaxHeight);
                     if (height > maxHeight) {
                         view.setLayoutParams(new FrameLayout.LayoutParams(
-                                FrameLayout.LayoutParams.MATCH_PARENT
-                                , maxHeight));
+                                FrameLayout.LayoutParams.MATCH_PARENT, maxHeight));
                     }
                 }
             };
@@ -107,8 +108,6 @@ private DisplayMetrics getDisplayMetrics() {
         return dm;
     }
 
-    public abstract View createView(Context context, LayoutInflater inflater, ViewGroup container);
-
     @Override
     public void show(FragmentManager manager, String tag) {
         FragmentTransaction transaction = manager.beginTransaction();
@@ -152,6 +151,14 @@ public void onDismiss(DialogInterface dialog) {
         remove();
     }
 
+    public void remove() {
+        FragmentManager fragmentManager = getFragmentManager();
+        if (fragmentManager == null) return;
+        FragmentTransaction ft = fragmentManager.beginTransaction();
+        ft.remove(this);
+        ft.addToBackStack(null);
+    }
+
     @Override
     public void onStart() {
         Dialog dialog = getDialog();
@@ -163,24 +170,6 @@ public void onStart() {
         super.onStart();
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(SAVED_GRAVITY, mGravity);
-        outState.putBoolean(SAVED_TOUCH_OUT, mCanceledOnTouchOutside);
-        outState.putBoolean(SAVED_CANCELED_BACK, mCanceledBack);
-        outState.putFloat(SAVED_WIDTH, mWidth);
-        outState.putFloat(SAVED_HEIGHT_MAX, mMaxHeight);
-        if (mPadding != null) outState.putIntArray(SAVED_PADDING, mPadding);
-        outState.putInt(SAVED_ANIM_STYLE, mAnimStyle);
-        outState.putBoolean(SAVED_DIM_ENABLED, isDimEnabled);
-        outState.putInt(SAVED_BACKGROUND_COLOR, mBackgroundColor);
-        outState.putInt(SAVED_RADIUS, mRadius);
-        outState.putFloat(SAVED_ALPHA, mAlpha);
-        outState.putInt(SAVED_X, mX);
-        outState.putInt(SAVED_Y, mY);
-    }
-
     /**
      * 对话框配置
      *
@@ -211,12 +200,22 @@ private void setDialogGravity(Dialog dialog) {
         window.setAttributes(wlp);
     }
 
-    public void remove() {
-        FragmentManager fragmentManager = getFragmentManager();
-        if (fragmentManager == null) return;
-        FragmentTransaction ft = fragmentManager.beginTransaction();
-        ft.remove(this);
-        ft.addToBackStack(null);
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(SAVED_GRAVITY, mGravity);
+        outState.putBoolean(SAVED_TOUCH_OUT, mCanceledOnTouchOutside);
+        outState.putBoolean(SAVED_CANCELED_BACK, mCanceledBack);
+        outState.putFloat(SAVED_WIDTH, mWidth);
+        outState.putFloat(SAVED_HEIGHT_MAX, mMaxHeight);
+        if (mPadding != null) outState.putIntArray(SAVED_PADDING, mPadding);
+        outState.putInt(SAVED_ANIM_STYLE, mAnimStyle);
+        outState.putBoolean(SAVED_DIM_ENABLED, isDimEnabled);
+        outState.putInt(SAVED_BACKGROUND_COLOR, mBackgroundColor);
+        outState.putInt(SAVED_RADIUS, mRadius);
+        outState.putFloat(SAVED_ALPHA, mAlpha);
+        outState.putInt(SAVED_X, mX);
+        outState.putInt(SAVED_Y, mY);
     }
 
     /**
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/res/drawable/TriangleArrowDrawable.java b/circledialog/src/main/java/com/mylhyl/circledialog/res/drawable/TriangleArrowDrawable.java
@@ -0,0 +1,80 @@
+package com.mylhyl.circledialog.res.drawable;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.Gravity;
+
+/**
+ * Created by hupei on 2018/8/3 8:58.
+ */
+public class TriangleArrowDrawable extends Drawable {
+
+    private final int arrowDirection;
+    private final int bgColor;
+
+    public TriangleArrowDrawable(int arrowDirection, int bgColor) {
+        this.arrowDirection = arrowDirection;
+        this.bgColor = bgColor;
+    }
+
+    @Override
+    public void draw(@NonNull Canvas canvas) {
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setColor(bgColor);
+        paint.setStyle(Paint.Style.FILL);
+        Path path = createPath();
+        canvas.drawPath(path, paint);
+    }
+
+    private Path createPath() {
+        Rect bound = getBounds();
+        Path path = new Path();
+        if (arrowDirection == Gravity.TOP) {
+            path.moveTo(bound.right / 2, bound.bottom / 2);
+            path.lineTo(0, bound.bottom);
+            path.lineTo(bound.right, bound.bottom);
+            path.close();
+        } else if (arrowDirection == Gravity.BOTTOM) {
+            path.moveTo(bound.right / 2, bound.bottom / 2);
+            path.lineTo(0, 0);
+            path.lineTo(bound.right, 0);
+            path.close();
+
+        } else if (arrowDirection == Gravity.LEFT) {
+            path.moveTo(bound.right / 2, bound.bottom / 2);
+            path.lineTo(bound.right, 0);
+            path.lineTo(bound.right, bound.bottom);
+            path.close();
+        } else if (arrowDirection == Gravity.RIGHT) {
+            path.moveTo(bound.right / 2, bound.bottom / 2);
+            path.lineTo(0, 0);
+            path.lineTo(0, bound.bottom);
+            path.close();
+        }
+        return path;
+
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+
+    }
+
+    @Override
+    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.UNKNOWN;
+    }
+}
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/view/BuildViewImpl.java b/circledialog/src/main/java/com/mylhyl/circledialog/view/BuildViewImpl.java
@@ -85,8 +85,9 @@ public ItemsView buildItems() {
             else if (mParams.rvItemListener != null || mParams.itemsParams.adapterRv != null)
                 mItemsView = new BodyItemsRvView(mContext, mParams);
 
-            mRoot.addView(mItemsView.getView());
         }
+        if (mItemsView != null)
+            mRoot.addView(mItemsView.getView());
         return mItemsView;
     }
 
diff --git a/config.gradle b/config.gradle
@@ -15,6 +15,7 @@ ext {
             // support
             appcompatV7  : "com.android.support:appcompat-v7:${dependVersion.support}",
             recyclerview : "com.android.support:recyclerview-v7:${dependVersion.support}",
+            cardview : "com.android.support:cardview-v7:${dependVersion.support}",
             leakcanary   : "com.squareup.leakcanary:leakcanary-android:1.5.4",
             lottie       : "com.airbnb.android:lottie:2.5.4",
             baseRvAdapter: "com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.40"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`google()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.1.2'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`11`	`11`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ dependencies {`
`28`	`28`	`compileOnly rootProject.ext.dependencies.appcompatV7`
`29`	`29`	`compileOnly rootProject.ext.dependencies.recyclerview`
`30`	`30`	`compileOnly rootProject.ext.dependencies.lottie`
	`31`	`+ compileOnly rootProject.ext.dependencies.cardview`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`publish {`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,9 @@ public ItemsView buildItems() {`
`85`	`85`	`else if (mParams.rvItemListener != null \|\| mParams.itemsParams.adapterRv != null)`
`86`	`86`	`mItemsView = new BodyItemsRvView(mContext, mParams);`
`87`	`87`
`88`		`- mRoot.addView(mItemsView.getView());`
`89`	`88`	`}`
	`89`	`+ if (mItemsView != null)`
	`90`	`+ mRoot.addView(mItemsView.getView());`
`90`	`91`	`return mItemsView;`
`91`	`92`	`}`
`92`	`93`