summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Course/Detail/Classic.ui.qml112
-rw-r--r--Course/Detail/Classic/Content/Main.ui.qml24
-rw-r--r--Eduport.qrc2
-rw-r--r--Label/Body.ui.qml12
-rw-r--r--Label/Hx.ui.qml12
-rw-r--r--imports/Eduport/Eduport.qml12
6 files changed, 81 insertions, 93 deletions
diff --git a/Course/Detail/Classic.ui.qml b/Course/Detail/Classic.ui.qml
index df26739..7e0238a 100644
--- a/Course/Detail/Classic.ui.qml
+++ b/Course/Detail/Classic.ui.qml
@@ -3,6 +3,9 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
import QtMultimedia 5.15
+import Bootstrap 5.3
+import Eduport 1.4
+import "../../Label" as Lbl
import "Classic/Content" as Content
Flickable {
@@ -18,11 +21,6 @@ Flickable {
property alias time: time
property alias trial: trial
property alias buy: buy
- property bool doesntEmbed: Qt.platform.os === "android"
- || Qt.platform.os === "linux"
- || Qt.platform.os === "osx"
- || Qt.platform.os === "unix"
- || Qt.platform.os === "windows"
contentHeight: body.height
ColumnLayout {
@@ -33,26 +31,6 @@ Flickable {
right: parent.right
}
- FontLoader {
- id: heebo
- source: "../../Heebo/Heebo-Bold.ttf"
- }
-
- FontLoader {
- id: bold
- source: doesntEmbed ? "" : "../../Roboto/Roboto-Bold.ttf"
- }
-
- FontLoader {
- id: medium
- source: doesntEmbed ? "" : "../../Roboto/Roboto-Medium.ttf"
- }
-
- FontLoader {
- id: regular
- source: doesntEmbed ? "" : "../../Roboto/Roboto-Regular.ttf"
- }
-
Rectangle {
color: "#f5f7f9"
Layout.fillWidth: true
@@ -74,17 +52,16 @@ Flickable {
implicitHeight: introBadge.height
radius: 5.2
color: Qt.rgba( .0235, .416, .788, 1.0)
- Label {
+ Lbl.Hx {
id: introBadge
text: qsTr("Digital Marketing")
color: "white"
- font {
- family: doesntEmbed ? "Roboto" : bold.name
- weight: Font.Bold
- pointSize: 15
- }
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
+ font.family: Eduport.baseFont
+ .family
+ horizontalAlignment: Text
+ .AlignHCenter
+ verticalAlignment: Text
+ .AlignVCenter
topPadding: 8
leftPadding: 25.6
rightPadding: 25.6
@@ -92,36 +69,28 @@ Flickable {
}
}
- Label {
+ Lbl.Hx {
id: introTitleHeader
text: qsTr("The Complete Digital Marketing Course - 12 Courses in 1")
color: "#24292d"
- wrapMode: Text.Wrap
Layout.fillWidth: true
- font {
- family: heebo.name
- pointSize: 30
- }
+ font.pointSize: 22.5
+ + .01875 * parent.width
}
- Label {
+ Lbl.Body {
id: introTitleParagraph
text: qsTr("Satisfied conveying a dependent contented he gentleman agreeable do be. Warrant private blushes removed an in equally totally if. Delivered dejection necessary objection do Mr prevailed. Mr feeling does chiefly cordial in do.")
color: "#747579"
- wrapMode: Text.Wrap
Layout.fillWidth: true
- font {
- family: doesntEmbed ? "Roboto" : regular.name
- pointSize: 15
- }
}
}
}
GridLayout {
Layout.topMargin: 64
- columns: width < 992 ? 1 : 2
- rows: width < 992 ? 2 : 1
+ columns: body.width < 992 ? 1 : 2
+ rows: body.width < 992 ? 2 : 1
Content.Main {
id: mainContent
@@ -217,23 +186,17 @@ Flickable {
RowLayout {
- Label {
+ Lbl.Hx {
text: priceText
- font {
- family: heebo.name
- pointSize: 23
- }
+ font.pointSize: 21
+ + .0075 * parent.width
}
- Label {
+ Lbl.Body {
id: originalPrice
text: "$350"
color: "#4d000000"
- font {
- family: doesntEmbed ? "Roboto" : regular.name
- pointSize: 15
- strikeout: true
- }
+ font.strikeout: true
}
Rectangle {
@@ -248,8 +211,9 @@ Flickable {
text: qsTr("60% off")
color: "white"
font {
- family: doesntEmbed ? "Roboto" : regular.name
- pointSize: 13.6
+ family: Bootstrap.bodyFont.family
+ weight: Bootstrap.bodyFont.weight
+ pointSize: Bootstrap.badgeFontSize
}
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@@ -264,13 +228,9 @@ Flickable {
RowLayout {
id: time
- Label {
+ Lbl.Body {
text: qsTr("5 days left at this price")
color: "#d6293e"
- font {
- family: doesntEmbed ? "Roboto" : regular.name
- pointSize: 15
- }
}
}
}
@@ -283,22 +243,19 @@ Flickable {
Button {
id: trial
- text: qsTr("Free trial")
horizontalPadding: 16
verticalPadding: 8
+ text: qsTr("Free trial")
+ font: Bootstrap.btnFont
contentItem: Text {
horizontalAlignment: Text.AlignHCenter
text: trial.text
+ font: trial.font
color: trial.down ? "#ffffff" : "#066ac9"
- font {
- family: doesntEmbed ? "Roboto" : medium.name
- weight: Font.Medium
- pointSize: 15
- }
}
background: Rectangle {
- color: trial.down ? "#066ac9" : "#ffffff"
radius: 5.2
+ color: trial.down ? "#066ac9" : "#ffffff"
border {
color: "#066ac9"
width: 1
@@ -308,22 +265,19 @@ Flickable {
Button {
id: buy
- text: qsTr("Buy course")
horizontalPadding: 16
verticalPadding: 8
+ text: qsTr("Buy course")
+ font: Bootstrap.btnFont
contentItem: Text {
horizontalAlignment: Text.AlignHCenter
text: buy.text
+ font: buy.font
color: "#ffffff"
- font {
- family: doesntEmbed ? "Roboto" : medium.name
- weight: Font.Medium
- pointSize: 15
- }
}
background: Rectangle {
- color: buy.down ? "#0aa073" : "#0cbc87"
radius: 5.2
+ color: buy.down ? "#0aa073" : "#0cbc87"
border {
color: buy.down ? "#0a966c" : "#0cbc87"
width: 1
diff --git a/Course/Detail/Classic/Content/Main.ui.qml b/Course/Detail/Classic/Content/Main.ui.qml
index 801ed8f..b4d8321 100644
--- a/Course/Detail/Classic/Content/Main.ui.qml
+++ b/Course/Detail/Classic/Content/Main.ui.qml
@@ -2,7 +2,9 @@ import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
+import Bootstrap 5.3
import "../../../.."
+import "../../../../Label" as Lbl
import "Main/TabContents" as MainTabContents
ColumnLayout {
@@ -61,8 +63,9 @@ ColumnLayout {
text: modelData
color: "#066ac9"
font {
- family: doesntEmbed ? "Roboto" : regular.name
- pointSize: 15
+ family: Bootstrap.bodyFont.family
+ weight: Bootstrap.bodyFont.weight
+ pointSize: Bootstrap.bodyFont.pointSize
}
}
background: Rectangle {
@@ -94,28 +97,21 @@ ColumnLayout {
ColumnLayout {
id: overview
- Label {
+ Lbl.Hx {
text: qsTr("Course Description")
color: "#24292d"
- wrapMode: Text.Wrap
Layout.fillWidth: true
Layout.bottomMargin: 16
- font {
- family: heebo.name
- pointSize: 20.1
- }
+ font.pointSize: 20.1
+ + .00075
+ * parent.width
}
- Label {
+ Lbl.Body {
id: courseDescription
text: qsTr("Welcome to the Digital Marketing Ultimate Course Bundle - 12 Courses in 1 (Over 36 hours of content)")
color: "#747579"
- wrapMode: Text.Wrap
Layout.fillWidth: true
- font {
- family: doesntEmbed ? "Roboto" : regular.name
- pointSize: 15
- }
}
}
diff --git a/Eduport.qrc b/Eduport.qrc
index ed4bac4..984d8db 100644
--- a/Eduport.qrc
+++ b/Eduport.qrc
@@ -7,6 +7,8 @@
<file>imports/Bootstrap/qmldir</file>
<file>imports/Eduport/Eduport.qml</file>
<file>imports/Eduport/qmldir</file>
+ <file>Label/Hx.ui.qml</file>
+ <file>Label/Body.ui.qml</file>
<file>Button/Primary.ui.qml</file>
</qresource>
</RCC>
diff --git a/Label/Body.ui.qml b/Label/Body.ui.qml
new file mode 100644
index 0000000..76d0bbe
--- /dev/null
+++ b/Label/Body.ui.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import Bootstrap 5.3
+
+Label {
+ wrapMode: Label.Wrap
+ font {
+ family: Bootstrap.bodyFont.family
+ weight: Bootstrap.bodyFont.weight
+ pointSize: Bootstrap.bodyFont.pointSize
+ }
+}
diff --git a/Label/Hx.ui.qml b/Label/Hx.ui.qml
new file mode 100644
index 0000000..5e97303
--- /dev/null
+++ b/Label/Hx.ui.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import Eduport 1.4
+
+Label {
+ wrapMode: Label.Wrap
+ font {
+ family: Eduport.hFont.family
+ weight: Eduport.hFont.weight
+ pointSize: Eduport.h6FontSize
+ }
+}
diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml
index e3b36dd..14fe725 100644
--- a/imports/Eduport/Eduport.qml
+++ b/imports/Eduport/Eduport.qml
@@ -7,6 +7,14 @@ QtObject {
readonly property real h6FontSize: 15
readonly property real formTextFontSize: 14
+ readonly property bool haveRoboto: Qt.platform.os === "android"
+ || Qt.platform.os === "linux"
+ || Qt.platform.os === "osx"
+ || Qt.platform.os === "unix"
+ || Qt.platform.os === "windows"
+ readonly property FontLoader roboto: FontLoader {
+ source: haveRoboto ? "" : "../../Roboto/Roboto-Bold.ttf"
+ }
readonly property FontLoader bold: FontLoader {
source: "../../Heebo/Heebo-Bold.ttf"
}
@@ -16,6 +24,10 @@ QtObject {
readonly property FontLoader regular: FontLoader {
source: "../../Heebo/Heebo-Regular.ttf"
}
+ readonly property font baseFont: Qt.font({
+ family: haveRoboto ? "Roboto" : roboto.name,
+ weight: Font.Bold
+ })
readonly property font hFont: Qt.font({
family: bold.name,
weight: Font.Bold
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 17:44:38 +0000