Merge pull request #90 from usagisang/issue-41

fix(origin): fix ui bug

Author: usagisang

origin/src/main/java/com/kokomi/origin/explore/flow/NewsFlowAdapter.kt

@@ -228,6 +228,7 @@ internal class NewsFlowAdapter(
             }
             lifecycleScope.launch {
                 flowCurrentItem.collect {
+                    start.visibility = View.GONE
                     if (it.first == adapterPosition) {
                         playerPool exchange playerView.bindPlayer
                         playerView.onResume()

origin/src/main/java/com/kokomi/origin/explore/flow/NewsFlowFragment.kt

@@ -58,7 +58,12 @@ class NewsFlowFragment<VM : NewsFlowViewModel>(
                 registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
                     override fun onPageSelected(position: Int) {
                         lifecycleScope.launch {
+                            Log.i(TAG, "onPageSelected: $position")
                             flowCurrentItem emit Pair(position, !flowCurrentItem.value.second)
+                            if(refresh) {
+                                refresh = false
+                                pager2.isUserInputEnabled = true
+                            }
                         }
                     }
                 })
@@ -71,7 +76,6 @@ class NewsFlowFragment<VM : NewsFlowViewModel>(
                 news.collect {
                     flowAdapter.notifyDataSetChanged()
                     if (refresh) {
-                        refresh = false
                         Log.i(TAG, "update - refresh")
                         pager2.setCurrentItem(0, false)
                     }
@@ -115,10 +119,11 @@ class NewsFlowFragment<VM : NewsFlowViewModel>(
     private var refresh = false
 
     internal fun refresh() {
+        pager2.isUserInputEnabled = false
         swipe.isRefreshing = true
-        refresh = true
         lifecycleScope.launch {
             viewModel.refresh {
+                refresh = true
                 Log.i(TAG, "refresh - result = $it")
                 swipe.isRefreshing = false
             }

origin/src/main/java/com/kokomi/origin/player/PlayerPool.kt

@@ -20,7 +20,7 @@ class PlayerPool(
 
     private val playerMap by lazy {
         val map = hashMapOf<Int, Player>()
-        for (i in -1 until size) {
+        for (i in -1 until size - 1) {
             val player = GLPlayerBuilder(appContext)
                 .setInfiniteLoop(true)
                 .setRenderFirstFrame(true)
@@ -41,7 +41,7 @@ class PlayerPool(
             setMediaItem(MediaItem.fromUrl(url))
             prepare()
         }
-        nextBufferKey = (nextBufferKey + 1) % size
+        nextBufferKey = (nextBufferKey + 1) % (size - 1)
     }
 
     private var autoPlay = true