Downloads queue activity
parent
77186d271d
commit
e8e95a485b
@ -0,0 +1,101 @@
|
|||||||
|
package org.koitharu.kotatsu.download.ui
|
||||||
|
|
||||||
|
import androidx.core.view.isVisible
|
||||||
|
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.flow.launchIn
|
||||||
|
import kotlinx.coroutines.flow.onEach
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.databinding.ItemDownloadBinding
|
||||||
|
import org.koitharu.kotatsu.download.domain.DownloadManager
|
||||||
|
import org.koitharu.kotatsu.utils.JobStateFlow
|
||||||
|
import org.koitharu.kotatsu.utils.ext.format
|
||||||
|
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
|
||||||
|
import org.koitharu.kotatsu.utils.ext.setIndeterminateCompat
|
||||||
|
|
||||||
|
fun downloadItemAD(
|
||||||
|
scope: CoroutineScope,
|
||||||
|
) = adapterDelegateViewBinding<JobStateFlow<DownloadManager.State>, JobStateFlow<DownloadManager.State>, ItemDownloadBinding>(
|
||||||
|
{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
|
||||||
|
) {
|
||||||
|
|
||||||
|
var job: Job? = null
|
||||||
|
|
||||||
|
bind {
|
||||||
|
job?.cancel()
|
||||||
|
job = item.onEach { state ->
|
||||||
|
binding.textViewTitle.text = state.manga.title
|
||||||
|
binding.imageViewCover.setImageDrawable(
|
||||||
|
state.cover ?: getDrawable(R.drawable.ic_placeholder)
|
||||||
|
)
|
||||||
|
when (state) {
|
||||||
|
is DownloadManager.State.Cancelling -> {
|
||||||
|
binding.textViewStatus.setText(R.string.cancelling_)
|
||||||
|
binding.progressBar.setIndeterminateCompat(true)
|
||||||
|
binding.progressBar.isVisible = true
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
is DownloadManager.State.Done -> {
|
||||||
|
binding.textViewStatus.setText(R.string.download_complete)
|
||||||
|
binding.progressBar.setIndeterminateCompat(false)
|
||||||
|
binding.progressBar.isVisible = false
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
is DownloadManager.State.Error -> {
|
||||||
|
binding.textViewStatus.setText(R.string.error_occurred)
|
||||||
|
binding.progressBar.setIndeterminateCompat(false)
|
||||||
|
binding.progressBar.isVisible = false
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
|
||||||
|
binding.textViewDetails.isVisible = true
|
||||||
|
}
|
||||||
|
is DownloadManager.State.PostProcessing -> {
|
||||||
|
binding.textViewStatus.setText(R.string.processing_)
|
||||||
|
binding.progressBar.setIndeterminateCompat(true)
|
||||||
|
binding.progressBar.isVisible = true
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
is DownloadManager.State.Preparing -> {
|
||||||
|
binding.textViewStatus.setText(R.string.preparing_)
|
||||||
|
binding.progressBar.setIndeterminateCompat(true)
|
||||||
|
binding.progressBar.isVisible = true
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
is DownloadManager.State.Progress -> {
|
||||||
|
binding.textViewStatus.setText(R.string.manga_downloading_)
|
||||||
|
binding.progressBar.setIndeterminateCompat(false)
|
||||||
|
binding.progressBar.isVisible = true
|
||||||
|
binding.progressBar.max = state.max
|
||||||
|
binding.progressBar.setProgressCompat(state.progress, true)
|
||||||
|
binding.textViewPercent.text = (state.percent * 100f).format(1) + "%"
|
||||||
|
binding.textViewPercent.isVisible = true
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
is DownloadManager.State.Queued -> {
|
||||||
|
binding.textViewStatus.setText(R.string.queued)
|
||||||
|
binding.progressBar.setIndeterminateCompat(false)
|
||||||
|
binding.progressBar.isVisible = false
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
is DownloadManager.State.WaitingForNetwork -> {
|
||||||
|
binding.textViewStatus.setText(R.string.waiting_for_network)
|
||||||
|
binding.progressBar.setIndeterminateCompat(false)
|
||||||
|
binding.progressBar.isVisible = false
|
||||||
|
binding.textViewPercent.isVisible = false
|
||||||
|
binding.textViewDetails.isVisible = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.launchIn(scope)
|
||||||
|
}
|
||||||
|
|
||||||
|
onViewRecycled {
|
||||||
|
job?.cancel()
|
||||||
|
job = null
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,58 @@
|
|||||||
|
package org.koitharu.kotatsu.download.ui
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.os.Bundle
|
||||||
|
import androidx.core.graphics.Insets
|
||||||
|
import androidx.core.view.isVisible
|
||||||
|
import androidx.core.view.updatePadding
|
||||||
|
import androidx.lifecycle.lifecycleScope
|
||||||
|
import kotlinx.coroutines.flow.flatMapLatest
|
||||||
|
import kotlinx.coroutines.flow.flowOf
|
||||||
|
import kotlinx.coroutines.flow.launchIn
|
||||||
|
import kotlinx.coroutines.flow.onEach
|
||||||
|
import org.koitharu.kotatsu.base.ui.BaseActivity
|
||||||
|
import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
|
||||||
|
import org.koitharu.kotatsu.download.ui.service.DownloadService
|
||||||
|
import org.koitharu.kotatsu.utils.LifecycleAwareServiceConnection
|
||||||
|
|
||||||
|
class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContentView(ActivityDownloadsBinding.inflate(layoutInflater))
|
||||||
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
val adapter = DownloadsAdapter(lifecycleScope)
|
||||||
|
binding.recyclerView.setHasFixedSize(true)
|
||||||
|
binding.recyclerView.adapter = adapter
|
||||||
|
LifecycleAwareServiceConnection.bindService(
|
||||||
|
this,
|
||||||
|
this,
|
||||||
|
Intent(this, DownloadService::class.java),
|
||||||
|
0
|
||||||
|
).service.flatMapLatest { binder ->
|
||||||
|
(binder as? DownloadService.DownloadBinder)?.downloads ?: flowOf(null)
|
||||||
|
}.onEach {
|
||||||
|
adapter.items = it?.toList().orEmpty()
|
||||||
|
binding.textViewHolder.isVisible = it.isNullOrEmpty()
|
||||||
|
}.launchIn(lifecycleScope)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onWindowInsetsChanged(insets: Insets) {
|
||||||
|
binding.recyclerView.updatePadding(
|
||||||
|
left = insets.left,
|
||||||
|
right = insets.right,
|
||||||
|
bottom = insets.bottom
|
||||||
|
)
|
||||||
|
binding.toolbar.updatePadding(
|
||||||
|
left = insets.left,
|
||||||
|
right = insets.right,
|
||||||
|
top = insets.top
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
fun newIntent(context: Context) = Intent(context, DownloadsActivity::class.java)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
package org.koitharu.kotatsu.download.ui
|
||||||
|
|
||||||
|
import androidx.recyclerview.widget.DiffUtil
|
||||||
|
import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import org.koitharu.kotatsu.download.domain.DownloadManager
|
||||||
|
import org.koitharu.kotatsu.utils.JobStateFlow
|
||||||
|
|
||||||
|
class DownloadsAdapter(
|
||||||
|
scope: CoroutineScope,
|
||||||
|
) : AsyncListDifferDelegationAdapter<JobStateFlow<DownloadManager.State>>(DiffCallback()) {
|
||||||
|
|
||||||
|
init {
|
||||||
|
delegatesManager.addDelegate(downloadItemAD(scope))
|
||||||
|
setHasStableIds(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getItemId(position: Int): Long {
|
||||||
|
return items[position].value.startId.toLong()
|
||||||
|
}
|
||||||
|
|
||||||
|
private class DiffCallback : DiffUtil.ItemCallback<JobStateFlow<DownloadManager.State>>() {
|
||||||
|
|
||||||
|
override fun areItemsTheSame(
|
||||||
|
oldItem: JobStateFlow<DownloadManager.State>,
|
||||||
|
newItem: JobStateFlow<DownloadManager.State>,
|
||||||
|
): Boolean {
|
||||||
|
return oldItem.value.startId == newItem.value.startId
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun areContentsTheSame(
|
||||||
|
oldItem: JobStateFlow<DownloadManager.State>,
|
||||||
|
newItem: JobStateFlow<DownloadManager.State>,
|
||||||
|
): Boolean {
|
||||||
|
return oldItem.value == newItem.value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
package org.koitharu.kotatsu.utils
|
||||||
|
|
||||||
|
import kotlinx.coroutines.Deferred
|
||||||
|
import kotlinx.coroutines.cancelAndJoin
|
||||||
|
import kotlinx.coroutines.coroutineScope
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.flow.launchIn
|
||||||
|
|
||||||
|
class DeferredStateFlow<R, S>(
|
||||||
|
private val stateFlow: StateFlow<S>,
|
||||||
|
private val deferred: Deferred<R>,
|
||||||
|
) : StateFlow<S> by stateFlow, Deferred<R> by deferred {
|
||||||
|
|
||||||
|
suspend fun collectAndAwait(): R {
|
||||||
|
return coroutineScope {
|
||||||
|
val collectJob = launchIn(this)
|
||||||
|
val result = await()
|
||||||
|
collectJob.cancelAndJoin()
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
package org.koitharu.kotatsu.utils
|
||||||
|
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.cancelAndJoin
|
||||||
|
import kotlinx.coroutines.coroutineScope
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.flow.launchIn
|
||||||
|
|
||||||
|
class JobStateFlow<S>(
|
||||||
|
private val stateFlow: StateFlow<S>,
|
||||||
|
private val job: Job,
|
||||||
|
) : StateFlow<S> by stateFlow, Job by job {
|
||||||
|
|
||||||
|
suspend fun collectAndJoin(): Unit {
|
||||||
|
coroutineScope {
|
||||||
|
val collectJob = launchIn(this)
|
||||||
|
join()
|
||||||
|
collectJob.cancelAndJoin()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
package org.koitharu.kotatsu.utils
|
||||||
|
|
||||||
|
import android.app.Activity
|
||||||
|
import android.content.ComponentName
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.ServiceConnection
|
||||||
|
import android.os.IBinder
|
||||||
|
import androidx.lifecycle.DefaultLifecycleObserver
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
|
||||||
|
class LifecycleAwareServiceConnection private constructor(
|
||||||
|
private val host: Activity,
|
||||||
|
) : ServiceConnection, DefaultLifecycleObserver {
|
||||||
|
|
||||||
|
private val serviceStateFlow = MutableStateFlow<IBinder?>(null)
|
||||||
|
|
||||||
|
val service: StateFlow<IBinder?>
|
||||||
|
get() = serviceStateFlow
|
||||||
|
|
||||||
|
override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
|
||||||
|
serviceStateFlow.value = service
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onServiceDisconnected(name: ComponentName?) {
|
||||||
|
serviceStateFlow.value = null
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDestroy(owner: LifecycleOwner) {
|
||||||
|
super.onDestroy(owner)
|
||||||
|
host.unbindService(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
fun bindService(
|
||||||
|
host: Activity,
|
||||||
|
lifecycleOwner: LifecycleOwner,
|
||||||
|
service: Intent,
|
||||||
|
flags: Int,
|
||||||
|
): LifecycleAwareServiceConnection {
|
||||||
|
val connection = LifecycleAwareServiceConnection(host)
|
||||||
|
host.bindService(service, connection, flags)
|
||||||
|
lifecycleOwner.lifecycle.addObserver(connection)
|
||||||
|
return connection
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,12 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.utils
|
|
||||||
|
|
||||||
import kotlinx.coroutines.Job
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
|
|
||||||
class LiveStateFlow<T>(
|
|
||||||
private val stateFlow: StateFlow<T>,
|
|
||||||
private val job: Job,
|
|
||||||
) : StateFlow<T> by stateFlow, Job by job {
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -0,0 +1,47 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/appbar"
|
||||||
|
style="@style/Widget.Kotatsu.AppBar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:elevation="4dp">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
style="@style/Widget.Kotatsu.Toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:clipToPadding="false"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:scrollbars="vertical"
|
||||||
|
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||||
|
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_holder"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_margin="20dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/text_downloads_holder"
|
||||||
|
android:textAppearance="?android:textAppearanceMedium"
|
||||||
|
android:textColor="?android:textColorSecondary"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
@ -0,0 +1,97 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:paddingStart="16dp"
|
||||||
|
android:paddingTop="4dp"
|
||||||
|
android:paddingEnd="16dp"
|
||||||
|
android:paddingBottom="6dp">
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:id="@+id/card_cover"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
app:cardCornerRadius="4dp"
|
||||||
|
app:cardElevation="4dp"
|
||||||
|
app:layout_constraintDimensionRatio="h,1:1"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageView_cover"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:contentDescription="@null"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
tools:src="@tools:sample/backgrounds/scenic" />
|
||||||
|
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_title"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/card_cover"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="@tools:sample/lorem" />
|
||||||
|
|
||||||
|
<com.google.android.material.progressindicator.LinearProgressIndicator
|
||||||
|
android:id="@+id/progressBar"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/card_cover"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/textView_title" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_status"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/card_cover"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/progressBar"
|
||||||
|
tools:text="@string/manga_downloading_" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_percent"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
|
||||||
|
app:layout_constraintBaseline_toBaselineOf="@id/textView_status"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
tools:text="25%" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_details"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="4"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/card_cover"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/textView_status"
|
||||||
|
tools:text="@tools:sample/lorem[3]" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
Loading…
Reference in New Issue