prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Zakhar Timoshenko
2022-08-07 03:04:00 +03:00
parent 9a22001289 dff17fd11f
commit 78f8407eca
12 changed files with 124 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
View File

@@ -14,17 +14,18 @@ import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.history.domain.HistoryRepository
import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.util.replaceWith
import org.koitharu.kotatsu.utils.ext.requireBitmap
class RecentListFactory(
private val context: Context,
private val historyRepository: HistoryRepository,
private val coil: ImageLoader
private val coil: ImageLoader,
) : RemoteViewsService.RemoteViewsFactory {
private val dataSet = ArrayList<Manga>()
private val transformation = RoundedCornersTransformation(
context.resources.getDimension(R.dimen.appwidget_corner_radius_inner)
context.resources.getDimension(R.dimen.appwidget_corner_radius_inner),
)
private val coverSize = Size(
context.resources.getDimensionPixelSize(R.dimen.widget_cover_width),
@@ -38,9 +39,8 @@ class RecentListFactory(
override fun getItemId(position: Int) = dataSet[position].id
override fun onDataSetChanged() {
dataSet.clear()
val data = runBlocking { historyRepository.getList(0, 10) }
dataSet.addAll(data)
dataSet.replaceWith(data)
}
override fun hasStableIds() = true
@@ -54,7 +54,7 @@ class RecentListFactory(
.data(item.coverUrl)
.size(coverSize)
.transformations(transformation)
.build()
.build(),
).requireBitmap()
}.onSuccess { cover ->
views.setImageViewBitmap(R.id.imageView_cover, cover)
@@ -72,4 +72,4 @@ class RecentListFactory(
override fun getViewTypeCount() = 1
override fun onDestroy() = Unit
}
}

8
app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
View File

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.util.replaceWith
import org.koitharu.kotatsu.utils.ext.requireBitmap
class ShelfListFactory(
@@ -27,7 +28,7 @@ class ShelfListFactory(
private val dataSet = ArrayList<Manga>()
private val config = AppWidgetConfig(context, widgetId)
private val transformation = RoundedCornersTransformation(
context.resources.getDimension(R.dimen.appwidget_corner_radius_inner)
context.resources.getDimension(R.dimen.appwidget_corner_radius_inner),
)
private val coverSize = Size(
context.resources.getDimensionPixelSize(R.dimen.widget_cover_width),
@@ -41,7 +42,6 @@ class ShelfListFactory(
override fun getItemId(position: Int) = dataSet[position].id
override fun onDataSetChanged() {
dataSet.clear()
val data = runBlocking {
val category = config.categoryId
if (category == 0L) {
@@ -50,7 +50,7 @@ class ShelfListFactory(
favouritesRepository.getManga(category)
}
}
dataSet.addAll(data)
dataSet.replaceWith(data)
}
override fun hasStableIds() = true
@@ -65,7 +65,7 @@ class ShelfListFactory(
.data(item.coverUrl)
.size(coverSize)
.transformations(transformation)
.build()
.build(),
).requireBitmap()
}.onSuccess { cover ->
views.setImageViewBitmap(R.id.imageView_cover, cover)