Browse Source

Remove deprecated method:
showIndicator(boolean)
disableTouchScroll(boolean).

zhpanvip 4 years ago
parent
commit
480288177d

+ 7 - 6
app/src/main/java/com/example/zhpan/circleviewpager/fragment/HomeFragment.java

@@ -84,7 +84,8 @@ public class HomeFragment extends BaseFragment {
     protected void initView(Bundle savedInstanceState, View view) {
         initRecyclerView(view);
         initRefreshLayout(view);
-        initBanner();
+        initHorizontalBanner();
+        initVerticalBanner();
         fetchData(true);
     }
 
@@ -156,9 +157,7 @@ public class HomeFragment extends BaseFragment {
         return RetrofitGnerator.getApiSerVice().getBannerData().subscribeOn(Schedulers.io());
     }
 
-
-    private void initBanner() {
-        HomeAdapter homeAdapter = new HomeAdapter();
+    private void initHorizontalBanner() {
         mViewPagerHorizontal
                 .setScrollDuration(600)
                 .setOffScreenPageLimit(2)
@@ -171,7 +170,7 @@ public class HomeFragment extends BaseFragment {
                 .disallowInterceptTouchEvent(true)
                 .setIndicatorView(mIndicatorView)   // 这里为了设置标题故用了自定义Indicator,如果无需标题则没必要添加此行代码
                 .setIndicatorSliderColor(getColor(R.color.red_normal_color), getColor(R.color.red_checked_color))
-                .setAdapter(homeAdapter)
+                .setAdapter(new HomeAdapter())
                 .registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
                     @Override
                     public void onPageSelected(int position) {
@@ -182,10 +181,12 @@ public class HomeFragment extends BaseFragment {
                     }
                 })
                 .setOnPageClickListener(this::onPageClicked).create();
+    }
+
+    private void initVerticalBanner() {
         mViewPagerVertical
                 .setAutoPlay(true)
                 .setScrollDuration(500)
-
                 .setLifecycleRegistry(getLifecycle())
                 .setIndicatorStyle(IndicatorStyle.ROUND_RECT)
                 .setIndicatorSlideMode(IndicatorSlideMode.SCALE)

+ 0 - 19
bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java

@@ -991,25 +991,6 @@ public class BannerViewPager<T, VH extends BaseViewHolder<T>> extends RelativeLa
         return this;
     }
 
-    /**
-     * @param showIndicator is show indicator
-     * @deprecated Use {@link #setIndicatorVisibility(int)} instead.
-     */
-    @Deprecated
-    public BannerViewPager<T, VH> showIndicator(boolean showIndicator) {
-        mIndicatorLayout.setVisibility(showIndicator ? VISIBLE : GONE);
-        return this;
-    }
-
-    /**
-     * @deprecated user {@link #setUserInputEnabled(boolean)} instead.
-     */
-    @Deprecated
-    public BannerViewPager<T, VH> disableTouchScroll(boolean disableTouchScroll) {
-        mBannerManager.getBannerOptions().setUserInputEnabled(!disableTouchScroll);
-        return this;
-    }
-
     public BannerViewPager<T, VH> setLifecycleRegistry(Lifecycle lifecycleRegistry) {
         lifecycleRegistry.addObserver(this);
         return this;

+ 0 - 1
bannerview/src/main/java/com/zhpan/bannerview/provider/ScrollDurationManger.java

@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
 
 
 /**
- * source from:https://github.com/youth5201314/banner/blob/master/banner/src/main/java/com/youth/banner/util/ScrollSpeedManger.java
  * thanks:https://github.com/zguop/banner/blob/master/pager2banner/src/main/java/com/to/aboomy/pager2banner/Banner.java
  */
 public class ScrollDurationManger extends LinearLayoutManager {