mobile UI: stop the use of dark icon theme

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

See #2686

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

5 files changed, 3 insertions, 16 deletions

diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index 9a185789c..57ef6c884 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -220,8 +220,8 @@ Kirigami.Page {
 
 	actions.main: Kirigami.Action {
 		icon {
-			name: state !== "view" ? subsurfaceTheme.iconStyle + "/document-save.svg" :
-						 subsurfaceTheme.iconStyle + "/document-edit.svg"
+			name: state !== "view" ? ":/icons/document-save.svg" :
+						 ":/icons/document-edit.svg"
 			color: subsurfaceTheme.primaryColor
 		}
 		text: state !== "view" ? qsTr("Save edits") : qsTr("Edit dive")
diff --git a/mobile-widgets/qml/TripDetails.qml b/mobile-widgets/qml/TripDetails.qml
index eca51653d..bbf95cf23 100644
--- a/mobile-widgets/qml/TripDetails.qml
+++ b/mobile-widgets/qml/TripDetails.qml
@@ -49,7 +49,7 @@ Kirigami.Page {
 
 	property QtObject saveAction: Kirigami.Action {
 		icon {
-			name: subsurfaceTheme.iconStyle + "/document-save.svg"
+			name: ":/icons/document-save.svg"
 			color: enabled ? subsurfaceTheme.primaryColor : subsurfaceTheme.backgroundColor
 		}
 		text: enabled ? qsTr("Save edits") : ""
diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc
index f7075556b..c76e4b7de 100644
--- a/mobile-widgets/qml/mobile-resources.qrc
+++ b/mobile-widgets/qml/mobile-resources.qrc
@@ -98,9 +98,7 @@
 		<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/mobile-widgets/themeinterface.cpp b/mobile-widgets/themeinterface.cpp
index 3e8544bdb..e3ebbe5a2 100644
--- a/mobile-widgets/themeinterface.cpp
+++ b/mobile-widgets/themeinterface.cpp
@@ -25,7 +25,6 @@ double themeInterface::m_smallPointSize;
 double themeInterface::m_titlePointSize;
 
 QString themeInterface::m_currentTheme;
-QString themeInterface::m_iconStyle;
 
 const QColor BLUE_BACKGROUND_COLOR = "#eff0f1";
 const QColor BLUE_CONTRAST_ACCENT_COLOR = "#FF5722";
@@ -140,7 +139,6 @@ void themeInterface::update_theme()
 		m_primaryTextColor = BLUE_PRIMARY_TEXT_COLOR;
 		m_secondaryTextColor = BLUE_SECONDARY_TEXT_COLOR;
 		m_textColor = BLUE_TEXT_COLOR;
-		m_iconStyle = ":/icons";
 	} else if (m_currentTheme == "Pink") {
 		m_backgroundColor = PINK_BACKGROUND_COLOR;
 		m_contrastAccentColor = PINK_CONTRAST_ACCENT_COLOR;
@@ -154,7 +152,6 @@ void themeInterface::update_theme()
 		m_primaryTextColor = PINK_PRIMARY_TEXT_COLOR;
 		m_secondaryTextColor = PINK_SECONDARY_TEXT_COLOR;
 		m_textColor = PINK_TEXT_COLOR;
-		m_iconStyle = ":/icons";
 	} else {
 		m_backgroundColor = DARK_BACKGROUND_COLOR;
 		m_contrastAccentColor = DARK_CONTRAST_ACCENT_COLOR;
@@ -168,7 +165,6 @@ void themeInterface::update_theme()
 		m_primaryTextColor = DARK_PRIMARY_TEXT_COLOR;
 		m_secondaryTextColor = DARK_SECONDARY_TEXT_COLOR;
 		m_textColor = DARK_TEXT_COLOR;
-		m_iconStyle = ":/icons-dark";
 	}
 	emit instance()->backgroundColorChanged(m_backgroundColor);
 	emit instance()->contrastAccentColorChanged(m_contrastAccentColor);
@@ -182,5 +178,4 @@ void themeInterface::update_theme()
 	emit instance()->primaryTextColorChanged(m_primaryTextColor);
 	emit instance()->secondaryTextColorChanged(m_secondaryTextColor);
 	emit instance()->textColorChanged(m_textColor);
-	emit instance()->iconStyleChanged(m_iconStyle);
 }
diff --git a/mobile-widgets/themeinterface.h b/mobile-widgets/themeinterface.h
index 1c68699fc..35bb251a8 100644
--- a/mobile-widgets/themeinterface.h
+++ b/mobile-widgets/themeinterface.h
@@ -33,18 +33,14 @@ class themeInterface : public QObject {
 
 	// Support
 	Q_PROPERTY(QString currentTheme MEMBER m_currentTheme WRITE set_currentTheme NOTIFY currentThemeChanged)
-	Q_PROPERTY(QString iconStyle MEMBER m_iconStyle NOTIFY iconStyleChanged)
 
 public:
 	static themeInterface *instance();
-
 	static void setup(QQmlContext *ct);
-
 	static double currentScale();
 
 public slots:
 	static void set_currentTheme(const QString &theme);
-
 	static void set_currentScale(double);
 
 signals:
@@ -68,7 +64,6 @@ signals:
 	void currentScaleChanged(double);
 
 	void currentThemeChanged(const QString &);
-	void iconStyleChanged(const QString &);
 
 private:
 	themeInterface() {}
@@ -94,6 +89,5 @@ private:
 	static double m_titlePointSize;
 
 	static QString m_currentTheme;
-	static QString m_iconStyle;
 };
 #endif