From a8cfdfac07ccd622d80a7ae4e3e06e4bb5580f78 Mon Sep 17 00:00:00 2001
From: KienHT <kienhantrung@gmail.com>
Date: Fri, 20 Jul 2018 15:32:11 +0700
Subject: [PATCH] handle sync and async data

---
 app/src/main/AndroidManifest.xml              |  4 +
 .../com/kienht/bubble_picker/AsyncActivity.kt | 84 +++++++++++++++++++
 .../com/kienht/bubble_picker/MainActivity.kt  | 64 +++-----------
 .../com/kienht/bubble_picker/SyncActivity.kt  | 73 ++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 18 +++-
 app/src/main/res/layout/async_activity.xml    |  9 ++
 app/src/main/res/layout/sync_activity.xml     | 15 ++++
 .../com/kienht/bubblepicker/physics/Engine.kt |  2 +-
 .../bubblepicker/rendering/BubblePicker.kt    | 60 ++++++-------
 .../bubblepicker/rendering/PickerRenderer.kt  | 15 ++--
 10 files changed, 248 insertions(+), 96 deletions(-)
 create mode 100644 app/src/main/java/com/kienht/bubble_picker/AsyncActivity.kt
 create mode 100644 app/src/main/java/com/kienht/bubble_picker/SyncActivity.kt
 create mode 100644 app/src/main/res/layout/async_activity.xml
 create mode 100644 app/src/main/res/layout/sync_activity.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9be394..0ff45b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,12 +11,16 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
+
+        </activity>
+        <activity android:name=".SyncActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".AsyncActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/kienht/bubble_picker/AsyncActivity.kt b/app/src/main/java/com/kienht/bubble_picker/AsyncActivity.kt
new file mode 100644
index 0000000..4ce80b6
--- /dev/null
+++ b/app/src/main/java/com/kienht/bubble_picker/AsyncActivity.kt
@@ -0,0 +1,84 @@
+package com.kienht.bubble_picker
+
+import android.content.res.TypedArray
+import android.os.Bundle
+import android.os.Handler
+import android.support.v7.app.AppCompatActivity
+import android.widget.Toast
+import com.kienht.bubblepicker.BubblePickerListener
+import com.kienht.bubblepicker.adapter.BubblePickerAdapter
+import com.kienht.bubblepicker.model.BubbleGradient
+import com.kienht.bubblepicker.model.PickerItem
+import com.kienht.bubblepicker.rendering.BubblePicker
+
+/**
+ * @author kienht
+ * @since 20/07/2018
+ */
+class AsyncActivity : AppCompatActivity(), BubblePickerListener {
+
+    lateinit var images: TypedArray
+    lateinit var colors: TypedArray
+
+    private var picker: BubblePicker? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.async_activity)
+
+        val titles = resources.getStringArray(R.array.countries)
+        colors = resources.obtainTypedArray(R.array.colors)
+        images = resources.obtainTypedArray(R.array.images)
+
+        Handler().postDelayed({
+            picker = BubblePicker(this, null)
+            picker!!.adapter = object : BubblePickerAdapter {
+                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)
+                    }
+                }
+            }
+
+            picker!!.bubbleSize = 10
+            picker!!.listener = this@AsyncActivity
+
+            setContentView(picker)
+
+        }, 3000)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (picker != null) {
+            picker!!.onResume()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (picker != null) {
+            picker!!.onPause()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        colors.resources
+        images.resources
+    }
+
+    override fun onBubbleSelected(item: PickerItem) {
+        toast("Selected: " + item.title!!)
+    }
+
+    override fun onBubbleDeselected(item: PickerItem) {
+        toast("Unselected: " + item.title!!)
+    }
+
+    private fun toast(text: String) = Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kienht/bubble_picker/MainActivity.kt b/app/src/main/java/com/kienht/bubble_picker/MainActivity.kt
index 6e7d29e..215f903 100644
--- a/app/src/main/java/com/kienht/bubble_picker/MainActivity.kt
+++ b/app/src/main/java/com/kienht/bubble_picker/MainActivity.kt
@@ -1,16 +1,8 @@
 package com.kienht.bubble_picker
 
-import android.content.res.TypedArray
+import android.content.Intent
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
-import android.os.Handler
-import android.support.v4.content.ContextCompat
-import android.util.Log
-import android.widget.Toast
-import com.kienht.bubblepicker.BubblePickerListener
-import com.kienht.bubblepicker.adapter.BubblePickerAdapter
-import com.kienht.bubblepicker.model.BubbleGradient
-import com.kienht.bubblepicker.model.PickerItem
 import kotlinx.android.synthetic.main.activity_main.*
 
 /**
@@ -19,56 +11,20 @@ import kotlinx.android.synthetic.main.activity_main.*
  */
 class MainActivity : AppCompatActivity() {
 
-    lateinit var images: TypedArray
-    lateinit var colors: TypedArray
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        val titles = resources.getStringArray(R.array.countries)
-        colors = resources.obtainTypedArray(R.array.colors)
-        images = resources.obtainTypedArray(R.array.images)
-
-        picker.adapter = object : BubblePickerAdapter {
-            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)
-                }
-            }
-        }
-
-        picker.bubbleSize = 10
-        picker.listener = object : BubblePickerListener {
-            override fun onBubbleDeselected(item: PickerItem) {
-                toast("Unselected: " + item.title!!)
-            }
 
-            override fun onBubbleSelected(item: PickerItem) {
-                toast("Selected: " + item.title!!)
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        picker.onResume()
-    }
+        setContentView(R.layout.activity_main)
 
-    override fun onPause() {
-        super.onPause()
-        picker.onPause()
-    }
+        button_sync_activity.setOnClickListener({
+            val intent = Intent(this@MainActivity, SyncActivity::class.java)
+            startActivity(intent)
+        })
 
-    override fun onDestroy() {
-        super.onDestroy()
-        colors.resources
-        images.resources
+        button_async_activity.setOnClickListener({
+            val intent = Intent(this@MainActivity, AsyncActivity::class.java)
+            startActivity(intent)
+        })
     }
 
-    private fun toast(text: String) = Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
 }
