2 files changed, 28 insertions, 25 deletions
diff --git a/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml
index 22a102a..8d4dcc6 100644
--- a/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml
+++ b/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 
 Column {
 	spacing: 16
diff --git a/Course/Detail/Classic/Content/Main/TabContents/Reviews/ReviewItem.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Reviews/ReviewItem.ui.qml
index 4f7f4a3..9643916 100644
--- a/Course/Detail/Classic/Content/Main/TabContents/Reviews/ReviewItem.ui.qml
+++ b/Course/Detail/Classic/Content/Main/TabContents/Reviews/ReviewItem.ui.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Effects
 
 Item {
 	width: reviewItem.width
@@ -10,26 +10,29 @@ Item {
 		id:reviewItem
 		spacing: 16
 		RowLayout {
-			id: reviewAvatar
 			Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-			Rectangle {
-				id: avatarMask
-				radius: 100
-				Layout.preferredHeight: 82
-				Layout.preferredWidth: 82
-				Layout.minimumHeight: 82
-				Layout.minimumWidth: 82
-				Image{
-					id: avatarImage
-					source: "https://eduport.webestica.com/assets/images/avatar/09.jpg"
-					sourceSize: Qt.size(parent.width, parent.height)
-					visible: false
+			Image {
+				id: avatarImage
+				source: "https://eduport.webestica.com/assets/images/avatar/09.jpg"
+				sourceSize {
+					width: 82
+					height: 82
+				}
+			}
+			layer {
+				enabled: true
+				effect: MultiEffect {
+					maskEnabled: true
+					maskSource: maskRectangle
 				}
 			}
-			OpacityMask {
-				anchors.fill: avatarMask
-				source: avatarImage
-				maskSource: avatarMask
+			Rectangle {
+				id: maskRectangle
+				width: avatarImage.sourceSize.width
+				height: avatarImage.sourceSize.height
+				radius: avatarImage.sourceSize.width
+				layer.enabled: true
+				visible: false
 			}
 		}
 		ColumnLayout {
@@ -66,4 +69,4 @@ Item {
 		}
 
 	}
-}
-\ No newline at end of file
+}