diff options
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 3 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 6 | ||||
| -rw-r--r-- | mobile-widgets/qml/mobile-resources.qrc | 2 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 6fed1355e..d766970ff 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -187,7 +187,8 @@ Kirigami.Page { actions.main: Kirigami.Action { icon { - name: state !== "view" ? ":/icons/document-save.svg" : ":/icons/document-edit.svg" + name: state !== "view" ? ":/icons" + subsurfaceTheme.iconStyle + "/document-save.svg" : + ":/icons" + subsurfaceTheme.iconStyle + "/document-edit.svg" color: subsurfaceTheme.primaryColor } text: state !== "view" ? qsTr("Save edits") : qsTr("Edit dive") diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 02d763e49..8827651a8 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -460,6 +460,7 @@ if you have network connectivity and want to sync your data to cloud storage."), subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor + subsurfaceTheme.iconStyle = "-dark" } function pinkTheme() { @@ -477,6 +478,7 @@ if you have network connectivity and want to sync your data to cloud storage."), subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor + subsurfaceTheme.iconStyle = "" } function darkTheme() { @@ -494,6 +496,7 @@ if you have network connectivity and want to sync your data to cloud storage."), subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor) subsurfaceTheme.drawerColor = subsurfaceTheme.darkDrawerColor + subsurfaceTheme.iconStyle = "-dark" } function setupUnits() { @@ -538,6 +541,9 @@ if you have network connectivity and want to sync your data to cloud storage."), property double headingPointSize: regularPointSize * 1.2 property double smallPointSize: regularPointSize * 0.8 + // icon Theme + property string iconStyle: "" + // colors currently in use property string currentTheme property color darkerPrimaryColor diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc index eb4f91ef2..3cf536d6d 100644 --- a/mobile-widgets/qml/mobile-resources.qrc +++ b/mobile-widgets/qml/mobile-resources.qrc @@ -67,7 +67,9 @@ <file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file> <file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file> <file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file> + <file alias="icons-dark/document-edit.svg">kirigami/icons-dark/document-edit.svg</file> <file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file> + <file alias="icons-dark/document-save.svg">kirigami/icons-dark/document-save.svg</file> <file alias="icons/go-up.svg">kirigami/icons/go-up.svg</file> <file alias="icons/gps.svg">kirigami/icons/gps.svg</file> <file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file> diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 328d76ea2..b176aadb9 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -30,6 +30,7 @@ BREEZE=../breeze-icons rm -rf $MC mkdir -p $MC/icons +mkdir -p $MC/icons-dark cp -R $PMMC/* $MC/ cp $BREEZE/icons/actions/22/map-globe.svg $MC/icons @@ -37,6 +38,8 @@ cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons cp $BREEZE/icons/actions/24/document-save.svg $MC/icons +cp $BREEZE/icons-dark/actions/24/document-edit.svg $MC/icons-dark +cp $BREEZE/icons-dark/actions/24/document-save.svg $MC/icons-dark cp $BREEZE/icons/actions/24/go-next.svg $MC/icons cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons cp $BREEZE/icons/actions/24/go-up.svg $MC/icons |