Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Higher quality thumbnails #117

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Higher quality thumbnails #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7024a79
Higher quality thumbnails
imashnake0 Jan 8, 2024
1110341
Conditional fallbacks
imashnake0 Jan 9, 2024
f65bac1
Collapsed if-else
imashnake0 Jan 9, 2024
ddb8f9d
Cleanup
imashnake0 Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions api/anilist/src/main/kotlin/com/imashnake/animite/api/anilist/sanitize/media/Media.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import com.imashnake.animite.api.anilist.MediaListQuery
import com.imashnake.animite.api.anilist.MediaQuery
import com.imashnake.animite.api.anilist.type.MediaRankType

private const val HQ_DEFAULT = "hqdefault"
private const val MAX_RES_DEFAULT = "maxresdefault"
private const val SD_DEFAULT = "sddefault"

data class Media(
/** @see MediaQuery.Media.bannerImage */
val bannerImage: String?,
Expand Down Expand Up @@ -54,14 +58,20 @@ data class Media(
* @see MediaQuery.Trailer.site */
val url: String?,
/** @see MediaQuery.Trailer.thumbnail */
val thumbnail: String?,
val thumbnail: Thumbnail,
) {
/** @see MediaQuery.Trailer.thumbnail */
enum class Site(val baseUrl: String) {
YOUTUBE("https://www.youtube.com/watch?v="),
DAILYMOTION("https://www.dailymotion.com/video/"),
UNKNOWN("")
}

data class Thumbnail(
val maxResDefault: String?,
val sdDefault: String?,
val defaultThumbnail: String?
)
}

internal constructor(query: MediaQuery.Media) : this(
Expand Down Expand Up @@ -101,7 +111,17 @@ data class Media(
} else {
Trailer(
url = "${Trailer.Site.valueOf(query.trailer.site.uppercase()).baseUrl}${query.trailer.id}",
thumbnail = query.trailer.thumbnail
thumbnail = with(query.trailer) {
Trailer.Thumbnail(
maxResDefault = thumbnail?.takeIf {
it.contains(HQ_DEFAULT)
}?.replace(HQ_DEFAULT, MAX_RES_DEFAULT),
sdDefault = thumbnail?.takeIf {
it.contains(HQ_DEFAULT)
}?.replace(HQ_DEFAULT, SD_DEFAULT),
defaultThumbnail = thumbnail
)
}
)
}
)
Expand Down
28 changes: 24 additions & 4 deletions app/src/main/java/com/imashnake/animite/features/media/MediaPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ import androidx.compose.material3.SuggestionChip
import androidx.compose.material3.SuggestionChipDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
Expand Down Expand Up @@ -408,16 +412,32 @@ fun MediaTrailer(
modifier = Modifier
.wrapContentSize()
.clip(RoundedCornerShape(dimensionResource(R.dimen.trailer_corner_radius)))
.background(color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.15f))
.clickable {
val appIntent = Intent(Intent.ACTION_VIEW, Uri.parse(trailer.url))
context.startActivity(appIntent)
}
) {
AsyncImage(
model = ImageRequest.Builder(LocalContext.current)
.data(trailer.thumbnail)
var bestThumbnail by rememberSaveable { mutableStateOf(trailer.thumbnail.maxResDefault) }

val model = remember(bestThumbnail) {
ImageRequest.Builder(context)
.data(bestThumbnail)
.apply {
listener(
onError = { _, _ ->
bestThumbnail = if (bestThumbnail?.contains("maxresdefault") == true) {
trailer.thumbnail.sdDefault
} else trailer.thumbnail.defaultThumbnail
}
)
}
.crossfade(Constants.CROSSFADE_DURATION)
.build(),
.build()
}

AsyncImage(
model = model,
contentDescription = stringResource(R.string.trailer),
contentScale = ContentScale.FillWidth,
modifier = Modifier
Expand Down