Merge remote-tracking branch 'origin/feature/appwidget' into devel

app/src/main/AndroidManifest.xml

@@ -46,7 +46,12 @@
 			android:label="@string/settings" />
 		<activity
 			android:name=".ui.reader.SimpleSettingsActivity"
-			android:label="@string/settings" />
+			android:label="@string/settings">
+			<intent-filter>
+				<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
+		</activity>
 		<activity android:name=".ui.browser.BrowserActivity" />
 		<activity
 			android:name=".ui.utils.CrashActivity"
@@ -62,6 +67,12 @@
 			android:name=".ui.download.DownloadService"
 			android:foregroundServiceType="dataSync" />
 		<service android:name=".ui.settings.AppUpdateService" />
+		<service
+			android:name=".ui.widget.shelf.ShelfWidgetService"
+			android:permission="android.permission.BIND_REMOTEVIEWS" />
+		<service
+			android:name=".ui.widget.recent.RecentWidgetService"
+			android:permission="android.permission.BIND_REMOTEVIEWS" />
 
 		<provider
 			android:name=".ui.search.MangaSuggestionsProvider"
@@ -76,6 +87,23 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/filepaths" />
 		</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>
+		<receiver android:name=".ui.widget.recent.RecentWidgetProvider"
+			android:label="@string/recent_manga">
+			<intent-filter>
+				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+			</intent-filter>
+			<meta-data android:name="android.appwidget.provider"
+				android:resource="@xml/widget_recent" />
+		</receiver>
 
 	</application>
 

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -25,7 +25,10 @@ import org.koitharu.kotatsu.core.local.cookies.persistence.SharedPrefsCookiePers
 import org.koitharu.kotatsu.core.parser.UserAgentInterceptor
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.domain.MangaLoaderContext
+import org.koitharu.kotatsu.domain.favourites.FavouritesRepository
+import org.koitharu.kotatsu.domain.history.HistoryRepository
 import org.koitharu.kotatsu.ui.utils.AppCrashHandler
+import org.koitharu.kotatsu.ui.widget.WidgetUpdater
 import org.koitharu.kotatsu.utils.CacheUtils
 import java.util.concurrent.TimeUnit
 
@@ -48,6 +51,9 @@ class KotatsuApp : Application() {
 			initErrorHandler()
 		}
 		AppCompatDelegate.setDefaultNightMode(AppSettings(this).theme)
+		val widgetUpdater = WidgetUpdater(applicationContext)
+		FavouritesRepository.subscribe(widgetUpdater)
+		HistoryRepository.subscribe(widgetUpdater)
 	}
 
 	private fun initKoin() {

app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsActivity.kt

@@ -172,7 +172,7 @@ class MangaDetailsActivity : BaseActivity(), MangaDetailsView {
 	companion object {
 
 		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"
 

app/src/main/java/org/koitharu/kotatsu/ui/reader/SimpleSettingsActivity.kt

@@ -4,9 +4,11 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.commit
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.ui.common.BaseActivity
 import org.koitharu.kotatsu.ui.settings.MainSettingsFragment
+import org.koitharu.kotatsu.ui.settings.NetworkSettingsFragment
 import org.koitharu.kotatsu.ui.settings.ReaderSettingsFragment
 
 class SimpleSettingsActivity : BaseActivity() {
@@ -15,10 +17,10 @@ class SimpleSettingsActivity : BaseActivity() {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_settings_simple)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val section = intent?.getIntExtra(EXTRA_SECTION, 0)
 		supportFragmentManager.commit {
-			replace(R.id.container, when(section) {
-				SECTION_READER -> ReaderSettingsFragment()
+			replace(R.id.container, when(intent?.action) {
+				Intent.ACTION_MANAGE_NETWORK_USAGE -> NetworkSettingsFragment()
+				ACTION_READER -> ReaderSettingsFragment()
 				else -> MainSettingsFragment()
 			})
 		}
@@ -26,10 +28,9 @@ class SimpleSettingsActivity : BaseActivity() {
 
 	companion object {
 
-		private const val EXTRA_SECTION = "section"
-		private const val SECTION_READER = 1
+		private const val ACTION_READER = "${BuildConfig.APPLICATION_ID}.action.MANAGE_READER_SETTINGS"
 
 		fun newReaderSettingsIntent(context: Context) = Intent(context, SimpleSettingsActivity::class.java)
-			.putExtra(EXTRA_SECTION, SECTION_READER)
+			.setAction(ACTION_READER)
 	}
 }

app/src/main/java/org/koitharu/kotatsu/ui/settings/NetworkSettingsFragment.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.ui.settings
+
+import android.os.Bundle
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.ui.common.BasePreferenceFragment
+
+class NetworkSettingsFragment : BasePreferenceFragment(R.string.settings) {
+
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+		//TODO https://developer.android.com/training/basics/network-ops/managing
+	}
+}

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

@@ -0,0 +1,31 @@
+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.domain.history.OnHistoryChangeListener
+import org.koitharu.kotatsu.ui.widget.recent.RecentWidgetProvider
+import org.koitharu.kotatsu.ui.widget.shelf.ShelfWidgetProvider
+
+class WidgetUpdater(private val context: Context) : OnFavouritesChangeListener,
+	OnHistoryChangeListener {
+
+	override fun onFavouritesChanged(mangaId: Long) {
+		updateWidget(ShelfWidgetProvider::class.java)
+	}
+
+	override fun onHistoryChanged() {
+		updateWidget(RecentWidgetProvider::class.java)
+	}
+
+	private fun updateWidget(cls: Class<*>) {
+		val intent = Intent(context, cls)
+		intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+		val ids = AppWidgetManager.getInstance(context)
+			.getAppWidgetIds(ComponentName(context, cls))
+		intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
+		context.sendBroadcast(intent)
+	}
+}

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

@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.ui.widget.recent
+
+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.history.HistoryRepository
+import org.koitharu.kotatsu.ui.details.MangaDetailsActivity
+
+class RecentListFactory(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 { HistoryRepository().getList(0, 10) }
+		dataSet.addAll(data)
+	}
+
+	override fun hasStableIds() = true
+
+	override fun getViewAt(position: Int): RemoteViews {
+		val views = RemoteViews(packageName, R.layout.item_recent)
+		val item = dataSet[position]
+		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.imageView_cover, intent)
+		return views
+	}
+
+	override fun getCount() = dataSet.size
+
+	override fun getViewTypeCount() = 1
+
+	override fun onDestroy() {
+	}
+}

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

@@ -0,0 +1,39 @@
+package org.koitharu.kotatsu.ui.widget.recent
+
+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 RecentWidgetProvider : AppWidgetProvider() {
+
+	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, MangaDetailsActivity::class.java)
+			intent.action = MangaDetailsActivity.ACTION_MANGA_VIEW
+			views.setPendingIntentTemplate(R.id.stackView, PendingIntent.getActivity(
+				context,
+				0,
+				intent,
+				PendingIntent.FLAG_UPDATE_CURRENT
+			))
+			views.setEmptyView(R.id.stackView, R.id.textView_holder)
+			appWidgetManager.updateAppWidget(id, views)
+		}
+		appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.stackView)
+	}
+}

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

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.ui.widget.recent
+
+import android.content.Intent
+import android.widget.RemoteViewsService
+
+class RecentWidgetService : RemoteViewsService() {
+
+	override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
+		return RecentListFactory(this, intent)
+	}
+}

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

@@ -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() {
+	}
+}

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

@@ -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)
+	}
+}

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

@@ -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)
+	}
+}

app/src/main/res/layout/item_recent.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/imageView_cover"
+	android:layout_width="92dp"
+	android:layout_height="128dp"
+	android:scaleType="centerCrop"
+	tools:ignore="ContentDescription" />

app/src/main/res/layout/item_shelf.xml

@@ -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>

app/src/main/res/layout/widget_recent.xml

@@ -0,0 +1,23 @@
+<?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">
+
+	<StackView
+		xmlns:tools="http://schemas.android.com/tools"
+		android:id="@+id/stackView"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		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/history_is_empty"
+		android:textColor="?android:textColorPrimary" />
+
+</FrameLayout>

app/src/main/res/layout/widget_shelf.xml

@@ -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>

app/src/main/res/values-ru/strings.xml

@@ -130,4 +130,6 @@
 	<string name="text_categories_holder">Категории помогают упорядочивать избранную мангу. Нажмите «+», чтобы создать категорию</string>
 	<string name="text_history_holder">Здесь будет оборажаться манга, которую Вы читаете. Вы можете найти, что почитать, в боковом меню</string>
 	<string name="text_local_holder">У Вас пока нет сохранённой манги. Вы можете сохранить мангу из онлайн каталога или импортировать из файла</string>
+	<string name="manga_shelf">Полка с мангой</string>
+	<string name="recent_manga">Recent manga</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -131,4 +131,6 @@
 	<string name="text_categories_holder">You can use categories to organize your favourite manga. Press «+» to create a category</string>
 	<string name="text_history_holder">Manga you are reading will be displayed here. You can find what to read in side menu</string>
 	<string name="text_local_holder">You have not any saved manga yet. You can save it from online sources or import from file</string>
+	<string name="manga_shelf">Manga shelf</string>
+	<string name="recent_manga">Recent manga</string>
 </resources>

app/src/main/res/xml/widget_recent.xml

@@ -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_recent"
+	android:minWidth="40dp"
+	android:minHeight="110dp"
+	android:minResizeWidth="40dp"
+	android:minResizeHeight="40dp"
+	android:previewImage="@drawable/ic_appwidget_recent"
+	android:resizeMode="horizontal|vertical"
+	android:updatePeriodMillis="0"
+	android:widgetCategory="home_screen" />

app/src/main/res/xml/widget_shelf.xml

@@ -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" />