From cb7845499d4ace4329ab41c43d04d5618e7f349a Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 20:07:55 -0500 Subject: [PATCH] [+] Display family name in account vc --- ProjectClock/AccountViewController.swift | 10 ++- ProjectClock/Base.lproj/Main.storyboard | 93 ++++++++++++++---------- 2 files changed, 62 insertions(+), 41 deletions(-) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index d1e8403..4a0d73b 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -167,8 +167,14 @@ class ManageVC: UIViewController func display() { lUsername.text = localStorage.string(forKey: "name") - // TODO: Correct join date + // TODO: Implement join date (not important) lJoinDate.text = localStorage.string(forKey: "id") + + // Display family name + if let family = localStorage.object(forKey: "family") as? Family + { + lCurrentFamily.text = family.name + } } /** @@ -198,6 +204,8 @@ class ManageVC: UIViewController */ class FamilyVC: UIViewController { + // No family view - prompt to create/join a family + @IBOutlet weak var noFamilyView: UIView! var createMode: Bool! @IBAction func btnCreate(_ sender: Any) diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index 0ffc998..ccc08a3 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -1059,72 +1059,85 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + - - + + - +