work on custom icon

sailfish-spotify · Jul 14, 2018 · 6d900fd · 6d900fd
1 parent e8ee289
commit 6d900fd
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 8 deletions.
diff --git a/playspot.pro b/playspot.pro
@@ -68,6 +68,7 @@ HEADERS += \
     src/o2/o2reply.h \
     src/o2/o2replyserver.h \
     src/o2/o2spotify.h \
-    src/spotify.h
+    src/spotify.h \
+    src/IconProvider.h
 
 #QMAKE_LFLAGS += -lavahi-client -lavahi-common
diff --git a/qml/components/MenuButton.qml b/qml/components/MenuButton.qml
@@ -7,10 +7,12 @@ IconButton {
     height: icon.height
 
     x: Theme.paddingMedium
-    y: Theme.paddingMedium
-    icon.height: Theme.iconSizeMedium
+    y: Theme.paddingLarge*1.5
+    icon.height: Theme.iconSizeSmall
     icon.fillMode: Image.PreserveAspectFit
-    icon.source: "image://theme/icon-m-menu" /*navPanel.expanded
+    icon.source: "image://hutspot-icons/icon-m-toolbar"
+
+               /*"image://theme/icon-m-menu" navPanel.expanded
                  ? "image://theme/icon-m-down"
                  : "image://theme/icon-m-up"*/
     onClicked: {

diff --git a/qml/icons/icon-m-toolbar.png b/qml/icons/icon-m-toolbar.png
diff --git a/qml/pages/Playing.qml b/qml/pages/Playing.qml
@@ -78,6 +78,17 @@ Page {
                 }
             }
 
+            PushUpMenu {
+                MenuItem {
+                    text: qsTr("Login")
+                    onClicked: spotify.doO2Auth(Spotify._scope, app.auth_using_browser.value)
+                }
+                MenuItem {
+                    text: qsTr("Refresh Token")
+                    onClicked: spotify.refreshToken()
+                }
+            }
+
             /* playbackState
                   .context type uri
                   .is_playing

diff --git a/src/IconProvider.h b/src/IconProvider.h
@@ -0,0 +1,42 @@
+#ifndef ICONPROVIDER_H
+#define ICONPROVIDER_H
+
+#include <sailfishapp.h>
+#include <QQuickImageProvider>
+#include <QPainter>
+#include <QColor>
+
+class IconProvider : public QQuickImageProvider
+{
+public:
+    IconProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap)
+    {
+    }
+
+    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
+    {
+        QStringList parts = id.split('?');
+
+        QPixmap sourcePixmap(SailfishApp::pathTo("qml/icons/" + parts.at(0) + ".png").toString(QUrl::RemoveScheme));
+
+        if (size)
+            *size  = sourcePixmap.size();
+
+        if (parts.length() > 1)
+            if (QColor::isValidColor(parts.at(1)))
+            {
+                QPainter painter(&sourcePixmap);
+                painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+                painter.fillRect(sourcePixmap.rect(), parts.at(1));
+                painter.end();
+            }
+
+        if (requestedSize.width() > 0 && requestedSize.height() > 0)
+            return sourcePixmap.scaled(requestedSize.width(), requestedSize.height(), Qt::IgnoreAspectRatio);
+        else
+            return sourcePixmap;
+    }
+};
+
+#endif // ICONPROVIDER_H
+
diff --git a/src/hutspot.cpp b/src/hutspot.cpp
@@ -16,6 +16,7 @@
 
 #include <sailfishapp.h>
 
+#include "IconProvider.h"
 #include "spotify.h"
 //#include "servicebrowser.h"
 
@@ -31,6 +32,10 @@ int main(int argc, char *argv[])
     Spotify spotify;
     view->rootContext()->setContextProperty("spotify", &spotify);
 
+    // custom icon loader
+    QQmlEngine *engine = view->engine();
+    engine->addImageProvider(QLatin1String("hutspot-icons"), new IconProvider);
+
 //    ServiceBrowser serviceBrowser;
 //    view->rootContext()->setContextProperty("serviceBrowser", &serviceBrowser);
 

diff --git a/translations/hutspot.ts b/translations/hutspot.ts
@@ -359,22 +359,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Playing.qml" line="119"/>
+        <location filename="../qml/pages/Playing.qml" line="83"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Playing.qml" line="87"/>
+        <source>Refresh Token</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Playing.qml" line="130"/>
         <source>no artist known</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Playing.qml" line="292"/>
+        <location filename="../qml/pages/Playing.qml" line="303"/>
         <source>No Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Playing.qml" line="316"/>
+        <location filename="../qml/pages/Playing.qml" line="327"/>
         <source>No tracks found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/Playing.qml" line="388"/>
+        <location filename="../qml/pages/Playing.qml" line="399"/>
         <source>Connection lost with Spotify servers</source>
         <translation type="unfinished"></translation>
     </message>