fix coloring in some badges

--a faulty check was using backgroundColor instead of
textColor for badges shown from global shortcuts indicators
--improve badges to understand the new url form of
plasma 5.11 launchers

plasmoid/package/contents/ui/main.qml

@@ -1313,10 +1313,11 @@ Item {
     function getBadger(identifier) {
         var ident1 = identifier;
         var n = ident1.lastIndexOf('/');
+
         var result = n>=0 ? ident1.substring(n + 1) : identifier;
 
         for(var i=0; i<badgers.length; ++i) {
-            if (badgers[i].id === result) {
+            if (result.indexOf(badgers[i].id) >= 0) {
                 return badgers[i];
             }
         }

plasmoid/package/contents/ui/task/CircleText.qml

@@ -110,10 +110,12 @@ Rectangle {
         text: numberValue > 0 ? numberValue : ""
         font.pixelSize: 0.6 * parent.height
         font.bold: true
-        color: (( (mainItemContainer.badgeIndicator > 0)
-                || (centralItem.smartLauncherItem.countVisible && !centralItem.smartLauncherItem.progressVisible) ))
-               && proportion>0 ? theme.backgroundColor : theme.textColor
+        color: useBackgroundColor ? theme.backgroundColor : theme.textColor
         visible: showNumber
+
+        property bool useBackgroundColor: ( (mainItemContainer.badgeIndicator > 0)
+                                           || (centralItem.smartLauncherItem.countVisible && !centralItem.smartLauncherItem.progressVisible) )
+                                          && proportion>0
     }
 
 

plasmoid/package/contents/ui/task/TaskDelegate.qml

@@ -527,15 +527,7 @@ MouseArea{
         checkWindowsStates();
     }
 
-    onLauncherUrlChanged: {
-        var badger = root.getBadger(launcherUrl);
-
-        if (badger && !isLauncher) {
-            badgeIndicator = parseInt(badger.value);
-        } else {
-            badgeIndicator = 0;
-        }
-    }
+    onLauncherUrlChanged: updateBadge();
 
     ////// End of Values Changes /////
 
@@ -1175,6 +1167,16 @@ MouseArea{
         mainItemContainer.audioStreams.forEach(function (item) { item.decreaseVolume(); });
     }
 
+    function updateBadge() {
+        var badger = root.getBadger(launcherUrl);
+
+        if (badger && !isLauncher) {
+            badgeIndicator = parseInt(badger.value);
+        } else {
+            badgeIndicator = 0;
+        }
+    }
+
     Connections {
         target: pulseAudio.item
         ignoreUnknownSignals: true // Plasma-PA might not be available
@@ -1188,7 +1190,6 @@ MouseArea{
         onDragSourceChanged: mainItemContainer.updateAudioStreams()
     }
 
-
     ///REMOVE
     //fix wrong positioning of launchers....
     onActivityChanged:{