Improve widgets ui #457

2023-08-26 18:35:49 +03:00
parent 2684a7384e
commit 74ca19a931
23 changed files with 440 additions and 82 deletions
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
@@ -55,6 +55,7 @@ class RecentListFactory(
 					.data(item.coverUrl)
 					.size(coverSize)
 					.tag(item.source)
+					.tag(item)
 					.transformations(transformation)
 					.build(),
 			).getDrawableOrThrow().toBitmap()
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentWidgetConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentWidgetConfigActivity.kt
@@ -0,0 +1,74 @@
+package org.koitharu.kotatsu.widget.recent
+
+import android.app.Activity
+import android.appwidget.AppWidgetManager
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityAppwidgetRecentBinding
+import com.google.android.material.R as materialR
+
+@AndroidEntryPoint
+class RecentWidgetConfigActivity :
+	BaseActivity<ActivityAppwidgetRecentBinding>(),
+	View.OnClickListener {
+
+	private lateinit var config: AppWidgetConfig
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityAppwidgetRecentBinding.inflate(layoutInflater))
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+		}
+		viewBinding.buttonDone.setOnClickListener(this)
+		val appWidgetId = intent?.getIntExtra(
+			AppWidgetManager.EXTRA_APPWIDGET_ID,
+			AppWidgetManager.INVALID_APPWIDGET_ID,
+		) ?: AppWidgetManager.INVALID_APPWIDGET_ID
+		if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+			finishAfterTransition()
+			return
+		}
+		config = AppWidgetConfig(this, RecentWidgetProvider::class.java, appWidgetId)
+		viewBinding.switchBackground.isChecked = config.hasBackground
+	}
+
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.button_done -> {
+				config.hasBackground = viewBinding.switchBackground.isChecked
+				updateWidget()
+				setResult(
+					Activity.RESULT_OK,
+					Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId),
+				)
+				finish()
+			}
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom,
+			top = insets.top,
+		)
+	}
+
+	private fun updateWidget() {
+		val intent = Intent(this, RecentWidgetProvider::class.java)
+		intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+		val ids = intArrayOf(config.widgetId)
+		intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
+		sendBroadcast(intent)
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt
@@ -2,43 +2,52 @@ package org.koitharu.kotatsu.widget.recent

 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.widget.RemoteViews
 import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
+import org.koitharu.kotatsu.core.ui.BaseAppWidgetProvider
 import org.koitharu.kotatsu.reader.ui.ReaderActivity

-class RecentWidgetProvider : AppWidgetProvider() {
+class RecentWidgetProvider : BaseAppWidgetProvider() {

 	override fun onUpdate(
 		context: Context,
 		appWidgetManager: AppWidgetManager,
 		appWidgetIds: IntArray
 	) {
-		appWidgetIds.forEach { id ->
-			val views = RemoteViews(context.packageName, R.layout.widget_recent)
-			val adapter = Intent(context, RecentWidgetService::class.java)
-			adapter.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id)
-			adapter.data = Uri.parse(adapter.toUri(Intent.URI_INTENT_SCHEME))
-			views.setRemoteAdapter(R.id.stackView, adapter)
-			val intent = Intent(context, ReaderActivity::class.java)
-			intent.action = ReaderActivity.ACTION_MANGA_READ
-			views.setPendingIntentTemplate(
-				R.id.stackView,
-				PendingIntentCompat.getActivity(
-					context,
-					0,
-					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT,
-					true,
-				),
-			)
-			views.setEmptyView(R.id.stackView, R.id.textView_holder)
-			appWidgetManager.updateAppWidget(id, views)
-		}
+		super.onUpdate(context, appWidgetManager, appWidgetIds)
 		appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.stackView)
 	}
+
+	override fun onUpdateWidget(context: Context, config: AppWidgetConfig): RemoteViews {
+		val views = RemoteViews(context.packageName, R.layout.widget_recent)
+		if (!config.hasBackground) {
+			views.setInt(R.id.widget_root, "setBackgroundColor", Color.TRANSPARENT)
+		} else {
+			views.setInt(R.id.widget_root, "setBackgroundResource", R.drawable.bg_appwidget_root)
+		}
+		val adapter = Intent(context, RecentWidgetService::class.java)
+		adapter.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId)
+		adapter.data = Uri.parse(adapter.toUri(Intent.URI_INTENT_SCHEME))
+		views.setRemoteAdapter(R.id.stackView, adapter)
+		val intent = Intent(context, ReaderActivity::class.java)
+		intent.action = ReaderActivity.ACTION_MANGA_READ
+		views.setPendingIntentTemplate(
+			R.id.stackView,
+			PendingIntentCompat.getActivity(
+				context,
+				0,
+				intent,
+				PendingIntent.FLAG_UPDATE_CURRENT,
+				true,
+			),
+		)
+		views.setEmptyView(R.id.stackView, R.id.textView_holder)
+		return views
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -27,7 +28,7 @@ class ShelfListFactory(
 ) : RemoteViewsService.RemoteViewsFactory {

 	private val dataSet = ArrayList<Manga>()
-	private val config = AppWidgetConfig(context, widgetId)
+	private val config = AppWidgetConfig(context, ShelfWidgetProvider::class.java, widgetId)
 	private val transformation = RoundedCornersTransformation(
 		context.resources.getDimension(R.dimen.appwidget_corner_radius_inner),
 	)
@@ -66,7 +67,8 @@ class ShelfListFactory(
 					.data(item.coverUrl)
 					.size(coverSize)
 					.tag(item.source)
-					.transformations(transformation)
+					.tag(item)
+					.transformations(transformation, TrimTransformation())
 					.build(),
 			).getDrawableOrThrow().toBitmap()
 		}.onSuccess { cover ->
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfWidgetConfigActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfWidgetConfigActivity.kt
@@ -8,7 +8,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.viewModels
 import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
@@ -19,14 +18,14 @@ import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
+import org.koitharu.kotatsu.databinding.ActivityAppwidgetShelfBinding
 import org.koitharu.kotatsu.widget.shelf.adapter.CategorySelectAdapter
 import org.koitharu.kotatsu.widget.shelf.model.CategoryItem
 import com.google.android.material.R as materialR

@AndroidEntryPoint
-class ShelfConfigActivity :
-	BaseActivity<ActivityCategoriesBinding>(),
+class ShelfWidgetConfigActivity :
+	BaseActivity<ActivityAppwidgetShelfBinding>(),
 	OnListItemClickListener<CategoryItem>,
 	View.OnClickListener {

@@ -37,16 +36,14 @@ class ShelfConfigActivity :

 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
+		setContentView(ActivityAppwidgetShelfBinding.inflate(layoutInflater))
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		adapter = CategorySelectAdapter(this)
 		viewBinding.recyclerView.adapter = adapter
-		viewBinding.buttonDone.isVisible = true
 		viewBinding.buttonDone.setOnClickListener(this)
-		viewBinding.fabAdd.hide()
 		val appWidgetId = intent?.getIntExtra(
 			AppWidgetManager.EXTRA_APPWIDGET_ID,
 			AppWidgetManager.INVALID_APPWIDGET_ID,
@@ -55,8 +52,9 @@ class ShelfConfigActivity :
 			finishAfterTransition()
 			return
 		}
-		config = AppWidgetConfig(this, appWidgetId)
+		config = AppWidgetConfig(this, ShelfWidgetProvider::class.java, appWidgetId)
 		viewModel.checkedId = config.categoryId
+		viewBinding.switchBackground.isChecked = config.hasBackground

 		viewModel.content.observe(this, this::onContentChanged)
 		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
@@ -66,6 +64,7 @@ class ShelfConfigActivity :
 		when (v.id) {
 			R.id.button_done -> {
 				config.categoryId = viewModel.checkedId
+				config.hasBackground = viewBinding.switchBackground.isChecked
 				updateWidget()
 				setResult(
 					Activity.RESULT_OK,
@@ -81,11 +80,6 @@ class ShelfConfigActivity :
 	}

 	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.fabAdd.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-			rightMargin = topMargin + insets.right
-			leftMargin = topMargin + insets.left
-			bottomMargin = topMargin + insets.bottom
-		}
 		viewBinding.recyclerView.updatePadding(
 			left = insets.left,
 			right = insets.right,
--- a/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt
@@ -2,43 +2,52 @@ package org.koitharu.kotatsu.widget.shelf

 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.widget.RemoteViews
 import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
+import org.koitharu.kotatsu.core.ui.BaseAppWidgetProvider
 import org.koitharu.kotatsu.reader.ui.ReaderActivity

-class ShelfWidgetProvider : AppWidgetProvider() {
+class ShelfWidgetProvider : BaseAppWidgetProvider() {

 	override fun onUpdate(
 		context: Context,
 		appWidgetManager: AppWidgetManager,
 		appWidgetIds: IntArray
 	) {
-		appWidgetIds.forEach { id ->
-			val views = RemoteViews(context.packageName, R.layout.widget_shelf)
-			val adapter = Intent(context, ShelfWidgetService::class.java)
-			adapter.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id)
-			adapter.data = Uri.parse(adapter.toUri(Intent.URI_INTENT_SCHEME))
-			views.setRemoteAdapter(R.id.gridView, adapter)
-			val intent = Intent(context, ReaderActivity::class.java)
-			intent.action = ReaderActivity.ACTION_MANGA_READ
-			views.setPendingIntentTemplate(
-				R.id.gridView,
-				PendingIntentCompat.getActivity(
-					context,
-					0,
-					intent,
-					PendingIntent.FLAG_UPDATE_CURRENT,
-					true,
-				),
-			)
-			views.setEmptyView(R.id.gridView, R.id.textView_holder)
-			appWidgetManager.updateAppWidget(id, views)
-		}
+		super.onUpdate(context, appWidgetManager, appWidgetIds)
 		appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.gridView)
 	}
+
+	override fun onUpdateWidget(context: Context, config: AppWidgetConfig): RemoteViews {
+		val views = RemoteViews(context.packageName, R.layout.widget_shelf)
+		if (!config.hasBackground) {
+			views.setInt(R.id.widget_root, "setBackgroundColor", Color.TRANSPARENT)
+		} else {
+			views.setInt(R.id.widget_root, "setBackgroundResource", R.drawable.bg_appwidget_root)
+		}
+		val adapter = Intent(context, ShelfWidgetService::class.java)
+		adapter.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId)
+		adapter.data = Uri.parse(adapter.toUri(Intent.URI_INTENT_SCHEME))
+		views.setRemoteAdapter(R.id.gridView, adapter)
+		val intent = Intent(context, ReaderActivity::class.java)
+		intent.action = ReaderActivity.ACTION_MANGA_READ
+		views.setPendingIntentTemplate(
+			R.id.gridView,
+			PendingIntentCompat.getActivity(
+				context,
+				0,
+				intent,
+				PendingIntent.FLAG_UPDATE_CURRENT,
+				true,
+			),
+		)
+		views.setEmptyView(R.id.gridView, R.id.textView_holder)
+		return views
+	}
 }