Merge PR #946: Move utils into separate module

nymea-app/main.cpp

@@ -170,8 +170,8 @@ int main(int argc, char *argv[])
     qmlRegisterType<NfcThingActionWriter>("Nymea", 1, 0, "NfcThingActionWriter");
 
     qmlRegisterSingletonType<PushNotifications>("Nymea", 1, 0, "PushNotifications", PushNotifications::pushNotificationsProvider);
-    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "Nymea", 1, 0, "NymeaUtils" );
+    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "NymeaApp.Utils", 1, 0, "NymeaUtils" );
-    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/AirQualityIndex.qml"), "Nymea", 1, 0, "AirQualityIndex" );
+    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/AirQualityIndex.qml"), "NymeaApp.Utils", 1, 0, "AirQualityIndex" );
 
     qmlRegisterType<DashboardModel>("Nymea", 1, 0, "DashboardModel");
     qmlRegisterUncreatableType<DashboardItem>("Nymea", 1, 0, "DashboardItem", "");

nymea-app/ui/MainMenu.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.1
 import Qt.labs.settings 1.0
 import "components"
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 Drawer {
     id: root

nymea-app/ui/Nymea.qml

@@ -36,6 +36,7 @@ import Qt.labs.settings 1.0
 import Qt.labs.folderlistmodel 2.2
 import QtQuick.Window 2.3
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ApplicationWindow {
     id: app

nymea-app/ui/RootItem.qml

@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "components"
 import "connection"
 

nymea-app/ui/SettingsPage.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "components"
 
 Page {

nymea-app/ui/components/BatteryStatusIcon.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ColorIcon {
     id: root

nymea-app/ui/components/ConnectionStatusIcon.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ColorIcon {
     id: root

nymea-app/ui/components/MediaPlayer.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import QtGraphicalEffects 1.0
 import "../delegates"
 import "../utils"

nymea-app/ui/customviews/GenericTypeGraph.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../customviews"
 import QtCharts 2.2

nymea-app/ui/delegates/InterfaceTile.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 
 MainPageTile {

nymea-app/ui/devicelistpages/LightThingsListPage.qml

@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../utils"
 

nymea-app/ui/devicelistpages/ThingsListPageBase.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 
 Page {

nymea-app/ui/devicepages/SensorDevicePage.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../customviews"
 

nymea-app/ui/grouping/GroupThingsPage.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../delegates"
 

nymea-app/ui/mainviews/FavoritesView.qml

@@ -33,6 +33,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 import "../delegates"
 

nymea-app/ui/mainviews/dashboard/DashboardAddWizard.qml

@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../../components"
 import "../../delegates"
 

nymea-app/ui/mainviews/dashboard/DashboardFolderDelegate.qml

@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../../components"
 import "../../delegates"
 

nymea-app/ui/mainviews/dashboard/DashboardThingDelegate.qml

@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.2
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../../components"
 import "../../delegates"
 

nymea-app/ui/mainviews/energy/ConsumerStats.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
 import QtCharts 2.3
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components/"
 
 StatsBase {

nymea-app/ui/mainviews/energy/ConsumersHistory.qml

@@ -3,6 +3,7 @@ import QtCharts 2.3
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components"
 
 Item {

nymea-app/ui/mainviews/energy/ConsumersPieChart.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components"
 
 Item {

nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ChartView {
     id: consumptionPieChart

nymea-app/ui/mainviews/energy/CurrentPowerBalancePieChart.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "qrc:/ui/components"
 
 Item {

nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtCharts 2.2
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 ChartView {
     id: productionPieChart

nymea-app/ui/system/UsersSettingsPage.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.1
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 import "../components"
 
 SettingsPageBase {

nymea-app/ui/system/zigbee/ZigbeeNodePage.qml

@@ -34,6 +34,7 @@ import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.3
 import "qrc:/ui/components"
 import Nymea 1.0
+import NymeaApp.Utils 1.0
 
 SettingsPageBase {
     id: root