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

Use publicUrl instead of url

Browse Source
This commit is contained in:
Koitharu
2021-02-03 07:09:29 +02:00
parent 3357c00578
commit 5bb6eae673
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
View File

@@ -183,7 +183,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(),
} }
R.id.action_browser -> { R.id.action_browser -> {
viewModel.manga.value?.let { viewModel.manga.value?.let {
startActivity(BrowserActivity.newIntent(this, it.url, it.title)) startActivity(BrowserActivity.newIntent(this, it.publicUrl, it.title))
} }
true true
} }

2
app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
View File

@@ -51,7 +51,7 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
private fun onMangaUpdated(manga: Manga) { private fun onMangaUpdated(manga: Manga) {
with(binding) { with(binding) {
imageViewCover.newImageRequest(manga.largeCoverUrl ?: manga.coverUrl) imageViewCover.newImageRequest(manga.largeCoverUrl ?: manga.coverUrl)
.referer(manga.url) .referer(manga.publicUrl)
.fallback(R.drawable.ic_placeholder) .fallback(R.drawable.ic_placeholder)
.placeholderMemoryCacheKey(CoilUtils.metadata(imageViewCover)?.memoryCacheKey) .placeholderMemoryCacheKey(CoilUtils.metadata(imageViewCover)?.memoryCacheKey)
.lifecycle(viewLifecycleOwner) .lifecycle(viewLifecycleOwner)

2
app/src/main/java/org/koitharu/kotatsu/download/DownloadService.kt
View File

@@ -106,7 +106,7 @@ class DownloadService : BaseService() {
output = MangaZip.findInDir(destination, data) output = MangaZip.findInDir(destination, data)
output.prepare(data) output.prepare(data)
val coverUrl = data.largeCoverUrl ?: data.coverUrl val coverUrl = data.largeCoverUrl ?: data.coverUrl
downloadFile(coverUrl, data.url, destination).let { file -> downloadFile(coverUrl, data.publicUrl, destination).let { file ->
output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl)) output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
} }
val chapters = if (chaptersIds == null) { val chapters = if (chaptersIds == null) {

2
app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
View File

@@ -36,7 +36,7 @@ fun mangaGridItemAD(
binding.textViewTitle.text = item.title binding.textViewTitle.text = item.title
imageRequest?.dispose() imageRequest?.dispose()
imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl) imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
.referer(item.manga.url) .referer(item.manga.publicUrl)
.placeholder(R.drawable.ic_placeholder) .placeholder(R.drawable.ic_placeholder)
.fallback(R.drawable.ic_placeholder) .fallback(R.drawable.ic_placeholder)
.error(R.drawable.ic_placeholder) .error(R.drawable.ic_placeholder)

2
app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
View File

@@ -38,7 +38,7 @@ fun mangaListDetailedItemAD(
binding.textViewTitle.text = item.title binding.textViewTitle.text = item.title
binding.textViewSubtitle.textAndVisible = item.subtitle binding.textViewSubtitle.textAndVisible = item.subtitle
imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl) imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
.referer(item.manga.url) .referer(item.manga.publicUrl)
.placeholder(R.drawable.ic_placeholder) .placeholder(R.drawable.ic_placeholder)
.fallback(R.drawable.ic_placeholder) .fallback(R.drawable.ic_placeholder)
.error(R.drawable.ic_placeholder) .error(R.drawable.ic_placeholder)

2
app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
View File

@@ -38,7 +38,7 @@ fun mangaListItemAD(
binding.textViewTitle.text = item.title binding.textViewTitle.text = item.title
binding.textViewSubtitle.textAndVisible = item.subtitle binding.textViewSubtitle.textAndVisible = item.subtitle
imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl) imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl)
.referer(item.manga.url) .referer(item.manga.publicUrl)
.placeholder(R.drawable.ic_placeholder) .placeholder(R.drawable.ic_placeholder)
.fallback(R.drawable.ic_placeholder) .fallback(R.drawable.ic_placeholder)
.error(R.drawable.ic_placeholder) .error(R.drawable.ic_placeholder)

2
app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt
View File

@@ -17,7 +17,7 @@ class ShareHelper(private val context: Context) {
intent.putExtra(Intent.EXTRA_TEXT, buildString { intent.putExtra(Intent.EXTRA_TEXT, buildString {
append(manga.title) append(manga.title)
append("\n \n") append("\n \n")
append(manga.url) append(manga.publicUrl)
}) })
val shareIntent = val shareIntent =
Intent.createChooser(intent, context.getString(R.string.share_s, manga.title)) Intent.createChooser(intent, context.getString(R.string.share_s, manga.title))