diff --git a/imagebrowserlibrary/src/main/java/com/maning/imagebrowserlibrary/view/CircleIndicator.java b/imagebrowserlibrary/src/main/java/com/maning/imagebrowserlibrary/view/CircleIndicator.java index eb54216..6acc8df 100644 --- a/imagebrowserlibrary/src/main/java/com/maning/imagebrowserlibrary/view/CircleIndicator.java +++ b/imagebrowserlibrary/src/main/java/com/maning/imagebrowserlibrary/view/CircleIndicator.java @@ -4,20 +4,18 @@ import android.animation.AnimatorInflater; import android.annotation.TargetApi; import android.content.Context; -import android.content.res.TypedArray; import android.database.DataSetObserver; import android.os.Build; - -import androidx.annotation.AnimatorRes; -import androidx.annotation.DrawableRes; -import androidx.viewpager.widget.ViewPager; - import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.view.animation.Interpolator; import android.widget.LinearLayout; +import androidx.annotation.AnimatorRes; +import androidx.annotation.DrawableRes; +import androidx.viewpager.widget.ViewPager; + import com.maning.imagebrowserlibrary.R; /** @@ -64,41 +62,9 @@ public CircleIndicator(Context context, AttributeSet attrs, int defStyleAttr, in } private void init(Context context, AttributeSet attrs) { - handleTypedArray(context, attrs); checkIndicatorConfig(context); - } - - private void handleTypedArray(Context context, AttributeSet attrs) { - if (attrs == null) { - return; - } - - TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MNImageBrowserCircleIndicator); - mIndicatorWidth = - typedArray.getDimensionPixelSize(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_width, -1); - mIndicatorHeight = - typedArray.getDimensionPixelSize(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_height, -1); - mIndicatorMargin = - typedArray.getDimensionPixelSize(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_margin, -1); - - mAnimatorResId = typedArray.getResourceId(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_animator, - R.animator.browser_scale_with_alpha); - mAnimatorReverseResId = - typedArray.getResourceId(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_animator_reverse, 0); - mIndicatorBackgroundResId = - typedArray.getResourceId(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_drawable, - R.drawable.mn_browser_white_radius); - mIndicatorUnselectedBackgroundResId = - typedArray.getResourceId(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_drawable_unselected, - mIndicatorBackgroundResId); - - int orientation = typedArray.getInt(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_orientation, -1); - setOrientation(orientation == VERTICAL ? VERTICAL : HORIZONTAL); - - int gravity = typedArray.getInt(R.styleable.MNImageBrowserCircleIndicator_mn_ibci_gravity, -1); - setGravity(gravity >= 0 ? gravity : Gravity.CENTER); - - typedArray.recycle(); + setGravity(Gravity.CENTER); + setOrientation(HORIZONTAL); } /** diff --git a/imagebrowserlibrary/src/main/res/animator/browser_scale_with_alpha.xml b/imagebrowserlibrary/src/main/res/animator/browser_scale_with_alpha.xml index 8ef7f85..213fac9 100644 --- a/imagebrowserlibrary/src/main/res/animator/browser_scale_with_alpha.xml +++ b/imagebrowserlibrary/src/main/res/animator/browser_scale_with_alpha.xml @@ -12,11 +12,11 @@ android:propertyName="scaleX" android:valueType="floatType" android:valueFrom="1.0" - android:valueTo="1.8"/> + android:valueTo="1.6"/> + android:valueTo="1.6"/> \ No newline at end of file diff --git a/imagebrowserlibrary/src/main/res/values/attrs.xml b/imagebrowserlibrary/src/main/res/values/attrs.xml index ce6f69e..0d2c4cc 100644 --- a/imagebrowserlibrary/src/main/res/values/attrs.xml +++ b/imagebrowserlibrary/src/main/res/values/attrs.xml @@ -1,59 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file