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

Polish guides looks, font sizes, and colors #5487

Merged
merged 2 commits into from
Jul 28, 2024
Merged

Polish guides looks, font sizes, and colors #5487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a199eb
Polish guides looks, font sizes, and colors
nirvn Jul 28, 2024
d7df4a9
Harmonize the guide popup's bottom margin
nirvn Jul 28, 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
36 changes: 17 additions & 19 deletions src/qml/QFieldGuide.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ Popup {
}

Text {
id: title
objectName: "guideInternalTitle"
font.bold: true
font: Theme.strongFont
elide: Text.ElideRight
text: {
if (internalObject.step) {
Expand All @@ -213,6 +214,7 @@ Popup {
Text {
id: description
objectName: "guideInternalDescription"
font: Theme.tipFont
wrapMode: Text.WordWrap
color: Theme.mainTextColor
text: {
Expand All @@ -235,31 +237,30 @@ Popup {
id: animatedHint
visible: internalObject.step.animatedGuide !== undefined
source: visible ? internalObject.step.animatedGuide : ""
anchors.top: description.bottom
anchors.left: description.left
anchors.right: hintPanel.right
anchors.rightMargin: 15
anchors {
bottom: parent.bottom
left: parent.left
right: hintPanel.right
rightMargin: 15
bottomMargin: 15
}
fillMode: AnimatedImage.PreserveAspectFit
anchors.topMargin: 8
}

QfButton {
id: nextButton
objectName: "nextButton"

property bool isLast: guide.index === steps.length - 1

objectName: "nextButton"
text: isLast ? guide.finishText : guide.nextText
verticalPadding: 0
horizontalPadding: 12
anchors {
bottom: parent.bottom
bottomMargin: 8
right: parent.right
rightMargin: 15
bottomMargin: 15
}
bgcolor: Theme.mainColor
color: "white"
height: 32
radius: 5
onClicked: {
Expand All @@ -275,18 +276,16 @@ Popup {
id: previousButton
objectName: "previousButton"
text: guide.previousText
verticalPadding: 0
horizontalPadding: 12
bgcolor: "#00000000"
bgcolor: "transparent"
color: Theme.mainColor
height: 32
radius: 5
visible: guide.index !== 0
anchors {
right: nextButton.left
bottom: parent.bottom
bottomMargin: 8
rightMargin: 14
bottomMargin: 15
rightMargin: 15
}
onClicked: {
guide.index -= 1;
Expand All @@ -297,14 +296,13 @@ Popup {
anchors {
right: parent.right
top: parent.top
margins: 2
topMargin: 8
rightMargin: 8
}
width: 30
height: width
icon.color: Theme.mainTextColor
icon.source: Theme.getThemeIcon('ic_close_black_24dp')
icon.width: 45
icon.height: 45
padding: 0
bgcolor: "transparent"

Expand Down
Loading