Merge pull request '02-contacts' (#15) from 02-contacts into master

Reviewed-on: #15

Badge.qml

@@ -7,12 +7,12 @@ import CustomQmlTypes 1.0
 import "theme"
 
 Rectangle {
-    width: parent.width * 0.25
+    property int size
-    height: width
+
-    radius: width/2
+    width: size
-    anchors.right: parent.right
+    height: size
-    anchors.bottom: parent.bottom
+    radius: size/2
-    anchors.margins: parent.width * 0.09
+
     property alias content: container.children
 
     Column {
@@ -20,5 +20,4 @@ Rectangle {
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
     }
-
 }

Portrait.qml

@@ -71,5 +71,9 @@ Item {
 
     Badge {
         id: badge
+        size: parent.width * 0.25
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        anchors.margins: parent.width * 0.09
     }
 }

PortraitRow.qml

@@ -26,14 +26,16 @@ Item {
 
     property color rowColor: Theme.backgroundMainColor
     property color rowHilightColor: Theme.backgroundHilightElementColor
-    property alias badgeColor: portrait.badgeColor
     property alias portraitBorderColor: portrait.portraitBorderColor
     property alias portraitColor: portrait.portraitColor
     property alias nameColor: cn.color
     property alias onionColor: onion.color
     property alias onionVisible: onion.visible
+
+    property alias badgeColor: portrait.badgeColor
     property alias badgeVisible: portrait.badgeVisible
     property alias badgeContent: portrait.badgeContent
+
     property alias hoverEnabled: buttonMA.hoverEnabled
 
     // Ideally read only for icons to match against

theme/CwtchDark.qml

@@ -9,6 +9,7 @@ ThemeType {
     readonly property color pink: "#E85DA1"
     readonly property color hotPink: "#D01972"
     readonly property color lightGrey: "#9E9E9E"
+    readonly property color softGreen: "#A0FFB0"
 
     backgroundMainColor: darkGreyPurple
     backgroundPaneColor: darkGreyPurple
@@ -48,6 +49,8 @@ ThemeType {
     portraitBlockedBackgroundColor: lightGrey
     portraitBlockedTextColor: lightGrey
 
+    portraitOnlineBadgeColor: softGreen
+
     portraitContactBadgeColor: hotPink
     portraitContactBadgeTextColor: whitePurple
     portraitProfileBadgeColor: mauvePurple

theme/CwtchLight.qml

@@ -9,6 +9,7 @@ ThemeType {
     readonly property color pink: "#E85DA1"
     readonly property color hotPink: "#D01972"
     readonly property color lightGrey: "#B3B6B3"
+    readonly property color softGreen: "#A0FFB0"
 
     backgroundMainColor: whitePurple
     backgroundPaneColor: softPurple
@@ -49,6 +50,8 @@ ThemeType {
     portraitBlockedBackgroundColor: lightGrey
     portraitBlockedTextColor: lightGrey
 
+    portraitOnlineBadgeColor: softGreen
+
     portraitContactBadgeColor: hotPink
     portraitContactBadgeTextColor: whitePurple
     portraitProfileBadgeColor: brightPurple

theme/Theme.qml

@@ -46,6 +46,8 @@ Item {
     readonly property color portraitBlockedBackgroundColor: theme.portraitBlockedBackgroundColor
     readonly property color portraitBlockedTextColor: theme.portraitBlockedTextColor
 
+    readonly property color portraitOnlineBadgeColor: theme.portraitOnlineBadgeColor
+
     readonly property color portraitContactBadgeColor: theme.portraitContactBadgeColor
     readonly property color portraitContactBadgeTextColor: theme.portraitContactBadgeTextColor
     readonly property color portraitProfileBadgeColor: theme.portraitProfileBadgeColor

theme/ThemeType.qml

@@ -40,6 +40,8 @@ QtObject {
     property color portraitBlockedBackgroundColor: "red"
     property color portraitBlockedTextColor: "red"
 
+    property color portraitOnlineBadgeColor: "red"
+
     property color portraitContactBadgeColor: "red"
     property color portraitContactBadgeTextColor: "red"
     property color portraitProfileBadgeColor: "red"