prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change shortcuts target to reader

Browse Source
This commit is contained in:
Koitharu
2020-12-16 08:32:57 +02:00
parent 904d12f611
commit b8d2fa69c4
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View File

@@ -37,7 +37,11 @@
<action android:name="${applicationId}.action.VIEW_MANGA" />
</intent-filter>
</activity>
<activity android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity" />
<activity android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity">
<intent-filter>
<action android:name="${applicationId}.action.READ_MANGA" />
</intent-filter>
</activity>
<activity
android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
android:label="@string/search" />

2
app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
View File

@@ -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<ActivityReaderBinding>(),
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 {

6
app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt
View File

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

6
app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentWidgetProvider.kt
View File

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

6
app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfWidgetProvider.kt
View File

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