master..a32c342 · dashared/GDproject

git.iko.soy/dashared/GDproject

35 files changed+544−2680

unifiedsplit

GDproject.xcodeproj/project.pbxproj+12−40

@@ -8,31 +8,26 @@

99/* Begin PBXBuildFile section */

1010 1210A0BB223940310080686D /* SimplifiedChannelsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1210A0BA223940310080686D /* SimplifiedChannelsList.swift */; };

11− 121A8972226B1EAC005EE599 /* TagsSuggestionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121A8971226B1EAC005EE599 /* TagsSuggestionController.swift */; };

11+ 121A8972226B1EAC005EE599 /* AnonimousChannelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121A8971226B1EAC005EE599 /* AnonimousChannelController.swift */; };

1212 1220FF94227C41270092C6BC /* TaggsSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1220FF93227C41270092C6BC /* TaggsSelectionViewController.swift */; };

13− 123589FD22899339002F8028 /* MessageViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123589FC22899339002F8028 /* MessageViewCell.swift */; };

1413 123E37A5221F1B3200F6E42A /* LogInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123E37A4221F1B3200F6E42A /* LogInViewController.swift */; };

1514 123E37A7221F1DD700F6E42A /* MainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123E37A6221F1DD700F6E42A /* MainController.swift */; };

1615 124CC7032221C00C009DF531 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 124CC7022221C00C009DF531 /* Model.swift */; };

17− 125A9A8A2285C3DA00513E2A /* CodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125A9A892285C3DA00513E2A /* CodeViewController.swift */; };

18− 125A9A8E2286068A00513E2A /* RegisterTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125A9A8D2286068A00513E2A /* RegisterTableViewController.swift */; };

19− 125A9A90228609C500513E2A /* InititalsViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125A9A8F228609C500513E2A /* InititalsViewCell.swift */; };

20− 125A9A922286100800513E2A /* FacultyTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125A9A912286100800513E2A /* FacultyTableViewController.swift */; };

2116 125BD57D22171D2A008A3575 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125BD57C22171D2A008A3575 /* ProfileViewController.swift */; };

2217 125BD57F22171D73008A3575 /* Extentions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125BD57E22171D73008A3575 /* Extentions.swift */; };

2318 125BD5812217314A008A3575 /* NewsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125BD5802217314A008A3575 /* NewsVC.swift */; };

2419 1261BB93227B364C003898CF /* ChannelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB92227B364C003898CF /* ChannelViewController.swift */; };

2520 1261BB95227B3991003898CF /* AddToChannelVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB94227B3991003898CF /* AddToChannelVC.swift */; };

2621 1261BB9E227B793D003898CF /* ChatInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB9D227B793D003898CF /* ChatInfoViewController.swift */; };

27− 12758257227F1401001F291F /* DialogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12758256227F1401001F291F /* DialogViewController.swift */; };

2822 1288B5CE221F1158002BE6B1 /* DataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1288B5CD221F1158002BE6B1 /* DataStorage.swift */; };

2923 1291BE2D2221312D009D3F23 /* ChannelsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */; };

3024 1291BE342221569B009D3F23 /* TabbarCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */; };

25+ 1291BE3622218DBF009D3F23 /* LogInCoordinator1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE3522218DBF009D3F23 /* LogInCoordinator1.swift */; };

3126 129320042279B4270035C7B3 /* MessagesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 129320032279B4270035C7B3 /* MessagesViewController.swift */; };

3227 129320072279B5690035C7B3 /* MessagesCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 129320062279B5690035C7B3 /* MessagesCoordinator.swift */; };

3328 129320092279C3B50035C7B3 /* PeopleToWriteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 129320082279C3B50035C7B3 /* PeopleToWriteViewController.swift */; };

29+ 1293200B2279D02D0035C7B3 /* DialogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1293200A2279D02D0035C7B3 /* DialogViewController.swift */; };

3430 1293200D2279D7310035C7B3 /* CompletionTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1293200C2279D7310035C7B3 /* CompletionTree.swift */; };

35− 1298810B227F13840032ACA3 /* DialogCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1298810A227F13840032ACA3 /* DialogCell.swift */; };

3631 12BA4B9B224101A400DF93D7 /* ApplicationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */; };

3732 12BA4B9D224101E700DF93D7 /* BaseCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */; };

3833 12BA4B9F224102B700DF93D7 /* LogInCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */; };

@@ -107,31 +102,26 @@

107102

108103/* Begin PBXFileReference section */

109104 1210A0BA223940310080686D /* SimplifiedChannelsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimplifiedChannelsList.swift; sourceTree = "<group>"; };

110− 121A8971226B1EAC005EE599 /* TagsSuggestionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagsSuggestionController.swift; sourceTree = "<group>"; };

105+ 121A8971226B1EAC005EE599 /* AnonimousChannelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnonimousChannelController.swift; sourceTree = "<group>"; };

111106 1220FF93227C41270092C6BC /* TaggsSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaggsSelectionViewController.swift; sourceTree = "<group>"; };

112− 123589FC22899339002F8028 /* MessageViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewCell.swift; sourceTree = "<group>"; };

113107 123E37A4221F1B3200F6E42A /* LogInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInViewController.swift; sourceTree = "<group>"; };

114108 123E37A6221F1DD700F6E42A /* MainController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainController.swift; sourceTree = "<group>"; };

115109 124CC7022221C00C009DF531 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };

116− 125A9A892285C3DA00513E2A /* CodeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeViewController.swift; sourceTree = "<group>"; };

117− 125A9A8D2286068A00513E2A /* RegisterTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterTableViewController.swift; sourceTree = "<group>"; };

118− 125A9A8F228609C500513E2A /* InititalsViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InititalsViewCell.swift; sourceTree = "<group>"; };

119− 125A9A912286100800513E2A /* FacultyTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FacultyTableViewController.swift; sourceTree = "<group>"; };

120110 125BD57C22171D2A008A3575 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };

121111 125BD57E22171D73008A3575 /* Extentions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extentions.swift; sourceTree = "<group>"; };

122112 125BD5802217314A008A3575 /* NewsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsVC.swift; sourceTree = "<group>"; };

123113 1261BB92227B364C003898CF /* ChannelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelViewController.swift; sourceTree = "<group>"; };

124114 1261BB94227B3991003898CF /* AddToChannelVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddToChannelVC.swift; sourceTree = "<group>"; };

125115 1261BB9D227B793D003898CF /* ChatInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoViewController.swift; sourceTree = "<group>"; };

126− 12758256227F1401001F291F /* DialogViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DialogViewController.swift; sourceTree = "<group>"; };

127116 1288B5CD221F1158002BE6B1 /* DataStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataStorage.swift; sourceTree = "<group>"; };

128117 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelsCoordinator.swift; sourceTree = "<group>"; };

129118 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarCoordinator.swift; sourceTree = "<group>"; };

119+ 1291BE3522218DBF009D3F23 /* LogInCoordinator1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInCoordinator1.swift; sourceTree = "<group>"; };

130120 129320032279B4270035C7B3 /* MessagesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagesViewController.swift; sourceTree = "<group>"; };

131121 129320062279B5690035C7B3 /* MessagesCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagesCoordinator.swift; sourceTree = "<group>"; };

132122 129320082279C3B50035C7B3 /* PeopleToWriteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PeopleToWriteViewController.swift; path = GDproject/Controller/Messages/PeopleToWriteViewController.swift; sourceTree = SOURCE_ROOT; };

123+ 1293200A2279D02D0035C7B3 /* DialogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DialogViewController.swift; path = GDproject/Controller/Messages/DialogViewController.swift; sourceTree = SOURCE_ROOT; };

133124 1293200C2279D7310035C7B3 /* CompletionTree.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletionTree.swift; sourceTree = "<group>"; };

134− 1298810A227F13840032ACA3 /* DialogCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogCell.swift; sourceTree = "<group>"; };

135125 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationCoordinator.swift; sourceTree = "<group>"; };

136126 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCoordinator.swift; sourceTree = "<group>"; };

137127 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInCoordinator.swift; sourceTree = "<group>"; };

@@ -224,11 +214,8 @@

224214 1291BE3722218DC4009D3F23 /* Log In */ = {

225215 isa = PBXGroup;

226216 children = (

227− 125A9A912286100800513E2A /* FacultyTableViewController.swift */,

228− 125A9A8F228609C500513E2A /* InititalsViewCell.swift */,

229− 125A9A8D2286068A00513E2A /* RegisterTableViewController.swift */,

230− 125A9A892285C3DA00513E2A /* CodeViewController.swift */,

231217 123E37A4221F1B3200F6E42A /* LogInViewController.swift */,

218+ 1291BE3522218DBF009D3F23 /* LogInCoordinator1.swift */,

232219 );

233220 path = "Log In";

234221 sourceTree = "<group>";

@@ -238,22 +225,12 @@

238225 children = (

239226 1261BB9D227B793D003898CF /* ChatInfoViewController.swift */,

240227 129320082279C3B50035C7B3 /* PeopleToWriteViewController.swift */,

241− 1298810C227F138C0032ACA3 /* Dialog */,

228+ 1293200A2279D02D0035C7B3 /* DialogViewController.swift */,

242229 129320032279B4270035C7B3 /* MessagesViewController.swift */,

243− 123589FC22899339002F8028 /* MessageViewCell.swift */,

244230 );

245231 path = Messages;

246232 sourceTree = "<group>";

247233 };

248− 1298810C227F138C0032ACA3 /* Dialog */ = {

249− isa = PBXGroup;

250− children = (

251− 12758256227F1401001F291F /* DialogViewController.swift */,

252− 1298810A227F13840032ACA3 /* DialogCell.swift */,

253− );

254− path = Dialog;

255− sourceTree = "<group>";

256− };

