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

Jump to bottom

[Jetcaster] Fix layout inconsistency in the discovery screen and the library screen #1421

Merged
merged 1 commit into from
Jun 28, 2024
+8 −10
Merged

[Jetcaster] Fix layout inconsistency in the discovery screen and the library screen #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ private fun Route(jetcasterAppState: JetcasterAppState) {
playEpisode = {
jetcasterAppState.playEpisode()
},
modifier = Modifier
.padding(JetcasterAppDefaults.overScanMargin.default.intoPaddingValues())
.fillMaxSize()
modifier = Modifier.fillMaxSize()
)
}
}
Expand All @@ -170,9 +168,7 @@ private fun Route(jetcasterAppState: JetcasterAppState) {
playEpisode = {
jetcasterAppState.playEpisode()
},
modifier = Modifier
.padding(JetcasterAppDefaults.overScanMargin.default.intoPaddingValues())
.fillMaxSize()
modifier = Modifier.fillMaxSize()
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private fun PodcastRow(
podcastList: PodcastList,
onPodcastSelected: (PodcastInfo) -> Unit,
modifier: Modifier = Modifier,
contentPadding: PaddingValues = PaddingValues(),
contentPadding: PaddingValues = JetcasterAppDefaults.padding.podcastRowContentPadding,
horizontalArrangement: Arrangement.Horizontal =
Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow),
) {
Expand Down
2 changes: 1 addition & 1 deletion Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/EpisodeRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal fun EpisodeRow(
modifier: Modifier = Modifier,
horizontalArrangement: Arrangement.Horizontal =
Arrangement.spacedBy(JetcasterAppDefaults.gap.item),
contentPadding: PaddingValues = PaddingValues(),
contentPadding: PaddingValues = JetcasterAppDefaults.padding.episodeRowContentPadding,
focusRequester: FocusRequester = remember { FocusRequester() },
lazyListState: TvLazyListState = remember(playerEpisodeList) { TvLazyListState() }
) {
Expand Down
6 changes: 4 additions & 2 deletions Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/theme/Space.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal data object JetcasterAppDefaults {

internal data class OverScanMarginSettings(
val default: OverScanMargin = OverScanMargin(),
val catalog: OverScanMargin = OverScanMargin(start = 0.dp, end = 0.dp),
val catalog: OverScanMargin = OverScanMargin(end = 0.dp),
val episode: OverScanMargin = OverScanMargin(start = 80.dp, end = 80.dp),
val drawer: OverScanMargin = OverScanMargin(start = 0.dp, end = 0.dp),
val podcast: OverScanMargin = OverScanMargin(
Expand Down Expand Up @@ -74,7 +74,9 @@ internal data class ThumbnailSize(

internal data class PaddingSettings(
val tab: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 6.dp),
val sectionTitle: PaddingValues = PaddingValues(bottom = 16.dp)
val sectionTitle: PaddingValues = PaddingValues(bottom = 16.dp),
val podcastRowContentPadding: PaddingValues = PaddingValues(horizontal = 5.dp),
val episodeRowContentPadding: PaddingValues = PaddingValues(horizontal = 5.dp),
)

internal data class GapSettings(
Expand Down