diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index 69d76e435..38e4c3640 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -1,6 +1,8 @@ package org.koitharu.kotatsu.details.ui +import android.app.assist.AssistContent import android.content.Context +import android.os.Build import android.os.Bundle import android.text.SpannedString import android.view.Gravity @@ -80,6 +82,7 @@ import org.koitharu.kotatsu.core.util.ext.observeEvent import org.koitharu.kotatsu.core.util.ext.parentView import org.koitharu.kotatsu.core.util.ext.start import org.koitharu.kotatsu.core.util.ext.textAndVisible +import org.koitharu.kotatsu.core.util.ext.toUriOrNull import org.koitharu.kotatsu.databinding.ActivityDetailsBinding import org.koitharu.kotatsu.databinding.LayoutDetailsTableBinding import org.koitharu.kotatsu.details.data.MangaDetails @@ -204,6 +207,13 @@ class DetailsActivity : addMenuProvider(menuProvider) } + override fun onProvideAssistContent(outContent: AssistContent) { + super.onProvideAssistContent(outContent) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + viewModel.getMangaOrNull()?.publicUrl?.toUriOrNull()?.let { outContent.webUri = it } + } + } + override fun isNsfwContent(): Flow = viewModel.manga.map { it?.contentRating == ContentRating.ADULT } override fun onClick(v: View) { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index 32dba40e5..f771eaaa8 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -1,7 +1,9 @@ package org.koitharu.kotatsu.reader.ui +import android.app.assist.AssistContent import android.content.DialogInterface import android.content.Intent +import android.os.Build import android.os.Bundle import android.view.Gravity import android.view.KeyEvent @@ -47,6 +49,7 @@ import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled import org.koitharu.kotatsu.core.util.ext.observe import org.koitharu.kotatsu.core.util.ext.observeEvent import org.koitharu.kotatsu.core.util.ext.postDelayed +import org.koitharu.kotatsu.core.util.ext.toUriOrNull import org.koitharu.kotatsu.core.util.ext.zipWithPrevious import org.koitharu.kotatsu.databinding.ActivityReaderBinding import org.koitharu.kotatsu.details.ui.pager.pages.PagesSavedObserver @@ -182,6 +185,13 @@ class ReaderActivity : viewModel.onPause() } + override fun onProvideAssistContent(outContent: AssistContent) { + super.onProvideAssistContent(outContent) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + viewModel.getMangaOrNull()?.publicUrl?.toUriOrNull()?.let { outContent.webUri = it } + } + } + override fun isNsfwContent(): Flow = viewModel.isMangaNsfw override fun onIdle() {