@@ -23,14 +23,13 @@ protocol CustomServerSelectionViewControllerDelegate: class {
2323class CustomServerSelectionViewController : UIViewController {
2424
2525 private struct Strings {
26- static let missingIPTitle = " Missing IP Address "
27- static let invalidPortTitle = " Invalid Server Port "
28- static let serverAddressLabel = " Server address "
26+ static let missingIPTitle = " Missing IP Address "
27+ static let invalidPortTitle = " Invalid Server Port "
28+ static let serverAddressLabel = " Server address "
2929 static let serverAddressPlaceholder = " https://your-server.com "
30- static let serverPortLabel = " Server Port "
31- static let serverPortPlaceholder = " 8096 "
32- static let connectTitle = " Connect to Server "
33-
30+ static let serverPortLabel = " Server Port "
31+ static let serverPortPlaceholder = " 8096 "
32+ static let connectTitle = " Connect to Server "
3433 }
3534
3635 enum Errors : LocalizedError {
@@ -39,62 +38,83 @@ class CustomServerSelectionViewController: UIViewController {
3938
4039 public var errorDescription : String ? {
4140 switch self {
42- case . missingIP: return Strings . missingIPTitle
43- case . invalidServerPort: return Strings . invalidPortTitle
41+ case . missingIP:
42+ return Strings . missingIPTitle
43+ case . invalidServerPort:
44+ return Strings . invalidPortTitle
4445 }
4546 }
4647 }
4748
48- lazy var scrollView : UIScrollView = ViewBuilder . scrollView ( subview: self . contentView)
49- lazy var contentView : UIStackView = ViewBuilder . stackView ( arrangedSubviews: [ self . serverIPLabel,
50- self . serverIPField,
51- self . serverPortLabel,
52- self . serverPortField,
53- self . errorTextLabel,
54- self . connectButton] ,
55- layoutMargins: UIEdgeInsets ( top: 20 , left: 20 , bottom: 20 , right: 20 ) )
56-
57- lazy var serverIPLabel = ViewBuilder . textLabel ( font: . title3,
58- text: Strings . serverAddressLabel)
59- lazy var serverIPField : UITextField = ViewBuilder . textField ( placeholder: Strings . serverAddressPlaceholder,
60- text: " " ,
61- keybordType: . URL)
62-
63- lazy var serverPortLabel = ViewBuilder . textLabel ( font: . title3,
64- text: Strings . serverPortLabel)
65- lazy var serverPortField : UITextField = ViewBuilder . textField ( placeholder: Strings . serverPortPlaceholder,
66- keybordType: . numberPad)
67-
68- lazy var errorTextLabel : UILabel = ViewBuilder . textLabel ( textColor: . red,
69- font: . callout,
70- isHidden: true )
71-
72- lazy var connectButton : UIButton = ViewBuilder . button ( title: Strings . connectTitle,
73- color: UIColor ( red: 20 / 255 , green: 200 / 255 , blue: 20 / 255 , alpha: 1 ) ,
74- target: self ,
75- selector: #selector( self . connectButtonWasTapped) )
49+ lazy private var serverIPField : UITextField = ViewBuilder . textField ( placeholder: Strings . serverAddressPlaceholder,
50+ text: " " , keybordType: . URL)
51+
52+ lazy private var serverPortField : UITextField = ViewBuilder . textField ( placeholder: Strings . serverPortPlaceholder,
53+ keybordType: . numberPad)
54+
55+ lazy private var errorTextLabel : UILabel = ViewBuilder . textLabel ( textColor: . red,
56+ font: . callout,
57+ isHidden: true )
58+
59+ lazy private var connectButton : UIButton = ViewBuilder . button ( title: Strings . connectTitle,
60+ color: UIColor ( red: 20 / 255 , green: 200 / 255 , blue: 20 / 255 , alpha: 1 ) ,
61+ target: self ,
62+ selector: #selector( self . connectButtonWasTapped) )
7663
7764 weak var delegate : CustomServerSelectionViewControllerDelegate ?
7865
7966 override func viewDidLoad( ) {
8067 setupViewController ( )
8168 }
8269
70+ override func viewDidDisappear( _ animated: Bool ) {
71+ resetViewController ( )
72+ }
73+
8374 private func setupViewController( ) {
75+ let serverIPLabel : UILabel = ViewBuilder . textLabel ( font: . title3, text: Strings . serverAddressLabel)
76+ let serverPortLabel : UILabel = ViewBuilder . textLabel ( font: . title3, text: Strings . serverPortLabel)
77+
8478 title = " Custom Connection "
8579 view. backgroundColor = . black
80+
81+ let views = [ serverIPLabel,
82+ serverIPField,
83+ serverPortLabel,
84+ serverPortField,
85+ errorTextLabel,
86+ connectButton]
87+
88+ let contentView : UIStackView = ViewBuilder . stackView ( arrangedSubviews: views,
89+ layoutMargins: UIEdgeInsets ( top: 20 , left: 20 , bottom: 20 , right: 20 ) )
90+
91+ let scrollView : UIScrollView = ViewBuilder . scrollView ( subview: contentView)
92+
8693 view. addSubview ( scrollView)
8794 scrollView. fillSuperView ( )
95+
96+ serverIPField. autocapitalizationType = . none
97+ }
98+
99+ private func resetViewController( ) {
100+ resetError ( )
88101 }
89102
90103 private func getServerConnection( ) throws -> ServerConnection {
91104
92- guard var ipAddress = serverIPField. text,
93- !ipAddress . isEmpty else { throw Errors . missingIP }
105+ guard var ipAddress = serverIPField. text, ipAddress . isNotBlankOrEmpty else { throw Errors . missingIP }
106+
94107 if !ipAddress. contains ( " : " ) {
95108 ipAddress = " http:// " + ipAddress
96109 }
97- let portString = serverPortField. text? . isEmpty == true ? Strings . serverPortPlaceholder : serverPortField. text!
110+
111+ let portString : String
112+ if let userDefinedPort = serverPortField. text {
113+ portString = userDefinedPort. isNotBlankOrEmpty ? userDefinedPort : Strings . serverPortPlaceholder
114+ } else {
115+ portString = Strings . serverPortPlaceholder
116+ }
117+
98118 guard let port = Int ( portString) else { throw Errors . invalidServerPort }
99119
100120 return ServerConnection ( ipAddress: ipAddress, port: port)
@@ -105,9 +125,15 @@ class CustomServerSelectionViewController: UIViewController {
105125 errorTextLabel. isHidden = false
106126 }
107127
128+ private func resetError( ) {
129+ errorTextLabel. text = " "
130+ errorTextLabel. isHidden = true
131+ }
132+
108133 @objc
109- func connectButtonWasTapped( ) {
134+ private func connectButtonWasTapped( ) {
110135 do {
136+ resetError ( )
111137 let connection = try getServerConnection ( )
112138 delegate? . connectToServer ( connection)
113139 } catch {
0 commit comments