Fixed template copy

Parra-Inc · Aug 5, 2024 · 4ae65f8 · 4ae65f8
1 parent 2424d4b
commit 4ae65f8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/dev/ParraDev/Settings Tab/Account Screen/AccountHeader.swift b/dev/ParraDev/Settings Tab/Account Screen/AccountHeader.swift
@@ -10,16 +10,14 @@ import Parra
 import SwiftUI
 
 struct AccountHeader: View {
-    let user: ParraUser?
-
     var body: some View {
         VStack {
             ParraProfilePhotoWell(
                 size: CGSize(width: 100, height: 100)
             )
             .padding(.bottom, 6)
 
-            IdentityLabels(user: user)
+            IdentityLabels()
         }
         .padding()
         .frame(maxWidth: .infinity)

diff --git a/dev/ParraDev/Settings Tab/Account Screen/AccountView.swift b/dev/ParraDev/Settings Tab/Account Screen/AccountView.swift
@@ -13,14 +13,12 @@ struct AccountView: View {
     @EnvironmentObject private var parraAuthState: ParraAuthState
     @State private var isSigningIn = false
 
-    var user: ParraUser? {
-        return parraAuthState.current.user
-    }
-
     var body: some View {
+        let user = parraAuthState.current.user
+
         List {
             Section {
-                AccountHeader(user: user)
+                AccountHeader()
             }
 
             Section {

diff --git a/dev/ParraDev/Settings Tab/Cells/ProfileCell.swift b/dev/ParraDev/Settings Tab/Cells/ProfileCell.swift
@@ -14,18 +14,20 @@ public struct ProfileCell: View {
     @EnvironmentObject private var parraAuthState: ParraAuthState
 
     public var body: some View {
-        if let user = parraAuthState.current.user {
-            AuthenticatedProfileInfoView(user: user)
-        } else {
+        switch parraAuthState.current {
+        case .anonymous, .authenticated:
+            AuthenticatedProfileInfoView()
+        default:
             UnauthenticatedProfileInfoView()
         }
     }
 }
 
 struct IdentityLabels: View {
-    let user: ParraUser?
+    @EnvironmentObject private var parraAuthState: ParraAuthState
 
     var body: some View {
+        let user = parraAuthState.current.user
         let identityNames = user?.info.identityNames ?? []
 
         if identityNames.isEmpty {
@@ -46,11 +48,9 @@ struct IdentityLabels: View {
 }
 
 struct AuthenticatedProfileInfoView: View {
-    let user: ParraUser
-
     @ViewBuilder var labels: some View {
         VStack(alignment: .leading) {
-            IdentityLabels(user: user)
+            IdentityLabels()
         }
     }
 

diff --git a/templates/default/App/Settings Tab/Account Screen/AccountView.liquid.swift b/templates/default/App/Settings Tab/Account Screen/AccountView.liquid.swift
@@ -13,14 +13,12 @@ struct AccountView: View {
     @EnvironmentObject private var parraAuthState: ParraAuthState
     @State private var isSigningIn = false
 
-    var user: ParraUser? {
-        return parraAuthState.current.user
-    }
-
     var body: some View {
+        let user = parraAuthState.current.user
+
         List {
             Section {
-                AccountHeader(user: user)
+                AccountHeader()
             }
 
             Section {

diff --git a/templates/default/App/Settings Tab/Cells/ProfileCell.liquid.swift b/templates/default/App/Settings Tab/Cells/ProfileCell.liquid.swift
@@ -14,18 +14,20 @@ public struct ProfileCell: View {
     @EnvironmentObject private var parraAuthState: ParraAuthState
 
     public var body: some View {
-        if let user = parraAuthState.current.user {
-            AuthenticatedProfileInfoView(user: user)
-        } else {
+        switch parraAuthState.current {
+        case .anonymous, .authenticated:
+            AuthenticatedProfileInfoView()
+        default:
             UnauthenticatedProfileInfoView()
         }
     }
 }
 
 struct IdentityLabels: View {
-    let user: ParraUser?
+    @EnvironmentObject private var parraAuthState: ParraAuthState
 
     var body: some View {
+        let user = parraAuthState.current.user
         let identityNames = user?.info.identityNames ?? []
 
         if identityNames.isEmpty {
@@ -46,11 +48,9 @@ struct IdentityLabels: View {
 }
 
 struct AuthenticatedProfileInfoView: View {
-    let user: ParraUser
-
     @ViewBuilder var labels: some View {
         VStack(alignment: .leading) {
-            IdentityLabels(user: user)
+            IdentityLabels()
         }
     }