Makefile

@@ -1,51 +1,33 @@
 .PHONY: all clean linux windows android
-all: clean linux windows android
-default: linux
+
+DEFAULT_GOAL: linux
 
 SHELL  := env QT_BUILD_VERSION=$(QT_BUILD_VERSION) $(SHELL)
 QT_BUILD_VERSION ?= "5.13.4"
 
+all: clean linux windows android
+
 clean:
 	rm -r vendor || true
 	find -type f -iname "moc*" | xargs rm
 	find -iname "rcc*" | xargs rm
 
 linux:
-	$(MAKE) linux_build || $(MAKE) linux_clean
-
-windows:
-	$(MAKE) windows_build || $(MAKE) windows_clean
-
-android:
-	$(MAKE) android_build || $(MAKE) android_clean
-
-linux_build:
 	date
 	qtdeploy -qt_version $(QT_BUILD_VERSION) build linux 2>&1 | tee qtdeploy.log | pv
 	date
 	cp -R assets deploy/linux/
-	$(MAKE) linux_clean
 
-linux_clean:
-	#ntd
-
-windows_build:
+windows:
 	date
 	qtdeploy -qt_version $(QT_BUILD_VERSION) build windows 2>&1 | tee qtdeploy.log | pv
 	date
 	cp -R assets deploy/windows/
-	$(MAKE) linux_clean
 
-windows_clean:
-	#ntd
-
-android_build:
+android:
 	cp -R assets android/
 	date
 	## TODO have this also include AndroidExtras (see ANDROID_DEBUGGING) for full notes.
 	env ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml" qtdeploy -debug -qt_version $(QT_BUILD_VERSION) build android 2>&1 | tee qtdeploy.log | pv
 	date
 
-android_clean:
-	mv android/assets assets
-

qml/opaque

@@ -1 +1 @@
-Subproject commit d9cc60c21f7e263960307bb9b06963dd759c74b6
+Subproject commit 365eedbd90eb936043e42f632355862d2a34c77a

qml/widgets/MyProfile.qml

@@ -38,13 +38,14 @@ Item {
         if (dualPane) {
             profile.height = Theme.contactPortraitSize * logscale
 
-            portrait.baseWidth = Theme.contactPortraitSize * logscale
-            portrait.height = Theme.contactPortraitSize * logscale
-
             portrait.anchors.horizontalCenter = undefined
             portrait.anchors.left = profile.left
             portrait.anchors.leftMargin = 25 * logscale
 
+            portrait.size = Theme.contactPortraitSize * logscale
+
+            profiletype.height = Theme.badgeTextSize * gcd.themeScale
+
             nameRow.anchors.right = undefined
             nameRow.anchors.left = portrait.right
 
@@ -56,12 +57,14 @@ Item {
         } else {
             profile.height = (Theme.contactPortraitSize * 2 * logscale)
 
-            portrait.size = Theme.contactPortraitSize * 1.5
-
             portrait.anchors.left =  undefined
             portrait.anchors.leftMargin = undefined
             portrait.anchors.horizontalCenter = profile.horizontalCenter
 
+            portrait.size = Theme.contactPortraitSize * 1.5
+
+            profiletype.height = Theme.badgeTextSize * gcd.themeScale * 1.5
+
             nameRow.anchors.left =  profile.left
             nameRow.anchors.right = profile.right
 
@@ -91,11 +94,15 @@ Item {
             portraitBorderColor: Theme.portraitOnlineBorderColor
             portraitColor: Theme.portraitOnlineBackgroundColor
 
-            badgeContent: Image {// Profle Type
+            badgeContent: Opaque.Icon {// Profle Type
                 id: profiletype
                 source: tag == "v1-userPassword" ? gcd.assetPath + "core/lock-24px.webp" : gcd.assetPath + "core/lock_open-24px.webp"
                 height: Theme.badgeTextSize * gcd.themeScale
                 width: height
+
+                iconColor: Theme.defaultButtonTextColor
+                backgroundColor: portrait.badgeColor
+                hilightBackgroundColor: portrait.badgeColor
             }
         }
 
@@ -125,6 +132,7 @@ Item {
 
                     anchors.left: name.right
                     anchors.top: name.top
+                    anchors.leftMargin: 10 * gcd.themeScale
 
                     icon: "fontawesome/solid/plus"
 

qml/widgets/ProfileRow.qml

@@ -33,11 +33,15 @@ RowLayout {
         nameColor: Theme.portraitOnlineTextColor
         onionColor: Theme.portraitOnlineTextColor
 
-        badgeContent: Image {// Profle Type
+        badgeContent: Opaque.Icon {// Profle Type
             id: profiletype
             source: tag == "v1-userPassword" ? gcd.assetPath + "core/lock-24px.webp" : gcd.assetPath + "core/lock_open-24px.webp"
             height: Theme.badgeTextSize * gcd.themeScale
             width: height
+
+            iconColor: Theme.defaultButtonTextColor
+            backgroundColor: prow.badgeColor
+            hilightBackgroundColor: prow.badgeColor
         }
 
         onClicked: rowClicked(handle)