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

Fix layout issues on mobile item details #2246

Merged
merged 5 commits into from
Dec 21, 2020
Merged

Fix layout issues on mobile item details #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9d956f
Fix layout issues on mobile item details
thornbill Dec 18, 2020
628b525
Hide primary image wrapper when no image is available
thornbill Dec 18, 2020
f0792e9
Add alt tag to primary image
thornbill Dec 18, 2020
900ae8d
Tweak max-height of square primary images
thornbill Dec 18, 2020
b40274f
Adjust top margin for main buttons
thornbill Dec 18, 2020
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
37 changes: 31 additions & 6 deletions src/assets/css/librarybrowser.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,26 @@
padding-bottom: 10vh;
}

.primaryImageWrapper {
display: none;
}

.primaryImageWrapper > img {
display: block;
margin: 0 auto;
max-width: 80vw;
max-height: 50vh;
}

.primaryImageWrapper > img.aspect-square {
max-height: 45vh;
}

.layout-mobile .primaryImageWrapper {
display: block;
flex: 1 0 auto;
}

@media all and (min-width: 40em) {
.dashboardDocument .adminDrawerLogo,
.dashboardDocument .mainDrawerButton {
Expand Down Expand Up @@ -453,8 +473,7 @@
}

.layout-mobile .itemBackdrop {
background-attachment: scroll;
height: 26.5vh;
display: none;
}

.layout-desktop .itemBackdrop::after {
Expand Down Expand Up @@ -614,7 +633,8 @@
}

.layout-mobile .mainDetailButtons {
margin-top: 1em;
flex: 2 0 70%;
margin-top: 0.5em;
margin-bottom: 0.5em;
}

Expand All @@ -638,9 +658,9 @@
}

.layout-mobile .detailPagePrimaryContainer {
display: block;
flex-wrap: wrap;
position: relative;
padding: 0.5em 3.3% 0.5em;
padding: 4.5rem 3.3% 0.5rem;
}

.layout-tv #itemDetailPage:not(.noBackdrop) .detailPagePrimaryContainer,
Expand Down Expand Up @@ -669,6 +689,10 @@
flex: 1 0 0;
}

.layout-mobile .infoWrapper {
flex: 2 0 70%;
}

.infoText {
white-space: nowrap;
text-overflow: ellipsis;
Expand Down Expand Up @@ -729,7 +753,8 @@
background-size: contain;
}

.noBackdrop .detailLogo {
.noBackdrop .detailLogo,
.layout-mobile .detailLogo {
display: none;
}

Expand Down
4 changes: 4 additions & 0 deletions src/controllers/itemDetails/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<div class="detailLogo"></div>
<div class="detailPageWrapperContainer">
<div class="detailPagePrimaryContainer padded-left padded-right">
<div class="primaryImageWrapper hide">
<img id="primaryImage" />
</div>

<div class="infoWrapper infoText">
<div class="nameContainer"></div>
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em;"></div>
Expand Down
25 changes: 23 additions & 2 deletions src/controllers/itemDetails/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ function renderDetailPageBackdrop(page, item, apiClient) {
let hasbackdrop = false;
const itemBackdropElement = page.querySelector('#itemBackdrop');

if (!layoutManager.mobile && !userSettings.detailsBanner()) {
if (layoutManager.mobile || !userSettings.detailsBanner()) {
return false;
}

Expand Down Expand Up @@ -589,6 +589,24 @@ function renderDetailPageBackdrop(page, item, apiClient) {
return hasbackdrop;
}

function renderPrimaryImage(page, item, apiClient) {
if (item?.ImageTags?.Primary) {
const imageUrl = apiClient.getScaledImageUrl(item.Id, {
type: 'Primary',
maxWidth: dom.getScreenWidth(),
tag: item.ImageTags.Primary
});

const imageElem = page.querySelector('#primaryImage');
imageElem.src = imageUrl;
imageElem.alt = item.Name;
if (item.PrimaryImageAspectRatio === 1) {
imageElem.classList.add('aspect-square');
}
page.querySelector('.primaryImageWrapper')?.classList.remove('hide');
}
}

function reloadFromItem(instance, page, params, item, user) {
const apiClient = ServerConnections.getApiClient(item.ServerId);

Expand All @@ -601,6 +619,9 @@ function reloadFromItem(instance, page, params, item, user) {
renderLogo(page, item, apiClient);
renderDetailPageBackdrop(page, item, apiClient);
}
if (layoutManager.mobile) {
renderPrimaryImage(page, item, apiClient);
}
renderBackdrop(item);

// Render the main information for the item
Expand Down Expand Up @@ -2073,7 +2094,7 @@ export default function (view, params) {
view.addEventListener('viewshow', function (e) {
const page = this;

libraryMenu.setTransparentMenu(true);
libraryMenu.setTransparentMenu(!layoutManager.mobile);

if (e.detail.isRestored) {
if (currentItem) {
Expand Down