owen/TVTime
1
0
Fork 0
mirror of https://github.com/owenlejeune/TVTime.git synced 2025-11-08 04:32:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

some fixes for Next MCU extra

Browse Source
This commit is contained in:
Owen LeJeune
2023-07-11 22:11:25 -04:00
parent 19f5ae426f
commit 8d74d6ee53
4 changed files with 116 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/owenlejeune/tvtime/api/nextmcu/NextMCUClient.kt
View File

@@ -8,7 +8,7 @@ import org.koin.core.parameter.parametersOf
class NextMCUClient: KoinComponent {
companion object {
private const val BASE_URL = "https://www.whenisthenextmcufilm.com/"
private const val BASE_URL = "https://dev.whenisthenextmcufilm.com/"
}
private val client: Client by inject { parametersOf(BASE_URL) }

1
app/src/main/java/com/owenlejeune/tvtime/api/nextmcu/model/NextMCU.kt
View File

@@ -7,6 +7,7 @@ import java.util.Date
class NextMCU(
@SerializedName("days_until") val daysUntil: Int,
@SerializedName("title") val title: String,
@SerializedName("id") val id: Int,
@SerializedName("overview") val overview: String,
@SerializedName("poster_url") val posterUrl: String?,
@SerializedName("release_date") val releaseDate: Date,

8
app/src/main/java/com/owenlejeune/tvtime/ui/components/DetailViewCommon.kt
View File

@@ -89,9 +89,11 @@ fun DetailHeader(
)
rating?.let {
RatingView(
progress = rating
)
if (it > 0f) {
RatingView(
progress = rating
)
}
}
}
}

201
app/src/main/java/com/owenlejeune/tvtime/ui/screens/MediaDetailScreen.kt
View File

@@ -377,7 +377,7 @@ private fun MediaViewContent(
mediaItem?.productionCompanies?.firstOrNull { it.name == "Marvel Studios" } != null
&& preferences.showNextMcuProduction
) {
NextMcuProjectCard(appNavController = appNavController)
NextMcuProjectCard(itemId = itemId, appNavController = appNavController)
}
if (windowSize != WindowSizeClass.Expanded) {
@@ -472,11 +472,13 @@ private fun MiscDetails(
.wrapContentHeight()
) {
Text(text = year, color = MaterialTheme.colorScheme.onBackground)
Text(
text = runtime,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(start = 12.dp)
)
if (runtime != "0m") {
Text(
text = runtime,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(start = 12.dp)
)
}
Text(
text = contentRating,
color = MaterialTheme.colorScheme.onBackground,
@@ -870,40 +872,42 @@ fun SimilarContentCard(
val pagingItems = similarContent?.collectAsLazyPagingItems()
pagingItems?.let {
ContentCard(
modifier = modifier,
title = stringResource(id = R.string.recommended_label)
) {
LazyRow(
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight()
.padding(vertical = 16.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp)
if (it.itemCount > 0) {
ContentCard(
modifier = modifier,
title = stringResource(id = R.string.recommended_label)
) {
item {
Spacer(modifier = Modifier.width(8.dp))
}
lazyPagingItems(pagingItems) { item ->
item?.let {
TwoLineImageTextCard(
title = item.title,
modifier = Modifier
.width(124.dp)
.wrapContentHeight(),
imageUrl = TmdbUtils.getFullPosterPath(item),
onItemClicked = {
appNavController.navigate(
AppNavItem.DetailView.withArgs(mediaType, item.id)
)
},
placeholder = Icons.Filled.Movie,
hideSubtitle = true
)
LazyRow(
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight()
.padding(vertical = 16.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp)
) {
item {
Spacer(modifier = Modifier.width(8.dp))
}
lazyPagingItems(pagingItems) { item ->
item?.let {
TwoLineImageTextCard(
title = item.title,
modifier = Modifier
.width(124.dp)
.wrapContentHeight(),
imageUrl = TmdbUtils.getFullPosterPath(item),
onItemClicked = {
appNavController.navigate(
AppNavItem.DetailView.withArgs(mediaType, item.id)
)
},
placeholder = Icons.Filled.Movie,
hideSubtitle = true
)
}
}
item {
Spacer(modifier = Modifier.width(8.dp))
}
}
item {
Spacer(modifier = Modifier.width(8.dp))
}
}
}
@@ -1099,6 +1103,7 @@ private fun WatchProviderContainer(
@Composable
private fun NextMcuProjectCard(
itemId: Int,
appNavController: NavController,
modifier: Modifier = Modifier
) {
@@ -1110,70 +1115,82 @@ private fun NextMcuProjectCard(
val nextMcuProject = remember { viewModel.nextMcuProject }
Card(
shape = RoundedCornerShape(10.dp),
elevation = CardDefaults.cardElevation(defaultElevation = 10.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = modifier.then(Modifier
.fillMaxWidth()
)
) {
Box(
modifier = Modifier.height(250.dp)
if (nextMcuProject.value?.id != itemId) {
Card(
shape = RoundedCornerShape(10.dp),
elevation = CardDefaults.cardElevation(defaultElevation = 10.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = modifier.then(Modifier
.fillMaxWidth()
.clickable {
nextMcuProject.value?.let {
appNavController.navigate(
AppNavItem.DetailView.withArgs(
it.type,
it.id
)
)
}
}
)
) {
val model = ImageRequest.Builder(LocalContext.current)
.data(nextMcuProject.value?.posterUrl)
.diskCacheKey(nextMcuProject.value?.title)
.networkCachePolicy(CachePolicy.ENABLED)
.memoryCachePolicy(CachePolicy.ENABLED)
.build()
Column(
modifier = Modifier.padding(all = 8.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
Box(
modifier = Modifier.height(250.dp)
) {
Text(
text = stringResource(R.string.next_in_the_mcu_title),
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.W700,
modifier = Modifier.padding(start = 2.dp)
)
val model = ImageRequest.Builder(LocalContext.current)
.data(nextMcuProject.value?.posterUrl)
.diskCacheKey(nextMcuProject.value?.title)
.networkCachePolicy(CachePolicy.ENABLED)
.memoryCachePolicy(CachePolicy.ENABLED)
.build()
Row(
horizontalArrangement = Arrangement.spacedBy(12.dp)
Column(
modifier = Modifier.padding(all = 8.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
AsyncImage(
model = model,
modifier = Modifier
.aspectRatio(0.7f)
.clip(RoundedCornerShape(10.dp)),
contentDescription = nextMcuProject.value?.title
Text(
text = stringResource(R.string.next_in_the_mcu_title),
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.W700,
modifier = Modifier.padding(start = 2.dp)
)
Column(
verticalArrangement = Arrangement.spacedBy(6.dp)
Row(
horizontalArrangement = Arrangement.spacedBy(12.dp)
) {
Text(
text = nextMcuProject.value?.title ?: "",
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.W600
AsyncImage(
model = model,
modifier = Modifier
.aspectRatio(0.7f)
.clip(RoundedCornerShape(10.dp)),
contentDescription = nextMcuProject.value?.title
)
val releaseDate =
nextMcuProject.value?.releaseDate?.format(DateFormat.MMMM_dd) ?: ""
val daysLeft = stringResource(
id = R.string.days_left,
nextMcuProject.value?.daysUntil ?: -1
)
Text(
text = "$releaseDate • $daysLeft",
fontStyle = FontStyle.Italic
)
Column(
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
text = nextMcuProject.value?.title ?: "",
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.W600
)
Text(
text = nextMcuProject.value?.overview ?: "",
overflow = TextOverflow.Ellipsis
)
val releaseDate =
nextMcuProject.value?.releaseDate?.format(DateFormat.MMMM_dd) ?: ""
val daysLeft = stringResource(
id = R.string.days_left,
nextMcuProject.value?.daysUntil ?: -1
)
Text(
text = "$releaseDate • $daysLeft",
fontStyle = FontStyle.Italic
)
Text(
text = nextMcuProject.value?.overview ?: "",
overflow = TextOverflow.Ellipsis
)
}
}
}
}