Shelf app widget
This commit is contained in:
@@ -62,8 +62,14 @@
|
|||||||
<service
|
<service
|
||||||
android:name=".ui.download.DownloadService"
|
android:name=".ui.download.DownloadService"
|
||||||
android:foregroundServiceType="dataSync" />
|
android:foregroundServiceType="dataSync" />
|
||||||
|
|
||||||
<service android:name=".ui.settings.AppUpdateService" />
|
<service android:name=".ui.settings.AppUpdateService" />
|
||||||
|
|
||||||
|
<service
|
||||||
|
android:name=".ui.widget.shelf.ShelfWidgetService"
|
||||||
|
android:permission="android.permission.BIND_REMOTEVIEWS">
|
||||||
|
</service>
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".ui.tracker.TrackerJobService"
|
android:name=".ui.tracker.TrackerJobService"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
@@ -83,6 +89,15 @@
|
|||||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
android:resource="@xml/filepaths" />
|
android:resource="@xml/filepaths" />
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
|
<receiver android:name=".ui.widget.shelf.ShelfWidgetProvider"
|
||||||
|
android:label="@string/manga_shelf">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data android:name="android.appwidget.provider"
|
||||||
|
android:resource="@xml/widget_shelf" />
|
||||||
|
</receiver>
|
||||||
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
|
|||||||
@@ -25,8 +25,10 @@ import org.koitharu.kotatsu.core.local.cookies.persistence.SharedPrefsCookiePers
|
|||||||
import org.koitharu.kotatsu.core.parser.UserAgentInterceptor
|
import org.koitharu.kotatsu.core.parser.UserAgentInterceptor
|
||||||
import org.koitharu.kotatsu.core.prefs.AppSettings
|
import org.koitharu.kotatsu.core.prefs.AppSettings
|
||||||
import org.koitharu.kotatsu.domain.MangaLoaderContext
|
import org.koitharu.kotatsu.domain.MangaLoaderContext
|
||||||
|
import org.koitharu.kotatsu.domain.favourites.FavouritesRepository
|
||||||
import org.koitharu.kotatsu.ui.tracker.TrackerJobService
|
import org.koitharu.kotatsu.ui.tracker.TrackerJobService
|
||||||
import org.koitharu.kotatsu.ui.utils.AppCrashHandler
|
import org.koitharu.kotatsu.ui.utils.AppCrashHandler
|
||||||
|
import org.koitharu.kotatsu.ui.widget.WidgetUpdater
|
||||||
import org.koitharu.kotatsu.utils.CacheUtils
|
import org.koitharu.kotatsu.utils.CacheUtils
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
@@ -47,6 +49,8 @@ class KotatsuApp : Application() {
|
|||||||
Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
|
Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
|
||||||
TrackerJobService.setup(this)
|
TrackerJobService.setup(this)
|
||||||
AppCompatDelegate.setDefaultNightMode(AppSettings(this).theme)
|
AppCompatDelegate.setDefaultNightMode(AppSettings(this).theme)
|
||||||
|
val widgetUpdater = WidgetUpdater(applicationContext)
|
||||||
|
FavouritesRepository.subscribe(widgetUpdater)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun initKoin() {
|
private fun initKoin() {
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ class MangaDetailsActivity : BaseActivity(), MangaDetailsView {
|
|||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
private const val EXTRA_MANGA = "manga"
|
private const val EXTRA_MANGA = "manga"
|
||||||
private const val EXTRA_MANGA_ID = "manga_id"
|
const val EXTRA_MANGA_ID = "manga_id"
|
||||||
|
|
||||||
const val ACTION_MANGA_VIEW = "${BuildConfig.APPLICATION_ID}.action.VIEW_MANGA"
|
const val ACTION_MANGA_VIEW = "${BuildConfig.APPLICATION_ID}.action.VIEW_MANGA"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package org.koitharu.kotatsu.ui.widget
|
||||||
|
|
||||||
|
import android.appwidget.AppWidgetManager
|
||||||
|
import android.content.ComponentName
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import org.koitharu.kotatsu.domain.favourites.OnFavouritesChangeListener
|
||||||
|
import org.koitharu.kotatsu.ui.widget.shelf.ShelfWidgetProvider
|
||||||
|
|
||||||
|
class WidgetUpdater(private val context: Context) : OnFavouritesChangeListener {
|
||||||
|
|
||||||
|
override fun onFavouritesChanged(mangaId: Long) {
|
||||||
|
val intent = Intent(context, ShelfWidgetProvider::class.java)
|
||||||
|
intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
|
||||||
|
val ids = AppWidgetManager.getInstance(context)
|
||||||
|
.getAppWidgetIds(ComponentName(context, ShelfWidgetProvider::class.java))
|
||||||
|
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
|
||||||
|
context.sendBroadcast(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
package org.koitharu.kotatsu.ui.widget.shelf
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.widget.RemoteViews
|
||||||
|
import android.widget.RemoteViewsService
|
||||||
|
import androidx.core.graphics.drawable.toBitmap
|
||||||
|
import coil.Coil
|
||||||
|
import coil.api.get
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import okio.IOException
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.core.model.Manga
|
||||||
|
import org.koitharu.kotatsu.domain.favourites.FavouritesRepository
|
||||||
|
import org.koitharu.kotatsu.ui.details.MangaDetailsActivity
|
||||||
|
|
||||||
|
class ShelfListFactory(context: Context, private val intent: Intent) : RemoteViewsService.RemoteViewsFactory {
|
||||||
|
|
||||||
|
private val packageName = context.packageName
|
||||||
|
|
||||||
|
private val dataSet = ArrayList<Manga>()
|
||||||
|
|
||||||
|
override fun onCreate() {
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getLoadingView() = null
|
||||||
|
|
||||||
|
override fun getItemId(position: Int) = dataSet[position].id
|
||||||
|
|
||||||
|
override fun onDataSetChanged() {
|
||||||
|
dataSet.clear()
|
||||||
|
val data = runBlocking { FavouritesRepository().getAllManga(0) }
|
||||||
|
dataSet.addAll(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hasStableIds() = true
|
||||||
|
|
||||||
|
override fun getViewAt(position: Int): RemoteViews {
|
||||||
|
val views = RemoteViews(packageName, R.layout.item_shelf)
|
||||||
|
val item = dataSet[position]
|
||||||
|
views.setTextViewText(R.id.textView_title, item.title)
|
||||||
|
try {
|
||||||
|
val cover = runBlocking {
|
||||||
|
Coil.loader().get(item.coverUrl).toBitmap()
|
||||||
|
}
|
||||||
|
views.setImageViewBitmap(R.id.imageView_cover, cover)
|
||||||
|
} catch (e: IOException) {
|
||||||
|
views.setImageViewResource(R.id.imageView_cover, R.drawable.ic_placeholder)
|
||||||
|
}
|
||||||
|
val intent = Intent()
|
||||||
|
intent.putExtra(MangaDetailsActivity.EXTRA_MANGA_ID, item.id)
|
||||||
|
views.setOnClickFillInIntent(R.id.rootLayout, intent)
|
||||||
|
return views
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getCount() = dataSet.size
|
||||||
|
|
||||||
|
override fun getViewTypeCount() = 1
|
||||||
|
|
||||||
|
override fun onDestroy() {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package org.koitharu.kotatsu.ui.widget.shelf
|
||||||
|
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.appwidget.AppWidgetManager
|
||||||
|
import android.appwidget.AppWidgetProvider
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
|
import android.widget.RemoteViews
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.ui.details.MangaDetailsActivity
|
||||||
|
|
||||||
|
class ShelfWidgetProvider : AppWidgetProvider() {
|
||||||
|
|
||||||
|
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, MangaDetailsActivity::class.java)
|
||||||
|
intent.action = MangaDetailsActivity.ACTION_MANGA_VIEW
|
||||||
|
views.setPendingIntentTemplate(R.id.gridView, PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
0,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT
|
||||||
|
))
|
||||||
|
views.setEmptyView(R.id.gridView, R.id.textView_holder)
|
||||||
|
appWidgetManager.updateAppWidget(id, views)
|
||||||
|
}
|
||||||
|
appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.gridView)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package org.koitharu.kotatsu.ui.widget.shelf
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.widget.RemoteViewsService
|
||||||
|
|
||||||
|
class ShelfWidgetService : RemoteViewsService() {
|
||||||
|
|
||||||
|
override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
|
||||||
|
return ShelfListFactory(this, intent)
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
app/src/main/res/drawable-nodpi/ic_appwidget_shelf.png
Normal file
BIN
app/src/main/res/drawable-nodpi/ic_appwidget_shelf.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 76 KiB |
35
app/src/main/res/layout/item_shelf.xml
Normal file
35
app/src/main/res/layout/item_shelf.xml
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/rootLayout"
|
||||||
|
android:layout_width="92dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:paddingBottom="4dp"
|
||||||
|
tools:ignore="UselessParent">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageView_cover"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="128dp"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_title"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:gravity="center"
|
||||||
|
android:lines="2"
|
||||||
|
android:textColor="?android:textColorPrimary" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
27
app/src/main/res/layout/widget_shelf.xml
Normal file
27
app/src/main/res/layout/widget_shelf.xml
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<GridView
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/gridView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:columnWidth="92dp"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:numColumns="auto_fit"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
tools:listitem="@layout/item_shelf" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_holder"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/you_have_not_favourites_yet"
|
||||||
|
android:textColor="?android:textColorPrimary" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -118,4 +118,5 @@
|
|||||||
<string name="download">Загрузить</string>
|
<string name="download">Загрузить</string>
|
||||||
<string name="read_from_start">Читать с начала</string>
|
<string name="read_from_start">Читать с начала</string>
|
||||||
<string name="restart">Перезапустить</string>
|
<string name="restart">Перезапустить</string>
|
||||||
|
<string name="manga_shelf">Полка с мангой</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -119,4 +119,5 @@
|
|||||||
<string name="download">Download</string>
|
<string name="download">Download</string>
|
||||||
<string name="read_from_start">Read from start</string>
|
<string name="read_from_start">Read from start</string>
|
||||||
<string name="restart">Restart</string>
|
<string name="restart">Restart</string>
|
||||||
|
<string name="manga_shelf">Manga shelf</string>
|
||||||
</resources>
|
</resources>
|
||||||
12
app/src/main/res/xml/widget_shelf.xml
Normal file
12
app/src/main/res/xml/widget_shelf.xml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<appwidget-provider
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:initialLayout="@layout/widget_shelf"
|
||||||
|
android:minWidth="110dp"
|
||||||
|
android:minHeight="110dp"
|
||||||
|
android:minResizeWidth="40dp"
|
||||||
|
android:minResizeHeight="40dp"
|
||||||
|
android:previewImage="@drawable/ic_appwidget_shelf"
|
||||||
|
android:resizeMode="horizontal|vertical"
|
||||||
|
android:updatePeriodMillis="0"
|
||||||
|
android:widgetCategory="home_screen" />
|
||||||
@@ -9,7 +9,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:4.1.0-alpha04'
|
classpath 'com.android.tools.build:gradle:4.1.0-alpha05'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
|||||||
Reference in New Issue
Block a user