From b4e2c4ebca6e808807a489a2394e201a329b12d2 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 18:46:39 -0500 Subject: [PATCH 1/3] [F] Fix family segoe --- ProjectClock/AccountViewController.swift | 6 ++-- ProjectClock/Base.lproj/Main.storyboard | 35 +++++++++++++++++++----- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index 633c58b..3118660 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -199,9 +199,9 @@ class FamilyVC: UIViewController performSegue(withIdentifier: "family-create-join", sender: nil) } - @IBSegueAction func sendAlarm(_ c: NSCoder) -> FamilyCreateJoinVC? + @IBSegueAction func segueCreateJoin(_ coder: NSCoder) -> FamilyCreateJoinVC? { - return FamilyCreateJoinVC(coder: c, create: createMode) + return FamilyCreateJoinVC(coder: coder, create: createMode) } } @@ -210,6 +210,7 @@ class FamilyCreateJoinVC: UIViewController { let createMode: Bool @IBOutlet weak var lFamilyNameOrId: UILabel! + @IBOutlet weak var bCreateJoin: UIButton! init?(coder: NSCoder, create: Bool) { @@ -225,6 +226,7 @@ class FamilyCreateJoinVC: UIViewController override func viewDidLoad() { lFamilyNameOrId.text = createMode ? "Family Name" : "Family ID" + bCreateJoin.setTitle(createMode ? "Create" : "Join", for: .normal) } } diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index c221164..8eec5e2 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -1040,6 +1040,7 @@ + @@ -1055,15 +1056,15 @@ - + + - + + + + + + + + From a42093a0f0fca09e7888c77d4a0f24dae2d91efe Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 18:59:57 -0500 Subject: [PATCH 2/3] [-] Remove unused User model --- ProjectClock/Models.swift | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift index 647770b..fdb58f3 100644 --- a/ProjectClock/Models.swift +++ b/ProjectClock/Models.swift @@ -8,18 +8,10 @@ import Foundation import AVFoundation -struct User: Codable -{ - var id: String - var name: String - var email: String - var pass: String -} - struct Family: Codable { var fid: Int - var fname: String + var name: String var members: [String] // And a hidden field: admin pin } From 438bcf922ecf16e78e5d99cd1841cd2a6937c038 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 24 Jan 2021 19:05:31 -0500 Subject: [PATCH 3/3] [+] Check family pin length --- ProjectClock/AccountViewController.swift | 18 +++++++++++++++++- ProjectClock/Base.lproj/Main.storyboard | 5 ++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index 3118660..9cbaaab 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -205,13 +205,20 @@ class FamilyVC: UIViewController } } - +/** + Create or join a family + */ class FamilyCreateJoinVC: UIViewController { let createMode: Bool @IBOutlet weak var lFamilyNameOrId: UILabel! @IBOutlet weak var bCreateJoin: UIButton! + @IBOutlet weak var tNameOrId: UITextField! + @IBOutlet weak var tPin: UITextField! + /** + Pass in create mode from FamilyVC + */ init?(coder: NSCoder, create: Bool) { createMode = create @@ -228,5 +235,14 @@ class FamilyCreateJoinVC: UIViewController lFamilyNameOrId.text = createMode ? "Family Name" : "Family ID" bCreateJoin.setTitle(createMode ? "Create" : "Join", for: .normal) } + + /** + Called when the user clicks create or join button + */ + @IBAction func btnCreateOrJoin(_ sender: Any) + { + // Check pin + guard let pin = tPin.text, pin.count >= 4 else { msg("Pin Too Weak", "Your family pin must be 4 numbers or more."); return } + } } diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index 8eec5e2..0ffc998 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -1016,7 +1016,7 @@ - + @@ -1024,6 +1024,7 @@ + @@ -1042,6 +1043,8 @@ + +