diff --git a/app/src/main/java/com/kienht/bubble_picker/SyncActivity.kt b/app/src/main/java/com/kienht/bubble_picker/SyncActivity.kt
new file mode 100644
index 0000000..0a99ea3
--- /dev/null
+++ b/app/src/main/java/com/kienht/bubble_picker/SyncActivity.kt
@@ -0,0 +1,73 @@
+package com.kienht.bubble_picker
+
+import android.content.res.TypedArray
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.widget.Toast
+import com.kienht.bubblepicker.BubblePickerListener
+import com.kienht.bubblepicker.adapter.BubblePickerAdapter
+import com.kienht.bubblepicker.model.BubbleGradient
+import com.kienht.bubblepicker.model.PickerItem
+import kotlinx.android.synthetic.main.sync_activity.*
+
+/**
+ * @author kienht
+ * @since 20/07/2018
+ */
+class SyncActivity : AppCompatActivity() {
+
+    lateinit var images: TypedArray
+    lateinit var colors: TypedArray
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.sync_activity)
+
+        val titles = resources.getStringArray(R.array.countries)
+        colors = resources.obtainTypedArray(R.array.colors)
+        images = resources.obtainTypedArray(R.array.images)
+
+        picker.adapter = object : BubblePickerAdapter {
+            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)
+                    imgUrl = "http://sohanews.sohacdn.com/2018/4/11/hat9-1523392964439195574255.jpg"
+                }
+            }
+        }
+
+        picker.bubbleSize = 10
+        picker.listener = object : BubblePickerListener {
+            override fun onBubbleDeselected(item: PickerItem) {
+                toast("Unselected: " + item.title!!)
+            }
+
+            override fun onBubbleSelected(item: PickerItem) {
+                toast("Selected: " + item.title!!)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        picker.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        picker.onPause()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        colors.resources
+        images.resources
+    }
+
+    private fun toast(text: String) = Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fbc81ef..0d2b5ef 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,13 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingLeft="50dp"
+    android:paddingRight="50dp"
     android:background="@android:color/white"
+
+    android:gravity="center"
     android:orientation="vertical">
 
-    <com.kienht.bubblepicker.rendering.BubblePicker
-        android:id="@+id/picker"
+    <Button
+        android:id="@+id/button_sync_activity"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:backgroundColor="@android:color/white" />
+        android:layout_height="wrap_content"
+        android:text="SYNC DATA ACTIVITY" />
 
+    <Button
+        android:id="@+id/button_async_activity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="ASYNC DATA ACTIVITY" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/async_activity.xml b/app/src/main/res/layout/async_activity.xml
new file mode 100644
index 0000000..e99e842
--- /dev/null
+++ b/app/src/main/res/layout/async_activity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sync_activity.xml b/app/src/main/res/layout/sync_activity.xml
new file mode 100644
index 0000000..d1d94c0
--- /dev/null
+++ b/app/src/main/res/layout/sync_activity.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <com.kienht.bubblepicker.rendering.BubblePicker
+        android:id="@+id/picker"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:backgroundColor="@android:color/white" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/bubblepicker/src/main/java/com/kienht/bubblepicker/physics/Engine.kt b/bubblepicker/src/main/java/com/kienht/bubblepicker/physics/Engine.kt
index 1e92a4e..e4f9cf1 100755
--- a/bubblepicker/src/main/java/com/kienht/bubblepicker/physics/Engine.kt
+++ b/bubblepicker/src/main/java/com/kienht/bubblepicker/physics/Engine.kt
@@ -46,7 +46,7 @@ object Engine {
 
     fun build(bodiesCount: Int, scaleX: Float, scaleY: Float): List<CircleBody> {
         val density = interpolate(0.8f, 0.2f, radius / 100f)
-        for (i in 0..bodiesCount - 1) {
+        for (i in 0 until bodiesCount) {
             val x = if (Random().nextBoolean()) -startX else startX
             val y = if (Random().nextBoolean()) -0.5f / scaleY else 0.5f / scaleY
             bodies.add(CircleBody(world, Vec2(x, y), bubbleRadius * scaleX, (bubbleRadius * scaleX) * 1.3f, density,
diff --git a/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/BubblePicker.kt b/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/BubblePicker.kt
index efb92be..05ca858 100755
--- a/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/BubblePicker.kt
+++ b/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/BubblePicker.kt
@@ -7,6 +7,7 @@ import android.support.annotation.ColorInt
 import android.util.AttributeSet
 import android.util.Log
 import android.view.MotionEvent
+import android.view.View
 import com.kienht.bubblepicker.BubblePickerListener
 import com.kienht.bubblepicker.R
 import com.kienht.bubblepicker.adapter.BubblePickerAdapter
@@ -16,8 +17,8 @@ import com.kienht.bubblepicker.model.PickerItem
 /**
  * Created by irinagalata on 1/19/17.
  */
-class BubblePicker : GLSurfaceView {
-    val renderer = PickerRenderer(this)
+class BubblePicker(context: Context?, attrs: AttributeSet?) : GLSurfaceView(context, attrs) {
+    private lateinit var renderer: PickerRenderer
 
     @ColorInt
     var background: Int = 0
@@ -26,37 +27,21 @@ class BubblePicker : GLSurfaceView {
             renderer.backgroundColor = Color(value)
         }
 
-    var isStarted: Boolean = false
-
     var datas: List<PickerItem> = ArrayList()
         set(value) {
             field = value
-            renderer.items = value
+            renderer.pickerList = value
             onResume()
         }
 
-    override fun onResume() {
-        if (!isStarted && renderer.items != null && renderer.items!!.isNotEmpty()) {
-            super.onResume()
-            isStarted = true
-        }
-    }
-
-    override fun onPause() {
-        if (isStarted && renderer.items!!.isNotEmpty()) {
-            super.onPause()
-            isStarted = false
-        }
-    }
-
     var adapter: BubblePickerAdapter? = null
         set(value) {
             field = value
             if (value != null) {
-                renderer.items = ArrayList((0 until value.totalCount)
+                renderer.pickerList = ArrayList((0 until value.totalCount)
                         .map { value.getItem(it) }.toList())
-                onResume()
             }
+            onResume()
         }
 
     var maxSelectedCount: Int? = null
@@ -85,26 +70,31 @@ class BubblePicker : GLSurfaceView {
             renderer.centerImmediately = value
         }
 
-    private var startX = 0f
-    private var startY = 0f
-    private var previousX = 0f
-    private var previousY = 0f
     var isAlwaysSelected = true
         set(value) {
             field = value
             renderer.isAlwaysSelected = value
         }
 
-    constructor(context: Context?) : this(context, null)
-    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
+    private var startX = 0f
+    private var startY = 0f
+    private var previousX = 0f
+    private var previousY = 0f
+
+    init {
+        init()
+        attrs?.let { retrieveAttrubutes(attrs) }
+    }
+
+    private fun init() {
+        renderer = PickerRenderer(this)
+
         setZOrderOnTop(true)
         setEGLContextClientVersion(2)
         setEGLConfigChooser(8, 8, 8, 8, 16, 0)
         holder.setFormat(PixelFormat.RGBA_8888)
         setRenderer(renderer)
         renderMode = RENDERMODE_CONTINUOUSLY
-        attrs?.let { retrieveAttrubutes(attrs) }
-
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -154,4 +144,16 @@ class BubblePicker : GLSurfaceView {
         array.recycle()
     }
 
+    override fun onResume() {
+        if (renderer.pickerList.isNotEmpty()) {
+            super.onResume()
+        }
+    }
+
+    override fun onPause() {
+        if (renderer.pickerList.isNotEmpty()) {
+            super.onPause()
+        }
+    }
+
 }
diff --git a/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/PickerRenderer.kt b/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/PickerRenderer.kt
index ee8320b..d45dacf 100755
--- a/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/PickerRenderer.kt
+++ b/bubblepicker/src/main/java/com/kienht/bubblepicker/rendering/PickerRenderer.kt
@@ -3,6 +3,7 @@ package com.kienht.bubblepicker.rendering
 import android.opengl.GLES20
 import android.opengl.GLES20.*
 import android.opengl.GLSurfaceView
+import android.util.Log
 import android.view.View
 import com.kienht.bubblepicker.*
 import com.kienht.bubblepicker.model.Color
@@ -16,7 +17,6 @@ import com.kienht.bubblepicker.rendering.BubbleShader.vertexShader
 import org.jbox2d.common.Vec2
 import java.lang.ref.WeakReference
 import java.nio.FloatBuffer
-import java.util.*
 import javax.microedition.khronos.egl.EGLConfig
 import javax.microedition.khronos.opengles.GL10
 import kotlin.collections.ArrayList
@@ -46,7 +46,7 @@ class PickerRenderer(val glView: View) : GLSurfaceView.Renderer {
 
     var listener: BubblePickerListener? = null
 
-    var items: List<PickerItem> ?= null
+    var pickerList: List<PickerItem> = ArrayList()
 
     val selectedItems: List<PickerItem?>
         get() = Engine.selectedBodies.map { circles.firstOrNull { circle -> circle.circleBody == it }?.pickerItem }
@@ -89,21 +89,20 @@ class PickerRenderer(val glView: View) : GLSurfaceView.Renderer {
         drawFrame()
     }
 
-    private fun initialize() {
-        if(items == null){
+    fun initialize() {
+        if (pickerList.isEmpty()) {
             return
         }
-
         clear()
 
         Engine.centerImmediately = centerImmediately
 
-        Engine.build(items!!.size, scaleX, scaleY)
+        Engine.build(pickerList.size, scaleX, scaleY)
                 .forEachIndexed { index, body ->
-                    circles.add(Item(WeakReference(glView.context), items!![index], body, isAlwaysSelected))
+                    circles.add(Item(WeakReference(glView.context), pickerList[index], body, isAlwaysSelected))
                 }
 
-        items!!.forEach {
+        pickerList.forEach {
             if (circles.isNotEmpty() && (it.isSelected || isAlwaysSelected)) {
                 Engine.resize(circles.first { circle -> circle.pickerItem == it })
             }