mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 23:51:21 +02:00
SeriesOverview Alignment (#930)
## Description This PR changes the padding on the SeriesOverview to align it with the updated layout on the Home, MovieDetails and SeriesDetails pages. There is also a small change to fix an incorrect spacing on the SeriesDetails, and start padding added to the ItemRow to bring it into alignment with other text elements on the page and ensure consistent spacing from the navdrawer ### Related issues I believe this is the final PR to close out [704](https://github.com/damontecres/Wholphin/discussions/704) ### Testing Tested changes on both the emulator and physical tv ## Screenshots Home screen showing the ItemRow alignment <img width="1920" height="1080" alt="home" src="https://github.com/user-attachments/assets/b338e2b4-2c53-45a1-b532-544263632230" /> SeriesOverview <img width="1920" height="1080" alt="Screenshot_20260221_200450" src="https://github.com/user-attachments/assets/51710ade-5155-41d9-8b89-0678c71e0c76" /> ## AI or LLM usage AI was used to identify the current padding and spacing values
This commit is contained in:
parent
cc052453a4
commit
e8c9b4e208
4 changed files with 12 additions and 9 deletions
|
|
@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.LazyRow
|
import androidx.compose.foundation.lazy.LazyRow
|
||||||
import androidx.compose.foundation.lazy.itemsIndexed
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
|
|
@ -57,7 +58,7 @@ fun <T> ItemRow(
|
||||||
text = title,
|
text = title,
|
||||||
style = MaterialTheme.typography.titleLarge,
|
style = MaterialTheme.typography.titleLarge,
|
||||||
color = MaterialTheme.colorScheme.onBackground,
|
color = MaterialTheme.colorScheme.onBackground,
|
||||||
modifier = Modifier,
|
modifier = Modifier.padding(start = 8.dp),
|
||||||
)
|
)
|
||||||
LazyRow(
|
LazyRow(
|
||||||
state = state,
|
state = state,
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.github.damontecres.wholphin.ui.detail.series
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.focus.FocusState
|
import androidx.compose.ui.focus.FocusState
|
||||||
|
|
@ -31,17 +32,17 @@ fun FocusedEpisodeHeader(
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
) {
|
) {
|
||||||
EpisodeName(dto, modifier = Modifier)
|
EpisodeName(dto, modifier = Modifier.padding(start = 8.dp))
|
||||||
|
|
||||||
ep?.ui?.quickDetails?.let {
|
ep?.ui?.quickDetails?.let {
|
||||||
QuickDetails(it, ep.timeRemainingOrRuntime)
|
QuickDetails(it, ep.timeRemainingOrRuntime, Modifier.padding(start = 8.dp))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dto != null) {
|
if (dto != null) {
|
||||||
VideoStreamDetails(
|
VideoStreamDetails(
|
||||||
chosenStreams = chosenStreams,
|
chosenStreams = chosenStreams,
|
||||||
numberOfVersions = dto.mediaSourceCount ?: 0,
|
numberOfVersions = dto.mediaSourceCount ?: 0,
|
||||||
modifier = Modifier,
|
modifier = Modifier.padding(start = 8.dp),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
OverviewText(
|
OverviewText(
|
||||||
|
|
|
||||||
|
|
@ -621,7 +621,7 @@ fun SeriesDetailsHeader(
|
||||||
) {
|
) {
|
||||||
QuickDetails(series.ui.quickDetails, null, Modifier.padding(start = 8.dp))
|
QuickDetails(series.ui.quickDetails, null, Modifier.padding(start = 8.dp))
|
||||||
dto.genres?.letNotEmpty {
|
dto.genres?.letNotEmpty {
|
||||||
GenreText(it, Modifier.padding(start = 8.dp, bottom = 12.dp))
|
GenreText(it, Modifier.padding(start = 8.dp, bottom = 8.dp))
|
||||||
}
|
}
|
||||||
dto.overview?.let { overview ->
|
dto.overview?.let { overview ->
|
||||||
OverviewText(
|
OverviewText(
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ fun SeriesOverviewContent(
|
||||||
.onFocusChanged { pageHasFocus = it.hasFocus },
|
.onFocusChanged { pageHasFocus = it.hasFocus },
|
||||||
) {
|
) {
|
||||||
Column(
|
Column(
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
verticalArrangement = Arrangement.spacedBy(4.dp),
|
||||||
modifier =
|
modifier =
|
||||||
Modifier
|
Modifier
|
||||||
.focusGroup()
|
.focusGroup()
|
||||||
|
|
@ -159,9 +159,10 @@ fun SeriesOverviewContent(
|
||||||
Modifier
|
Modifier
|
||||||
.focusRequester(tabRowFocusRequester)
|
.focusRequester(tabRowFocusRequester)
|
||||||
.padding(paddingValues)
|
.padding(paddingValues)
|
||||||
|
.padding(bottom = 4.dp)
|
||||||
.fillMaxWidth(),
|
.fillMaxWidth(),
|
||||||
)
|
)
|
||||||
SeriesName(series.name, Modifier)
|
SeriesName(series.name, Modifier.padding(start = 8.dp))
|
||||||
FocusedEpisodeHeader(
|
FocusedEpisodeHeader(
|
||||||
preferences = preferences,
|
preferences = preferences,
|
||||||
ep = focusedEpisode,
|
ep = focusedEpisode,
|
||||||
|
|
@ -294,8 +295,8 @@ fun SeriesOverviewContent(
|
||||||
},
|
},
|
||||||
modifier =
|
modifier =
|
||||||
Modifier
|
Modifier
|
||||||
.fillMaxWidth()
|
.padding(top = 4.dp)
|
||||||
.padding(start = 16.dp),
|
.fillMaxWidth(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue