From 04496aca1d2f0e6b7ac1dd28aa256c0410862dfe Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 10 May 2020 19:26:54 -0400 Subject: [PATCH] Apply avatar style to local account avatar images --- .../Preferences/LocalAccountAvatarView.swift | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Tusker/Screens/Preferences/LocalAccountAvatarView.swift b/Tusker/Screens/Preferences/LocalAccountAvatarView.swift index 7fbbb4d0..19acc9ce 100644 --- a/Tusker/Screens/Preferences/LocalAccountAvatarView.swift +++ b/Tusker/Screens/Preferences/LocalAccountAvatarView.swift @@ -10,19 +10,27 @@ import SwiftUI struct LocalAccountAvatarView: View { let localAccountInfo: LocalData.UserAccountInfo - @State - var avatarImage: UIImage? = nil + @State var avatarImage: UIImage? = nil + @ObservedObject var preferences = Preferences.shared var body: some View { let image: Image if avatarImage == nil { - image = Image(systemName: "person.crop.square") + let imageName: String + switch preferences.avatarStyle { + case .circle: + imageName = "person.crop.circle" + case .roundRect: + imageName = "person.crop.square" + } + image = Image(systemName: imageName).resizable() } else { image = Image(uiImage: self.avatarImage!).renderingMode(.original) } return image .resizable() .frame(width: 30, height: 30) + .cornerRadius(preferences.avatarStyle.cornerRadiusFraction * 30) .onAppear(perform: self.loadImage) }