Bläddra i källkod

Optimize drawer.

zhpanvip 5 år sedan
förälder
incheckning
a8930017df

+ 1 - 2
.gitignore

@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+.idea
 .DS_Store
 /build
 /captures

+ 0 - 5
bannerview/src/main/java/com/zhpan/bannerview/indicator/DashIndicatorView.java

@@ -91,11 +91,6 @@ public class DashIndicatorView extends BaseIndicatorView {
         canvas.drawRect(left, 0, left + maxWidth, getSliderHeight(), mPaint);
     }
 
-    public DashIndicatorView setSliderHeight(float sliderHeight) {
-        this.sliderHeight = sliderHeight;
-        return this;
-    }
-
     public float getSliderHeight() {
         if (getIndicatorOptions().getSliderHeight() > 0) {
             return getIndicatorOptions().getSliderHeight();

+ 6 - 6
bannerview/src/main/java/com/zhpan/bannerview/indicator/IndicatorView.java

@@ -7,7 +7,7 @@ import android.util.AttributeSet;
 import androidx.annotation.Nullable;
 
 import com.zhpan.bannerview.indicator.drawer.BaseDrawer;
-import com.zhpan.bannerview.indicator.drawer.DrawerController;
+import com.zhpan.bannerview.indicator.drawer.DrawerProxy;
 import com.zhpan.bannerview.manager.IndicatorOptions;
 
 /**
@@ -20,7 +20,7 @@ import com.zhpan.bannerview.manager.IndicatorOptions;
  */
 public class IndicatorView extends BaseIndicatorView implements IIndicator {
 
-    private DrawerController mDrawerController;
+    private DrawerProxy mDrawerProxy;
 
     public IndicatorView(Context context) {
         this(context, null);
@@ -32,25 +32,25 @@ public class IndicatorView extends BaseIndicatorView implements IIndicator {
 
     public IndicatorView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mDrawerController = new DrawerController(getIndicatorOptions());
+        mDrawerProxy = new DrawerProxy(getIndicatorOptions());
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        BaseDrawer.MeasureResult measureResult = mDrawerController.measure(widthMeasureSpec, heightMeasureSpec);
+        BaseDrawer.MeasureResult measureResult = mDrawerProxy.onMeasure(widthMeasureSpec, heightMeasureSpec);
         setMeasuredDimension(measureResult.getMeasureWidth(), measureResult.getMeasureHeight());
     }
 
     @Override
     public void setIndicatorOptions(IndicatorOptions indicatorOptions) {
         super.setIndicatorOptions(indicatorOptions);
-        mDrawerController.setIndicatorOptions(indicatorOptions);
+        mDrawerProxy.setIndicatorOptions(indicatorOptions);
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        mDrawerController.draw(canvas);
+        mDrawerProxy.onDraw(canvas);
     }
 }

+ 6 - 4
bannerview/src/main/java/com/zhpan/bannerview/indicator/drawer/DrawerController.java → bannerview/src/main/java/com/zhpan/bannerview/indicator/drawer/DrawerProxy.java

@@ -13,11 +13,11 @@ import static com.zhpan.bannerview.constants.IndicatorStyle.DASH;
  *   Description: Indicator Drawer Controller.
  * </pre>
  */
-public class DrawerController {
+public class DrawerProxy implements IDrawer{
     
     private IDrawer mIDrawer;
 
-    public DrawerController(IndicatorOptions indicatorOptions) {
+    public DrawerProxy(IndicatorOptions indicatorOptions) {
         init(indicatorOptions);
     }
 
@@ -36,11 +36,13 @@ public class DrawerController {
         init(indicatorOptions);
     }
 
-    public BaseDrawer.MeasureResult measure(int widthMeasureSpec, int heightMeasureSpec) {
+    @Override
+    public BaseDrawer.MeasureResult onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         return mIDrawer.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
-    public void draw(Canvas canvas) {
+    @Override
+    public void onDraw(Canvas canvas) {
         mIDrawer.onDraw(canvas);
     }
 }