Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(origin): fix ui bug #90

Merged
merged 2 commits into from
Jun 29, 2022
Merged

fix(origin): fix ui bug #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b12dcf1
fix(origin): fix ui bug
Kokomi7QAQ Jun 29, 2022
ff58a0b
fix(origin): fix refresh bug
Kokomi7QAQ Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions origin/src/main/java/com/kokomi/origin/explore/flow/NewsFlowAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
9 changes: 7 additions & 2 deletions origin/src/main/java/com/kokomi/origin/explore/flow/NewsFlowFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
})
Expand All @@ -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)
}
Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions origin/src/main/java/com/kokomi/origin/player/PlayerPool.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -41,7 +41,7 @@ class PlayerPool(
setMediaItem(MediaItem.fromUrl(url))
prepare()
}
nextBufferKey = (nextBufferKey + 1) % size
nextBufferKey = (nextBufferKey + 1) % (size - 1)
}

private var autoPlay = true
Expand Down