257234 12E36D8F221424EA006FCDD7 = {

258235 isa = PBXGroup;

259236 children = (

@@ -339,7 +316,7 @@

339316 1220FF93227C41270092C6BC /* TaggsSelectionViewController.swift */,

340317 1261BB94227B3991003898CF /* AddToChannelVC.swift */,

341318 12D7D134221C42B700B35452 /* ChannelController.swift */,

342− 121A8971226B1EAC005EE599 /* TagsSuggestionController.swift */,

319+ 121A8971226B1EAC005EE599 /* AnonimousChannelController.swift */,

343320 12D7D132221C321600B35452 /* ChannelListController.swift */,

344321 1210A0BA223940310080686D /* SimplifiedChannelsList.swift */,

345322 12E36DC922144635006FCDD7 /* NewPostViewController.swift */,

@@ -437,36 +414,31 @@

437414 files = (

438415 129320072279B5690035C7B3 /* MessagesCoordinator.swift in Sources */,

439416 124CC7032221C00C009DF531 /* Model.swift in Sources */,

440− 125A9A90228609C500513E2A /* InititalsViewCell.swift in Sources */,

441417 1220FF94227C41270092C6BC /* TaggsSelectionViewController.swift in Sources */,

442418 12F3D6B0224106F700A69214 /* TabbarController.swift in Sources */,

443419 12E36DD522156559006FCDD7 /* MyStackView.swift in Sources */,

444420 12D7D137221D78E800B35452 /* Channel.swift in Sources */,

421+ 1291BE3622218DBF009D3F23 /* LogInCoordinator1.swift in Sources */,

445422 1210A0BB223940310080686D /* SimplifiedChannelsList.swift in Sources */,

446423 125BD5812217314A008A3575 /* NewsVC.swift in Sources */,

447424 12E36DB72214400A006FCDD7 /* Post.swift in Sources */,

448425 12DB7FDF221877160096878E /* InviteViewController.swift in Sources */,

449− 121A8972226B1EAC005EE599 /* TagsSuggestionController.swift in Sources */,

426+ 121A8972226B1EAC005EE599 /* AnonimousChannelController.swift in Sources */,

450427 1293200D2279D7310035C7B3 /* CompletionTree.swift in Sources */,

428+ 1293200B2279D02D0035C7B3 /* DialogViewController.swift in Sources */,

451429 12E36DCA22144635006FCDD7 /* NewPostViewController.swift in Sources */,

452430 1261BB9E227B793D003898CF /* ChatInfoViewController.swift in Sources */,

453431 12E36D9E221424EA006FCDD7 /* NewsController.swift in Sources */,

454− 1298810B227F13840032ACA3 /* DialogCell.swift in Sources */,

455− 125A9A922286100800513E2A /* FacultyTableViewController.swift in Sources */,

456− 125A9A8E2286068A00513E2A /* RegisterTableViewController.swift in Sources */,

457− 123589FD22899339002F8028 /* MessageViewCell.swift in Sources */,

458432 12E36DCC22144725006FCDD7 /* PostViewCell.swift in Sources */,

459433 123E37A5221F1B3200F6E42A /* LogInViewController.swift in Sources */,

460434 125BD57F22171D73008A3575 /* Extentions.swift in Sources */,

461435 12D7D133221C321600B35452 /* ChannelListController.swift in Sources */,

462− 125A9A8A2285C3DA00513E2A /* CodeViewController.swift in Sources */,

463436 1291BE342221569B009D3F23 /* TabbarCoordinator.swift in Sources */,

464437 129320092279C3B50035C7B3 /* PeopleToWriteViewController.swift in Sources */,

465438 12BA4B9B224101A400DF93D7 /* ApplicationCoordinator.swift in Sources */,

466439 1291BE2D2221312D009D3F23 /* ChannelsCoordinator.swift in Sources */,

467440 12E36DD122148122006FCDD7 /* FullPostController.swift in Sources */,

468441 129320042279B4270035C7B3 /* MessagesViewController.swift in Sources */,

469− 12758257227F1401001F291F /* DialogViewController.swift in Sources */,

470442 1288B5CE221F1158002BE6B1 /* DataStorage.swift in Sources */,

471443 12BA4B9F224102B700DF93D7 /* LogInCoordinator.swift in Sources */,

472444 12F3D6B22241097B00A69214 /* ProfileCoordinator.swift in Sources */,

GDproject/Base.lproj/Main.storyboard+114−334

@@ -90,9 +90,6 @@

9090 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yir-N6-Q6f">

9191 <rect key="frame" x="246" y="0.0" width="97" height="30"/>

9292 <state key="normal" title="New message"/>

93− <connections>

94− <action selector="sendMessage:" destination="R4D-Ao-uvG" eventType="touchUpInside" id="tQc-5f-SU3"/>

95− </connections>

9693 </button>

9794 </subviews>

9895 </stackView>

@@ -231,250 +228,6 @@

231228 </objects>

232229 <point key="canvasLocation" x="2799" y="1979"/>

233230 </scene>

234−

235− <scene sceneID="VW5-ny-vaB">

236− <objects>

237− <viewController storyboardIdentifier="CodeViewController" id="Lz1-1J-ywG" customClass="CodeViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

238− <view key="view" contentMode="scaleToFill" id="Rud-1x-pKL">

239− <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>

240− <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

241− <subviews>

242− <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter the code you received via mail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hE6-cQ-NbO">

243− <rect key="frame" x="50" y="47" width="275.5" height="20.5"/>

244− <fontDescription key="fontDescription" type="system" pointSize="17"/>

245− <nil key="textColor"/>

246− <nil key="highlightedColor"/>

247− </label>

248− <stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="2Gj-pC-RZ2">

249− <rect key="frame" x="37.5" y="99" width="300" height="58"/>

250− <subviews>

251− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="_" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="744-t1-YNn">

252− <rect key="frame" x="0.0" y="0.0" width="40" height="58"/>

253− <nil key="textColor"/>

254− <fontDescription key="fontDescription" type="system" pointSize="45"/>

255− <textInputTraits key="textInputTraits" keyboardType="numberPad"/>

256− </textField>

257− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="_" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jcR-jp-s7a">

258− <rect key="frame" x="52" y="0.0" width="40" height="58"/>

259− <nil key="textColor"/>

260− <fontDescription key="fontDescription" type="system" pointSize="45"/>

261− <textInputTraits key="textInputTraits" keyboardType="numberPad"/>

262− </textField>

263− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="_" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="YKO-0M-KD8">

264− <rect key="frame" x="104" y="0.0" width="40" height="58"/>

265− <nil key="textColor"/>

266− <fontDescription key="fontDescription" type="system" pointSize="45"/>

267− <textInputTraits key="textInputTraits" keyboardType="numberPad"/>

268− </textField>

269− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="_" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="SmG-Ae-oOs">

270− <rect key="frame" x="156" y="0.0" width="40" height="58"/>

271− <nil key="textColor"/>

272− <fontDescription key="fontDescription" type="system" pointSize="45"/>

273− <textInputTraits key="textInputTraits" keyboardType="numberPad"/>

274− </textField>

275− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="_" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vaP-rO-NZW">

276− <rect key="frame" x="208" y="0.0" width="40" height="58"/>

277− <nil key="textColor"/>

278− <fontDescription key="fontDescription" type="system" pointSize="45"/>

279− <textInputTraits key="textInputTraits" keyboardType="numberPad"/>

280− </textField>

281− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="_" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qDh-32-HSn">

282− <rect key="frame" x="260" y="0.0" width="40" height="58"/>

283− <nil key="textColor"/>

284− <fontDescription key="fontDescription" type="system" pointSize="45"/>

285− <textInputTraits key="textInputTraits" keyboardType="numberPad"/>

286− </textField>

287− </subviews>

288− <constraints>

289− <constraint firstAttribute="height" constant="58" id="5tl-bI-7tm"/>

290− <constraint firstItem="YKO-0M-KD8" firstAttribute="width" secondItem="744-t1-YNn" secondAttribute="width" id="E7r-rk-4Mb"/>

291− <constraint firstItem="SmG-Ae-oOs" firstAttribute="width" secondItem="744-t1-YNn" secondAttribute="width" id="Hkd-L6-qkf"/>

292− <constraint firstItem="qDh-32-HSn" firstAttribute="width" secondItem="744-t1-YNn" secondAttribute="width" id="Koj-e5-Dof"/>

293− <constraint firstItem="vaP-rO-NZW" firstAttribute="width" secondItem="744-t1-YNn" secondAttribute="width" id="Vzl-ZY-3yI"/>

294− <constraint firstItem="jcR-jp-s7a" firstAttribute="width" secondItem="744-t1-YNn" secondAttribute="width" id="bDe-cA-CGi"/>

295− <constraint firstAttribute="width" constant="300" id="gWy-t0-k14"/>

296− </constraints>

297− </stackView>

298− <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lCU-OF-giE">

299− <rect key="frame" x="0.0" y="617" width="375" height="50"/>

300− <subviews>

301− <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AMw-Yp-yMs">

302− <rect key="frame" x="327" y="8" width="32" height="30"/>

303− <state key="normal" title="Next"/>

304− <connections>

305− <action selector="whereToGoNext:" destination="Lz1-1J-ywG" eventType="touchUpInside" id="1OA-n8-Gky"/>

306− </connections>

307− </button>

308− </subviews>

309− <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

310− <constraints>

311− <constraint firstAttribute="bottom" secondItem="AMw-Yp-yMs" secondAttribute="bottom" constant="12" id="7qy-qR-6jm"/>

312− <constraint firstItem="AMw-Yp-yMs" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="lCU-OF-giE" secondAttribute="leading" constant="20" symbolic="YES" id="Bqz-qr-CNW"/>

313− <constraint firstAttribute="height" constant="50" id="Dyu-H3-S3f"/>

314− <constraint firstAttribute="trailing" secondItem="AMw-Yp-yMs" secondAttribute="trailing" constant="16" id="N19-bz-XCw"/>

315− <constraint firstItem="AMw-Yp-yMs" firstAttribute="top" secondItem="lCU-OF-giE" secondAttribute="top" constant="8" id="u6d-3F-1Y5"/>

316− </constraints>

317− </view>

318− </subviews>

319− <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

320− <constraints>

321− <constraint firstItem="hE6-cQ-NbO" firstAttribute="top" secondItem="xwd-51-foC" secondAttribute="top" constant="27" id="8Gx-SH-Pc0"/>

322− <constraint firstItem="2Gj-pC-RZ2" firstAttribute="top" secondItem="hE6-cQ-NbO" secondAttribute="bottom" constant="31.5" id="DEY-u8-rFj"/>

323− <constraint firstItem="lCU-OF-giE" firstAttribute="leading" secondItem="xwd-51-foC" secondAttribute="leading" id="HFt-0X-LMb"/>

324− <constraint firstItem="lCU-OF-giE" firstAttribute="trailing" secondItem="xwd-51-foC" secondAttribute="trailing" id="Z71-jX-S5Q"/>

325− <constraint firstItem="2Gj-pC-RZ2" firstAttribute="centerX" secondItem="xwd-51-foC" secondAttribute="centerX" id="aSr-QZ-LuB"/>

326− <constraint firstItem="hE6-cQ-NbO" firstAttribute="centerX" secondItem="xwd-51-foC" secondAttribute="centerX" id="oFz-CS-SSk"/>

327− <constraint firstItem="lCU-OF-giE" firstAttribute="bottom" secondItem="xwd-51-foC" secondAttribute="bottom" id="vMF-KP-eIa"/>

328− </constraints>

329− <viewLayoutGuide key="safeArea" id="xwd-51-foC"/>

330− </view>

331− <connections>

332− <outlet property="bottomConstraint" destination="vMF-KP-eIa" id="a15-El-XZs"/>

333− <outlet property="f1" destination="744-t1-YNn" id="kaQ-nt-ubz"/>

334− <outlet property="f2" destination="jcR-jp-s7a" id="tjD-L6-nis"/>

335− <outlet property="f3" destination="YKO-0M-KD8" id="QHg-UM-Bta"/>

336− <outlet property="f4" destination="SmG-Ae-oOs" id="bwy-JB-My7"/>

337− <outlet property="f5" destination="vaP-rO-NZW" id="rNh-iH-648"/>

338− <outlet property="f6" destination="qDh-32-HSn" id="h4g-QY-abI"/>

339− </connections>

340− </viewController>

341− <placeholder placeholderIdentifier="IBFirstResponder" id="y6E-3d-hPA" userLabel="First Responder" sceneMemberID="firstResponder"/>

342− </objects>

343− <point key="canvasLocation" x="4381.6000000000004" y="1961.4692653673164"/>

344− </scene>

345−

346− <scene sceneID="h6T-rh-iCS">

347− <objects>

348− <tableViewController storyboardIdentifier="RegisterTableViewController" id="gZg-8R-SiJ" customClass="RegisterTableViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

349− <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="yDm-gG-Zw0">

350− <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>

351− <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

352− <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>

353− <prototypes>

354− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="cell111" textLabel="bby-bf-qyX" style="IBUITableViewCellStyleDefault" id="Ybe-Vg-GR0">

355− <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>

356− <autoresizingMask key="autoresizingMask"/>

357− <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Ybe-Vg-GR0" id="OZG-F0-QqJ">

358− <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>

359− <autoresizingMask key="autoresizingMask"/>

360− <subviews>

361− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Add faculty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bby-bf-qyX">

362− <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>

363− <autoresizingMask key="autoresizingMask"/>

364− <fontDescription key="fontDescription" type="system" pointSize="17"/>

365− <nil key="textColor"/>

366− <nil key="highlightedColor"/>

367− </label>

368− </subviews>

369− </tableViewCellContentView>

370− </tableViewCell>

371− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="facultyCell" textLabel="8Xf-Sx-eEe" detailTextLabel="Vjg-Il-F07" style="IBUITableViewCellStyleSubtitle" id="xJW-zY-MeC">

372− <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>

373− <autoresizingMask key="autoresizingMask"/>

374− <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="xJW-zY-MeC" id="hnt-oe-CHh">

375− <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

376− <autoresizingMask key="autoresizingMask"/>

377− <subviews>

378− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Add faculty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8Xf-Sx-eEe">

379− <rect key="frame" x="16" y="5" width="87" height="20.5"/>

380− <autoresizingMask key="autoresizingMask"/>

381− <fontDescription key="fontDescription" type="system" pointSize="17"/>

382− <nil key="textColor"/>

383− <nil key="highlightedColor"/>

384− </label>

385− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vjg-Il-F07">

386− <rect key="frame" x="16" y="25.5" width="44" height="14.5"/>

387− <autoresizingMask key="autoresizingMask"/>

388− <fontDescription key="fontDescription" type="system" pointSize="12"/>

389− <nil key="textColor"/>

390− <nil key="highlightedColor"/>

391− </label>

392− </subviews>

393− </tableViewCellContentView>

394− </tableViewCell>

395− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="nameCell" id="VPG-zq-xMh" customClass="InititalsViewCell" customModule="GDproject" customModuleProvider="target">

396− <rect key="frame" x="0.0" y="143.5" width="375" height="44"/>

397− <autoresizingMask key="autoresizingMask"/>

398− <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VPG-zq-xMh" id="jrO-rB-x0c">

399− <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

400− <autoresizingMask key="autoresizingMask"/>

401− <subviews>

402− <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hwQ-St-DAp">

403− <rect key="frame" x="16" y="7" width="343" height="30"/>

404− <constraints>

405− <constraint firstAttribute="height" constant="30" id="QXw-Sf-Hnk"/>

406− </constraints>

407− <nil key="textColor"/>

408− <fontDescription key="fontDescription" type="system" pointSize="17"/>

409− <textInputTraits key="textInputTraits"/>

410− </textField>

411− </subviews>

412− <constraints>

413− <constraint firstAttribute="bottom" secondItem="hwQ-St-DAp" secondAttribute="bottom" constant="6.5" id="3Kb-PR-ZPu"/>

414− <constraint firstItem="hwQ-St-DAp" firstAttribute="top" secondItem="jrO-rB-x0c" secondAttribute="top" constant="7" id="CyQ-kQ-mce"/>

415− <constraint firstAttribute="trailing" secondItem="hwQ-St-DAp" secondAttribute="trailing" constant="16" id="HKq-mF-8h9"/>

416− <constraint firstItem="hwQ-St-DAp" firstAttribute="leading" secondItem="jrO-rB-x0c" secondAttribute="leading" constant="16" id="NoW-FW-Q6L"/>

417− </constraints>

418− </tableViewCellContentView>

419− <connections>

420− <outlet property="initialsTextField" destination="hwQ-St-DAp" id="VU3-m6-FnI"/>

421− </connections>

422− </tableViewCell>

423− </prototypes>

424− <connections>

425− <outlet property="dataSource" destination="gZg-8R-SiJ" id="OVm-5H-nyP"/>

426− <outlet property="delegate" destination="gZg-8R-SiJ" id="khe-nG-0w4"/>

427− </connections>

428− </tableView>

429− </tableViewController>

430− <placeholder placeholderIdentifier="IBFirstResponder" id="0cS-ao-ZWH" userLabel="First Responder" sceneMemberID="firstResponder"/>

431− </objects>

432− <point key="canvasLocation" x="5925.6000000000004" y="2041.529235382309"/>

433− </scene>

434−

435− <scene sceneID="WcK-wN-L0e">

436− <objects>

437− <tableViewController storyboardIdentifier="FacultyTableViewController" id="wiz-jF-9HF" customClass="FacultyTableViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

438− <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Iny-a7-zjv">

439− <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>

440− <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

441− <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

442− <prototypes>

443− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="F" textLabel="mSQ-7c-C8A" detailTextLabel="YuF-0p-znr" style="IBUITableViewCellStyleSubtitle" id="Otu-BR-9o9">

444− <rect key="frame" x="0.0" y="28" width="375" height="44"/>

445− <autoresizingMask key="autoresizingMask"/>

446− <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Otu-BR-9o9" id="2Vm-f8-txH">

447− <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

448− <autoresizingMask key="autoresizingMask"/>

449− <subviews>

450− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mSQ-7c-C8A">

451− <rect key="frame" x="16" y="5" width="33.5" height="20.5"/>

452− <autoresizingMask key="autoresizingMask"/>

453− <fontDescription key="fontDescription" type="system" pointSize="17"/>

454− <nil key="textColor"/>

455− <nil key="highlightedColor"/>

456− </label>

457− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YuF-0p-znr">

458− <rect key="frame" x="16" y="25.5" width="44" height="14.5"/>

459− <autoresizingMask key="autoresizingMask"/>

460− <fontDescription key="fontDescription" type="system" pointSize="12"/>

461− <nil key="textColor"/>

462− <nil key="highlightedColor"/>

463− </label>

464− </subviews>

465− </tableViewCellContentView>

466− </tableViewCell>

467− </prototypes>

468− <connections>

469− <outlet property="dataSource" destination="wiz-jF-9HF" id="db0-qR-UJy"/>

470− <outlet property="delegate" destination="wiz-jF-9HF" id="i3e-Uc-EfR"/>

471− </connections>

472− </tableView>

473− </tableViewController>

474− <placeholder placeholderIdentifier="IBFirstResponder" id="Kkr-Cr-ZiV" userLabel="First Responder" sceneMemberID="firstResponder"/>

475− </objects>

476− <point key="canvasLocation" x="6804" y="2044"/>

477− </scene>

478231

479232 <scene sceneID="gAa-jy-vpG">

480233 <objects>

@@ -778,53 +531,29 @@

778531 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

779532 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

780533 <prototypes>

781− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="MessageViewCell" rowHeight="78" id="67C-fT-WEV" customClass="MessageViewCell" customModule="GDproject" customModuleProvider="target">

782− <rect key="frame" x="0.0" y="28" width="375" height="78"/>

534+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="MessagesCell" textLabel="9br-gb-mg8" detailTextLabel="Jxd-We-VyC" style="IBUITableViewCellStyleSubtitle" id="67C-fT-WEV">

535+ <rect key="frame" x="0.0" y="28" width="375" height="44"/>

783536 <autoresizingMask key="autoresizingMask"/>

784537 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="67C-fT-WEV" id="O3b-Xv-UNk">

785− <rect key="frame" x="0.0" y="0.0" width="375" height="77.5"/>

538+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

786539 <autoresizingMask key="autoresizingMask"/>

787540 <subviews>

788− <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xAY-IF-RpX">

789− <rect key="frame" x="229" y="11" width="130" height="15"/>

790− <constraints>

791− <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="130" id="f99-ZF-f8h"/>

792− </constraints>

793− <fontDescription key="fontDescription" type="system" pointSize="12"/>

794− <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

795− <nil key="highlightedColor"/>

796− </label>

797− <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FG3-gU-0r1">

798− <rect key="frame" x="16" y="11" width="46" height="22"/>

799− <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>

541+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9br-gb-mg8">

542+ <rect key="frame" x="16" y="5" width="33.5" height="20.5"/>

543+ <autoresizingMask key="autoresizingMask"/>

544+ <fontDescription key="fontDescription" type="system" pointSize="17"/>

800545 <nil key="textColor"/>

801546 <nil key="highlightedColor"/>

802547 </label>

803− <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nTy-rK-XTr">

804− <rect key="frame" x="16" y="49" width="343" height="18"/>

805− <fontDescription key="fontDescription" type="system" pointSize="15"/>

548+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Jxd-We-VyC">

549+ <rect key="frame" x="16" y="25.5" width="33" height="14.5"/>

550+ <autoresizingMask key="autoresizingMask"/>

551+ <fontDescription key="fontDescription" type="system" pointSize="12"/>

806552 <nil key="textColor"/>

807553 <nil key="highlightedColor"/>

808554 </label>

809555 </subviews>

810− <constraints>

811− <constraint firstItem="nTy-rK-XTr" firstAttribute="top" secondItem="xAY-IF-RpX" secondAttribute="bottom" constant="23" id="09Y-aK-nD9"/>

812− <constraint firstItem="FG3-gU-0r1" firstAttribute="top" secondItem="O3b-Xv-UNk" secondAttribute="topMargin" id="4Hp-d5-9An"/>

813− <constraint firstItem="xAY-IF-RpX" firstAttribute="top" secondItem="O3b-Xv-UNk" secondAttribute="topMargin" id="G4f-oJ-7ud"/>

814− <constraint firstItem="nTy-rK-XTr" firstAttribute="trailing" secondItem="O3b-Xv-UNk" secondAttribute="trailingMargin" id="MaE-VM-KhL"/>

815− <constraint firstItem="nTy-rK-XTr" firstAttribute="leading" secondItem="O3b-Xv-UNk" secondAttribute="leadingMargin" id="OIX-rY-Leo"/>

816− <constraint firstItem="nTy-rK-XTr" firstAttribute="top" secondItem="FG3-gU-0r1" secondAttribute="bottom" constant="16" id="Qdj-s3-t60"/>

817− <constraint firstItem="nTy-rK-XTr" firstAttribute="bottom" secondItem="O3b-Xv-UNk" secondAttribute="bottomMargin" id="Rv3-Mz-Aed"/>

818− <constraint firstItem="FG3-gU-0r1" firstAttribute="leading" secondItem="O3b-Xv-UNk" secondAttribute="leadingMargin" id="iN1-KG-dYn"/>

819− <constraint firstItem="xAY-IF-RpX" firstAttribute="trailing" secondItem="O3b-Xv-UNk" secondAttribute="trailingMargin" id="opV-4x-VCk"/>

820− <constraint firstItem="xAY-IF-RpX" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="FG3-gU-0r1" secondAttribute="trailing" constant="4" id="x9r-sM-t4x"/>

821− </constraints>

822556 </tableViewCellContentView>

823− <connections>

824− <outlet property="dateLabel" destination="xAY-IF-RpX" id="fcz-re-BXk"/>

825− <outlet property="dialogName" destination="FG3-gU-0r1" id="gd7-ND-wCi"/>

826− <outlet property="lastMessagePreview" destination="nTy-rK-XTr" id="Cmo-IJ-2r0"/>

827− </connections>

828557 </tableViewCell>

829558 </prototypes>

830559 <connections>

@@ -835,7 +564,7 @@

835564 </tableViewController>

836565 <placeholder placeholderIdentifier="IBFirstResponder" id="fu3-z4-EY7" userLabel="First Responder" sceneMemberID="firstResponder"/>

837566 </objects>

838− <point key="canvasLocation" x="2681" y="918"/>

567+ <point key="canvasLocation" x="2798" y="932"/>

839568 </scene>

840569

841570 <scene sceneID="6Td-bq-Ebf">

@@ -846,7 +575,7 @@

846575 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

847576 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

848577 <prototypes>

849− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="peopleToWriteCell" textLabel="e4H-yo-W57" style="IBUITableViewCellStyleDefault" id="5ue-Sf-Blf">

578+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="peopleToWriteCell" textLabel="e4H-yo-W57" detailTextLabel="QSb-Bd-4gu" style="IBUITableViewCellStyleValue1" id="5ue-Sf-Blf">

850579 <rect key="frame" x="0.0" y="28" width="375" height="44"/>

851580 <autoresizingMask key="autoresizingMask"/>

852581 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="5ue-Sf-Blf" id="8Dr-YE-x7M">

@@ -854,7 +583,14 @@

854583 <autoresizingMask key="autoresizingMask"/>

855584 <subviews>

856585 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="e4H-yo-W57">

857− <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>

586+ <rect key="frame" x="16" y="12" width="33.5" height="20.5"/>

587+ <autoresizingMask key="autoresizingMask"/>

588+ <fontDescription key="fontDescription" type="system" pointSize="17"/>

589+ <nil key="textColor"/>

590+ <nil key="highlightedColor"/>

591+ </label>

592+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QSb-Bd-4gu">

593+ <rect key="frame" x="315" y="12" width="44" height="20.5"/>

858594 <autoresizingMask key="autoresizingMask"/>

859595 <fontDescription key="fontDescription" type="system" pointSize="17"/>

860596 <nil key="textColor"/>

@@ -874,80 +610,124 @@

874610 </objects>

875611 <point key="canvasLocation" x="3614" y="938"/>

876612 </scene>

877−

878− <scene sceneID="1br-Xg-fR9">

613+

614+ <scene sceneID="9ac-1R-s4m">

879615 <objects>

880− <tableViewController storyboardIdentifier="ChatInfoViewController" id="Rfd-Hp-Qqv" customClass="ChatInfoViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

881− <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rvg-ok-cnE">

616+ <tableViewController storyboardIdentifier="DialogViewController" id="AVr-rR-mka" customClass="DialogViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

617+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="NlQ-jM-tQP">

882618 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>

883619 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

884− <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>

620+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

885621 <prototypes>

886− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" textLabel="EdJ-of-2FG" style="IBUITableViewCellStyleDefault" id="hl5-Uc-R53">

887− <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>

622+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="bgd-9d-SmR">

623+ <rect key="frame" x="0.0" y="28" width="375" height="44"/>

888624 <autoresizingMask key="autoresizingMask"/>

889− <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hl5-Uc-R53" id="Oy5-4e-dPI">

625+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bgd-9d-SmR" id="9W4-bO-4MN">

890626 <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

891627 <autoresizingMask key="autoresizingMask"/>

892− <subviews>

893− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EdJ-of-2FG">

894− <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>

895− <autoresizingMask key="autoresizingMask"/>

896− <fontDescription key="fontDescription" type="system" pointSize="17"/>

897− <nil key="textColor"/>

898− <nil key="highlightedColor"/>

899− </label>

900− </subviews>

901628 </tableViewCellContentView>

902629 </tableViewCell>

903630 </prototypes>

904− <sections/>

905631 <connections>

906− <outlet property="dataSource" destination="Rfd-Hp-Qqv" id="ThC-G8-che"/>

907− <outlet property="delegate" destination="Rfd-Hp-Qqv" id="1WG-zg-Ahf"/>

632+ <outlet property="dataSource" destination="AVr-rR-mka" id="quz-3V-jDT"/>

633+ <outlet property="delegate" destination="AVr-rR-mka" id="R4y-E9-LVr"/>

908634 </connections>

909635 </tableView>

910636 </tableViewController>

911− <placeholder placeholderIdentifier="IBFirstResponder" id="KPW-41-EQd" userLabel="First Responder" sceneMemberID="firstResponder"/>

637+ <placeholder placeholderIdentifier="IBFirstResponder" id="Tzh-O8-O7T" userLabel="First Responder" sceneMemberID="firstResponder"/>

912638 </objects>

913− <point key="canvasLocation" x="5057" y="938"/>

639+ <point key="canvasLocation" x="4336" y="937"/>

914640 </scene>

915−

916− <scene sceneID="gfS-IA-vBj">

641+

642+ <scene sceneID="1br-Xg-fR9">

917643 <objects>

918− <tableViewController storyboardIdentifier="TagsSuggestionController" id="shX-JH-apo" customClass="TagsSuggestionController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

919− <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="jTj-mU-lli">

644+ <tableViewController id="Rfd-Hp-Qqv" customClass="ChatInfoViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">

645+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rvg-ok-cnE">

920646 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>

921647 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

922− <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

923− <prototypes>

924− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" textLabel="Lbu-Z7-fTN" style="IBUITableViewCellStyleDefault" id="pnl-jg-9DL">

925− <rect key="frame" x="0.0" y="28" width="375" height="44"/>

926− <autoresizingMask key="autoresizingMask"/>

927− <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pnl-jg-9DL" id="Vsm-Ic-k7e">

928− <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

929− <autoresizingMask key="autoresizingMask"/>

930− <subviews>

931− <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Lbu-Z7-fTN">

932− <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>

648+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>

649+ <sections>

650+ <tableViewSection headerTitle="Title" id="EwY-Ph-im0">

651+ <cells>

652+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="hl5-Uc-R53">

653+ <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>

654+ <autoresizingMask key="autoresizingMask"/>

655+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hl5-Uc-R53" id="Oy5-4e-dPI">

656+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

933657 <autoresizingMask key="autoresizingMask"/>

934− <fontDescription key="fontDescription" type="system" pointSize="17"/>

935− <nil key="textColor"/>

936− <nil key="highlightedColor"/>

937− </label>

938− </subviews>

939− </tableViewCellContentView>

940− </tableViewCell>

941− </prototypes>

658+ </tableViewCellContentView>

659+ </tableViewCell>

660+ </cells>

661+ </tableViewSection>

662+ <tableViewSection headerTitle="Opportunities" id="FhP-ZG-Wz1">

663+ <cells>

664+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="q4L-ZD-zVb" style="IBUITableViewCellStyleDefault" id="lrc-b1-1JB">

665+ <rect key="frame" x="0.0" y="155.5" width="375" height="44"/>

666+ <autoresizingMask key="autoresizingMask"/>

667+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lrc-b1-1JB" id="4YN-xu-f78">

668+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

669+ <autoresizingMask key="autoresizingMask"/>

670+ <subviews>

671+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Leave chat" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="q4L-ZD-zVb">

672+ <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>

673+ <autoresizingMask key="autoresizingMask"/>

674+ <fontDescription key="fontDescription" type="system" pointSize="17"/>

675+ <color key="textColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

676+ <nil key="highlightedColor"/>

677+ </label>

678+ </subviews>

679+ </tableViewCellContentView>

680+ </tableViewCell>

681+ </cells>

682+ </tableViewSection>

683+ <tableViewSection headerTitle="Actions" id="oLK-Mz-9rh">

684+ <cells>

685+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="mO7-R4-T0a" style="IBUITableViewCellStyleDefault" id="6N5-8b-glu">

686+ <rect key="frame" x="0.0" y="255.5" width="375" height="44"/>

687+ <autoresizingMask key="autoresizingMask"/>

688+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6N5-8b-glu" id="pKT-jH-Ur5">

689+ <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>

690+ <autoresizingMask key="autoresizingMask"/>

691+ <subviews>

692+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show participants" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mO7-R4-T0a">

693+ <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>

694+ <autoresizingMask key="autoresizingMask"/>

695+ <fontDescription key="fontDescription" type="system" pointSize="17"/>

696+ <nil key="textColor"/>

697+ <nil key="highlightedColor"/>

698+ </label>

699+ </subviews>

700+ </tableViewCellContentView>

701+ </tableViewCell>

702+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="fXd-wg-rwW" style="IBUITableViewCellStyleDefault" id="VQR-WR-KA7">

703+ <rect key="frame" x="0.0" y="299.5" width="375" height="44"/>

704+ <autoresizingMask key="autoresizingMask"/>

705+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VQR-WR-KA7" id="mkm-sp-LKZ">

706+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>

707+ <autoresizingMask key="autoresizingMask"/>

708+ <subviews>

709+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Add participants" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fXd-wg-rwW">

710+ <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>

711+ <autoresizingMask key="autoresizingMask"/>

712+ <fontDescription key="fontDescription" type="system" pointSize="17"/>

713+ <nil key="textColor"/>

714+ <nil key="highlightedColor"/>

715+ </label>

716+ </subviews>

717+ </tableViewCellContentView>

718+ </tableViewCell>

719+ </cells>

720+ </tableViewSection>

721+ </sections>

942722 <connections>

943− <outlet property="dataSource" destination="shX-JH-apo" id="a9b-xm-VIg"/>

944− <outlet property="delegate" destination="shX-JH-apo" id="Cg4-aC-E7h"/>

723+ <outlet property="dataSource" destination="Rfd-Hp-Qqv" id="ThC-G8-che"/>

724+ <outlet property="delegate" destination="Rfd-Hp-Qqv" id="1WG-zg-Ahf"/>

945725 </connections>

946726 </tableView>

947727 </tableViewController>

948− <placeholder placeholderIdentifier="IBFirstResponder" id="RsJ-xx-GJW" userLabel="First Responder" sceneMemberID="firstResponder"/>

728+ <placeholder placeholderIdentifier="IBFirstResponder" id="KPW-41-EQd" userLabel="First Responder" sceneMemberID="firstResponder"/>

949729 </objects>

950− <point key="canvasLocation" x="5925" y="1339"/>

730+ <point key="canvasLocation" x="5057" y="938"/>

951731 </scene>

952732

953733 <scene sceneID="myW-UY-uGB">

GDproject/Constants.swift−4

@@ -63,9 +63,5 @@ let taggsSelectionViewController = "TaggsSelectionViewController"

6363

6464let dialogViewController = "DialogViewController"

6565

66−let tagsSuggestionController = "TagsSuggestionController"

67−

68−let chatInfoViewController = "ChatInfoViewController"

69−

7066let blueSystemColor = UIColor(red: 0, green: 137/255, blue: 249/255, alpha: 0.5)

7167

GDproject/Controller/ News and channels/AnonimousChannelController.swiftnew file+18

@@ -0,0 +1,18 @@

1+//

2+// AnonimousChannelController.swift

3+// GDproject

4+//

5+// Created by cstore on 20/04/2019.

7+//

9+import UIKit

10+

11+class AnonimousChannelController: UITableViewController {

12+

13+ override func viewDidLoad() {

14+ super.viewDidLoad()

15+ }

16+

17+

18+}

GDproject/Controller/ News and channels/ChannelController.swift+1−1

@@ -73,7 +73,7 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS

7373 if let _ = channel?.id { print("update")

7474 Model.updateChannel(with: channel!)

7575 } else { print("create")

76− //Model.createChannel(with: channel!)

76+ Model.createChannel(with: channel!)

7777 }

7878 return

7979 }

GDproject/Controller/ News and channels/ChannelListController.swift+2−2

@@ -30,7 +30,7 @@ class ChannelListController: UITableViewController {

3030 var displayingChannel: Model.Channels?

3131

3232 var toReload: Bool = false {

33− didSet {

33+ didSet{

3434 tableView.reloadData()

3535 }

3636 }

@@ -100,7 +100,7 @@ class ChannelListController: UITableViewController {

100100 @objc func addChannel()

101101 {

102102 // editing mode is on automatically

103− onEditingModeBegins?(Model.Channels(people: [], name: "Untitled", id: 0, tags: []),IndexPath(row: 1, section: 0))

103+ onEditingModeBegins?(Model.Channels(people: [], name: "Untitled", tags: []),IndexPath(row: 1, section: 0))

104104 }

105105

106106 static let generalChannel = Model.Channels(people: [], name: "General", id: -1, tags: [])

GDproject/Controller/ News and channels/ChannelViewController.swift+6−13

@@ -53,32 +53,26 @@ class ChannelViewController: UITableViewController, UpdatableName, UpdatableChan

5353 super.viewWillAppear(animated)

5454 tableView.reloadData()

5555 }

56−

56+ // TODO: update channel

5757 override func viewWillDisappear(_ animated: Bool) {

5858

5959 defer {

6060 super.viewWillDisappear(animated)

6161 }

6262

63− guard let _ = self.navigationController?.viewControllers.lastIndex(of: self) else

64− {

65− if let id = channel?.id, id != 0

63+ guard let _ = self.navigationController?.viewControllers.lastIndex(of: self) else {

64+ if let _ = channel?.id

6665 {

6766 Model.updateChannel(with: channel!)

6867 } else {

69− Model.createChannel(with: channel!) {

70− [weak self] in

71− self?.showAlertOn(result: $0)

72− return

73− }

68+ Model.createChannel(with: channel!)

7469 }

7570 return

7671 }

7772 // nou

7873 }

7974

80− @objc func showPreview()

81− {

75+ @objc func showPreview(){

8276 if let channel = channel {

8377 onShowingPreview?(channel)

8478 }

@@ -153,8 +147,7 @@ class ChannelViewController: UITableViewController, UpdatableName, UpdatableChan

153147

154148 override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath)

155149 {

156− if editingStyle == UITableViewCell.EditingStyle.delete

157− {

150+ if editingStyle == UITableViewCell.EditingStyle.delete {

158151 if indexPath.section == 1 {

159152 channel?.people.remove(at: indexPath.row-1)

160153 } else {

GDproject/Controller/ News and channels/FullPostController.swift+19−3

@@ -25,10 +25,27 @@ class FullPostController: UITableViewController {

2525

2626 func setUpNavigationBar(){

2727 navigationItem.largeTitleDisplayMode = .never

28− navigationItem.title = "Post"

28+ navigationItem.title = "\(post?.authorId ?? 0)"

29+ navigationItem.rightBarButtonItems = [UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(self.options))]

2930 }

3031

31−

32+ @objc func options(){

33+ // drafts

34+ // saved

35+

36+ let optionMenu = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)

37+ let editAction = UIAlertAction(title: "Send via message", style: .default)

38+ let shareAction = UIAlertAction(title: "Send via project", style: .default)

39+ let settingsAction = UIAlertAction(title: "Copy link", style: .default)

40+ let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)

41+

42+ optionMenu.addAction(editAction)

43+ optionMenu.addAction(shareAction)

44+ optionMenu.addAction(settingsAction)

45+ optionMenu.addAction(cancelAction)

46+

47+ self.present(optionMenu, animated: true, completion: nil)

48+ }

3249 // MARK: - Table view data source

3350

3451 override func numberOfSections(in tableView: UITableView) -> Int {

@@ -85,7 +102,6 @@ class FullPostController: UITableViewController {

85102 cell.onUserDisplay = { [weak self] (id) in

86103 let vc = self?.storyboard!.instantiateViewController(withIdentifier: profileViewController) as! ProfileViewController

87104 vc.idProfile = id

88−

89105 self?.navigationController?.pushViewController(vc, animated: true)

90106 }

91107 default:

GDproject/Controller/ News and channels/NewPostViewController.swift+8−26

@@ -41,7 +41,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

4141 let textStorage = MarklightTextStorage()

4242

4343 static var draft: String = ""

44− static var hashTagsDraft: [String] = [ ]

44+ static var hashTagsDraft: [String] = ["tt"]

4545

4646 var textView: UITextView!

4747

@@ -72,7 +72,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

7272

7373 setUpMD()

7474 setUpTextView()

75− // setUpAccessoryView()

75+ setUpAccessoryView()

7676 //setUpTagsView()

7777 }

7878

@@ -109,8 +109,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

109109 override func viewWillAppear(_ animated: Bool) {

110110 super.viewWillAppear(animated)

111111

112− //navigationController?.navigationBar.prefersLargeTitles = false

113− navigationItem.largeTitleDisplayMode = .never

112+ navigationController?.navigationBar.prefersLargeTitles = false

114113 navigationItem.title = "New post"

115114 textView.text = NewPostViewController.draft

116115 // tagsField.addTags(NewPostViewController.hashTagsDraft)

@@ -141,7 +140,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

141140 func setUpTextView(){

142141 view.addConstraint(bottomTextViewConstraint)

143142 view1.addSubview(textView)

144− textView.edgesToSuperview(insets: .top(8) + .left(8) + .bottom(8) + .right(8))

143+ textView.edgesToSuperview(insets: .top(8) + .left(8) + .bottom(40+8) + .right(8))

145144

146145 if #available(iOS 11.0, *) {

147146 textView.smartDashesType = .no

@@ -210,7 +209,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

210209 }

211210

212211 func setUpMD(){

213− textStorage.marklightTextProcessor.codeColor = UIColor.gray

212+ textStorage.marklightTextProcessor.codeColor = UIColor.orange

214213 textStorage.marklightTextProcessor.quoteColor = UIColor.darkGray

215214 textStorage.marklightTextProcessor.syntaxColor = UIColor.blue

216215 textStorage.marklightTextProcessor.codeFontName = "Courier"

@@ -232,27 +231,10 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

232231 var indexOfPost = 0

233232 // MARK:- new post

234233 @objc func newPost(){

235− self.navigationItem.title = "Sending..."

236− Model.createAndPublish(body: [Model.Attachments(markdown: textView!.text)], tags: currentTags) {

237− [weak self] in

238−

239− switch $0 {

240− case .success1, .success:

241− NewPostViewController.draft = ""

242− NewPostViewController.hashTagsDraft = []

243− self?.moveBackToParentVC?()

244− default:

245− self?.showAlertOn(result: $0)

246− self?.navigationItem.title = "New post"

247− }

248−

249− }

250−

251− // NewPostViewController.draft = ""

252− // NewPostViewController.hashTagsDraft = []

234+ Model.createAndPublish(body: [Model.Attachments(markdown: textView!.text)], tags: currentTags)

253235 // adding row to uiTableView after adding new post

254236 // myProtocol?.addPost(post: p)

255− // moveBackToParentVC?()

237+ moveBackToParentVC?()

256238 // somewhere here i will be sending server notifications about new post arrival

257239 }

258240

@@ -264,7 +246,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate, TagsReceiver

264246 [weak self]

265247 _ in

266248 NewPostViewController.draft = self?.textView.text ?? ""

267− NewPostViewController.hashTagsDraft = self?.currentTags ?? []

249+ NewPostViewController.hashTagsDraft = /*self?.tagsField.tags.map { $0.text } ??*/ []

268250 self?.moveBackToParentVC?()

269251 }

270252

GDproject/Controller/ News and channels/NewsController.swift+14−53

@@ -12,7 +12,6 @@ import Cartography

1212

1313protocol UpdateableWithChannel: class {

1414 var channel: Model.Channels? { get set }

15− func updateChannel(on channel: Model.Channels)

1615}

1716

1817protocol UpdateableWithUser: class {

@@ -20,14 +19,8 @@ protocol UpdateableWithUser: class {

2019}

2120// MARK:- Controller with posts and channels availiable.

2221// Search is availiable within every table (posts and channels). Has button-functionality for boths post and chnnels

23−class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWithChannel, UISearchResultsUpdating

22+class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWithChannel

2423{

25− func updateChannel(on channel: Model.Channels) {

26− self.channel = channel

27− news.currChannel = channel

28− decideWhatChannelDisplay()

29− }

30−

3124 var changedChannelName: ((String)->())?

3225

3326 @IBOutlet weak var tableView: UITableView!

@@ -38,7 +31,7 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

3831 // MARK: - Output -

3932 var onSelectChannel: (() -> Void)?

4033

41− var searchController: UISearchController?

34+ var searchController = UISearchController(searchResultsController: nil)

4235

4336 var news = NewsVC()

4437 var type: HeaderType? = .NEWS

@@ -48,13 +41,6 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

4841 override func viewDidLoad()

4942 {

5043 super.viewDidLoad()

51−

52− let updater = TagsSuggestionController()

53− updater.delegate = self

54− searchController = UISearchController(searchResultsController: updater)

55− navigationItem.largeTitleDisplayMode = .always

56−

57− navigationController?.navigationBar.prefersLargeTitles = true

5844 navigationItem.title = "Loading ..."

5945 tableView.refreshControl = refreshContr

6046 // Configure Refresh Control

@@ -63,9 +49,8 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

6349 tableView.register(PostViewCell.self, forCellReuseIdentifier: postCellId)

6450 tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")

6551

66− setUpSearchContr()

52+ // setUpSearchContr()

6753

68− // navigationItem.

6954 news.viewController = self

7055 news.type = type == .NEWS ? .NEWS : type!

7156 news.currChannel = channel

@@ -74,15 +59,14 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

7459 }

7560

7661 func setUpSearchContr(){

77− searchController?.delegate = self

78− searchController?.obscuresBackgroundDuringPresentation = false

62+ searchController.delegate = self

63+ searchController.obscuresBackgroundDuringPresentation = false

7964 navigationItem.searchController = searchController

8065 definesPresentationContext = true

81− searchController?.searchResultsUpdater = self

82− searchController?.searchBar.placeholder = "Search tags"

66+ searchController.searchBar.placeholder = "Search anything"

8367 }

8468

85− @objc func refreshPostsData( _ ff: UIRefreshControl) {

69+ @objc func refreshPostsData( _ ff: UIRefreshControl){

8670 decideWhatChannelDisplay()

8771 }

8872

@@ -92,7 +76,7 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

9276

9377 override func viewWillAppear(_ animated: Bool) {

9478 super.viewWillAppear(animated)

95− searchController?.isActive = false

79+ searchController.isActive = false

9680 // TODO:- display something if no posts are availiable

9781

9882 decideWhatChannelDisplay()

@@ -101,18 +85,16 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

10185 }

10286

10387 func decideWhatChannelDisplay(){

104−

10588 switch type! {

10689 case .NEWS, .NONE:

10790 if let channel = channel, let id = channel.id, id != -1 {

10891

109− Model.getAnonymousChannel(by: channel) { [weak self] in

92+ Model.getChannel(with: id) { [weak self] in

11093 self?.news.dataSourse = $0.posts

11194 self?.news.dictionary = $0.users

11295 self?.refreshContr.endRefreshing()

11396 self?.changedChannelName?(channel.name)

11497 }

115−

11698 } else {

11799 Model.getLast { [weak self] in

118100 self?.news.dataSourse = $0.posts

@@ -122,10 +104,12 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

122104 }

123105 }

124106 default:

125− refreshContr.endRefreshing()

126− break

107+ if let anonChannel = anonymousChannel {

108+ news.dataSourse = anonChannel.posts

109+ news.dictionary = anonChannel.users

110+ changedChannelName?("Anonymous")

111+ }

127112 }

128−

129113 }

130114

131115 func setUpNavigationItemsforPosts(){

@@ -133,27 +117,4 @@ class NewsController: UIViewController, UISearchControllerDelegate, UpdateableWi

133117 tableView.dataSource = news

134118 tableView.reloadData()

135119 }

136−

137− func updateSearchResults(for searchController: UISearchController)

138− {

139− let filteredData = CompletionTree.getCompletion(tree: Model.hashTagTree!, word: searchController.searchBar.text?.lowercased() ?? "")

140−

141− // Apply the filtered results to the search results table.

142− if let resultsController = searchController.searchResultsController as? TagsSuggestionController {

143− resultsController.suggestions = filteredData

144− resultsController.tableView.reloadData()

145− }

146− }

147−

148− func willPresentSearchController(_ searchController: UISearchController) {

149− searchController.searchResultsController?.view.isHidden = false;

150− }

151−

152− func didPresentSearchController(_ searchController: UISearchController) {

153− searchController.searchResultsController?.view.isHidden = false;

154− }

155−

156− func didDismissSearchController(_ searchController: UISearchController) {

157− searchController.searchBar.text = ""

158− }

159120}

GDproject/Controller/ News and channels/NewsVC.swift+11−12

@@ -19,9 +19,7 @@ struct PostCellData{

1919

2020 let markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 16))

2121 markdownParser.enabledElements = .disabledAutomaticLink

22− markdownParser.code.font = UIFont(name: "Menlo", size: 16)

23− markdownParser.code.textBackgroundColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)

24− markdownParser.code.color = #colorLiteral(red: 0.2549019754, green: 0.2745098174, blue: 0.3019607961, alpha: 1)

22+ markdownParser.code.textBackgroundColor = #colorLiteral(red: 0.8039215803, green: 0.8039215803, blue: 0.8039215803, alpha: 1)

2523

2624 return markdownParser.parse(markdown)

2725 }

@@ -44,7 +42,6 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource {

4442 }

4543

4644 (viewController as? NewsController)?.tableView.reloadData()

47− (viewController as? ProfileViewController)?.tableView.reloadData()

4845 }

4946 }

5047

@@ -88,17 +85,19 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource {

8885 vc.idProfile = id

8986 self?.viewController!.navigationController!.pushViewController(vc, animated: true)

9087 }

91−

92− cell.onAnonymousChannelDisplay = {

93− [weak self] in

94− (self?.viewController as? UpdateableWithChannel)?.updateChannel(on: Model.Channels(people: [], name: $0, id: 0, tags: [$0]))

95− }

9688 default:

9789 cell.onUserDisplay = { (id) in

9890 print("tapped when profile is opened already \(id)")

9991 }

10092 }

10193

94+ cell.onAnonymousChannelDisplay = {

95+ [weak self] (tag) in

96+ Model.getAnonymousChannel(by: Model.AnonymousChannel(people: [], tags: [tag]),

97+ completion: { (tuple) in self?.onChannelDidChange?(tuple) }

98+ )

99+ }

100+

102101 cell.selectionStyle = .none

103102 return cell

104103 }

@@ -118,13 +117,13 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource {

118117 // pagination

119118 if indexPath.row == cellDataSourse.count - 1 && prevLast != indexPath.row

120119 {

121− if let ch = currChannel, let id = ch.id, id != -1 {

120+ if let ch = currChannel, let id = ch.id, ch.id != -1{

122121 // check this!

123− Model.getAnonymousChannel(by: ch, exclusiveFrom: dataSourse.last?.id) { [weak self] in

122+ Model.getChannel(with: id, on: 10, from: dataSourse.last?.id )

123+ { [weak self] in

124124 self?.dataSourse.append(contentsOf: $0.posts)

125125 $0.users.forEach { self?.dictionary[$0.key] = $0.value }

126126 }

127−

128127 } else {

129128 // check this!

130129 Model.getLast(on: 10, from: dataSourse.last?.id )

GDproject/Controller/ News and channels/PostViewCell.swift+3−7

@@ -8,11 +8,11 @@

99import UIKit

1010import Cartography

11+import MarkdownKit

1112import TinyConstraints

1213

1314class PostViewCell: UITableViewCell

1415{

15−

1616 var onUserDisplay: ((Int)->())?

1717

1818 var onAnonymousChannelDisplay: ((String)->())?

@@ -42,7 +42,6 @@ class PostViewCell: UITableViewCell

4242

4343 let shareButton: UIButton = {

4444 let button = UIButton(type: UIButton.ButtonType.detailDisclosure)

45− button.isHidden = true

4645 return button

4746 }()

4847

@@ -87,7 +86,7 @@ class PostViewCell: UITableViewCell

8786 nameLabel.setTitle("\(post.user?.firstName ?? "") \(post.user?.lastName ?? "")", for: .normal)

8887 nameLabel.addTarget(self, action: #selector(displayProfile), for: .touchUpInside)

8988 if let user = post.user{

90− fullNameLabel.text = "\(user.faculty.name)"

89+ fullNameLabel.text = "\(user.firstName) \(user.middleName) \(user.lastName)"

9190 }

9291 else {

9392 fullNameLabel.text = "\(post.authorId)"

@@ -124,7 +123,6 @@ class PostViewCell: UITableViewCell

124123 let button = UIButton()

125124 button.setTitle("#" + hash, for: .normal)

126125 button.addTarget(self, action: #selector(setAnonymousChannel(on:)), for: .touchUpInside)

127− // button.addGestureRecognizer(longPressRecognizer)

128126 button.titleLabel?.font = UIFont.monospacedDigitSystemFont(ofSize: 15, weight: .semibold)

129127 button.setTitleColor(#colorLiteral(red: 0, green: 0.4784313725, blue: 1, alpha: 1), for: .normal)

130128 buttons.append(button)

@@ -182,9 +180,7 @@ class PostViewCell: UITableViewCell

182180 }

183181

184182 @objc func displayProfile(){

185− if let id = post?.authorId {

186− onUserDisplay?(id)

187− }

183+ onUserDisplay?(post!.authorId)

188184 }

189185

190186 @objc func setAnonymousChannel(on button: UIButton){

GDproject/Controller/ News and channels/TagsSuggestionController.swiftdeleted−52

@@ -1,52 +0,0 @@

1−//

2−// AnonimousChannelController.swift

3−// GDproject

4−//

5−// Created by cstore on 20/04/2019.

7−//

8−

9−import UIKit

10−

11−class TagsSuggestionController: UITableViewController

12−{

13− weak var delegate: UpdateableWithChannel?

14−

15− var suggestions = [String]()

16− var channel: Model.Channels?

17−

18− override func viewDidLoad()

19− {

20− super.viewDidLoad()

21− if let tree = Model.hashTagTree {

22− suggestions = CompletionTree.getCompletion(tree: tree, word: "")

23− print(suggestions)

24− }

25− tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")

26− tableView.reloadData()

27− }

28−

29− override func numberOfSections(in tableView: UITableView) -> Int {

30− return 1

31− }

32−

33− override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

34− return suggestions.count

35− }

36−

37− override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

38− {

39− let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)

40− cell.textLabel?.text = suggestions[indexPath.row]

41−

42− return cell

43− }

44−

45− override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)

46− {

47− channel = Model.Channels(people: [], name: "\(self.suggestions[indexPath.row])", id: 0, tags: [self.suggestions[indexPath.row]])

48−

49− delegate?.updateChannel(on: channel!)

50− self.dismiss(animated: true)

51− }

52−}

GDproject/Controller/Coordinators/LogInCoordinator.swift+8−37

@@ -10,8 +10,6 @@ import UIKit

1010

1111class LogInCoordinator: BaseCoordinator {

1212

13− let storyboard = UIStoryboard(name: "Main", bundle: nil)

14−

1513 var didEndFlow: (()->())?

1614 var window: UIWindow!

1715 var navigationController: UINavigationController?

@@ -24,47 +22,20 @@ class LogInCoordinator: BaseCoordinator {

2422

2523 override func start(){

2624 let logInVC = LogInViewController()

27− logInVC.authenticate = { [weak self, weak logInVC] (email) in

25+ logInVC.authenticate = { [weak self] (id) in

2826

29− DataStorage.standard.setEmail(email: email)

30− Model.authenticate(with: email) { [weak self]

31− (authStatus) in

32−

33− print(authStatus.userStatus)

27+ Model.authenticate(with: id) {

28+ (res) in

3429

35− if (authStatus.userStatus == "invalid") {

36− logInVC?.presentAlertInvalidCode()

30+ if (res) {

31+ DataStorage.standard.setUserKey(with: id)

32+ self?.didEndFlow?()

3733 }

38− else if (authStatus.userStatus == "canRegister") { // register form

39− self?.presentRegisterVC()

40− } else { // validation code

41− self?.presentViewControllerForCodeInput()

34+ else {

35+ DataStorage.standard.setUserKey(with: 0)

4236 }

4337 }

4438 }

45−

4639 navigationController?.pushViewController(logInVC, animated: false)

4740 }

48−

49− func presentViewControllerForCodeInput()

50− {

51− let vc = storyboard.instantiateViewController(withIdentifier: "CodeViewController") as! CodeViewController

52− self.navigationController?.pushViewController(vc, animated: true)

53− vc.onSuccessLogIn = {

54− [weak self] in self?.didEndFlow?()

55− }

56− }

57−

58− func presentRegisterVC(){

59−

60− let vc1 = storyboard.instantiateViewController(withIdentifier: "RegisterTableViewController") as! RegisterTableViewController

61−

62− vc1.onRegistration = { [weak self] in

63− self?.presentViewControllerForCodeInput()

64− }

65−

66− self.navigationController?.pushViewController(vc1, animated: true)

67− }

68−

69−

7041}

GDproject/Controller/Coordinators/MessagesCoordinator.swift+3−45

@@ -32,56 +32,14 @@ class MessagesCoordinator: BaseCoordinator {

3232 vc.onUserDisplayList = { [weak vc, unowned self] in

3333

3434 let newVC = self.storyboard.instantiateViewController(withIdentifier: peopleToWriteVC) as! PeopleToWriteViewController

35−

36− newVC.whatToDoWithSelection = { [weak newVC, weak self] people in

37− newVC?.navigationController?.popViewController(animated: true)

38−

39− // detect is it a user or group dialog

40− let count = people.count

41− if count == 1 {

42−

43− let user = people.first!.key

44− let createdDialog = Model.Dialog.userChat(Model.UserChat(user: user))

45−

46− let vc = DialogViewController()

47− vc.users = Model.Channels.fullPeopleDict

48− vc.dialog = createdDialog

49− self?.navigationController?.pushViewController(vc, animated: true)

50−

51− } else {

52− var group = Model.Group(users: people, name: "Untitled", id: 0)

53− group.users[DataStorage.standard.getUserId()] = Model.UserPermission(isAdmin: true)

54−

55− Model.createGroupChat(from: group, completion: { [weak self] id in

56−

57− let newVC1 = DialogViewController()

58− group.id = id

59− newVC1.users = Model.Channels.fullPeopleDict

60− newVC1.dialog = Model.Dialog.groupChat(Model.GroupChat(group: group))

61− self?.navigationController?.pushViewController(newVC1, animated: true)

62− })

63− }

64− }

65−

6635 vc?.navigationController?.pushViewController(newVC, animated: true)

6736 }

6837

69− vc.onDialogDisplay = { [weak vc] in

70−

71− let newVC = DialogViewController()

72− newVC.dialog = $0.dialog

73− newVC.users = $0.users

74− newVC.onUserDisplay = { [weak self] id in

75−

76− let vc = self?.storyboard.instantiateViewController(withIdentifier: profileViewController) as! ProfileViewController

77− vc.idProfile = id

78− self?.navigationController!.pushViewController(vc, animated: true)

79−

80− }

81−

38+ vc.onDialogDisplay = { [weak vc, unowned self] _ in

39+ let newVC = self.storyboard.instantiateViewController(withIdentifier: dialogVC) as! DialogViewController

40+ //newVC.currentDialog = $0

8241 vc?.navigationController?.pushViewController(newVC, animated: true)

8342 }

84−

8543 navigationController?.viewControllers = [vc]

8644 }

8745}

GDproject/Controller/Coordinators/ProfileCoordinator.swift+16−22

@@ -27,34 +27,28 @@ class ProfileCoordinator: BaseCoordinator {

2727 let storyboard = UIStoryboard(name: "Main", bundle: nil)

2828 let profile = storyboard.instantiateViewController(withIdentifier: "ProfileViewController") as! ProfileViewController

2929

30− profile.logOut = {

31− Model.logout() {

32− [weak self] in

33−

34− DataStorage.standard.setIsLoggedIn(value: false, with: 0)

35− self?.didEndSession?()

36− }

30+ profile.logOut = { [weak self] in

31+ DataStorage.standard.setIsLoggedIn(value: false, with: 0)

32+ self?.didEndSession?()

3733 }

3834

39− profile.deleteAllSessions = {

40− Model.deactivateAll() {

41− [weak self] in

42−

43− DataStorage.standard.setIsLoggedIn(value: false, with: 0)

44− self?.didEndSession?()

45− }

35+ profile.onSettings = { [weak self, weak storyboard] in

36+ let vc = storyboard?.instantiateViewController(withIdentifier: "SettingsViewController") as! SettingsViewController

37+ self?.navigationController?.pushViewController(vc, animated: true)

4638 }

4739

48− profile.onSettings = { [weak self, weak storyboard, weak profile] in

49−

50− let vc = storyboard?.instantiateViewController(withIdentifier: "RegisterTableViewController") as! RegisterTableViewController

51− vc.delegate = profile

52− vc.userActive = profile?.user

40+ profile.onChannelsListToAddAPerson = { [weak self, weak storyboard] (user) in

41+ let vc = storyboard?.instantiateViewController(withIdentifier: simplifiedChannelsList) as! SimplifiedChannelsList

42+ vc.user = user

5343

54− self?.navigationController?.pushViewController(vc, animated: true)

44+ let transition = CATransition()

45+ transition.duration = 0.5

46+ transition.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

47+ transition.type = CATransitionType.moveIn

48+ transition.subtype = CATransitionSubtype.fromTop

49+ self?.navigationController?.view.layer.add(transition, forKey: nil)

50+ self?.navigationController?.pushViewController(vc, animated: false)

5551 }

56−

57−

5852 navigationController?.setViewControllers([profile], animated: false)

5953 }

6054}

GDproject/Controller/Log In/CodeViewController.swiftdeleted−144

@@ -1,144 +0,0 @@

1−//

2−// CodeViewController.swift

3−// GDproject

4−//

5−// Created by cstore on 10/05/2019.

7−//

8−

9−import UIKit

10−import TinyConstraints

11−

12−class CodeViewController: UIViewController {

13−

14− @IBOutlet weak var f1: UITextField!

15− @IBOutlet weak var f2: UITextField!

16− @IBOutlet weak var f3: UITextField!

17− @IBOutlet weak var f4: UITextField!

18− @IBOutlet weak var f5: UITextField!

19− @IBOutlet weak var f6: UITextField!

20−

21− var loading = UIActivityIndicatorView(style: .gray)

22−

23− var onSuccessLogIn: (()->())?

24−

25− override func viewDidLoad() {

26− super.viewDidLoad()

27− setUpConstraint()

28−

29− navigationItem.title = DataStorage.standard.getEmail()

30−

31− f1.addTarget(self, action: #selector(textFiledDidChange(textField:)), for: .editingChanged)

32− f2.addTarget(self, action: #selector(textFiledDidChange(textField:)), for: .editingChanged)

33− f3.addTarget(self, action: #selector(textFiledDidChange(textField:)), for: .editingChanged)

34− f4.addTarget(self, action: #selector(textFiledDidChange(textField:)), for: .editingChanged)

35− f5.addTarget(self, action: #selector(textFiledDidChange(textField:)), for: .editingChanged)

36− f6.addTarget(self, action: #selector(textFiledDidChange(textField:)), for: .editingChanged)

37− }

38−

39− override func viewWillDisappear(_ animated: Bool) {

40− super.viewWillDisappear(animated)

41−

42− loading.stopAnimating()

43− }

44−

45− override func viewWillAppear(_ animated: Bool) {

46− super.viewWillAppear(animated)

47−

48− f1.becomeFirstResponder()

49− }

50−

51− @objc func textFiledDidChange(textField: UITextField) {

52− let text = textField.text

53−

54− // only 1 char

55− if text?.utf16.count == 1 {

56− switch textField {

57− case f1:

58− f2.becomeFirstResponder()

59− case f2:

60− f3.becomeFirstResponder()

61− case f3:

62− f4.becomeFirstResponder()

63− case f4:

64− f5.becomeFirstResponder()

65− case f5:

66− f6.becomeFirstResponder()

67− case f6:

68− f6.resignFirstResponder()

69− default:

70− break

71− }

72− }

73− }

74−

75−

76− func presentAlertInvalidData(with text: String)

77− {

78− let alert = UIAlertController(title: "Invalid code", message: text, preferredStyle: .alert)

79− alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))

80− self.present(alert, animated: true, completion: nil)

81−

82− loading.stopAnimating()

83− }

84−

85− @IBOutlet weak var bottomConstraint: NSLayoutConstraint!

86−

87− @IBAction func whereToGoNext(_ sender: UIButton)

88− {

89− guard let f1t = f1.text, let f2t = f2.text, let f3t = f3.text, let f4t = f4.text, let f5t = f5.text, let f6t = f6.text else {

90− presentAlertInvalidData(with: "Some fields are missing");

91− return

92− }

93−

94− if f1t.isEmpty || f2t.isEmpty || f3t.isEmpty || f4t.isEmpty || f5t.isEmpty || f6t.isEmpty {

95− presentAlertInvalidData(with: "Some fields are missing");

96− return

97− }

98−

99− let code = "\(f1.text!)\(f2.text!)\(f3.text!)\(f4.text!)\(f5.text!)\(f6.text!)"

100− if let codeToInt = Int(code)

101− {

102− loading.startAnimating()

103− Model.verify(with: codeToInt) { [weak self] in

104− // if everything is okay we can authemticicate

105− if !$0 {

106− self?.presentAlertInvalidData(with: "Wrong code. Try again!")

107− self?.loading.stopAnimating()

108− return

109− } else {

110− // Model.authemticiateMe

111− Model.authenticateMe { [weak self] (res) in

112− if res {

113− self?.onSuccessLogIn?()

114− }

115− }

116− return

117− }

118− }

119− }

120− }

121−

122− func setUpConstraint()

123− {

124− self.view.addSubview(loading)

125− loading.centerInSuperview()

126− // for keyboard notifications

127− NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotifications), name: UIResponder.keyboardWillShowNotification, object: nil)

128−

129− NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotifications), name: UIResponder.keyboardWillHideNotification, object: nil)

130− }

131−

132− @objc func handleKeyboardNotifications(notification: NSNotification){

133− if let userInfo = notification.userInfo {

134− // UIKeyboardFrameEndUserInfoKey

135− let keyBoardFrame = (userInfo[UIResponder.keyboardFrameEndUserInfoKey] as! NSValue).cgRectValue

136− bottomConstraint.constant = notification.name == UIResponder.keyboardWillShowNotification ? keyBoardFrame.height - self.view.safeAreaInsets.bottom : 0

137−

138− UIView.animate(withDuration: 0, delay: 0, options: .curveEaseOut, animations: {

139− self.view.layoutIfNeeded()

140− })

141− }

142− }

143−

144−}

GDproject/Controller/Log In/FacultyTableViewController.swiftdeleted−88

@@ -1,88 +0,0 @@

1−//

2−// FacultyTableViewController.swift

3−// GDproject

4−//

5−// Created by cstore on 10/05/2019.

7−//

8−

9−import UIKit

10−

11−protocol ChosenFactulty: class {

12− func onChooseFaculty(faculty: Model.Faculty)

13−}

14−

15−class FacultyTableViewController: UITableViewController {

16−

17− weak var delegate: ChosenFactulty?

18−

19− var currentFaculties: [Model.Faculty] = []{

20− didSet {

21− tableView.reloadData()

22− }

23− }

24−

25− var isFiltering: Bool {

26− return searchController.isActive && !searchBarIsEmpty()

27− }

28−

29− func searchBarIsEmpty() -> Bool {

30− return searchController.searchBar.text?.isEmpty ?? true

31− }

32−

33− var searchController = UISearchController(searchResultsController: nil)

34−

35− override func viewDidLoad() {

36− super.viewDidLoad()

37−

38− self.navigationItem.title = "Faculties"

39− self.navigationItem.searchController = searchController

40− self.navigationItem.hidesSearchBarWhenScrolling = false

41− searchController.obscuresBackgroundDuringPresentation = false

42−

43− setUpTimer()

44− }

45−

46− func setUpTimer(){

47− Timer.scheduledTimer(withTimeInterval: 2, repeats: true) { (timer) in

48− DispatchQueue.main.async { [weak self] in

49−

50− if self!.isFiltering {

51− Model.searchFaculty(string: (self?.searchController.searchBar.text)!) { [weak self] in

52− self?.currentFaculties = $0

53− }

54− }

55− }

56− }

57− }

58−

59−

60− // MARK: - Table view data source

61−

62− override func numberOfSections(in tableView: UITableView) -> Int {

63− return 1

64− }

65−

66− override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

67− return currentFaculties.count

68− }

69−

70−

71− override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

72− {

73− let cell = tableView.dequeueReusableCell(withIdentifier: "F", for: indexPath)

74−

75− cell.textLabel?.text = currentFaculties[indexPath.row].name

76− cell.detailTextLabel?.text = currentFaculties[indexPath.row].campusName

77− cell.selectionStyle = .none

78−

79− return cell

80− }

81−

82− override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

83− delegate?.onChooseFaculty(faculty: currentFaculties[indexPath.row])

84− searchController.dismiss(animated: true, completion: nil)

85− self.navigationController?.popViewController(animated: true)

86− }

87−

88−}

GDproject/Controller/Log In/InititalsViewCell.swiftdeleted−23

@@ -1,23 +0,0 @@

1−//

2−// InititalsViewCell.swift

3−// GDproject

4−//

5−// Created by cstore on 10/05/2019.

7−//

8−

9−import UIKit

10−

11−class InititalsViewCell: UITableViewCell {

12−

13− @IBOutlet weak var initialsTextField: UITextField!

14−

15− override func awakeFromNib() {

16− super.awakeFromNib()

17− // Initialization code

18− }

19−

20− func fill(with name: String){

21− initialsTextField.text = name

22− }

23−}

GDproject/Controller/Log In/LogInCoordinator1.swiftnew file+48

@@ -0,0 +1,48 @@

1+////

2+//// LogInCoordinator.swift

3+//// GDproject

4+////

5+//// Created by cstore on 23/02/2019.

7+////

8+//

9+//import UIKit

10+//

11+//class LogInCoordinator{

12+//

13+// private weak var navigationController: UINavigationController?

14+// private var window: UIWindow!

15+// // MARK:- Init

16+// init(navigationController: UINavigationController, window: UIWindow) {

17+// self.navigationController = navigationController

18+// self.window = window

19+// }

20+//

21+// func start(){

22+// showLogInPage()

23+// }

24+//

25+// // MARK: - Private implementation

26+//// private func showStatusPage(){

27+//// let controller = TabbarCoordinator(window: window)

28+//// controller.start()

29+//// }

30+//

31+// private func showLogInPage(){

32+// let controller = UIStoryboard.makeLogIn()

33+//

34+// controller.onLogIn = {

35+// (id) in Model.authenticate(with: id) {

36+// (res) in

37+//

38+// if (res) { DataStorage.standard.setUserKey(with: id) }

39+// else { DataStorage.standard.setUserKey(with: 0) }

40+//

41+// controller.authenticateSucceeded = res

42+// }

43+// }

44+//

45+// navigationController?.pushViewController(controller, animated: false)

46+// }

47+//

48+//}

GDproject/Controller/Log In/LogInViewController.swift+4−29

@@ -14,24 +14,7 @@ import Result

1414

1515class LogInViewController: UIViewController {

1616

17− var loading = UIActivityIndicatorView(style: .gray)

18−

19− var authenticate: ((String)->())?

20−

21− func presentAlertInvalidCode()

22− {

23− let alert = UIAlertController(title: "Invalid email", message: "Try again. Use @hse.ru mail.", preferredStyle: .alert)

24− alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))

25− self.present(alert, animated: true, completion: nil)

26− mailTextField.text = ""

27− loading.stopAnimating()

28− }

29−

30− override func viewWillDisappear(_ animated: Bool) {

31− super.viewWillDisappear(animated)

32−

33− loading.stopAnimating()

34− }

17+ var authenticate: ((Int)->())?

3518

3619 let logInLabel: UILabel = {

3720 let label = UILabel()

@@ -47,8 +30,6 @@ class LogInViewController: UIViewController {

4730 textField.placeholder = "Mail"

4831 textField.borderStyle = .roundedRect

4932 textField.textColor = .black

50− textField.autocorrectionType = UITextAutocorrectionType.no

51− textField.autocapitalizationType = UITextAutocapitalizationType.none

5233 textField.clearButtonMode = .always

5334 return textField

5435 }()

@@ -64,8 +45,7 @@ class LogInViewController: UIViewController {

6445 }()

6546

6647 @objc func handleTap(){

67− loading.startAnimating()

68− authenticate?(mailTextField.text!)

48+ authenticate?(Int(mailTextField.text!)!)

6949 }

7050

7151 private lazy var keyboardBar = UIView()

@@ -75,10 +55,6 @@ class LogInViewController: UIViewController {

7555 func setUpView(){

7656 // logIn stack with textField and label

7757 view.addSubview(contentView)

78− view.addSubview(loading)

79−

80− loading.centerInSuperview()

81−

8258 contentView.edgesToSuperview(excluding: .bottom, insets: .left(16) + .right(16) + .top(80), usingSafeArea: true)

8359 let views = [logInLabel, mailTextField]

8460 contentView.stack(views, axis: .vertical, spacing: 10)

@@ -86,7 +62,6 @@ class LogInViewController: UIViewController {

8662

8763 func configureKeyboard(){

8864

89− mailTextField.keyboardType = .emailAddress

9065 // configure keyboardBar setUp

9166 view.addSubview(keyboardBar)

9267 keyboardBar.height(50)

@@ -97,14 +72,14 @@ class LogInViewController: UIViewController {

9772 // configure keyboardBar components

9873 keyboardBar.addSubview(logInButton)

9974 logInButton.height(50)

100− logInButton.rightToSuperview(view.rightAnchor, offset: -16, relation: .equal, isActive: true)

75+ logInButton.leftToSuperview(view.leftAnchor, offset: 16, relation: .equal, isActive: true)

10176

10277 }

10378

10479 func logicOfLogInInputValidation() -> ((String?)->()) {

10580

10681 let logic: ((String?)->()) = { [weak self] (someText) in

107− if let text = someText, !text.isEmpty, text.contains("@") {

82+ if let text = someText, !text.isEmpty, let _ = Int(text) {

10883 self?.logInButton.isEnabled = true

10984 } else {

11085 self?.logInButton.isEnabled = false

GDproject/Controller/Log In/RegisterTableViewController.swiftdeleted−198

@@ -1,198 +0,0 @@

1−//

2−// RegisterTableViewController.swift

3−// GDproject

4−//

5−// Created by cstore on 10/05/2019.

7−//

8−

9−import UIKit

10−

11−class RegisterTableViewController: UITableViewController, ChosenFactulty

12−{

13−

14− func presentAlertInvalidData(message: String)

15− {

16− let alert = UIAlertController(title: "Invalid data", message: message, preferredStyle: .alert)

17− alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))

18− self.present(alert, animated: true, completion: nil)

19− }

20−

21− func onChooseFaculty(faculty: Model.Faculty) {

22− self.faculty = faculty

23− tableView.reloadData()

24− }

25−

26− weak var delegate: UpdateUser?

27−

28− var onRegistration: (()->())?

29−

30− var faculty: Model.Faculty?

31− var user: Model.NewRegistration = Model.NewRegistration(email: DataStorage.standard.getEmail()!, firstName: nil, middleName: nil, lastName: nil, faculty: nil)

32−

33− var userActive: Model.Users? {

34− didSet {

35− if let userA = userActive {

36− user.firstName = userA.firstName

37− user.middleName = userA.middleName

38− user.lastName = userA.lastName

39−

40− faculty = userA.faculty

41− self.updateUserIfCan = true

42− tableView.reloadData()

43− }

44− }

45− }

46−

47− var updateUserIfCan: Bool = false

48−

49− override func viewDidLoad()

50− {

51− super.viewDidLoad()

52−

53− navigationItem.largeTitleDisplayMode = .never

54− tableView.keyboardDismissMode = .interactive

55− navigationItem.title = user.email

56− navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(endRegistration))

57− }

58−

59−

60− @objc func endRegistration()

61− {

62− let fieldsMissing = "Some fields are missing. Add more information"

63− updateUser()

64− guard let faculty = faculty else { presentAlertInvalidData(message: fieldsMissing); return }

65−

66− user.faculty = faculty.url

67−

68− guard let name = user.firstName else { presentAlertInvalidData(message: fieldsMissing); return }

69− guard let middle = user.middleName else { presentAlertInvalidData(message: fieldsMissing); return }

70− guard let last = user.lastName else { presentAlertInvalidData(message: fieldsMissing); return }

71−

72− if updateUserIfCan {

73− guard let delegate = delegate else { return }

74− guard var userA = userActive else { return }

75−

76− // updating current

77− userA.firstName = name

78− userA.faculty = faculty

79− userA.middleName = middle

80− userA.lastName = last

81−

82− Model.userUpdate(with: user) { [weak self] in

83−

84− if $0 {

85− delegate.updateUserObj(with: userA)

86− self?.navigationController?.popViewController(animated: true)

87− } else {

88− self?.presentAlertInvalidData(message: "Something went wrong! Try again")

89− }

90−

91− }

92− } else {

93−

94− Model.register(object: user)

95− { [weak self] in

96− self?.onRegistration?()

97− }

98− }

99− }

100− // MARK: - Table view data source

101−

102− override func numberOfSections(in tableView: UITableView) -> Int {

103− return 2

104− }

105−

106− override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

107−

108− switch section {

109− case 0:

110− return 3

111− default:

112− if let _ = faculty {

113− return 2

114− } else {

115− return 1

116− }

117− }

118− }

119−

120− override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String?

121− {

122− switch section {

123− case 0:

124− return "Initials"

125− default:

126− return "Faculty"

127− }

128− }

129−

130−

131− override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

132− {

133− switch indexPath.section {

134− case 0:

135− let cell = tableView.dequeueReusableCell(withIdentifier: "nameCell", for: indexPath) as! InititalsViewCell

136− switch indexPath.row{

137− case 0:

138− if let name = user.firstName {

139− cell.fill(with: name)

140− } else {

141− cell.initialsTextField.placeholder = "First name"

142− }

143− case 1:

144− if let name = user.middleName {

145− cell.fill(with: name)

146− } else {

147− cell.initialsTextField.placeholder = "Middle name"

148− }

149− default:

150− if let name = user.lastName {

151− cell.fill(with: name)

152− } else {

153− cell.initialsTextField.placeholder = "Last name"

154− }

155− }

156− cell.selectionStyle = .none

157− return cell

158− default:

159− switch indexPath.row {

160− case 0:

161− let cell = tableView.dequeueReusableCell(withIdentifier: "cell111", for: indexPath)

162− cell.selectionStyle = .none

163− return cell

164− default:

165− let cell = tableView.dequeueReusableCell(withIdentifier: "facultyCell", for: indexPath)

166− cell.textLabel?.text = faculty!.name

167− cell.detailTextLabel?.text = faculty!.campusName

168− cell.selectionStyle = .none

169− return cell

170− }

171− }

172− }

173−

174−

175− override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

176− if indexPath.section == 1 && indexPath.row == 0 {

177−

178− updateUser()

179−

180− let vc = storyboard?.instantiateViewController(withIdentifier: "FacultyTableViewController") as! FacultyTableViewController

181−

182− vc.delegate = self

183−

184− self.navigationController?.pushViewController(vc, animated: true)

185− }

186− }

187−

188− func updateUser(){

189− guard let cell = tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? InititalsViewCell else {return}

190− guard let cell1 = tableView.cellForRow(at: IndexPath(row: 1, section: 0)) as? InititalsViewCell else {return}

191− guard let cell2 = tableView.cellForRow(at: IndexPath(row: 2, section: 0)) as? InititalsViewCell else {return}

192−

193− user.firstName = cell.initialsTextField.text!

194− user.middleName = cell1.initialsTextField.text!

195− user.lastName = cell2.initialsTextField.text!

196− }

197−

198−}

GDproject/Controller/Messages/ChatInfoViewController.swift+56−270

@@ -8,301 +8,87 @@

99import UIKit

1010

11+

1112/// Class for displaying chat info

1213///

1314class ChatInfoViewController: UITableViewController {

1415

15− enum PersonStatus{

16− case admin

17− case ordinary

18− }

19−

20− weak var delegate: UpdatableGroup?

21−

22− var groupChat: Model.Group? {

23− didSet{

24− if let groupChat = groupChat {

25− usersArray = groupChat.users.map { $0.key }

26− }

27− }

28− }

29−

30− var usersArray: [Int] = [] {

31− didSet {

32− tableView.reloadData()

33− }

34− }

35−

36− var users: [Int: Model.Users] = [:]

37−

38− func canIEditThisChat() -> PersonStatus

39− {

40− let myId = UserDefaults.standard.integer(forKey: UserDefaultsKeys.id.rawValue)

41−

42− if let groupChatUserPermission = groupChat?.users[myId]?.isAdmin {

43− return groupChatUserPermission ? .admin : .ordinary

44− }

45−

46− return .ordinary

47− }

48−

49− var myPermissions: PersonStatus = .ordinary

50−

51−

5216

5317 override func viewDidLoad() {

5418 super.viewDidLoad()

5519

56− tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")

57− myPermissions = canIEditThisChat()

58− tableView.reloadData()

59−

60− switch myPermissions {

61− case .admin:

62− navigationItem.rightBarButtonItem = self.editButtonItem

63− default:

64− return

65− }

20+ // Uncomment the following line to preserve selection between presentations

21+ // self.clearsSelectionOnViewWillAppear = false

22+

23+ // Uncomment the following line to display an Edit button in the navigation bar for this view controller.

24+ // self.navigationItem.rightBarButtonItem = self.editButtonItem

6625 }

6726

6827 // MARK: - Table view data source

6928

7029 override func numberOfSections(in tableView: UITableView) -> Int {

71− return 3

30+ // #warning Incomplete implementation, return the number of sections

31+ return 0

7232 }

7333

7434 override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

75− switch section {

76− case 0:

77− return 1

78− case 1:

79− return 1

80− default:

81− return usersArray.count + (myPermissions == .ordinary ? 0 : 1)

82− }

35+ // #warning Incomplete implementation, return the number of rows

36+ return 0

8337 }

8438

85−

86− override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

87− {

88− let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)

39+ /*

40+ override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

41+ let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath)

42+

43+ // Configure the cell...

8944

90− if indexPath.row == 0 {

91− switch indexPath.section {

92− case 0:

93− cell.textLabel?.text = groupChat!.name

94− cell.selectionStyle = .none

95− return cell

96− case 1:

97− cell.textLabel?.text = "Leave chat"

98− cell.textLabel?.textColor = #colorLiteral(red: 1, green: 0.1491314173, blue: 0, alpha: 1)

99− cell.selectionStyle = .none

100− return cell

101− default:

102− switch myPermissions{

103− case .admin:

104− cell.textLabel?.text = "Add participants"

105− cell.accessoryType = .disclosureIndicator

106− case .ordinary:

107− cell.textLabel?.text = name(for: users[usersArray[indexPath.row]])

108− }

109− cell.selectionStyle = .none

110− return cell

111− }

112− }

113−

114− switch myPermissions{

115− case .admin:

116− cell.textLabel?.text = name(for: users[usersArray[indexPath.row-1]])

117− case .ordinary:

118− cell.textLabel?.text = name(for: users[usersArray[indexPath.row]])

119− }

120− cell.selectionStyle = .none

12145 return cell

12246 }

123−

124− private func name(for user: Model.Users?) -> String {

125− if let user = user, let perm = groupChat?.users[user.id]?.isAdmin {

126− if perm {

127− return "🤴🏻 \(user.fullName())"

128− }

129− return "👤 \(user.fullName())"

130− }

131−

132− return "left"

133− }

134−

135− override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String?

136− {

137− switch section {

138− case 0:

139− return "Title"

140− case 1:

141− return "Opportunities"

142− default:

143− return "Participants"

144− }

145− }

146−

47+ */

14748

148− func editName(for cell: UITableViewCell){

149− let alert = UIAlertController(title: "Are you sure?", message: "Title:", preferredStyle: .alert)

150−

151− let action1 = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)

152−

153− alert.addTextField { [weak self] (tf) in

154− tf.textColor = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1)

155− tf.text = self?.groupChat?.name

156− }

157−

158− let action2 = UIAlertAction(title: "OK", style: .default) { [unowned self] _ in

159− let name = alert.textFields?.first?.text

160− cell.textLabel?.text = name

161− self.groupChat?.name = name!

162− Model.updateGroupChat(with: self.groupChat!)

163− self.delegate?.updateGroup(with: self.groupChat!)

164− }

165−

166− alert.addAction(action1)

167− alert.addAction(action2)

168−

169− present(alert, animated: true, completion: nil)

170− }

171− override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)

172− {

173− guard let groupChat = groupChat else {

174− return

175− }

176−

177− guard let cell = tableView.cellForRow(at: indexPath) else {

178− return

179− }

180−

181− if indexPath.row == 0 {

182− switch indexPath.section{

183− case 0:

184− switch myPermissions{

185− case .admin:

186− editName(for: cell)

187− default:

188− break

189− }

190− case 1:

191− Model.leaveGroupChat(id: groupChat.id) {

192− [weak self] in

193− self?.navigationController?.popViewController(animated: true)

194− }

195− default:

196− switch myPermissions{

197− case .admin:

198− showUserChoiceVC()

199− default:

200− showParticipantPage(with: usersArray[indexPath.row])

201− }

202− }

203− }

204−

205−

206− if indexPath.section == 2 && indexPath.row != 0 {

207− switch myPermissions{

208− case .admin:

209− showParticipantPage(with: usersArray[indexPath.row-1])

210− default:

211− showParticipantPage(with: usersArray[indexPath.row])

212− }

213− }

214− }

215−

216− var onUserDiplay: ((Int)->())?

217−

218− func showParticipantPage(with user: Int?) {

219− if let user = user {

220− onUserDiplay?(user)

221− }

222− }

223−

224− func showUserChoiceVC()

225− {

226− let vc = storyboard?.instantiateViewController(withIdentifier: peopleToWriteVC) as! PeopleToWriteViewController

227−

228− vc.whatToDoWithSelection = { [weak self, weak vc] mapa in

229−

230− mapa.forEach { self?.users[$0.key] = Model.Channels.fullPeopleDict[$0.key] }

231− mapa.forEach { self?.groupChat?.users[$0.key] = $0.value }

232− vc?.navigationController?.popViewController(animated: true)

233− }

234−

235− navigationController?.pushViewController(vc, animated: true)

236− }

237−

238− override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath)

239− {

240− if editingStyle == UITableViewCell.EditingStyle.delete {

241− groupChat?.users[usersArray[indexPath.row-1]] = nil

242− }

243−

244− tableView.reloadData()

245− }

246−

49+ /*

50+ // Override to support conditional editing of the table view.

24751 override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {

248− if indexPath.row == 0 {

249− return false

250− }

251−

52+ // Return false if you do not want the specified item to be editable.

25253 return true

25354 }

254−

255− override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]?

256− {

257− let editButton = UITableViewRowAction(style: .normal, title: "Promote") { [unowned self] (rowAction, indexPath) in

258−

259− self.tableView.beginUpdates()

260− self.groupChat?.users[self.usersArray[indexPath.row-1]]?.isAdmin = true

261− self.tableView.reloadRows(at: [indexPath], with: .none)

262− self.tableView.endUpdates()

263− }

264−

265− editButton.backgroundColor = #colorLiteral(red: 0.476841867, green: 0.5048075914, blue: 1, alpha: 1)

266−

267− let restrictButton = UITableViewRowAction(style: .normal, title: "Restrict") { [unowned self] (rowAction, indexPath) in

268−

269− self.tableView.beginUpdates()

270− self.groupChat?.users[self.usersArray[indexPath.row-1]]?.isAdmin = false

271− self.tableView.reloadRows(at: [indexPath], with: .none)

272− self.tableView.endUpdates()

273− }

274−

275− restrictButton.backgroundColor = #colorLiteral(red: 0.8039215803, green: 0.8039215803, blue: 0.8039215803, alpha: 1)

276−

277− let deleteButton = UITableViewRowAction(style: .normal, title: "Delete") { [unowned self] (action, indexPath) in

278−

279− self.tableView.beginUpdates()

280− self.groupChat?.users[self.usersArray[indexPath.row-1]] = nil

281− self.tableView.deleteRows(at: [indexPath], with: .none)

282− self.tableView.endUpdates()

283− }

284−

285− deleteButton.backgroundColor = #colorLiteral(red: 1, green: 0.1491314173, blue: 0, alpha: 1)

286−

287− return [editButton, restrictButton, deleteButton]

55+ */

56+

57+ /*

58+ // Override to support editing the table view.

59+ override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {

60+ if editingStyle == .delete {

61+ // Delete the row from the data source

62+ tableView.deleteRows(at: [indexPath], with: .fade)

63+ } else if editingStyle == .insert {

64+ // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view

65+ }

66+ }

67+ */

68+

69+ /*

70+ // Override to support rearranging the table view.

71+ override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {

72+

28873 }

289−

290− /// update chatInfo

291− override func viewWillDisappear(_ animated: Bool) {

292−

293− defer {

294− super.viewWillDisappear(animated)

295− }

296−

297− guard let _ = self.navigationController?.viewControllers.lastIndex(of: self) else {

298− switch myPermissions {

299− case .ordinary:

300− return

301− case .admin:

302− Model.updateGroupChat(with: groupChat!)

303− delegate?.updateGroup(with: groupChat!)

304− }

305− return

306− }

74+ */

75+

76+ /*

77+ // Override to support conditional rearranging of the table view.

78+ override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {

79+ // Return false if you do not want the item to be re-orderable.

80+ return true

30781 }

82+ */

83+

84+ /*

85+ // MARK: - Navigation

86+

87+ // In a storyboard-based application, you will often want to do a little preparation before navigation

88+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {

89+ // Get the new view controller using segue.destination.

90+ // Pass the selected object to the new view controller.

91+ }

92+ */

93+

30894}

GDproject/Controller/Messages/Dialog/DialogCell.swiftdeleted−132

@@ -1,132 +0,0 @@

1−//

2−// DialogCell.swift

3−// GDproject

4−//

5−// Created by cstore on 05/05/2019.

7−//

8−

9−import UIKit

10−import TinyConstraints

11−import MarkdownKit

12−

13−class DialogCell: UITableViewCell {

14−

15− let nameLabel: UIButton = {

16− let button = UIButton()

17− button.setTitleColor(.black, for: .normal)

18− button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)

19− button.contentHorizontalAlignment = UIControl.ContentHorizontalAlignment.left

20− return button

21− }()

22−

23− @objc func displayProfile()

24− {

25− if let id = self.user?.id {

26− print("diplay")

27− onUserDisplay?(id)

28− }

29− }

30−

31− var onUserDisplay: ((Int)->())?

32−

33−

34− let timeLabel: UILabel = {

35− let label = UILabel()

36− label.font = UIFont.systemFont(ofSize: 9)

37− label.textAlignment = NSTextAlignment.right

38− label.textColor = #colorLiteral(red: 0.4352941176, green: 0.4431372549, blue: 0.4745098039, alpha: 1)

39− return label

40− }()

41−

42− func createTextView(with text: NSAttributedString, _ isSelectable: Bool) -> UITextView

43− {

44− let textView = UITextView()

45− textView.isScrollEnabled = false

46− textView.isEditable = false

47− textView.sizeToFit()

48−

49− if isSelectable {

50− textView.isSelectable = true

51− } else {

52− textView.isUserInteractionEnabled = false

53− }

54−

55− textView.attributedText = text

56− return textView

57− }

58−

59− override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?)

60− {

61− super.init(style: style, reuseIdentifier: reuseIdentifier)

62− }

63−

64− required init?(coder aDecoder: NSCoder)

65− {

66− fatalError("init(coder:) has not been implemented")

67− }

68−

69− var user: Model.Users? {

70− didSet{

71− nameLabel.setTitle(user!.fullName(), for: .normal)

72− }

73− }

74−

75− var textView: UITextView!

76−

77− func fill(with markdownText: NSAttributedString, byUser: Model.Users, when: String)

78− {

79− let myId = DataStorage.standard.getUserId()

80− // important

81− contentView.subviews.forEach({ $0.removeFromSuperview() })

82−

83− nameLabel.addTarget(self, action: #selector(displayProfile), for: .touchUpInside)

84−

85− self.user = byUser

86− textView = createTextView(with: markdownText, true)

87− textView.layer.cornerRadius = 10

88− textView.clipsToBounds = true

89−

90− self.contentView.addSubview(textView)

91− self.contentView.addSubview(timeLabel)

92−

93− timeLabel.text = when.getDate()

94− textView.width(min: 50, max: self.contentView.bounds.width-70, priority: .required, isActive: true)

95−

96− if myId == byUser.id

97− {

98− layoutMyMessage()

99− } else {

100− layOutOtherMessage()

101− }

102− }

103−

104− func layOutOtherMessage(){

105− self.contentView.addSubview(nameLabel)

106−

107− nameLabel.setTitle(user!.fullName(), for: .normal)

108−

109− nameLabel.edgesToSuperview(excluding: .bottom, insets: .top(4) + .left(8))

110− textView.edgesToSuperview(excluding: [.top, .right] , insets: .left(8) + .bottom(20))

111− textView.topToBottom(of: nameLabel)

112−

113− textView.backgroundColor = #colorLiteral(red: 0.8039215803, green: 0.8039215803, blue: 0.8039215803, alpha: 1)

114− textView.textColor = .white

115− timeLabel.edgesToSuperview(excluding: .top, insets: .right(70) + .left(8))

116− timeLabel.topToBottom(of: textView, offset: 4)

117− timeLabel.textAlignment = .left

118− }

119−

120− func layoutMyMessage()

121− {

122− textView.edgesToSuperview(excluding: .left, insets: .right(8) + .bottom(20) + .top(4))

123− textView.backgroundColor = UIColor(red:0.08, green:0.49, blue:0.98, alpha:1.0)

124− textView.textColor = .white

125− timeLabel.edgesToSuperview(excluding: .top, insets: .left(70) + .right(8))

126− timeLabel.topToBottom(of: textView, offset: 4)

127− timeLabel.textAlignment = .right

128− }

129−}

130−

131−

132−

GDproject/Controller/Messages/Dialog/DialogViewController.swiftdeleted−340

@@ -1,340 +0,0 @@

1−//

2−// DialogViewController.swift

3−// GDproject

4−//

5−// Created by cstore on 01/05/2019.

7−//

8−

9−import UIKit

10−import TinyConstraints

11−import Marklight

12−

13−protocol UpdatableGroup:class {

14− func updateGroup(with group: Model.Group)

15−}

16−

17−class DialogViewController: UIViewController, UpdatableGroup, UITableViewDelegate, UITableViewDataSource

18−{

19− var onUserDisplay: ((Int)->())?

20−

21− var tableView: UITableView = UITableView()

22−

23− func updateGroup(with group: Model.Group){

24− self.groupChat?.group = group

25− setTitleForGroup(groupChat: groupChat!)

26− }

27−

28− let cellId = "cell3"

29− var onInfoShow: (()->())?

30−

31− var dialog: Model.Dialog? {

32− didSet{

33− switch dialog! {

34− case .groupChat(let chat):

35− self.groupChat = chat

36− case .userChat(let chat):

37− self.userChat = chat

38− }

39− }

40− }

41−

42− var groupChat: Model.GroupChat?

43− var userChat: Model.UserChat?

44−

45− var users: [Int: Model.Users]?

46−

47− var groupId: Int?

48−

49− var cellData: [PostCellData] = [] {

50− didSet {

51− tableView.reloadData()

52− canBePaginated = true

53− }

54− }

55−

56− override func viewDidLoad() {

57− super.viewDidLoad()

58−

59− setConstraints()

60− magicForKeyboardChanges()

61−

62− self.tableView.delegate = self

63− self.tableView.dataSource = self

64−

65− tableView.setContentOffset(CGPoint(x: 0, y: 50), animated: false)

66−

67− navigationItem.largeTitleDisplayMode = .never

68−

69− tableView.keyboardDismissMode = .onDrag

70− tableView.separatorStyle = .none

71− tableView.register(DialogCell.self, forCellReuseIdentifier: cellId)

72− tableView.transform = CGAffineTransform(scaleX: 1, y: -1)

73− tableView.contentInsetAdjustmentBehavior = .never

74− tableView.contentOffset = CGPoint(x: 0, y: 30)

75−

76− if let groupChat = groupChat {

77− setTitleForGroup(groupChat: groupChat)

78− } else if let userChat = userChat{

79− setTitleForChat(userChat: userChat)

80− }

81− }

82−

83− var messageSendView: UIView = {

84− let view = UIView()

85− view.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)

86− return view

87− }()

88−

89− var messageTextView: UITextView =

90− {

91− let textStorage = MarklightTextStorage()

92− textStorage.marklightTextProcessor.codeColor = UIColor.orange

93− textStorage.marklightTextProcessor.quoteColor = UIColor.darkGray

94− textStorage.marklightTextProcessor.syntaxColor = UIColor.blue

95− textStorage.marklightTextProcessor.codeFontName = "Courier"

96− textStorage.marklightTextProcessor.fontTextStyle = UIFont.TextStyle.subheadline.rawValue

97− textStorage.marklightTextProcessor.hideSyntax = false

98−

99− let layoutManager = NSLayoutManager()

100−

101− // Assign the `UITextView`'s `NSLayoutManager` to the `NSTextStorage` subclass

102− //textStorage.addLayoutManager(textView.layoutManager)

103− textStorage.addLayoutManager(layoutManager)

104−

105− let textContainer = NSTextContainer()

106− layoutManager.addTextContainer(textContainer)

107−

108− let textView = UITextView(frame: CGRect.zero, textContainer: textContainer)

109− textView.isEditable = true

110− textView.isScrollEnabled = true

111− textView.backgroundColor = .white

112− return textView

113− }()

114−

115− var sendButton: UIButton = {

116− let button = UIButton()

117− button.setTitle("Send", for: .normal)

118− button.setTitleColor(.blue, for: .normal)

119− button.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold)

120− button.addTarget(self, action: #selector(sendMessage), for: .touchUpInside)

121− return button

122− }()

123−

124− @objc func sendMessage()

125− {

126− var destination: Model.MessageDestination?

127−

128− if let group = groupChat {

129− destination = Model.MessageDestination.groupChatDestination(group.group.id)

130− } else if let user = userChat {

131− destination = Model.MessageDestination.userChatDestination(user.user)

132− }

133−

134− if let destination = destination

135− {

136− Model.sendMessage(message: Model.SendMessage(body: Model.Attachments(markdown: messageTextView.text), destination: destination)) { [unowned self] in

137−

138− switch $0 {

139− case .success, .success1:

140− self.getMessagesNew(for: self.dialog!)

141− self.messageTextView.text = ""

142− default:

143− self.showAlertOn(result: $0)

144− }

145− }

146−

147− prevLast = -1

148− }

149− }

150−

151− var lineView: UIView = {

152− let view = UIView()

153− view.backgroundColor = #colorLiteral(red: 0.6000000238, green: 0.6000000238, blue: 0.6000000238, alpha: 1)

154− return view

155− }()

156−

157− var bottomConstraint: NSLayoutConstraint!

158−

159− func setConstraints(){

160− self.view.addSubview(tableView)

161− self.view.addSubview(messageSendView)

162−

163− messageSendView.addSubview(messageTextView)

164− messageSendView.addSubview(sendButton)

165− messageSendView.addSubview(lineView)

166−

167− messageSendView.edgesToSuperview(excluding: [.top,.bottom])

168−

169− bottomConstraint = NSLayoutConstraint(item: messageSendView, attribute: .bottom, relatedBy: .equal, toItem: self.view.safeAreaLayoutGuide, attribute: .bottom, multiplier: 1, constant: 0)

170− view.addConstraint(bottomConstraint)

171−

172− messageSendView.height(60)

173−

174− sendButton.edgesToSuperview(excluding: .left)

175− sendButton.width(60)

176−

177− lineView.edgesToSuperview(excluding: .bottom)

178− lineView.height(0.5)

179−

180− messageTextView.edgesToSuperview(excluding: .right)

181− messageTextView.rightToLeft(of: sendButton)

182−

183− tableView.edgesToSuperview(excluding: .bottom)

184− tableView.bottomToTop(of: messageSendView)

185−

186− self.view.layoutSubviews()

187− }

188−

189− func magicForKeyboardChanges()

190− {

191− NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotifications), name: UIResponder.keyboardWillShowNotification, object: nil)

192−

193− NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotifications), name: UIResponder.keyboardWillHideNotification, object: nil)

194− }

195−

196− @objc func handleKeyboardNotifications(notification: NSNotification){

197− if let userInfo = notification.userInfo{

198− // UIKeyboardFrameEndUserInfoKey

199−

200− let keyBoardFrame = (userInfo[UIResponder.keyboardFrameEndUserInfoKey] as! NSValue).cgRectValue

201−

202− bottomConstraint.constant = notification.name == UIResponder.keyboardWillShowNotification ? -(keyBoardFrame.height) + self.view.safeAreaInsets.bottom : 0

203−

204− UIView.animate(withDuration: 0, delay: 0, options: .curveEaseOut, animations: {

205− self.view.layoutIfNeeded()

206− }) { (completed) in

207−

208− }

209− }

210− }

211−

212− func setTitleForChat(userChat: Model.UserChat){

213− navigationItem.title = "\(users![userChat.user]!.fullName())"

214− navigationItem.rightBarButtonItem = UIBarButtonItem(title: "👤", style: .plain, target: self, action: #selector(showPersonPage))

215− }

216−

217− @objc func showPersonPage(){

218− if let id = userChat?.user{

219− onUserDisplay?(id)

220− }

221− }

222−

223− func setTitleForGroup(groupChat: Model.GroupChat){

224− navigationItem.title = "\(groupChat.group.name)"

225− navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Info", style: .plain, target: self, action: #selector(moveToInfoVC))

226− }

227−

228− // onInfoShow

229− @objc func moveToInfoVC(){

230− let vc = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: chatInfoViewController) as! ChatInfoViewController

231−

232− vc.delegate = self

233− vc.users = users!

234− vc.onUserDiplay = onUserDisplay

235−

236− if let groupChat = groupChat {

237− vc.groupChat = groupChat.group

238− }

239−

240− navigationController?.pushViewController(vc, animated: true)

241− }

242−

243− var currentMessagesInChat: [Model.LastMessage] = [] {

244− didSet

245− {

246− cellData = currentMessagesInChat.map { PostCellData(attributedData: PostCellData.create(with: [$0.body])) }

247− }

248− }

249−

250− // MARK: - Table view data source

251−

252− func numberOfSections(in tableView: UITableView) -> Int {

253− return 1

254− }

255−

256− func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

257− return cellData.count

258− }

259−

260− override func viewWillAppear(_ animated: Bool)

261− {

262− super.viewWillAppear(animated)

263− tabBarController?.tabBar.isHidden = true

264−

265− if let dialog = dialog {

266− getMessagesNew(for: dialog)

267− }

268− }

269−

270− func getMessages(for dialog: Model.Dialog, starting from: Int? = nil)

271− {

272− switch dialog {

273− case .groupChat(let groupChat):

274− Model.getMessagesFor(typeOfChat: Model.Dialog.groupChat(groupChat), chat: groupChat.group.id, exclusiveFrom: from)

275− { [weak self] in

276− self?.currentMessagesInChat.append(contentsOf: $0)

277− }

278− case .userChat(let userChat):

279− Model.getMessagesFor(typeOfChat: Model.Dialog.userChat(userChat), chat: userChat.user, exclusiveFrom: from)

280− { [weak self] in

281− self?.currentMessagesInChat.append(contentsOf: $0)

282− }

283− }

284− }

285−

286−

287− func getMessagesNew(for dialog: Model.Dialog, starting from: Int? = nil)

288− {

289− switch dialog {

290− case .groupChat(let groupChat):

291− Model.getMessagesFor(typeOfChat: Model.Dialog.groupChat(groupChat), chat: groupChat.group.id, exclusiveFrom: from)

292− { [weak self] in

293− self?.currentMessagesInChat = $0

294− }

295− case .userChat(let userChat):

296− Model.getMessagesFor(typeOfChat: Model.Dialog.userChat(userChat), chat: userChat.user, exclusiveFrom: from)

297− { [weak self] in

298− self?.currentMessagesInChat = $0

299− }

300− }

301− }

302−

303− func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

304− {

305− let cell = tableView.dequeueReusableCell(withIdentifier: cellId, for: indexPath) as! DialogCell

306−

307− //In cellForRowAtIndexPath

308− cell.transform = CGAffineTransform(scaleX: 1, y: -1)

309− cell.selectionStyle = .none

310−

311−

312− if let user = users?[currentMessagesInChat[indexPath.row].author]

313− {

314− cell.fill(with: cellData[indexPath.row].attributedData, byUser: user, when: currentMessagesInChat[indexPath.row].time)

315−

316− cell.onUserDisplay = onUserDisplay

317− }

318−

319− return cell

320− }

321−

322− var prevLast = -1

323− var canBePaginated = false

324− func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath)

325− {

326− if indexPath.row == cellData.count - 1 && prevLast != indexPath.row && canBePaginated && cellData.count >= 24

327− {

328− print("exclusiveFrom \(currentMessagesInChat.last?.id ?? 0)")

329− if let dialog = dialog

330− {

331− getMessages(for: dialog, starting: currentMessagesInChat.last?.id)

332− }

333−

334− prevLast = indexPath.row

335− }

336− }

337−}

338−

339−

340−

GDproject/Controller/Messages/DialogViewController.swiftnew file+67

@@ -0,0 +1,67 @@

1+//

2+// DialogViewController.swift

3+// GDproject

4+//

5+// Created by cstore on 01/05/2019.

7+//

9+import UIKit

10+

11+class DialogViewController: UITableViewController {

12+

13+ var onInfoShow: (()->())?

14+ var group: Model.Group?

15+

16+ override func viewDidLoad() {

17+ super.viewDidLoad()

18+

19+ tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")

20+

21+ if let id = group {

22+ navigationItem.title = "🌌 \(id.id) \(id.name)"

23+ navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Info", style: .plain, target: self, action: #selector(moveToInfoVC))

24+ }

25+ }

26+

27+

28+ @objc func moveToInfoVC(){

29+

30+ }

31+

32+ var currentMessagesInChat: [Model.LastMessage]? {

33+ didSet {

34+ tableView.reloadData()

35+ }

36+ }

37+

38+ // MARK: - Table view data source

39+

40+ override func numberOfSections(in tableView: UITableView) -> Int {

41+ return 1

42+ }

43+

44+ override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

45+ return currentMessagesInChat?.count ?? 0

46+ }

47+

48+ override func viewWillAppear(_ animated: Bool) {

49+ super.viewWillAppear(animated)

50+

51+ if let group = group {

52+ Model.getMessagesForGroupChat(chat: group.id) { [unowned self] in

53+ self.currentMessagesInChat = $0

54+ }

55+ }

56+ }

57+

58+ override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

59+ {

60+ let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)

61+

62+ cell.detailTextLabel?.text = currentMessagesInChat![indexPath.row].body.markdown

63+ cell.textLabel?.text = "\(currentMessagesInChat![indexPath.row].author)"

64+

65+ return cell

66+ }

67+}

GDproject/Controller/Messages/MessageViewCell.swiftdeleted−38

@@ -1,38 +0,0 @@

1−//

2−// MessageViewCell.swift

3−// GDproject

4−//

5−// Created by cstore on 13/05/2019.

7−//

8−

9−import UIKit

10−

11−class MessageViewCell: UITableViewCell {

12−

13− @IBOutlet weak var dialogName: UILabel!

14−

15− @IBOutlet weak var lastMessagePreview: UILabel!

16−

17− @IBOutlet weak var dateLabel: UILabel!

18−

19− override func awakeFromNib() {

20− super.awakeFromNib()

21− // Initialization code

22− }

23−

24− func fill(with dialog: Model.Dialog, user: Model.Users? = nil)

25− {

26− switch dialog {

27−

28− case .groupChat(let group):

29− dialogName.text = group.group.name

30− lastMessagePreview.text = group.lastMessage?.body.markdown

31− dateLabel.text = group.lastMessage?.time.getDate()

32− case .userChat(let userChat):

33− dialogName.text = "👤 \(user!.fullName())"

34− lastMessagePreview.text = userChat.lastMessage?.body.markdown

35− dateLabel.text = userChat.lastMessage?.time.getDate()

36− }

37− }

38−}

GDproject/Controller/Messages/MessagesViewController.swift+16−117

@@ -8,85 +8,30 @@

99import UIKit

1010

11−protocol SelectableDialog: class {

12− func openDialog(with dialog: Model.Dialog)

13−}

11+class MessagesViewController: UITableViewController {

1412

15−class MessagesViewController: UITableViewController, UISearchControllerDelegate, UISearchResultsUpdating, SelectableDialog {

16−

17− func openDialog(with dialog: Model.Dialog) {

18− onDialogDisplay?((dialog, users))

19− }

20−

21− func updateSearchResults(for searchController: UISearchController) {

22−

23− let filteredData = currentActiveDialogs

24− let inputText = searchController.searchBar.text ?? ""

25−

26− let filteredResults = filteredData.filter {

27−

28− switch $0 {

29− case .groupChat(let gropuChat):

30− return gropuChat.group.name.contains(inputText)

31−

32− case .userChat(let userChat):

33− let user = users[userChat.user]

34− guard let u = user else { return false }

35− return u.fullName().contains(inputText)

36−

37− }

38−

39− }

40−

41− // Apply the filtered results to the search results table.

42− if let resultsController = searchController.searchResultsController as? SuggestedDialogsTableViewController {

43− resultsController.users = users

44− resultsController.currentDialogs = filteredResults

45− resultsController.tableView.reloadData()

46− }

47− }

48−

4913 // curreent Active which can be displayed

5014 var currentActiveDialogs: [Model.Dialog] = [] {

51− didSet {

15+ didSet{

5216 tableView.reloadData()

5317 }

5418 }

5519

56− func setUpSearchContr(){

57−

58− searchController?.delegate = self

59− searchController?.obscuresBackgroundDuringPresentation = true

60− navigationItem.searchController = searchController

61− definesPresentationContext = true

62− searchController?.searchResultsUpdater = self

63− searchController?.searchBar.placeholder = "Search dialogs"

64−

65− }

66−

67− // curreent users

68− var users: [Int: Model.Users] = [:]

69−

7020 var onUserDisplayList: (()->())?

7121

72− var onDialogDisplay: (((dialog: Model.Dialog, users: [Int:Model.Users]))->())?

22+ var onDialogDisplay: ((Model.Dialog)->())?

7323

74− var searchController: UISearchController?

24+ let searchC = UISearchController(searchResultsController: nil)

7525

7626 override func viewDidLoad() {

7727 super.viewDidLoad()

78−

79− let updater = SuggestedDialogsTableViewController()

80−

81− updater.delegate = self

82− searchController = UISearchController(searchResultsController: updater)

83−

28+

8429 // Uncomment the following line to display an Edit button in the navigation bar for this view controller.

8530 self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Write", style: .plain, target: self, action: #selector(choosePerson))

8631

8732 self.navigationItem.title = "Messages"

8833 // self.navigationItem.largeTitleDisplayMode = .always

89− setUpSearchContr()

34+ self.navigationItem.searchController = searchC

9035 navigationController?.navigationBar.prefersLargeTitles = true

9136 self.navigationItem.hidesSearchBarWhenScrolling = false

9237 }

@@ -97,10 +42,9 @@ class MessagesViewController: UITableViewController, UISearchControllerDelegate,

9742

9843 override func viewWillAppear(_ animated: Bool) {

9944 super.viewWillAppear(animated)

100− tabBarController?.tabBar.isHidden = false

45+

10146 Model.getChatAll { [weak self] in

102− self?.currentActiveDialogs = $0.0

103− self?.users = $0.1

47+ self?.currentActiveDialogs = $0

10448 }

10549 }

10650

@@ -116,66 +60,21 @@ class MessagesViewController: UITableViewController, UISearchControllerDelegate,

11660

11761 override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

11862 {

119− let cell = tableView.dequeueReusableCell(withIdentifier: "MessageViewCell", for: indexPath) as! MessageViewCell

63+ let cell = tableView.dequeueReusableCell(withIdentifier: "MessagesCell", for: indexPath)

12064

12165 switch currentActiveDialogs[indexPath.row].self {

122− case .groupChat:

123− cell.fill(with: currentActiveDialogs[indexPath.row])

66+ case .groupChat(let group):

67+ cell.textLabel?.text = group.group.name

68+ cell.detailTextLabel?.text = group.lastMessage.body.markdown

12469 case .userChat(let userChat):

125− cell.fill(with: currentActiveDialogs[indexPath.row], user: users[userChat.user])

70+ cell.textLabel?.text = "\(userChat.user)"

71+ cell.detailTextLabel?.text = userChat.lastMessage.body.markdown

12672 }

127−

128− return cell

129− }

130−

131− override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

132− let tuple = (currentActiveDialogs[indexPath.row],users)

133− onDialogDisplay?(tuple)

134− }

135−}

136−

13773

138−class SuggestedDialogsTableViewController: UITableViewController {

139−

140− var idCell = "cell"

141−

142− var users: [Int: Model.Users] = [:]

143−

144− weak var delegate: SelectableDialog?

145−

146− var currentDialogs: [Model.Dialog] = []

147−

148− override func viewDidLoad() {

149− super.viewDidLoad()

150− tableView.register(UITableViewCell.self, forCellReuseIdentifier: idCell)

151− tableView.reloadData()

152− }

153−

154− override func numberOfSections(in tableView: UITableView) -> Int {

155− return 1

156− }

157−

158− override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

159− return currentDialogs.count

160− }

161−

162− override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell

163− {

164− let cell = tableView.dequeueReusableCell(withIdentifier: idCell, for: indexPath)

165−

166− switch currentDialogs[indexPath.row] {

167− case .groupChat(let groupChat):

168− cell.textLabel?.text = groupChat.group.name

169− case .userChat(let userChat):

170− cell.textLabel?.text = users[userChat.user]?.fullName()

171− }

172−

173− cell.accessoryType = .disclosureIndicator

17474 return cell

17575 }

176−

76+

17777 override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

178− delegate?.openDialog(with: currentDialogs[indexPath.row])

179− // self.dismiss(animated: true)

78+ onDialogDisplay?(currentActiveDialogs[indexPath.row])

18079 }

18180}

GDproject/Controller/Messages/PeopleToWriteViewController.swift+15−6

@@ -10,8 +10,7 @@ import UIKit

1010

1111class PeopleToWriteViewController: UITableViewController {

1212

13− // TODO: - edit button when it's used for selection

14− var whatToDoWithSelection: (([Int: Model.UserPermission])->())?

13+ // TODO: - edit button when it's used for selection

1514

1615 let searchC = UISearchController(searchResultsController: nil)

1716

@@ -24,9 +23,7 @@ class PeopleToWriteViewController: UITableViewController {

2423

2524 tableView.isEditing = true

2625 self.navigationItem.title = "People"

27−

28− self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(newMessage))

29−

26+ self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .compose, target: self, action: #selector(newMessage))

3027 self.navigationItem.largeTitleDisplayMode = .never

3128 self.navigationItem.searchController = searchC

3229 self.navigationItem.hidesSearchBarWhenScrolling = false

@@ -35,12 +32,15 @@ class PeopleToWriteViewController: UITableViewController {

3532 override func setEditing(_ editing: Bool, animated: Bool) {

3633 super.setEditing(true, animated: animated)

3734 }

35+ // MARK: - Table view data source

3836

3937 override func numberOfSections(in tableView: UITableView) -> Int {

38+ // #warning Incomplete implementation, return the number of sections

4039 return 1

4140 }

4241

4342 override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

43+ // #warning Incomplete implementation, return the number of rows

4444 return users.count

4545 }

4646

@@ -53,6 +53,7 @@ class PeopleToWriteViewController: UITableViewController {

5353 let cell = tableView.dequeueReusableCell(withIdentifier: "peopleToWriteCell", for: indexPath)

5454

5555 cell.textLabel?.text = users[indexPath.row].fullName()

56+ cell.detailTextLabel?.text = "\(users[indexPath.row].id)"

5657

5758 return cell

5859 }

@@ -61,7 +62,15 @@ class PeopleToWriteViewController: UITableViewController {

6162 {

6263 if chosenUsers.count != 0

6364 {

64− whatToDoWithSelection?(chosenUsers)

65+ navigationController?.popViewController(animated: false)

66+ var group = Model.Group(users: chosenUsers, name: "Untitled", id: 0)

67+

68+ Model.createGroupChat(from: group) { [unowned self] (id) in

69+ let vc = self.storyboard?.instantiateViewController(withIdentifier: dialogViewController) as! DialogViewController

70+ group.id = id

71+ vc.group = group

72+ self.navigationController?.pushViewController(vc, animated: true)

73+ }

6574 }

6675 }

6776}

GDproject/Controller/Profile/BasicInfoController.swift+11−16

@@ -16,20 +16,17 @@ struct CellData{

1616

1717class BasicInfoController: UIViewController, UITableViewDelegate, UITableViewDataSource {

1818

19− var userInfo: Model.Users? {

20− didSet {

21− if let userInfo = userInfo {

22− dataSourse = [CellData(opened: false, title: "Contacts", sectionData: [userInfo.email, userInfo.faculty.address]),

23− CellData(opened: false, title: "Faculty", sectionData: [userInfo.faculty.campusName, userInfo.faculty.name, userInfo.faculty.address, userInfo.faculty.path]),

24− CellData(opened: false, title: "Interests", sectionData: userInfo.faculty.tags)]

25− }

26− }

27− }

28−

29− var dataSourse: [CellData] = [ ]

19+ var dataSourse: [CellData] = [

20+ CellData(opened: false, title: "Phone", sectionData: ["+7 901 733 01 79"]),

21+ CellData(opened: false, title: "Mail", sectionData: ["vbogomazova@edu.hse.ru"]),

22+ CellData(opened: false, title: "Research ID", sectionData: ["4567834336789456737"]),

23+ CellData(opened: false, title: "Published", sectionData: ["Это будет очень длинное название книги 1, чтобы сделать проверку", "Книга 2", "Книга 3"]),

24+ CellData(opened: false, title: "Courses", sectionData: ["Курс 1", "Курс 2"]),

25+ CellData(opened: false, title: "Link", sectionData: ["https://wwww.hse.ru"])

26+ ]

3027

3128 func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

32− if (dataSourse[section].opened) {

29+ if (dataSourse[section].opened){

3330 return dataSourse[section].sectionData.count + 1

3431 } else {

3532 return 1

@@ -48,10 +45,8 @@ class BasicInfoController: UIViewController, UITableViewDelegate, UITableViewDat

4845 cell.selectionStyle = .none

4946 return cell

5047 } else {

51− let cell = tableView.dequeueReusableCell(withIdentifier: infoCellId, for: indexPath) as! InfoCell

52− cell.fill(title: dataSourse[indexPath.section].sectionData[indexPath.row - 1])

53− cell.accessoryType = .none

54− cell.selectionStyle = .none

48+ let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)

49+ cell.textLabel?.text = dataSourse[indexPath.section].sectionData[indexPath.row - 1]

5550 return cell

5651 }

5752 }

GDproject/Controller/Profile/InfoCell.swift+1−2

@@ -16,9 +16,8 @@ class InfoCell: UITableViewCell{

1616 label.font = UIFont.systemFont(ofSize: 16)

1717 label.sizeToFit()

1818 label.isScrollEnabled = false

19− // label.isUserInteractionEnabled = false

19+ label.isUserInteractionEnabled = false

2020 label.isEditable = false

21− label.dataDetectorTypes = .all

2221 label.textColor = .black

2322 return label

2423 }()

GDproject/Controller/Profile/ProfileViewController.swift+55−139

@@ -9,17 +9,8 @@

99import UIKit

1010import TinyConstraints

1111

12−protocol UpdateUser: class {

13− func updateUserObj(with user: Model.Users)

14−}

15−

16−class ProfileViewController: UIViewController, UpdateUser

12+class ProfileViewController: UIViewController

1713{

18− func updateUserObj(with user: Model.Users)

19− {

20− self.user = user

21− Model.Channels.fullPeopleDict[user.id] = user

22− }

2314

2415 @IBOutlet weak var segmentedControl: UISegmentedControl!

2516

@@ -41,31 +32,18 @@ class ProfileViewController: UIViewController, UpdateUser

4132

4233 var logOut: (()->())?

4334

44− var deleteAllSessions: (()->())?

45−

4635 var onSettings: (()->())?

4736

48− @IBAction func sendMessage(_ sender: UIButton)

49− {

50− if let userId = idProfile

51− {

52− let createdDialog = Model.Dialog.userChat(Model.UserChat(user: userId))

53− let vc = DialogViewController()

54− vc.users = Model.Channels.fullPeopleDict

55− vc.dialog = createdDialog

56− self.navigationController?.pushViewController(vc, animated: true)

57− }

58− }

37+ var onChannelsListToAddAPerson: ((Model.Users)->())?

5938

60− var protoDictionary: [String: UIImage] = ["135213": #imageLiteral(resourceName: "9"), "135288": #imageLiteral(resourceName: "5051"), "22723" : #imageLiteral(resourceName: "69"), "135083": #imageLiteral(resourceName: "42")]

39+ var protoDictionary: [Int: UIImage] = [9: #imageLiteral(resourceName: "9"), 5051: #imageLiteral(resourceName: "5051"), 69: #imageLiteral(resourceName: "69"), 42: #imageLiteral(resourceName: "42")]

6140

62− func fill(with user: Model.Users)

63− {

64− self.facultyLabel.text = user.faculty.name

41+ func fill(with user: Model.Users){

42+ self.facultyLabel.text = "Студент: Факультет Компьютерных Наук"

6543 self.nameLabel.text = "\(user.firstName) \(user.middleName)"

6644 self.surnameLabel.text = "\(user.lastName)"

67− self.profileImageView.image = protoDictionary[user.faculty.campusCode]?.roundedImage

68− self.placeLabel.text = "📍\(user.faculty.address)"

45+ self.profileImageView.image = protoDictionary[user.id]?.roundedImage

46+ self.placeLabel.text = "📍Москва, Кочновский пр.3"

6947 if user.id == DataStorage.standard.getUserId() {

7048 newMessageButton.isHidden = true

7149 } else {

@@ -75,61 +53,44 @@ class ProfileViewController: UIViewController, UpdateUser

7553

7654 var user: Model.Users? {

7755 didSet {

78− if let user = user {

79− self.fill(with: user)

80− navigationItem.title = "\(user.firstName) \(user.lastName)"

81− } else if let id = idProfile {

82− Model.getUsers(for: [id]) { [unowned self ] in

83− self.user = $0[id]

84− }

56+ self.fill(with: user!)

57+ Model.getPostsForUser(with: user!.id) { [weak self] (posts) in

58+ self?.dataSourse = posts

8559 }

60+ navigationItem.title = "\(user!.firstName) \(user!.lastName)"

8661 }

8762 }

8863

89− var channel: Model.Channels? {

90− didSet {

91− self.update()

92− }

93− }

64+ var basicInfo = BasicInfoController()

65+ var posts = NewsVC()

9466

95− func update()

96− {

97− Model.getAnonymousChannel(by: channel!) { [unowned self] in

98− self.posts.dataSourse = $0.posts

99− self.posts.dictionary = $0.users

100− self.user = $0.users[self.idProfile!]

67+ var dataSourse: [Model.Posts]?{

68+ didSet{

69+

70+ var newPosts: [Model.Posts] = []

71+

72+ dataSourse?.forEach({ (post) in

73+ newPosts.append(Model.Posts(body: post.body, authorId: post.authorId, id: post.id, user: user!, date: post.updated, tags: post.tags))

74+ })

75+

76+ self.posts.dataSourse = newPosts

77+ tableView.reloadData()

10178 }

10279 }

10380

104− var basicInfo = BasicInfoController()

105− var posts = NewsVC()

106−

10781 override func viewDidLoad()

10882 {

10983 super.viewDidLoad()

110− if idProfile == nil {

111− idProfile = DataStorage.standard.getUserId()

112− }

113−

84+ print("hell")

11485 posts.viewController = self

11586 posts.type = .NONE

116− posts.currChannel = channel

117−

118− posts.onFullPost = {

119− [weak self] (type,post) in

120−

121− let vc = self?.storyboard?.instantiateViewController(withIdentifier: fullPostControllerId) as! FullPostController

122− vc.type = type

123− vc.post = post

124− self?.navigationController!.pushViewController(vc, animated: true)

125− }

12687

12788 tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")

12889

12990 tableView.register(PostViewCell.self, forCellReuseIdentifier: postCellId)

13091

13192 tableView.register(BasicInfoCell.self, forCellReuseIdentifier: basicInfoCellId)

132−

93+

13394 tableView.register(InfoCell.self, forCellReuseIdentifier: infoCellId)

13495

13596 posts.viewController = self

@@ -139,27 +100,29 @@ class ProfileViewController: UIViewController, UpdateUser

139100 tableView.reloadData()

140101 }

141102

142− var idProfile: Int? {

143− didSet {

144− channel = Model.Channels(people: [idProfile!], name: "", id: 0, tags: [])

145− }

146− }

103+ var idProfile: Int?

147104

148105 override func viewWillAppear(_ animated: Bool) {

149− tabBarController?.tabBar.isHidden = false

150106

151107 if idProfile == nil {

152108 idProfile = DataStorage.standard.getUserId()

153109 }

154− user = Model.Channels.fullPeopleDict[idProfile!]

155110

156− update()

111+ if let id = idProfile {

112+ if let user = Model.idUser[id] {

113+ self.user = user

114+ } else {

115+ Model.getUsers(for: [id]) { [weak self] (dic) in

116+ self?.user = dic[id]

117+ }

118+ }

119+ }

157120

158121 setUpNavigarionBar()

159122 }

160123

161124 func setUpNavigarionBar(){

162− // navigationController?.navigationBar.prefersLargeTitles = true

125+ navigationController?.navigationBar.prefersLargeTitles = true

163126 let uibarbutton = UIBarButtonItem(title: "More", style: .plain, target: self, action: #selector(showInformation))

164127 navigationItem.rightBarButtonItems = [uibarbutton]

165128 navigationItem.largeTitleDisplayMode = .always

@@ -169,75 +132,29 @@ class ProfileViewController: UIViewController, UpdateUser

169132

170133 let optionMenu = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)

171134

172−

173− let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)

135+ let channelAction = UIAlertAction(title: "Add to a channel", style: .default){

136+ [weak self] (_) in

137+ self?.onChannelsListToAddAPerson?(self!.user!)

138+ }

174139

140+ let settingsAction = UIAlertAction(title: "Setting", style: .default)

141+ { [weak self] (_) in

142+ self?.onSettings?()

143+ }

175144

176− if idProfile == DataStorage.standard.getUserId() {

177− let logoutAction = UIAlertAction(title: "Log out", style: .destructive)

178− { [weak self] (_) in

179−

180− if let logOut = self?.logOut {

181− logOut()

182− } else {

183− Model.logout() {

184− DataStorage.standard.setIsLoggedIn(value: false, with: 0)

185− (UIApplication.shared.delegate as! AppDelegate).relaunch()

186− }

187− }

188− }

189−

190− let deleetAllSessionsAction = UIAlertAction(title: "Delete all sessions", style: .destructive)

191− { [weak self] _ in

192−

193− if let delete = self?.deleteAllSessions {

194− delete()

195− } else {

196− Model.deactivateAll() {

197− DataStorage.standard.setIsLoggedIn(value: false, with: 0)

198− (UIApplication.shared.delegate as! AppDelegate).relaunch()

199− }

200− }

201− }

202−

203− let settingsAction = UIAlertAction(title: "Edit profile", style: .default)

204− { [weak self] (_) in

205−

206− if let settings = self?.onSettings{

207− settings()

208− } else {

209− let vc = self?.storyboard?.instantiateViewController(withIdentifier: "RegisterTableViewController") as! RegisterTableViewController

210− vc.delegate = self

211− vc.userActive = self?.user

212−

213− self?.navigationController?.pushViewController(vc, animated: true)

214− }

215− }

216−

217− optionMenu.addAction(settingsAction)

218− optionMenu.addAction(logoutAction)

219− optionMenu.addAction(deleetAllSessionsAction)

220− } else {

221− let channelAction = UIAlertAction(title: "Add to a channel", style: .default)

222− {

223− [weak self] (_) in

224−

225− let vc = self?.storyboard?.instantiateViewController(withIdentifier: simplifiedChannelsList) as! SimplifiedChannelsList

226− vc.user = self?.user

227−

228− let transition = CATransition()

229− transition.duration = 0.5

230− transition.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

231− transition.type = CATransitionType.moveIn

232− transition.subtype = CATransitionSubtype.fromTop

233− self?.navigationController?.view.layer.add(transition, forKey: nil)

234− self?.navigationController?.pushViewController(vc, animated: false)

235− }

236−

237− optionMenu.addAction(channelAction)

145+ let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)

146+

147+ let logoutAction = UIAlertAction(title: "Log out", style: .destructive)

148+ { [weak self]

149+ (_) in

150+ self?.logOut?()

238151 }

239152

153+ optionMenu.addAction(channelAction)

154+ optionMenu.addAction(settingsAction)

155+ optionMenu.addAction(logoutAction)

240156 optionMenu.addAction(cancelAction)

157+

241158 self.present(optionMenu, animated: true, completion: nil)

242159 }

243160

@@ -267,7 +184,6 @@ class ProfileViewController: UIViewController, UpdateUser

267184 func changeToBasicInfo(){

268185 tableView.delegate = basicInfo

269186 tableView.dataSource = basicInfo

270− basicInfo.userInfo = self.user

271187 tableView.reloadData()

272188 }

273189}

GDproject/DataStorage.swift−8

@@ -37,13 +37,6 @@ class DataStorage{

3737 return UserDefaults.standard.integer(forKey: UserDefaultsKeys.id.rawValue)

3838 }

3939

40− func setEmail(email: String) {

41− UserDefaults.standard.set(email, forKey: UserDefaultsKeys.email.rawValue)

42− }

43−

44− func getEmail() -> String? {

45− return UserDefaults.standard.string(forKey: UserDefaultsKeys.email.rawValue)

46− }

4740 /**

4841 Function to determine is user logged in already or not

4942 */

@@ -56,5 +49,4 @@ class DataStorage{

5649enum UserDefaultsKeys: String{

5750 case loggedIn

5851 case id

59− case email

6052}

GDproject/Extentions.swift−47

@@ -60,50 +60,3 @@ extension UIStoryboard {

6060 return UIStoryboard.userEdit.instantiateViewController(withIdentifier: logInController) as! LogInViewController

6161 }

6262}

63−

64−

65−extension String {

66− func getDate() -> String

67− {

68− let dateFormatter = DateFormatter()

69− dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"//this your string date format

70− dateFormatter.timeZone = TimeZone(abbreviation: "UTC")

71− let date = dateFormatter.date(from: self)

72−

73− dateFormatter.dateFormat = "MMM d, yyyy HH:mm" ///this is what you want to convert format

74− dateFormatter.timeZone = NSTimeZone.local

75− let timeStamp = dateFormatter.string(from: date!)

76−

77− return timeStamp

78− }

79−}

80−

81−extension UIViewController {

82− func showAlertOn(result: ResultR) {

83−

84− let message: String

85−

86− switch result {

87− case .impossibleContent:

88− message = "Impossible content"

89− case .exceededContent:

90− message = "The content exceeded"

91− case .longContent:

92− message = "The content is too long"

93− case .badAccess:

94− message = "Try reloading the page again"

95− case .alreadyRegistered:

96− message = "User is already registered"

97− case .tooMuchToAdd:

98− message = "Limit of channels exceeded"

99− case .success, .success1:

100− return

101− default:

102− message = "Something went wrong"

103− }

104−

105− let alert = UIAlertController(title: "Error", message: message, preferredStyle: .alert)

106− alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))

107− self.present(alert, animated: true, completion: nil)

108− }

109−}

GDproject/Simple model/Model.swift+36−432

@@ -10,56 +10,29 @@ import Foundation

1010import UIKit

1111import Alamofire

1212

13−enum ResultR: Int {

14− case internalServerError = 500

15− case exceededContent = 470

16− case longContent = 471

17− case incorrectContent = 472

18− case impossibleContent = 473

19− case invalidTocken = 498

20− case alreadyRegistered = 409

21− case invalidCode = 403

22− case badAccess = 400

23− case tooMuchToAdd = 406

24− case notFound = 404

25− case success1 = 204

26− case success = 200

27−}

28−

2913class Model{

3014

3115 static let invalidTocken = 498

3216

33− static var hashTagTree: CompletionTree?

17+ static var hashTagTree: CompletionTree?

3418

3519 private static var isValidTocken: ((Int)->())? = { responce in

3620 print(responce)

3721 if responce == invalidTocken {

38−

3922 DataStorage.standard.setIsLoggedIn(value: false, with: 0)

4023 (UIApplication.shared.delegate as! AppDelegate).relaunch()

41−

42− Model.logout {

43− print("Logout Is Successful")

44− }

4524 }

4625 }

4726

4827 private static let baseUrl = "https://valera-denis.herokuapp.com"

4928 static let decoder = JSONDecoder()

50−

51− static let authMeURL = URL(string: "\(baseUrl)/authentication/me")!

52− static let deactivateURL = URL(string: "\(baseUrl)/deactivateAll")!

53− static let registerMeURL = URL(string: "\(baseUrl)/authentication/register")!

54− static let authVerifyURL = URL(string: "\(baseUrl)/authentication/verify")!

29+

5530 static let authenticationURL = URL(string:"\(baseUrl)/authentication/login")!

56− static let logOutURL = URL(string:"\(baseUrl)/authentication/logout")!

5731 static let postsLastURL = URL(string:"\(baseUrl)/posts/last")!

5832 static let postsForUserURL = URL(string:"\(baseUrl)/posts/forUser")!

5933 static let postsPublishURL = URL(string:"\(baseUrl)/posts/publish")!

6034 static let usersURL = URL(string:"\(baseUrl)/users")!

6135 static let usersAllURL = URL(string:"\(baseUrl)/users/all")!

62− static let usersUpdateURL = URL(string:"\(baseUrl)/users/update")!

6336 static let channelsGetURL = URL(string: "\(baseUrl)/channels/get")!

6437 static let channelsUpdateURL = URL(string: "\(baseUrl)/channels/update")!

6538 static let channelsListURL = URL(string: "\(baseUrl)/channels")!

@@ -67,7 +40,7 @@ class Model{

6740 static let channelsDeleteURL = URL(string: "\(baseUrl)/channels/delete")!

6841 static let channelsGetAnonURL = URL(string: "\(baseUrl)/channels/getAnonymous")!

6942 static let complexURL = URL(string: "\(baseUrl)/complex")!

70− static let hashTagTreeURL = URL(string: "\(baseUrl)/tags/completions")!

43+ static let hashTagTreeURL = URL(string: "\(baseUrl)/tagCompletions")!

7144 static let createGroupChatURL = URL(string: "\(baseUrl)/chats/createGroupChat")!

7245 static let chatsGetAllURL = URL(string: "\(baseUrl)/chats/getAll")!

7346 static let getGroupChatURL = URL(string: "\(baseUrl)/chats/getGroupChat")!

@@ -75,8 +48,7 @@ class Model{

7548 static let updateGroupChatURL = URL(string: "\(baseUrl)/chats/updateGroupChat")!

7649 static let messagesGetGroupChatURL = URL(string: "\(baseUrl)/messages/get/groupChat")! //r

7750 static let messagesSendURL = URL(string: "\(baseUrl)/messages/send")!

78− static let messagesGetUserChatURL = URL(string: "\(baseUrl)/messages/get/userChat")!

79− static let facultySearchURL = URL(string: "\(baseUrl)/faculty/search")!

51+ static let messagesUserChatURL = URL(string: "\(baseUrl)/messages/userChat")!

8052

8153

8254 struct QueryPosts<T: Codable>: Codable {

@@ -148,8 +120,6 @@ class Model{

148120 var lastName: String

149121 var firstName: String

150122 var id: Int

151− var faculty: Faculty

152− var email: String

153123

154124 func fullName() -> String {

155125 return "\(firstName) \(lastName)"

@@ -213,108 +183,24 @@ class Model{

213183 }

214184 }

215185

216− struct AuthStatus: Codable {

217− var userStatus: String

186+ static func authenticate(with id: Int, completion: @escaping ((Bool)->())) {

218187

219− init(){

220− userStatus = "invalid"

221− }

222− }

223−

224− static func logout(completion: @escaping (()->())){

225− var request = URLRequest(url: logOutURL)

226− request.httpMethod = "POST"

227−

228− AF.request(request).response { (responce) in

229− isValidTocken?(responce.response?.statusCode ?? 498)

230−

231− if let code = responce.response?.statusCode, code == 498 {

232− return

233− }

234−

235− completion()

236− }

237− }

238−

239− /*

240− "email": "vchernyshev@hse.ru",

241− "middleName": "Algebrovich",

242− "lastName": "Leonidov",

243− "faculty": "cs.hse.ru/dse",

244− "firstName": "Seva"

245− */

246−

247− struct NewRegistration: Codable{

248− var email: String

249− var firstName: String?

250− var middleName: String?

251− var lastName: String?

252− var faculty: String?

253− }

254−

255− static func register(object: NewRegistration, completion: @escaping (()->())) {

256− var request = URLRequest(url: registerMeURL)

257− request.httpBody = try? JSONEncoder().encode(object)

188+ let json: [String:Any] = ["authenticationId" : id]

189+ let jsonData = try? JSONSerialization.data(withJSONObject: json)

258190

191+ var request = URLRequest(url: authenticationURL)

259192 request.httpMethod = "POST"

260− request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

261193

262− AF.request(request).response { (responce) in

263−

264− guard let code = responce.response?.statusCode else { return }

265− isValidTocken?(code)

266−

267− if let code = responce.response?.statusCode, code == 498 {

268− return

269− }

270−

271− if code == 204 {

272−

273− let fields = responce.response?.allHeaderFields as? [String :String]

274− let cookies = HTTPCookie.cookies(withResponseHeaderFields: fields!, for: responce.response!.url!)

275− HTTPCookieStorage.shared.setCookie(cookies[0])

276−

277− completion()

278− }

279− }

280− }

281−

282− // true only if everything is good

283− static func verify(with code: Int, completion: @escaping ((Bool)->())){

284− var request = URLRequest(url: authVerifyURL)

285− request.httpMethod = "POST"

286− request.httpBody = "\(code)".data(using: .utf8)

194+ // insert json data to the request

195+ request.httpBody = jsonData

287196 request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

288197

289198 AF.request(request).response { (responce) in

290199

291− guard let statusCode = responce.response?.statusCode else { completion(false); return }

292− isValidTocken?(statusCode)

293−

294− if let code = responce.response?.statusCode, code == 498 {

295− return

296− }

297−

298− if statusCode == 204 {

299− // at this point cookies are set

300− completion(true)

301− } else {

200+ guard let realResponse = responce.response, realResponse.statusCode == 200 else

201+ {

202+ print("Not a 200 response")

302203 completion(false)

303− }

304− }

305− }

306−

307− // yes or no

308− static func authenticateMe(completion: @escaping ((Bool)->())){

309− var request = URLRequest(url: authMeURL)

310− request.httpMethod = "POST"

311−

312− AF.request(request).response { (responce) in

313−

314− guard let statusCode = responce.response?.statusCode else { completion(false); return }

315− isValidTocken?(statusCode)

316−

317− if let code = responce.response?.statusCode, code == 498 {

318204 return

319205 }

320206

@@ -324,45 +210,14 @@ class Model{

324210 return

325211 }

326212

327− DataStorage.standard.setIsLoggedIn(value: true, with: personId)

328− completion(true)

329− }

330− }

331−

332− // register, ok or invalid

333− static func authenticate(with email: String, completion: @escaping ((AuthStatus)->())) {

334−

335− let json: [String:Any] = ["authenticationEmail" : email]

336− let jsonData = try? JSONSerialization.data(withJSONObject: json)

337−

338− var request = URLRequest(url: authenticationURL)

339− request.httpMethod = "POST"

340−

341− // insert json data to the request

342− request.httpBody = jsonData

343− request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

344−

345− AF.request(request).response { (response) in

213+ let fields = realResponse.allHeaderFields as? [String :String]

346214

347− guard let realResponse = response.response, realResponse.statusCode == 200 else

348− {

349− print("Not a 200 response")

350− completion(AuthStatus())

351− return

352− }

353−

354− guard let json = response.data else { return }

355− guard let res = try? decoder.decode(AuthStatus.self, from: json) else { return }

215+ let cookies = HTTPCookie.cookies(withResponseHeaderFields: fields!, for: realResponse.url!)

356216

357− if realResponse.statusCode == 200 && res.userStatus == "registered"

358− {

359− // at this point cookies are set

360− let fields = realResponse.allHeaderFields as? [String :String]

361− let cookies = HTTPCookie.cookies(withResponseHeaderFields: fields!, for: realResponse.url!)

362− HTTPCookieStorage.shared.setCookie(cookies[0])

363− }

217+ HTTPCookieStorage.shared.setCookie(cookies[0])

364218

365− completion(res)

219+ DataStorage.standard.setIsLoggedIn(value: true, with: personId)

220+ completion(true)

366221 }

367222 }

368223

@@ -412,10 +267,6 @@ class Model{

412267

413268 isValidTocken?(response.response?.statusCode ?? 498)

414269

415− if let code = response.response?.statusCode, code == 498 {

416− return

417− }

418−

419270 guard let json = response.data else { return }

420271

421272 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { print("no")

@@ -427,7 +278,7 @@ class Model{

427278 }

428279

429280

430− static func createAndPublish(body: [Attachments], tags: [String], completion: @escaping ((ResultR)->())){

281+ static func createAndPublish(body: [Attachments], tags: [String]){

431282 let jsonUpd = CreatedPost(body: body, tags: tags)

432283 var request = URLRequest(url: postsPublishURL)

433284

@@ -441,18 +292,6 @@ class Model{

441292 (response) in

442293

443294 isValidTocken?(response.response?.statusCode ?? 498)

444−

445− if let code = response.response?.statusCode, code == 498 {

446− return

447− }

448−

449− if let code = response.response?.statusCode,

450− let result = ResultR(rawValue: code)

451− {

452− completion(result)

453− } else {

454− completion(.internalServerError)

455− }

456295 }

457296 }

458297

@@ -478,10 +317,6 @@ class Model{

478317

479318 isValidTocken?(response.response?.statusCode ?? 498)

480319

481− if let code = response.response?.statusCode, code == 498 {

482− return

483− }

484−

485320 guard let json = response.data else { return }

486321

487322 guard let newPost = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }

@@ -494,7 +329,7 @@ class Model{

494329

495330 static func getUsers(for ids: [Int], completion: @escaping (([Int:Users])->())){

496331 let json = "\(Set(ids))"

497−

332+ print(json)

498333 var request = URLRequest(url: usersURL)

499334

500335 request.httpMethod = "POST"

@@ -508,16 +343,11 @@ class Model{

508343

509344 isValidTocken?(response.response?.statusCode ?? 498)

510345

511− if let code = response.response?.statusCode, code == 498 {

512− return

513− }

514−

515346 guard let json = response.data else { return }

516347

517348 guard let users = try? decoder.decode([Users].self, from: json) else { return }

518349

519350 var dict: [Int:Users] = [:]

520−

521351 users.forEach({ (user) in

522352 dict[user.id] = user

523353 })

@@ -544,9 +374,6 @@ class Model{

544374

545375 isValidTocken?(response.response?.statusCode ?? 498)

546376

547− if let code = response.response?.statusCode, code == 498 {

548− return

549− }

550377

551378 guard let json = response.data else { return }

552379

@@ -558,7 +385,7 @@ class Model{

558385 }

559386

560387

561− static func createChannel(with channel: Channels, completion: @escaping ((ResultR)->())) {

388+ static func createChannel(with channel: Channels) {

562389

563390 var request = URLRequest(url: channelsCreateURL)

564391 request.httpMethod = "POST"

@@ -569,13 +396,6 @@ class Model{

569396 (response) in

570397

571398 isValidTocken?(response.response?.statusCode ?? 498)

572−

573− if let code = response.response?.statusCode, let result = ResultR(rawValue: code) {

574− completion(result)

575− return

576− }

577−

578− completion(ResultR.internalServerError)

579399 }

580400

581401 }

@@ -588,9 +408,6 @@ class Model{

588408 AF.request(request).responseJSON { (response) in

589409

590410 isValidTocken?(response.response?.statusCode ?? 498)

591− if let code = response.response?.statusCode, code == 498 {

592− return

593− }

594411

595412 guard let json = response.data else { return }

596413

@@ -609,9 +426,6 @@ class Model{

609426

610427 AF.request(request).response { (response) in

611428 isValidTocken?(response.response?.statusCode ?? 498)

612− if let code = response.response?.statusCode, code == 498 {

613− return

614− }

615429 }

616430 completion()

617431 }

@@ -627,9 +441,6 @@ class Model{

627441 (response) in

628442

629443 isValidTocken?(response.response?.statusCode ?? 498)

630− if let code = response.response?.statusCode, code == 498 {

631− return

632− }

633444 }

634445 }

635446

@@ -652,9 +463,6 @@ class Model{

652463 }

653464

654465 isValidTocken?(response.response?.statusCode ?? 498)

655− if let code = response.response?.statusCode, code == 498 {

656− return

657− }

658466 }

659467 }

660468

@@ -717,26 +525,23 @@ class Model{

717525 }

718526 }

719527 */

720− static func getAnonymousChannel(by anonymousChannel: Model.Channels, exclusiveFrom: Int? = nil, completion: @escaping (((users:[Int: Users], posts:[Posts]))->())){

528+ static func getAnonymousChannel(by anonymousChannel: Model.AnonymousChannel, completion: @escaping (((users:[Int: Users], posts:[Posts]))->())){

721529

722− let req = GeneralRequest<Model.Channels>(limit: 10, exclusiveFrom: exclusiveFrom, request: anonymousChannel)

723−

724530 var request = URLRequest(url: channelsGetAnonURL)

725531 request.httpMethod = "POST"

726− request.httpBody = try? JSONEncoder().encode(req)

532+ request.httpBody = try? JSONEncoder().encode(anonymousChannel)

727533

728534 request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

729535 AF.request(request).response {

730536 (response) in

731537

732538 isValidTocken?(response.response?.statusCode ?? 498)

733− if let code = response.response?.statusCode, code == 498 {

734− return

735− }

736539

737540 guard let json = response.data else { return }

738541

739542 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }

543+

544+ // idUser = newQueery.users

740545 completion((newQueery.users, newQueery.response))

741546 }

742547 }

@@ -746,16 +551,13 @@ class Model{

746551 AF.request(URLRequest(url: hashTagTreeURL)).responseJSON {

747552 (response) in

748553 isValidTocken?(response.response?.statusCode ?? 498)

749− if let code = response.response?.statusCode, code == 498 {

750− return

751− }

752554 guard let json = response.data else { return }

753555 guard let tree = try? decoder.decode(CompletionTree.self, from: json) else { return }

754556 completion(tree)

755557 }

756558 }

757559

758− static func getChatAll(limit: Int = 10, exclusiveFrom: Int? = nil, request: [Int] = [], completion: @escaping ((([Dialog],[Int:Model.Users]))->()))

560+ static func getChatAll(limit: Int = 10, exclusiveFrom: Int? = nil, request: [Int] = [], completion: @escaping (([Dialog])->()))

759561 {

760562 let req = GeneralRequest<[Int]>(limit: limit, exclusiveFrom: exclusiveFrom, request: request)

761563 var request = URLRequest(url: chatsGetAllURL)

@@ -766,14 +568,11 @@ class Model{

766568 AF.request(request).responseJSON { response in

767569 isValidTocken?(response.response?.statusCode ?? 498)

768570

769− if let code = response.response?.statusCode, code == 498 {

770− return

771− }

772−

773571 guard let json = response.data else { return }

774572 let dialogs = try! decoder.decode(QueryPosts<Dialog>.self, from: json)

775573

776− completion((dialogs.response,dialogs.users))

574+ print(dialogs.response)

575+ completion(dialogs.response)

777576 }

778577 }

779578

@@ -811,35 +610,18 @@ class Model{

811610

812611 struct GroupChat: Codable {

813612 var group: Group

814− var lastMessage: LastMessage?

815−

816−

817− init(group: Group, lastMessage: LastMessage? = nil) {

818− self.group = group

819− self.lastMessage = lastMessage

820− }

613+ var lastMessage: LastMessage

821614 }

822615

823616 struct UserChat: Codable {

824617 var user: Int

825− var lastMessage: LastMessage?

826−

827− init(user: Int, lastMessage: LastMessage? = nil) {

828− self.user = user

829− self.lastMessage = lastMessage

830− }

618+ var lastMessage: LastMessage

831619 }

832620

833621 struct Group: Codable {

834622 var users: [Int: UserPermission]

835623 var name: String

836624 var id: Int

837−

838− init(users: [Int: UserPermission] = [:], name: String = "", id: Int) {

839− self.id = id

840− self.users = users

841− self.name = name

842− }

843625 }

844626

845627 struct UserPermission: Codable {

@@ -853,7 +635,7 @@ class Model{

853635 var author: Int

854636 var id: Int

855637

856− enum MessageCodingKeys: CodingKey{

638+ private enum MessageCodingKeys: CodingKey{

857639 case user

858640 case group

859641 case body

@@ -941,9 +723,6 @@ class Model{

941723 AF.request(request).response { (response) in

942724

943725 isValidTocken?(response.response?.statusCode ?? 498)

944− if let code = response.response?.statusCode, code == 498 {

945− return

946− }

947726

948727 guard let json = response.data else { return }

949728 let stringInt = String.init(data: json, encoding: String.Encoding.utf8)

@@ -953,198 +732,23 @@ class Model{

953732 }

954733 }

955734

956− static func getMessagesFor(typeOfChat: Model.Dialog, chat id: Int, exclusiveFrom: Int? = nil, limit l: Int = 25, direction: String = "backward", completion: @escaping (([LastMessage])->()))

735+ static func getMessagesForGroupChat(chat id: Int, exclusiveFrom: Int? = nil, limit l: Int = 10, direction: String = "backward", completion: @escaping (([LastMessage])->()))

957736 {

958737 let req = GeneralRequest<Int>(direction: direction, limit: l, exclusiveFrom: exclusiveFrom, request: id)

959− var request: URLRequest?

960−

961− switch typeOfChat {

962− case .groupChat:

963− request = URLRequest(url: messagesGetGroupChatURL)

964− case .userChat:

965− request = URLRequest(url: messagesGetUserChatURL)

966− }

967−

968− request!.httpMethod = "POST"

969− request!.httpBody = try? JSONEncoder().encode(req)

970− request!.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

971738

972− AF.request(request!).response { (response) in

973−

974− isValidTocken?(response.response?.statusCode ?? 498)

975− if let code = response.response?.statusCode, code == 498 {

976− return

977− }

978−

979− guard let json = response.data else { return }

980− guard let messages = try? decoder.decode([LastMessage].self, from: json) else { return }

981−

982− completion(messages)

983− }

984− }

985−

986− static func leaveGroupChat(id: Int, completion: @escaping (()->()))

987− {

988− var request = URLRequest(url: leaveGroupChatURL)

739+ var request = URLRequest(url: messagesGetGroupChatURL)

989740 request.httpMethod = "POST"

990− request.httpBody = "\(id)".data(using: .utf8)

991− request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

992−

993− AF.request(request).response { (response) in

994− isValidTocken?(response.response?.statusCode ?? 498)

995−

996− if let code = response.response?.statusCode, code == 498 {

997− return

998− }

999− }

1000−

1001− completion()

1002− }

1003−

1004− static func updateGroupChat(with group: Model.Group)

1005− {

1006− var request = URLRequest(url: updateGroupChatURL)

1007− request.httpMethod = "POST"

1008− request.httpBody = try? JSONEncoder().encode(group)

1009− request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

1010−

1011− AF.request(request).response { (response) in

1012− isValidTocken?(response.response?.statusCode ?? 498)

1013−

1014− if let code = response.response?.statusCode, code == 498 {

1015− return

1016− }

1017− }

1018−

1019− // completion()

1020− }

1021−

1022− struct SendMessage: Codable {

1023− var body: Attachments

1024− var destination: MessageDestination

1025−

1026− init(from decoder: Decoder) throws

1027− {

1028− let container = try decoder.container(keyedBy: LastMessage.MessageCodingKeys.self)

1029− body = try container.decode(Attachments.self, forKey: .body)

1030−

1031− if container.contains(.user){

1032− destination = MessageDestination.userChatDestination(try Int(from: container.superDecoder(forKey: .user)))

1033− } else if container.contains(.group){

1034− destination = MessageDestination.groupChatDestination(try Int(from: container.superDecoder(forKey: .group)))

1035− } else {

1036− throw DecodingError.keyNotFound(LastMessage.MessageCodingKeys.group, DecodingError.Context(codingPath: container.codingPath, debugDescription: "hz gr1"))

1037− }

1038− }

1039−

1040− func encode(to encoder: Encoder) throws {

1041− var container = encoder.container(keyedBy: LastMessage.MessageCodingKeys.self)

1042− try container.encode(body, forKey: .body)

1043−

1044− switch destination {

1045− case .userChatDestination(let uId):

1046− try uId.encode(to: container.superEncoder(forKey: .user))

1047− case .groupChatDestination(let gId):

1048− try gId.encode(to: container.superEncoder(forKey: .group))

1049− }

1050− }

1051−

1052− init(body: Attachments, destination: MessageDestination)

1053− {

1054− self.body = body

1055− self.destination = destination

1056− }

1057− }

1058−

1059− static func sendMessage(message: SendMessage, completion: @escaping ((ResultR)->())){

1060−

1061− var request = URLRequest(url: messagesSendURL)

741+ request.httpBody = try? JSONEncoder().encode(req)

1062742 request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

1063− request.httpMethod = "POST"

1064− request.httpBody = try? JSONEncoder().encode(message)

1065743

1066744 AF.request(request).response { (response) in

1067− isValidTocken?(response.response?.statusCode ?? 498)

1068−

1069− if let code = response.response?.statusCode, code == 498 {

1070− return

1071− }

1072745

1073− if let result = ResultR(rawValue: response.response!.statusCode){

1074− completion(result)

1075− } else {

1076− completion(.internalServerError)

1077− }

1078− }

1079− }

1080−

1081− struct Faculty: Codable

1082− {

1083−

1084− var path: String

1085− var url: String

1086− var campusName: String

1087− var campusCode: String

1088− var name: String

1089− var tags: [String]

1090− var address: String

1091−

1092− }

1093−

1094− static func searchFaculty(string: String, completion: @escaping (([Model.Faculty])->()))

1095− {

1096− var request = URLRequest(url: facultySearchURL)

1097− request.httpMethod = "POST"

1098− request.httpBody = string.data(using: .utf8)

1099− request.setValue("text/plain;charset=utf-8", forHTTPHeaderField: "Content-Type")

1100−

1101− AF.request(request).response { (response) in

1102746 isValidTocken?(response.response?.statusCode ?? 498)

1103747

1104− if let code = response.response?.statusCode, code == 498 {

1105− return

1106− }

1107−

1108748 guard let json = response.data else { return }

1109− guard let faculties = try? decoder.decode([Faculty].self, from: json) else { return }

1110−

1111− completion(faculties)

1112− }

1113− }

1114−

1115− static func userUpdate(with newUser: NewRegistration, completion: @escaping ((Bool)->())) {

1116− var request = URLRequest(url: usersUpdateURL)

1117− request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")

1118− request.httpMethod = "POST"

1119− request.httpBody = try? JSONEncoder().encode(newUser)

1120−

1121− AF.request(request).response { (response) in

1122− isValidTocken?(response.response?.statusCode ?? 498)

1123−

1124− if let code = response.response?.statusCode, code == 498 {

1125− return

1126− }

1127−

1128− if let code = response.response?.statusCode, code != 204{

1129− completion (false)

1130− } else {

1131− completion(true)

1132− }

1133− }

1134− }

1135−

1136− static func deactivateAll(completion: @escaping (()->())){

1137− var request = URLRequest(url: deactivateURL)

1138− request.httpMethod = "DELETE"

1139−

1140− AF.request(request).response { (responce) in

1141− isValidTocken?(responce.response?.statusCode ?? 498)

1142−

1143− if let code = responce.response?.statusCode, code == 498 {

1144− return

1145− }

749+ guard let messages = try? decoder.decode([LastMessage].self, from: json) else { return }

1146750

1147− completion()

751+ completion(messages)

1148752 }

1149753 }

1150754}