From cdbc7a5dd47baa3c96255098d3864e9ccd80c2f8 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 18:35:32 -0500 Subject: [PATCH 1/3] [+] Specify that username and password are both case-sensitive --- ProjectClock/Base.lproj/Main.storyboard | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index d3c9efa..65a13e3 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -784,7 +784,7 @@ - + @@ -803,7 +803,7 @@ - + From c8484d4cc180e40d181f3765c7fbfa16e65697d1 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 18:36:40 -0500 Subject: [PATCH 2/3] [+] Create family views --- ProjectClock/AccountViewController.swift | 23 +++ ProjectClock/Base.lproj/Main.storyboard | 180 ++++++++++++++++++++++- 2 files changed, 197 insertions(+), 6 deletions(-) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index 26ad71b..7cbbb53 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -136,6 +136,8 @@ class ManageVC: UIViewController @IBOutlet weak var lUsername: UILabel! @IBOutlet weak var lJoinDate: UILabel! + @IBOutlet weak var lCurrentFamily: UILabel! + /** Called when the user switched to the account tab (whether the view container is hidden or not) */ @@ -177,3 +179,24 @@ class ManageVC: UIViewController } } } + +/** + Family view controller that displays family info or create/join family buttons + */ +class FamilyVC: UIViewController +{ + @IBAction func btnCreate(_ sender: Any) + { + } + + @IBAction func btnJoin(_ sender: Any) + { + } +} + + +class FamilyCreateJoinVC: UIViewController +{ + @IBOutlet weak var lFamilyNameOrId: UILabel! +} + diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index 65a13e3..c221164 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -847,7 +847,7 @@ - + @@ -858,13 +858,13 @@ - + - + @@ -896,8 +896,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9ce66652ab8b19f05d9fcccbdff136664d89d630 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 18:36:56 -0500 Subject: [PATCH 3/3] [+] Implement family create/join segue --- ProjectClock/AccountViewController.swift | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index 7cbbb53..633c58b 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -185,18 +185,46 @@ class ManageVC: UIViewController */ class FamilyVC: UIViewController { + var createMode: Bool! + @IBAction func btnCreate(_ sender: Any) { + createMode = true + performSegue(withIdentifier: "family-create-join", sender: nil) } @IBAction func btnJoin(_ sender: Any) { + createMode = false + performSegue(withIdentifier: "family-create-join", sender: nil) + } + + @IBSegueAction func sendAlarm(_ c: NSCoder) -> FamilyCreateJoinVC? + { + return FamilyCreateJoinVC(coder: c, create: createMode) } } class FamilyCreateJoinVC: UIViewController { + let createMode: Bool @IBOutlet weak var lFamilyNameOrId: UILabel! + + init?(coder: NSCoder, create: Bool) + { + createMode = create + super.init(coder: coder) + } + + required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } + + /** + On load + */ + override func viewDidLoad() + { + lFamilyNameOrId.text = createMode ? "Family Name" : "Family ID" + } }