mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile UI: stop the use of dark icon theme

Browse source 
This was used very inconsistently and had more bugs than positive
impact.

See #2686

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-03-20 12:20:43 -07:00
parent f4f15039ac
commit 98ef01b2e4
6 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mobile-widgets/qml/DiveDetails.qml
View file

@ -220,8 +220,8 @@ Kirigami.Page {
actions.main: Kirigami.Action { actions.main: Kirigami.Action {
icon { icon {
name: state !== "view" ? subsurfaceTheme.iconStyle + "/document-save.svg" : name: state !== "view" ? ":/icons/document-save.svg" :
subsurfaceTheme.iconStyle + "/document-edit.svg" ":/icons/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")

2
mobile-widgets/qml/TripDetails.qml
View file

@ -49,7 +49,7 @@ Kirigami.Page {
property QtObject saveAction: Kirigami.Action { property QtObject saveAction: Kirigami.Action {
icon { icon {
name: subsurfaceTheme.iconStyle + "/document-save.svg" name: ":/icons/document-save.svg"
color: enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor color: enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor
} }
text: enabled ? qsTr("Save edits") : "" text: enabled ? qsTr("Save edits") : ""

2
mobile-widgets/qml/mobile-resources.qrc
View file

@ -98,9 +98,7 @@
<file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file> <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/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/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/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/go-up.svg">kirigami/icons/go-up.svg</file>
<file alias="icons/gps.svg">kirigami/icons/gps.svg</file> <file alias="icons/gps.svg">kirigami/icons/gps.svg</file>
<file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file> <file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file>

5
mobile-widgets/themeinterface.cpp
View file

@ -25,7 +25,6 @@ double themeInterface::m_smallPointSize;
double themeInterface::m_titlePointSize; double themeInterface::m_titlePointSize;
QString themeInterface::m_currentTheme; QString themeInterface::m_currentTheme;
QString themeInterface::m_iconStyle;
const QColor BLUE_BACKGROUND_COLOR = "#eff0f1"; const QColor BLUE_BACKGROUND_COLOR = "#eff0f1";
const QColor BLUE_CONTRAST_ACCENT_COLOR = "#FF5722"; const QColor BLUE_CONTRAST_ACCENT_COLOR = "#FF5722";
@ -140,7 +139,6 @@ void themeInterface::update_theme()
m_primaryTextColor = BLUE_PRIMARY_TEXT_COLOR; m_primaryTextColor = BLUE_PRIMARY_TEXT_COLOR;
m_secondaryTextColor = BLUE_SECONDARY_TEXT_COLOR; m_secondaryTextColor = BLUE_SECONDARY_TEXT_COLOR;
m_textColor = BLUE_TEXT_COLOR; m_textColor = BLUE_TEXT_COLOR;
m_iconStyle = ":/icons";
} else if (m_currentTheme == "Pink") { } else if (m_currentTheme == "Pink") {
m_backgroundColor = PINK_BACKGROUND_COLOR; m_backgroundColor = PINK_BACKGROUND_COLOR;
m_contrastAccentColor = PINK_CONTRAST_ACCENT_COLOR; m_contrastAccentColor = PINK_CONTRAST_ACCENT_COLOR;
@ -154,7 +152,6 @@ void themeInterface::update_theme()
m_primaryTextColor = PINK_PRIMARY_TEXT_COLOR; m_primaryTextColor = PINK_PRIMARY_TEXT_COLOR;
m_secondaryTextColor = PINK_SECONDARY_TEXT_COLOR; m_secondaryTextColor = PINK_SECONDARY_TEXT_COLOR;
m_textColor = PINK_TEXT_COLOR; m_textColor = PINK_TEXT_COLOR;
m_iconStyle = ":/icons";
} else { } else {
m_backgroundColor = DARK_BACKGROUND_COLOR; m_backgroundColor = DARK_BACKGROUND_COLOR;
m_contrastAccentColor = DARK_CONTRAST_ACCENT_COLOR; m_contrastAccentColor = DARK_CONTRAST_ACCENT_COLOR;
@ -168,7 +165,6 @@ void themeInterface::update_theme()
m_primaryTextColor = DARK_PRIMARY_TEXT_COLOR; m_primaryTextColor = DARK_PRIMARY_TEXT_COLOR;
m_secondaryTextColor = DARK_SECONDARY_TEXT_COLOR; m_secondaryTextColor = DARK_SECONDARY_TEXT_COLOR;
m_textColor = DARK_TEXT_COLOR; m_textColor = DARK_TEXT_COLOR;
m_iconStyle = ":/icons-dark";
} }
emit instance()->backgroundColorChanged(m_backgroundColor); emit instance()->backgroundColorChanged(m_backgroundColor);
emit instance()->contrastAccentColorChanged(m_contrastAccentColor); emit instance()->contrastAccentColorChanged(m_contrastAccentColor);
@ -182,5 +178,4 @@ void themeInterface::update_theme()
emit instance()->primaryTextColorChanged(m_primaryTextColor); emit instance()->primaryTextColorChanged(m_primaryTextColor);
emit instance()->secondaryTextColorChanged(m_secondaryTextColor); emit instance()->secondaryTextColorChanged(m_secondaryTextColor);
emit instance()->textColorChanged(m_textColor); emit instance()->textColorChanged(m_textColor);
emit instance()->iconStyleChanged(m_iconStyle);
} }

6
mobile-widgets/themeinterface.h
View file

@ -33,18 +33,14 @@ class themeInterface : public QObject {
// Support // Support
Q_PROPERTY(QString currentTheme MEMBER m_currentTheme WRITE set_currentTheme NOTIFY currentThemeChanged) Q_PROPERTY(QString currentTheme MEMBER m_currentTheme WRITE set_currentTheme NOTIFY currentThemeChanged)
Q_PROPERTY(QString iconStyle MEMBER m_iconStyle NOTIFY iconStyleChanged)
public: public:
static themeInterface *instance(); static themeInterface *instance();
static void setup(QQmlContext *ct); static void setup(QQmlContext *ct);
static double currentScale(); static double currentScale();
public slots: public slots:
static void set_currentTheme(const QString &theme); static void set_currentTheme(const QString &theme);
static void set_currentScale(double); static void set_currentScale(double);
signals: signals:
@ -68,7 +64,6 @@ signals:
void currentScaleChanged(double); void currentScaleChanged(double);
void currentThemeChanged(const QString &); void currentThemeChanged(const QString &);
void iconStyleChanged(const QString &);
private: private:
themeInterface() {} themeInterface() {}
@ -94,6 +89,5 @@ private:
static double m_titlePointSize; static double m_titlePointSize;
static QString m_currentTheme; static QString m_currentTheme;
static QString m_iconStyle;
}; };
#endif #endif

7
scripts/mobilecomponents.sh
View file

@ -30,16 +30,13 @@ BREEZE=../breeze-icons
rm -rf $MC rm -rf $MC
mkdir -p $MC/icons mkdir -p $MC/icons
mkdir -p $MC/icons-dark
cp -R $PMMC/* $MC/ cp -R $PMMC/* $MC/
cp $BREEZE/icons/actions/22/map-globe.svg $MC/icons cp $BREEZE/icons/actions/22/map-globe.svg $MC/icons
cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons 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/distribute-horizontal-x.svg $MC/icons
cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons cp $BREEZE/icons-dark/actions/24/document-edit.svg $MC/icons
cp $BREEZE/icons/actions/24/document-save.svg $MC/icons cp $BREEZE/icons-dark/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-next.svg $MC/icons
cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons
cp $BREEZE/icons/actions/24/go-up.svg $MC/icons cp $BREEZE/icons/actions/24/go-up.svg $MC/icons