diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9ed804995..d3198abc1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,11 @@ - + + + + + diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index e1d38dd08..3afba452c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -25,6 +25,7 @@ import kotlinx.coroutines.withContext import org.koin.android.ext.android.get import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.core.parameter.parametersOf +import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.domain.MangaIntent import org.koitharu.kotatsu.base.ui.BaseFullscreenActivity @@ -342,6 +343,7 @@ class ReaderActivity : BaseFullscreenActivity(), companion object { + const val ACTION_MANGA_READ = "${BuildConfig.APPLICATION_ID}.action.READ_MANGA" private const val EXTRA_STATE = "state" fun newIntent(context: Context, manga: Manga, state: ReaderState?): Intent { diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt b/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt index 7a5b0a308..d112091f0 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt @@ -19,7 +19,7 @@ import org.koin.core.component.inject import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.domain.MangaDataRepository import org.koitharu.kotatsu.core.model.Manga -import org.koitharu.kotatsu.details.ui.DetailsActivity +import org.koitharu.kotatsu.reader.ui.ReaderActivity import org.koitharu.kotatsu.utils.ext.requireBitmap import org.koitharu.kotatsu.utils.ext.safe @@ -86,8 +86,8 @@ class MangaShortcut(private val manga: Manga) : KoinComponent { IconCompat.createWithAdaptiveBitmap(it) } ?: IconCompat.createWithResource(context, R.drawable.ic_shortcut_default)) .setIntent( - DetailsActivity.newIntent(context, manga.id) - .setAction(DetailsActivity.ACTION_MANGA_VIEW) + ReaderActivity.newIntent(context, manga.id, null) + .setAction(ReaderActivity.ACTION_MANGA_READ) ) } diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt index 733885853..bd655b274 100644 --- a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt +++ b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt @@ -8,7 +8,7 @@ import android.content.Intent import android.net.Uri import android.widget.RemoteViews import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.details.ui.DetailsActivity +import org.koitharu.kotatsu.reader.ui.ReaderActivity class RecentWidgetProvider : AppWidgetProvider() { @@ -23,8 +23,8 @@ class RecentWidgetProvider : AppWidgetProvider() { 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, DetailsActivity::class.java) - intent.action = DetailsActivity.ACTION_MANGA_VIEW + val intent = Intent(context, ReaderActivity::class.java) + intent.action = ReaderActivity.ACTION_MANGA_READ views.setPendingIntentTemplate( R.id.stackView, PendingIntent.getActivity( context, diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt index 5b92d7b8e..7d7f9f62a 100644 --- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt +++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt @@ -8,7 +8,7 @@ import android.content.Intent import android.net.Uri import android.widget.RemoteViews import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.details.ui.DetailsActivity +import org.koitharu.kotatsu.reader.ui.ReaderActivity class ShelfWidgetProvider : AppWidgetProvider() { @@ -23,8 +23,8 @@ class ShelfWidgetProvider : AppWidgetProvider() { 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, DetailsActivity::class.java) - intent.action = DetailsActivity.ACTION_MANGA_VIEW + val intent = Intent(context, ReaderActivity::class.java) + intent.action = ReaderActivity.ACTION_MANGA_READ views.setPendingIntentTemplate( R.id.gridView, PendingIntent.getActivity( context,