Browse Source

Add Drawable Indicator demo.

zhpanvip 5 years ago
parent
commit
9bfadb5b23

+ 12 - 15
app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.kt

@@ -43,25 +43,22 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun getCheckedId(position: Int): Int {
-        var checkedId = R.id.rb_home
-        when (position) {
-            0 -> checkedId = R.id.rb_home
-            1 -> checkedId = R.id.rb_find
-            2 -> checkedId = R.id.rb_add
+        return when (position) {
+            0 -> R.id.rb_home
+            1 -> R.id.rb_find
+            2 -> R.id.rb_add
+            3 -> R.id.rb_others
+            else -> R.id.rb_home
         }
-        return checkedId
     }
 
     private fun setListener() {
-        rg_tab?.setOnCheckedChangeListener { group, checkedId ->
-            if (checkedId == R.id.rb_home) {
-                vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_HOME, false)
-
-            } else if (checkedId == R.id.rb_find) {
-                vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_FIND, false)
-
-            } else if (checkedId == R.id.rb_add) {
-                vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_OTHERS, false)
+        rg_tab?.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_home -> vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_HOME, false)
+                R.id.rb_find -> vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_FIND, false)
+                R.id.rb_add -> vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_INDICATOR, false)
+                R.id.rb_others -> vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_OTHERS, false)
             }
         }
     }

+ 2 - 2
app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt

@@ -16,8 +16,8 @@ class AdapterFragmentPager(fm: FragmentManager) : FragmentPagerAdapter(fm) {
             val fragmentList = SparseArray<BaseFragment>()
             fragmentList.put(PAGE_HOME, HomeFragment.getInstance())
             fragmentList.put(PAGE_FIND, PageFragment.getInstance())
-            fragmentList.put(PAGE_INDICATOR, OthersFragment.getInstance())
-            fragmentList.put(PAGE_OTHERS, IndicatorFragment.getInstance())
+            fragmentList.put(PAGE_INDICATOR, IndicatorFragment.getInstance())
+            fragmentList.put(PAGE_OTHERS, OthersFragment.getInstance())
             return fragmentList
         }
 

+ 2 - 2
app/src/main/java/com/example/zhpan/circleviewpager/view/DrawableIndicator.java

@@ -5,10 +5,10 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 
-import androidx.annotation.DrawableRes;
-import androidx.annotation.Nullable;
 
 import com.zhpan.bannerview.indicator.BaseIndicatorView;
 

+ 12 - 1
app/src/main/res/layout/activity_main.xml

@@ -57,7 +57,18 @@
                 android:text="@string/tab3"
                 android:textColor="@drawable/text_color_selector" />
 
-
+            <RadioButton
+                android:id="@+id/rb_others"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="bottom"
+                android:layout_weight="1"
+                android:button="@null"
+                android:drawableTop="@drawable/tab4_selector"
+                android:gravity="center_horizontal|bottom"
+                android:paddingBottom="@dimen/dp_5"
+                android:text="@string/tab4"
+                android:textColor="@drawable/text_color_selector" />
         </RadioGroup>
 
 

+ 1 - 1
bannerview/build.gradle

@@ -32,7 +32,7 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
 }
 
-version = "2.6.3"
+version = "2.6.4"
 def siteUrl = 'https://github.com/zhpanvip/BannerViewPager'      // 项目的主页
 def gitUrl = 'https://github.com/zhpanvip/BannerViewPager.git'   // Git仓库的url
 group = "com.zhpan.library" // Maven Group ID for the artifact,一般填你唯一的包名