Skip to content

Dynamic header height on page view #13

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

Open
dwffls wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Dynamic header height on page view #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c57c7
Added dynamic scaling of header
dwffls Jan 27, 2024
22b365d
Disable of scrolling when no items on page
dwffls Jan 27, 2024
68742e0
Updated translations
dwffls Jan 27, 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
4 changes: 2 additions & 2 deletions resources/translations/da_DK.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation type="unfinished">%1 is %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation type="unfinished">Press and hold the Home button or use the Web Configurator to configure the page</translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/de_CH.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation>%1 ist %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation>Heb d Home-Taschte drückt oder bruch dr Web-Konfigurator für d Siite ds konfiguriere</translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/de_DE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation>%1 ist %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation>Um die Seite zu anzupassen, Home-Taste gedrückt halten oder Web-Konfigurator verwenden</translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/en_US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation type="unfinished"></translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/fr_FR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation>%1 est %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation>Appuyez et maintenez le bouton Accueil ou utilisez le configurateur web pour configurer la page</translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/hu_HU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation type="unfinished">%1 is %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation type="unfinished">Press and hold the Home button or use the Web Configurator to configure the page</translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/it_IT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation type="unfinished">%1 is %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation>Tieni premuto il pulsante Home o usa il configuratore Web per configurare la pagina</translation>
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/nl_NL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ Climate fan</extracomment>
<context>
<name>Page</name>
<message>
<location filename="../../src/qml/components/Page.qml" line="182"/>
<location filename="../../src/qml/components/Page.qml" line="194"/>
<source>%1 is %2</source>
<extracomment>Used to show the entity state: %1 is the entity name, %2 is the state</extracomment>
<translation>%1 is %2</translation>
</message>
<message>
<location filename="../../src/qml/components/Page.qml" line="203"/>
<location filename="../../src/qml/components/Page.qml" line="215"/>
<source>Press and hold the Home button or use the Web Configurator to configure the page</source>
<extracomment>Web configurator is the name of the application, does not need translation</extracomment>
<translation>Houd de Home-knop ingedrukt of gebruik de webconfigurator om de pagina te configureren</translation>
Expand Down
20 changes: 18 additions & 2 deletions src/qml/components/Page.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,16 @@ ListView {
model: visualModel
header: header
currentIndex: 0

// Disable scrolling when no items on page, otherwise header is movable
interactive: visualModel.count

property string title: pageName
property string _id: pageId
property QtObject items: pageItems
property bool isCurrentItem: ListView.isCurrentItem
property int headerHeight: 260


Behavior on height {
NumberAnimation { easing.type: Easing.OutExpo; duration: 200 }
Expand Down Expand Up @@ -65,6 +70,17 @@ ListView {
}
}
}
onContentYChanged: {
// Adjust the height of the header image based on overscroll
if (contentY < -260){
headerHeight= Math.max(-contentY, 260);
// Return the header to its normal size when we release
if (!dragging){
contentY = -260;
}
}

}

DelegateModel {
id: visualModel
Expand All @@ -81,7 +97,7 @@ ListView {

Image {
id: headerImage
width: parent.width; height: 260
width: parent.width; height: headerHeight
source: resource.getBackgroundImage(pageImage)
sourceSize.width: parent.width
sourceSize.height: 260
Expand Down Expand Up @@ -248,7 +264,6 @@ ListView {

onReleased: {
page.interactive = true;

if (held) {
Haptic.play(Haptic.Click);
held = false;
Expand Down Expand Up @@ -361,3 +376,4 @@ ListView {
}
}
}