Merge branch 'feature/nextgen' into feature/sync

app/src/main/java/org/koitharu/kotatsu/widget/AppWidgetModule.kt

@@ -12,4 +12,4 @@ val appWidgetModule
 		single<InvalidationTracker.Observer> { WidgetUpdater(androidContext()) }
 
 		viewModel { ShelfConfigViewModel(get()) }
-	}
+	}

app/src/main/java/org/koitharu/kotatsu/widget/WidgetUpdater.kt

@@ -31,4 +31,4 @@ class WidgetUpdater(
 		intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
 		context.sendBroadcast(intent)
 	}
-}
+}

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

@@ -7,13 +7,14 @@ import android.widget.RemoteViewsService
 import coil.ImageLoader
 import coil.executeBlocking
 import coil.request.ImageRequest
+import coil.size.Size
+import coil.transform.RoundedCornersTransformation
 import kotlinx.coroutines.runBlocking
 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.utils.ext.requireBitmap
-import java.io.IOException
 
 class RecentListFactory(
 	private val context: Context,
@@ -22,9 +23,15 @@ class RecentListFactory(
 ) : RemoteViewsService.RemoteViewsFactory {
 
 	private val dataSet = ArrayList<Manga>()
+	private val transformation = RoundedCornersTransformation(
+		context.resources.getDimension(R.dimen.appwidget_corner_radius_inner)
+	)
+	private val coverSize = Size(
+		context.resources.getDimensionPixelSize(R.dimen.widget_cover_width),
+		context.resources.getDimensionPixelSize(R.dimen.widget_cover_height),
+	)
 
-	override fun onCreate() {
-	}
+	override fun onCreate() = Unit
 
 	override fun getLoadingView() = null
 
@@ -41,14 +48,17 @@ class RecentListFactory(
 	override fun getViewAt(position: Int): RemoteViews {
 		val views = RemoteViews(context.packageName, R.layout.item_recent)
 		val item = dataSet[position]
-		try {
-			val cover = coil.executeBlocking(
+		runCatching {
+			coil.executeBlocking(
 				ImageRequest.Builder(context)
 					.data(item.coverUrl)
+					.size(coverSize)
+					.transformations(transformation)
 					.build()
 			).requireBitmap()
+		}.onSuccess { cover ->
 			views.setImageViewBitmap(R.id.imageView_cover, cover)
-		} catch (e: IOException) {
+		}.onFailure {
 			views.setImageViewResource(R.id.imageView_cover, R.drawable.ic_placeholder)
 		}
 		val intent = Intent()
@@ -61,6 +71,5 @@ class RecentListFactory(
 
 	override fun getViewTypeCount() = 1
 
-	override fun onDestroy() {
-	}
+	override fun onDestroy() = Unit
 }

app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigActivity.kt

@@ -4,15 +4,12 @@ import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.snackbar.Snackbar
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
@@ -26,7 +23,7 @@ import org.koitharu.kotatsu.widget.shelf.model.CategoryItem
 import com.google.android.material.R as materialR
 
 class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(),
-	OnListItemClickListener<CategoryItem> {
+	OnListItemClickListener<CategoryItem>, View.OnClickListener {
 
 	private val viewModel by viewModel<ShelfConfigViewModel>()
 
@@ -41,10 +38,9 @@ class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(),
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		adapter = CategorySelectAdapter(this)
-		binding.recyclerView.addItemDecoration(
-			MaterialDividerItemDecoration(this, RecyclerView.VERTICAL)
-		)
 		binding.recyclerView.adapter = adapter
+		binding.buttonDone.isVisible = true
+		binding.buttonDone.setOnClickListener(this)
 		binding.fabAdd.hide()
 		val appWidgetId = intent?.getIntExtra(
 			AppWidgetManager.EXTRA_APPWIDGET_ID,
@@ -61,23 +57,18 @@ class ShelfConfigActivity : BaseActivity<ActivityCategoriesBinding>(),
 		viewModel.onError.observe(this, this::onError)
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		menuInflater.inflate(R.menu.opt_config, menu)
-		return super.onCreateOptionsMenu(menu)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-		R.id.action_done -> {
-			config.categoryId = viewModel.checkedId
-			updateWidget()
-			setResult(
-				Activity.RESULT_OK,
-				Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId)
-			)
-			finish()
-			true
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_done -> {
+				config.categoryId = viewModel.checkedId
+				updateWidget()
+				setResult(
+					Activity.RESULT_OK,
+					Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId)
+				)
+				finish()
+			}
 		}
-		else -> super.onOptionsItemSelected(item)
 	}
 
 	override fun onItemClick(item: CategoryItem, view: View) {

app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfConfigViewModel.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.widget.shelf
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -8,7 +9,6 @@ import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.widget.shelf.model.CategoryItem
-import java.util.*
 
 class ShelfConfigViewModel(
 	favouritesRepository: FavouritesRepository
@@ -16,7 +16,7 @@ class ShelfConfigViewModel(
 
 	private val selectedCategoryId = MutableStateFlow(0L)
 
-	val content = combine(
+	val content: LiveData<List<CategoryItem>> = combine(
 		favouritesRepository.observeCategories(),
 		selectedCategoryId
 	) { categories, selectedId ->
@@ -26,7 +26,7 @@ class ShelfConfigViewModel(
 			CategoryItem(it.id, it.title, selectedId == it.id)
 		}
 		list
-	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, emptyList())
 
 	var checkedId: Long by selectedCategoryId::value
 }

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

@@ -7,6 +7,8 @@ import android.widget.RemoteViewsService
 import coil.ImageLoader
 import coil.executeBlocking
 import coil.request.ImageRequest
+import coil.size.Size
+import coil.transform.RoundedCornersTransformation
 import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaIntent
@@ -14,20 +16,25 @@ 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.utils.ext.requireBitmap
-import java.io.IOException
 
 class ShelfListFactory(
 	private val context: Context,
 	private val favouritesRepository: FavouritesRepository,
 	private val coil: ImageLoader,
-	widgetId: Int
+	widgetId: Int,
 ) : RemoteViewsService.RemoteViewsFactory {
 
 	private val dataSet = ArrayList<Manga>()
 	private val config = AppWidgetConfig(context, widgetId)
+	private val transformation = RoundedCornersTransformation(
+		context.resources.getDimension(R.dimen.appwidget_corner_radius_inner)
+	)
+	private val coverSize = Size(
+		context.resources.getDimensionPixelSize(R.dimen.widget_cover_width),
+		context.resources.getDimensionPixelSize(R.dimen.widget_cover_height),
+	)
 
-	override fun onCreate() {
-	}
+	override fun onCreate() = Unit
 
 	override fun getLoadingView() = null
 
@@ -52,14 +59,17 @@ class ShelfListFactory(
 		val views = RemoteViews(context.packageName, R.layout.item_shelf)
 		val item = dataSet[position]
 		views.setTextViewText(R.id.textView_title, item.title)
-		try {
-			val cover = coil.executeBlocking(
+		runCatching {
+			coil.executeBlocking(
 				ImageRequest.Builder(context)
 					.data(item.coverUrl)
+					.size(coverSize)
+					.transformations(transformation)
 					.build()
 			).requireBitmap()
+		}.onSuccess { cover ->
 			views.setImageViewBitmap(R.id.imageView_cover, cover)
-		} catch (e: IOException) {
+		}.onFailure {
 			views.setImageViewResource(R.id.imageView_cover, R.drawable.ic_placeholder)
 		}
 		val intent = Intent()