Merge pull request #33 from igalata/feature/adapter

adapter implemented

Author: igalata

app/src/main/java/com/igalata/bubblepickerdemo/DemoActivity.kt

@@ -7,10 +7,10 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
 import android.widget.Toast
 import com.igalata.bubblepicker.BubblePickerListener
+import com.igalata.bubblepicker.adapter.BubblePickerAdapter
 import com.igalata.bubblepicker.model.BubbleGradient
 import com.igalata.bubblepicker.model.PickerItem
 import kotlinx.android.synthetic.main.activity_demo.*
-import java.util.*
 
 /**
  * Created by irinagalata on 1/19/17.
@@ -43,15 +43,20 @@ class DemoActivity : AppCompatActivity() {
         val colors = resources.obtainTypedArray(R.array.colors)
         val images = resources.obtainTypedArray(R.array.images)
 
-        picker.items = ArrayList()
+        picker.adapter = object : BubblePickerAdapter {
 
-        titles.forEachIndexed { i, country ->
-            picker.items?.add(PickerItem(country,
-                    gradient = BubbleGradient(colors.getColor((i * 2) % 8, 0), colors.getColor((i * 2) % 8 + 1, 0),
-                            BubbleGradient.VERTICAL),
-                    typeface = mediumTypeface,
-                    textColor = ContextCompat.getColor(this, android.R.color.white),
-                    backgroundImage = ContextCompat.getDrawable(this, images.getResourceId(i, 0))))
+            override val totalCount = titles.size
+
+            override fun getItem(position: Int): PickerItem {
+                return PickerItem().apply {
+                    title = titles[position]
+                    gradient = BubbleGradient(colors.getColor((position * 2) % 8, 0),
+                            colors.getColor((position * 2) % 8 + 1, 0), BubbleGradient.VERTICAL)
+                    typeface = mediumTypeface
+                    textColor = ContextCompat.getColor(this@DemoActivity, android.R.color.white)
+                    backgroundImage = ContextCompat.getDrawable(this@DemoActivity, images.getResourceId(position, 0))
+                }
+            }
         }
 
         colors.recycle()

bubblepicker/src/main/java/com/igalata/bubblepicker/adapter/BubblePickerAdapter.kt

@@ -0,0 +1,14 @@
+package com.igalata.bubblepicker.adapter
+
+import com.igalata.bubblepicker.model.PickerItem
+
+/**
+ * Created by irinagalata on 5/22/17.
+ */
+interface BubblePickerAdapter {
+
+    val totalCount: Int
+
+    fun getItem(position: Int): PickerItem
+
+}

bubblepicker/src/main/java/com/igalata/bubblepicker/model/PickerItem.kt

@@ -7,14 +7,14 @@ import android.support.annotation.ColorInt
 /**
  * Created by irinagalata on 1/19/17.
  */
-data class PickerItem @JvmOverloads constructor(val title: String? = null,
-                                                val icon: Drawable? = null,
-                                                val iconOnTop: Boolean = true,
-                                                @ColorInt val color: Int? = null,
-                                                val gradient: BubbleGradient? = null,
-                                                val overlayAlpha: Float = 0.5f,
-                                                val typeface: Typeface = Typeface.DEFAULT,
-                                                @ColorInt val textColor: Int? = null,
-                                                val textSize: Float = 40f,
-                                                val backgroundImage: Drawable? = null,
-                                                val isSelected: Boolean = false)
+data class PickerItem @JvmOverloads constructor(var title: String? = null,
+                                                var icon: Drawable? = null,
+                                                var iconOnTop: Boolean = true,
+                                                @ColorInt var color: Int? = null,
+                                                var gradient: BubbleGradient? = null,
+                                                var overlayAlpha: Float = 0.5f,
+                                                var typeface: Typeface = Typeface.DEFAULT,
+                                                @ColorInt var textColor: Int? = null,
+                                                var textSize: Float = 40f,
+                                                var backgroundImage: Drawable? = null,
+                                                var isSelected: Boolean = false)

bubblepicker/src/main/java/com/igalata/bubblepicker/rendering/BubblePicker.kt

@@ -8,10 +8,9 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import com.igalata.bubblepicker.BubblePickerListener
 import com.igalata.bubblepicker.R
-import com.igalata.bubblepicker.exception.EmptyPickerException
+import com.igalata.bubblepicker.adapter.BubblePickerAdapter
 import com.igalata.bubblepicker.model.Color
 import com.igalata.bubblepicker.model.PickerItem
-import java.util.*
 
 /**
  * Created by irinagalata on 1/19/17.
@@ -23,11 +22,21 @@ class BubblePicker : GLSurfaceView {
             field = value
             renderer.backgroundColor = Color(value)
         }
+    @Deprecated(level = DeprecationLevel.WARNING,
+            message = "Use BubblePickerAdapter for the view setup instead")
     var items: ArrayList<PickerItem>? = null
         set(value) {
             field = value
             renderer.items = value ?: ArrayList()
         }
+    var adapter: BubblePickerAdapter? = null
+        set(value) {
+            field = value
+            if (value != null) {
+                renderer.items = ArrayList((0..value.totalCount - 1)
+                        .map { value.getItem(it) }.toList())
+            }
+        }
     var maxSelectedCount: Int? = null
         set(value) {
             renderer.maxSelectedCount = value
@@ -68,11 +77,6 @@ class BubblePicker : GLSurfaceView {
         attrs?.let { retrieveAttrubutes(attrs) }
     }
 
-    override fun onResume() {
-        super.onResume()
-        if (items?.isEmpty() ?: false) throw EmptyPickerException()
-    }
-
     override fun onTouchEvent(event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {

bubblepicker/src/main/java/com/igalata/bubblepicker/rendering/Item.kt

@@ -85,7 +85,7 @@ data class Item(val pickerItem: PickerItem, val circleBody: CircleBody) {
     private fun drawBackground(canvas: Canvas, withImage: Boolean) {
         val bgPaint = Paint()
         bgPaint.style = Paint.Style.FILL
-        pickerItem.color?.let { bgPaint.color = pickerItem.color }
+        pickerItem.color?.let { bgPaint.color = pickerItem.color!! }
         pickerItem.gradient?.let { bgPaint.shader = gradient }
         if (withImage) bgPaint.alpha = (pickerItem.overlayAlpha * 255).toInt()
         canvas.drawRect(0f, 0f, bitmapSize, bitmapSize, bgPaint)
@@ -95,7 +95,7 @@ data class Item(val pickerItem: PickerItem, val circleBody: CircleBody) {
         if (pickerItem.title == null || pickerItem.textColor == null) return
 
         val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
-            color = pickerItem.textColor
+            color = pickerItem.textColor!!
             textSize = pickerItem.textSize
             typeface = pickerItem.typeface
         }