From 5ec61ba1c9a4e656ae320e0bbc19e1f13c46239a Mon Sep 17 00:00:00 2001
From: Carson Black <uhhadd@gmail.com>
Date: Thu, 6 Aug 2020 17:27:21 -0400
Subject: [PATCH] [kcms/users] Port to use Avatar component

---
 .../package/contents/ui/UserDetailsPage.qml   | 18 ++--------
 kcms/users/package/contents/ui/main.qml       | 35 ++-----------------
 2 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/kcms/users/package/contents/ui/UserDetailsPage.qml b/kcms/users/package/contents/ui/UserDetailsPage.qml
index 3f13ec5bc..e9b78eca4 100644
--- a/kcms/users/package/contents/ui/UserDetailsPage.qml
+++ b/kcms/users/package/contents/ui/UserDetailsPage.qml
@@ -26,7 +26,7 @@ import QtQuick.Controls 2.5 as QQC2
 import QtQuick.Dialogs 1.3
 
 import org.kde.kcm 1.2
-import org.kde.kirigami 2.8 as Kirigami
+import org.kde.kirigami 2.13 as Kirigami
 
 SimpleKCM {
     id: usersDetailPage
@@ -98,29 +98,17 @@ SimpleKCM {
 
                 readonly property int size: 6 * Kirigami.Units.gridUnit
 
-                icon.name: usersDetailPage.user.faceValid || usersDetailPage.overrideImage ? "" : "user-identity"
-                icon.width: size
-                icon.height: size
                 implicitWidth: size
                 implicitHeight: size
                 flat: true
 
-                Image {
+                Kirigami.Avatar {
                     source: usersDetailPage.user.face
-                    visible: usersDetailPage.user.faceValid || usersDetailPage.overrideImage
-                    sourceSize: Qt.size(parent.size*Screen.devicePixelRatio, parent.size*Screen.devicePixelRatio)
-                    cache: false
+                    name: user.realName
                     anchors {
                         fill: parent
                         margins: Kirigami.Units.smallSpacing
                     }
-                    layer.enabled: usersDetailPage.user.faceValid || usersDetailPage.overrideImage
-                    layer.effect: OpacityMask {
-                        maskSource: Rectangle {
-                            height: userPfp.size; width: height
-                            radius: height/2
-                        }
-                    }
                 }
 
                 Layout.alignment: Qt.AlignHCenter
diff --git a/kcms/users/package/contents/ui/main.qml b/kcms/users/package/contents/ui/main.qml
index 1cdb5017a..4741af6d3 100644
--- a/kcms/users/package/contents/ui/main.qml
+++ b/kcms/users/package/contents/ui/main.qml
@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.5 as QQC2
 
 import org.kde.kcm 1.2 as KCM
-import org.kde.kirigami 2.12 as Kirigami
+import org.kde.kirigami 2.13 as Kirigami
 import org.kde.kcoreaddons 1.0 as KCoreAddons
 
 KCM.ScrollViewKCM {
@@ -61,43 +61,14 @@ KCM.ScrollViewKCM {
                     height: col.height
                     width: height
 
-                    visible: model.faceValid
-
                     color: "transparent"
                     border.color: Kirigami.ColorUtils.adjustColor(Kirigami.Theme.textColor, {alpha: 0.4*255})
                     border.width: 1
                     radius: height/2
 
-                    Image {
-                        anchors {
-                            fill: parent
-                            margins: 1
-                        }
-                        cache: false
-                        mipmap: true
+                    Kirigami.Avatar {
                         source: model.decoration
-                        layer.enabled: true
-                        layer.effect: OpacityMask {
-                            maskSource: Rectangle {
-                                height: col.height-2; width: height
-                                radius: height/2
-                            }
-                        }
-                    }
-                }
-                Rectangle {
-                    height: col.height
-                    width: height
-
-                    visible: !model.faceValid
-
-                    color: "transparent"
-                    border.color: Kirigami.ColorUtils.adjustColor(Kirigami.Theme.textColor, {alpha: 0.4*255})
-                    border.width: 1
-                    radius: height/2
-
-                    Kirigami.Icon {
-                        source: "user-identity"
+                        name: model.display
                         anchors {
                             fill: parent
                             margins: 1