mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
mobile-widgets/qml: integrate ThemeNew in qml
Update Settings to use ThemeNew (for theme change) Reduce subsurfaceTheme in main Signed-off-by: jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen
Dirk Hohndel
parent
3c93ee862b
commit
df9164f7e5
2 changed files with 15 additions and 130 deletions
|
|
@ -188,8 +188,8 @@ Kirigami.Page {
|
||||||
|
|
||||||
actions.main: Kirigami.Action {
|
actions.main: Kirigami.Action {
|
||||||
icon {
|
icon {
|
||||||
name: state !== "view" ? ":/icons" + subsurfaceTheme.iconStyle + "/document-save.svg" :
|
name: state !== "view" ? ThemeNew.iconStyle + "/document-save.svg" :
|
||||||
":/icons" + subsurfaceTheme.iconStyle + "/document-edit.svg"
|
ThemeNew.iconStyle + "/document-edit.svg"
|
||||||
color: subsurfaceTheme.primaryColor
|
color: subsurfaceTheme.primaryColor
|
||||||
}
|
}
|
||||||
text: state !== "view" ? qsTr("Save edits") : qsTr("Edit dive")
|
text: state !== "view" ? qsTr("Save edits") : qsTr("Edit dive")
|
||||||
|
|
|
||||||
|
|
@ -560,71 +560,11 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
||||||
] // end actions
|
] // end actions
|
||||||
Image {
|
Image {
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
source: "qrc:///icons/" + (subsurfaceTheme.currentTheme != "" ? subsurfaceTheme.currentTheme : "Blue") + "_gps.svg"
|
source: "qrc:///icons/" + (ThemeNew.currentTheme !== "" ? ThemeNew.currentTheme : "Blue") + "_gps.svg"
|
||||||
visible: locationServiceEnabled
|
visible: locationServiceEnabled
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function blueTheme() {
|
|
||||||
Material.theme = Material.Light
|
|
||||||
Material.accent = subsurfaceTheme.bluePrimaryColor
|
|
||||||
subsurfaceTheme.currentTheme = "Blue"
|
|
||||||
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.blueDarkerPrimaryColor
|
|
||||||
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.blueDarkerPrimaryTextColor
|
|
||||||
subsurfaceTheme.primaryColor = subsurfaceTheme.bluePrimaryColor
|
|
||||||
subsurfaceTheme.primaryTextColor = subsurfaceTheme.bluePrimaryTextColor
|
|
||||||
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.blueLightPrimaryColor
|
|
||||||
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor
|
|
||||||
subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor
|
|
||||||
subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor
|
|
||||||
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor
|
|
||||||
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
|
||||||
subsurfaceTheme.drawerColor = subsurfaceTheme.blueLightDrawerColor
|
|
||||||
subsurfaceTheme.contrastAccentColor = subsurfaceTheme.blueContrastAccentColor
|
|
||||||
subsurfaceTheme.lightDrawerColor = subsurfaceTheme.blueLightDrawerColor
|
|
||||||
subsurfaceTheme.iconStyle = "-dark"
|
|
||||||
}
|
|
||||||
|
|
||||||
function pinkTheme() {
|
|
||||||
Material.theme = Material.Light
|
|
||||||
Material.accent = subsurfaceTheme.pinkPrimaryColor
|
|
||||||
subsurfaceTheme.currentTheme = "Pink"
|
|
||||||
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.pinkDarkerPrimaryColor
|
|
||||||
subsurfaceTheme.darkerPrimaryTextColor = subsurfaceTheme.pinkDarkerPrimaryTextColor
|
|
||||||
subsurfaceTheme.primaryColor = subsurfaceTheme.pinkPrimaryColor
|
|
||||||
subsurfaceTheme.primaryTextColor = subsurfaceTheme.pinkPrimaryTextColor
|
|
||||||
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.pinkLightPrimaryColor
|
|
||||||
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor
|
|
||||||
subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor
|
|
||||||
subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor
|
|
||||||
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor
|
|
||||||
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
|
||||||
subsurfaceTheme.drawerColor = subsurfaceTheme.pinkLightDrawerColor
|
|
||||||
subsurfaceTheme.contrastAccentColor = subsurfaceTheme.pinkContrastAccentColor
|
|
||||||
subsurfaceTheme.lightDrawerColor = subsurfaceTheme.pinkLightDrawerColor
|
|
||||||
subsurfaceTheme.iconStyle = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
function darkTheme() {
|
|
||||||
Material.theme = Material.Dark
|
|
||||||
Material.accent = subsurfaceTheme.darkPrimaryColor
|
|
||||||
subsurfaceTheme.currentTheme = "Dark"
|
|
||||||
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.darkDarkerPrimaryColor
|
|
||||||
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.darkDarkerPrimaryTextColor
|
|
||||||
subsurfaceTheme.primaryColor = subsurfaceTheme.darkPrimaryColor
|
|
||||||
subsurfaceTheme.primaryTextColor = subsurfaceTheme.darkPrimaryTextColor
|
|
||||||
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.darkLightPrimaryColor
|
|
||||||
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor
|
|
||||||
subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor
|
|
||||||
subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor
|
|
||||||
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor
|
|
||||||
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
|
|
||||||
subsurfaceTheme.drawerColor = subsurfaceTheme.darkDrawerColor
|
|
||||||
subsurfaceTheme.contrastAccentColor = subsurfaceTheme.darkContrastAccentColor
|
|
||||||
subsurfaceTheme.lightDrawerColor = subsurfaceTheme.darkLightDrawerColor
|
|
||||||
subsurfaceTheme.iconStyle = "-dark"
|
|
||||||
}
|
|
||||||
|
|
||||||
function setupUnits() {
|
function setupUnits() {
|
||||||
// some screens are too narrow for Subsurface-mobile to render well
|
// some screens are too narrow for Subsurface-mobile to render well
|
||||||
// try to hack around that by making sure that we can fit at least 21 gridUnits in a row
|
// try to hack around that by making sure that we can fit at least 21 gridUnits in a row
|
||||||
|
|
@ -667,65 +607,19 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
||||||
property double headingPointSize: regularPointSize * 1.2
|
property double headingPointSize: regularPointSize * 1.2
|
||||||
property double smallPointSize: regularPointSize * 0.8
|
property double smallPointSize: regularPointSize * 0.8
|
||||||
|
|
||||||
// icon Theme
|
|
||||||
property string iconStyle: ""
|
|
||||||
|
|
||||||
// colors currently in use
|
// colors currently in use
|
||||||
property string currentTheme
|
property color darkerPrimaryColor: ThemeNew.darkerPrimaryColor
|
||||||
property color darkerPrimaryColor
|
property color darkerPrimaryTextColor: ThemeNew.darkerPrimaryTextColor
|
||||||
property color darkerPrimaryTextColor
|
property color primaryColor: ThemeNew.primaryColor
|
||||||
property color primaryColor
|
property color primaryTextColor: ThemeNew.primaryTextColor
|
||||||
property color primaryTextColor
|
property color lightPrimaryColor: ThemeNew.lightPrimaryColor
|
||||||
property color lightPrimaryColor
|
property color lightPrimaryTextColor: ThemeNew.lightPrimaryTextColor
|
||||||
property color lightPrimaryTextColor
|
property color backgroundColor: ThemeNew.backgroundColor
|
||||||
property color backgroundColor
|
property color textColor: ThemeNew.textColor
|
||||||
property color textColor
|
property color secondaryTextColor: ThemeNew.secondaryTextColor
|
||||||
property color secondaryTextColor
|
property color drawerColor: ThemeNew.drawerColor
|
||||||
property color drawerColor
|
property color contrastAccentColor: ThemeNew.contrastAccentColor
|
||||||
property color contrastAccentColor: "#FF5722" // used for delete button
|
property color lightDrawerColor: ThemeNew.lightDrawerColor
|
||||||
property color lightDrawerColor: "#FFFFFF"
|
|
||||||
|
|
||||||
// colors for the blue theme
|
|
||||||
property color blueDarkerPrimaryColor: "#303F9f"
|
|
||||||
property color blueDarkerPrimaryTextColor: "#ECECEC"
|
|
||||||
property color bluePrimaryColor: "#3F51B5"
|
|
||||||
property color bluePrimaryTextColor: "#FFFFFF"
|
|
||||||
property color blueLightPrimaryColor: "#C5CAE9"
|
|
||||||
property color blueLightPrimaryTextColor: "#212121"
|
|
||||||
property color blueBackgroundColor: "#eff0f1"
|
|
||||||
property color blueTextColor: blueLightPrimaryTextColor
|
|
||||||
property color blueSecondaryTextColor: "#757575"
|
|
||||||
property color blueLightDrawerColor: "#FFFFFF"
|
|
||||||
property color blueDrawerColor: blueLightDrawerColor
|
|
||||||
property color blueContrastAccentColor: "#FF5722" // used for delete button
|
|
||||||
|
|
||||||
// colors for the pink theme
|
|
||||||
property color pinkDarkerPrimaryColor: "#C2185B"
|
|
||||||
property color pinkDarkerPrimaryTextColor: "#ECECEC"
|
|
||||||
property color pinkPrimaryColor: "#FF69B4"
|
|
||||||
property color pinkPrimaryTextColor: "#212121"
|
|
||||||
property color pinkLightPrimaryColor: "#FFDDF4"
|
|
||||||
property color pinkLightPrimaryTextColor: "#212121"
|
|
||||||
property color pinkBackgroundColor: "#eff0f1"
|
|
||||||
property color pinkTextColor: pinkLightPrimaryTextColor
|
|
||||||
property color pinkSecondaryTextColor: "#757575"
|
|
||||||
property color pinkLightDrawerColor: "#FFFFFF"
|
|
||||||
property color pinkDrawerColor: pinkLightDrawerColor
|
|
||||||
property color pinkContrastAccentColor: "#FF5722" // used for delete button
|
|
||||||
|
|
||||||
// colors for the dark theme
|
|
||||||
property color darkDarkerPrimaryColor: "#303F9f"
|
|
||||||
property color darkDarkerPrimaryTextColor: "#ECECEC"
|
|
||||||
property color darkPrimaryColor: "#3F51B5"
|
|
||||||
property color darkPrimaryTextColor: "#ECECEC"
|
|
||||||
property color darkLightPrimaryColor: "#C5CAE9"
|
|
||||||
property color darkLightPrimaryTextColor: "#ECECEC"
|
|
||||||
property color darkBackgroundColor: "#303030"
|
|
||||||
property color darkTextColor: darkPrimaryTextColor
|
|
||||||
property color darkSecondaryTextColor: "#757575"
|
|
||||||
property color darkDrawerColor: "#424242"
|
|
||||||
property color darkLightDrawerColor: "#FFFFFF"
|
|
||||||
property color darkContrastAccentColor: "#FF5722" // used for delete button
|
|
||||||
|
|
||||||
property int initialWidth: rootItem.width
|
property int initialWidth: rootItem.width
|
||||||
property int initialHeight: rootItem.height
|
property int initialHeight: rootItem.height
|
||||||
|
|
@ -738,15 +632,6 @@ if you have network connectivity and want to sync your data to cloud storage."),
|
||||||
setupUnits() // but don't count this as a change (after all, it's not)
|
setupUnits() // but don't count this as a change (after all, it's not)
|
||||||
else
|
else
|
||||||
manager.appendTextToLog("Already adjusted size, ignoring this")
|
manager.appendTextToLog("Already adjusted size, ignoring this")
|
||||||
|
|
||||||
// this needs to pick the theme from persistent preference settings
|
|
||||||
var theme = PrefDisplay.theme
|
|
||||||
if (theme === "Blue")
|
|
||||||
blueTheme()
|
|
||||||
else if (theme === "Pink")
|
|
||||||
pinkTheme()
|
|
||||||
else
|
|
||||||
darkTheme()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue