git.iko.soy/dashared/GDproject
on master help sign in
Added chat info xml. Some additions to channels creation. Added new framework for hashtags
24023c7Darya Rednikina
Cartfile+2−1
compare with master
unifiedsplit
@@ -5,4 +5,5 @@ github "macteo/Marklight"
5github "Alamofire/Alamofire" "5.0.0-beta.5"
5github "Alamofire/Alamofire" "5.0.0-beta.5"
6github "52inc/Pulley"
6github "52inc/Pulley"
7github "HeroTransitions/Hero"
7github "HeroTransitions/Hero"
8−github "ReactiveCocoa/ReactiveCocoa" ~> 9.0
8+github "ReactiveCocoa/ReactiveCocoa" ~> 9.0
9+github "ZaidSA/TaggerKit" "bb826a7"
GDproject.xcodeproj/project.pbxproj+10
@@ -17,6 +17,7 @@
17 125BD5812217314A008A3575 /* NewsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125BD5802217314A008A3575 /* NewsVC.swift */; };
17 125BD5812217314A008A3575 /* NewsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125BD5802217314A008A3575 /* NewsVC.swift */; };
18 1261BB93227B364C003898CF /* ChannelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB92227B364C003898CF /* ChannelViewController.swift */; };
18 1261BB93227B364C003898CF /* ChannelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB92227B364C003898CF /* ChannelViewController.swift */; };
19 1261BB95227B3991003898CF /* AddToChannelVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB94227B3991003898CF /* AddToChannelVC.swift */; };
19 1261BB95227B3991003898CF /* AddToChannelVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB94227B3991003898CF /* AddToChannelVC.swift */; };
20+ 1261BB9E227B793D003898CF /* ChatInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1261BB9D227B793D003898CF /* ChatInfoViewController.swift */; };
20 1288B5CE221F1158002BE6B1 /* DataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1288B5CD221F1158002BE6B1 /* DataStorage.swift */; };
21 1288B5CE221F1158002BE6B1 /* DataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1288B5CD221F1158002BE6B1 /* DataStorage.swift */; };
21 1291BE2D2221312D009D3F23 /* ChannelsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */; };
22 1291BE2D2221312D009D3F23 /* ChannelsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */; };
22 1291BE342221569B009D3F23 /* TabbarCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */; };
23 1291BE342221569B009D3F23 /* TabbarCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */; };
@@ -29,6 +30,8 @@
29 12BA4B9B224101A400DF93D7 /* ApplicationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */; };
30 12BA4B9B224101A400DF93D7 /* ApplicationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */; };
30 12BA4B9D224101E700DF93D7 /* BaseCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */; };
31 12BA4B9D224101E700DF93D7 /* BaseCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */; };
31 12BA4B9F224102B700DF93D7 /* LogInCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */; };
32 12BA4B9F224102B700DF93D7 /* LogInCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */; };
33+ 12CE7D6F227B94B10024B6E8 /* TaggerKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12CE7D6E227B94B00024B6E8 /* TaggerKit.framework */; };
34+ 12CE7D71227B94B50024B6E8 /* TaggerKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 12CE7D6E227B94B00024B6E8 /* TaggerKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
32 12D7D133221C321600B35452 /* ChannelListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D7D132221C321600B35452 /* ChannelListController.swift */; };
35 12D7D133221C321600B35452 /* ChannelListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D7D132221C321600B35452 /* ChannelListController.swift */; };
33 12D7D135221C42B700B35452 /* ChannelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D7D134221C42B700B35452 /* ChannelController.swift */; };
36 12D7D135221C42B700B35452 /* ChannelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D7D134221C42B700B35452 /* ChannelController.swift */; };
34 12D7D137221D78E800B35452 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D7D136221D78E800B35452 /* Channel.swift */; };
37 12D7D137221D78E800B35452 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12D7D136221D78E800B35452 /* Channel.swift */; };
@@ -88,6 +91,7 @@
88 12FDAC92226B5E5400995B4E /* Pulley.framework in Embed Frameworks */,
91 12FDAC92226B5E5400995B4E /* Pulley.framework in Embed Frameworks */,
89 12FDAC8C226B5E4E00995B4E /* Hero.framework in Embed Frameworks */,
92 12FDAC8C226B5E4E00995B4E /* Hero.framework in Embed Frameworks */,
90 12FDAC90226B5E5200995B4E /* Marklight.framework in Embed Frameworks */,
93 12FDAC90226B5E5200995B4E /* Marklight.framework in Embed Frameworks */,
94+ 12CE7D71227B94B50024B6E8 /* TaggerKit.framework in Embed Frameworks */,
91 12FDACA0226B9E7C00995B4E /* ReactiveCocoa.framework in Embed Frameworks */,
95 12FDACA0226B9E7C00995B4E /* ReactiveCocoa.framework in Embed Frameworks */,
92 );
96 );
93 name = "Embed Frameworks";
97 name = "Embed Frameworks";
@@ -106,6 +110,7 @@
106 125BD5802217314A008A3575 /* NewsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsVC.swift; sourceTree = "<group>"; };
110 125BD5802217314A008A3575 /* NewsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsVC.swift; sourceTree = "<group>"; };
107 1261BB92227B364C003898CF /* ChannelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelViewController.swift; sourceTree = "<group>"; };
111 1261BB92227B364C003898CF /* ChannelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelViewController.swift; sourceTree = "<group>"; };
108 1261BB94227B3991003898CF /* AddToChannelVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddToChannelVC.swift; sourceTree = "<group>"; };
112 1261BB94227B3991003898CF /* AddToChannelVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddToChannelVC.swift; sourceTree = "<group>"; };
113+ 1261BB9D227B793D003898CF /* ChatInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoViewController.swift; sourceTree = "<group>"; };
109 1288B5CD221F1158002BE6B1 /* DataStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataStorage.swift; sourceTree = "<group>"; };
114 1288B5CD221F1158002BE6B1 /* DataStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataStorage.swift; sourceTree = "<group>"; };
110 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelsCoordinator.swift; sourceTree = "<group>"; };
115 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelsCoordinator.swift; sourceTree = "<group>"; };
111 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarCoordinator.swift; sourceTree = "<group>"; };
116 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarCoordinator.swift; sourceTree = "<group>"; };
@@ -118,6 +123,7 @@
118 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationCoordinator.swift; sourceTree = "<group>"; };
123 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationCoordinator.swift; sourceTree = "<group>"; };
119 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCoordinator.swift; sourceTree = "<group>"; };
124 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCoordinator.swift; sourceTree = "<group>"; };
120 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInCoordinator.swift; sourceTree = "<group>"; };
125 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInCoordinator.swift; sourceTree = "<group>"; };
126+ 12CE7D6E227B94B00024B6E8 /* TaggerKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TaggerKit.framework; path = Carthage/Build/iOS/TaggerKit.framework; sourceTree = "<group>"; };
121 12D7D132221C321600B35452 /* ChannelListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelListController.swift; sourceTree = "<group>"; };
127 12D7D132221C321600B35452 /* ChannelListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelListController.swift; sourceTree = "<group>"; };
122 12D7D134221C42B700B35452 /* ChannelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelController.swift; sourceTree = "<group>"; };
128 12D7D134221C42B700B35452 /* ChannelController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelController.swift; sourceTree = "<group>"; };
123 12D7D136221D78E800B35452 /* Channel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Channel.swift; sourceTree = "<group>"; };
129 12D7D136221D78E800B35452 /* Channel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Channel.swift; sourceTree = "<group>"; };
@@ -167,6 +173,7 @@
167 12FDAC7D226B5E2900995B4E /* Result.framework in Frameworks */,
173 12FDAC7D226B5E2900995B4E /* Result.framework in Frameworks */,
168 12FDAC9B226B652C00995B4E /* ReactiveSwift.framework in Frameworks */,
174 12FDAC9B226B652C00995B4E /* ReactiveSwift.framework in Frameworks */,
169 12FDAC7E226B5E2900995B4E /* Cartography.framework in Frameworks */,
175 12FDAC7E226B5E2900995B4E /* Cartography.framework in Frameworks */,
176+ 12CE7D6F227B94B10024B6E8 /* TaggerKit.framework in Frameworks */,
170 12FDAC8B226B5E4E00995B4E /* Hero.framework in Frameworks */,
177 12FDAC8B226B5E4E00995B4E /* Hero.framework in Frameworks */,
171 );
178 );
172 runOnlyForDeploymentPostprocessing = 0;
179 runOnlyForDeploymentPostprocessing = 0;
@@ -214,6 +221,7 @@
214 129320052279B4300035C7B3 /* Messages */ = {
221 129320052279B4300035C7B3 /* Messages */ = {
215 isa = PBXGroup;
222 isa = PBXGroup;
216 children = (
223 children = (
224+ 1261BB9D227B793D003898CF /* ChatInfoViewController.swift */,
217 129320082279C3B50035C7B3 /* PeopleToWriteViewController.swift */,
225 129320082279C3B50035C7B3 /* PeopleToWriteViewController.swift */,
218 1293200A2279D02D0035C7B3 /* DialogViewController.swift */,
226 1293200A2279D02D0035C7B3 /* DialogViewController.swift */,
219 129320032279B4270035C7B3 /* MessagesViewController.swift */,
227 129320032279B4270035C7B3 /* MessagesViewController.swift */,
@@ -224,6 +232,7 @@
224 12E36D8F221424EA006FCDD7 = {
232 12E36D8F221424EA006FCDD7 = {
225 isa = PBXGroup;
233 isa = PBXGroup;
226 children = (
234 children = (
235+ 12CE7D6E227B94B00024B6E8 /* TaggerKit.framework */,
227 12FDAC9D226B9E7600995B4E /* ReactiveCocoa.framework */,
236 12FDAC9D226B9E7600995B4E /* ReactiveCocoa.framework */,
228 12FDAC99226B652400995B4E /* ReactiveSwift.framework */,
237 12FDAC99226B652400995B4E /* ReactiveSwift.framework */,
229 12FDAC95226B61C400995B4E /* TinyConstraints.framework */,
238 12FDAC95226B61C400995B4E /* TinyConstraints.framework */,
@@ -414,6 +423,7 @@
414 1293200D2279D7310035C7B3 /* CompletionTree.swift in Sources */,
423 1293200D2279D7310035C7B3 /* CompletionTree.swift in Sources */,
415 1293200B2279D02D0035C7B3 /* DialogViewController.swift in Sources */,
424 1293200B2279D02D0035C7B3 /* DialogViewController.swift in Sources */,
416 12E36DCA22144635006FCDD7 /* NewPostViewController.swift in Sources */,
425 12E36DCA22144635006FCDD7 /* NewPostViewController.swift in Sources */,
426+ 1261BB9E227B793D003898CF /* ChatInfoViewController.swift in Sources */,
417 12E36D9E221424EA006FCDD7 /* NewsController.swift in Sources */,
427 12E36D9E221424EA006FCDD7 /* NewsController.swift in Sources */,
418 12E36DCC22144725006FCDD7 /* PostViewCell.swift in Sources */,
428 12E36DCC22144725006FCDD7 /* PostViewCell.swift in Sources */,
419 123E37A5221F1B3200F6E42A /* LogInViewController.swift in Sources */,
429 123E37A5221F1B3200F6E42A /* LogInViewController.swift in Sources */,
GDproject/Base.lproj/Main.storyboard+96−4
@@ -11,11 +11,11 @@
11 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
12 </dependencies>
12 </dependencies>
13 <scenes>
13 <scenes>
14− <!--Item-->
14+ <!--Chats-->
15 <scene sceneID="bZ2-fw-XBE">
15 <scene sceneID="bZ2-fw-XBE">
16 <objects>
16 <objects>
17 <navigationController id="gt4-mD-66Q" sceneMemberID="viewController">
17 <navigationController id="gt4-mD-66Q" sceneMemberID="viewController">
18− <tabBarItem key="tabBarItem" title="Item" id="ZPm-j1-3dy"/>
18+ <tabBarItem key="tabBarItem" title="Chats" image="chat" id="ZPm-j1-3dy"/>
19 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="XiY-wd-750">
19 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="XiY-wd-750">
20 <rect key="frame" x="0.0" y="20" width="375" height="44"/>
20 <rect key="frame" x="0.0" y="20" width="375" height="44"/>
21 <autoresizingMask key="autoresizingMask"/>
21 <autoresizingMask key="autoresizingMask"/>
@@ -546,6 +546,97 @@
546 </objects>
546 </objects>
547 <point key="canvasLocation" x="4336" y="937"/>
547 <point key="canvasLocation" x="4336" y="937"/>
548 </scene>
548 </scene>
549+ <!--Chat Info View Controller-->
550+ <scene sceneID="1br-Xg-fR9">
551+ <objects>
552+ <tableViewController id="Rfd-Hp-Qqv" customClass="ChatInfoViewController" customModule="GDproject" customModuleProvider="target" sceneMemberID="viewController">
553+ <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">
554+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
555+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
556+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
557+ <sections>
558+ <tableViewSection headerTitle="Title" id="EwY-Ph-im0">
559+ <cells>
560+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="hl5-Uc-R53">
561+ <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
562+ <autoresizingMask key="autoresizingMask"/>
563+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hl5-Uc-R53" id="Oy5-4e-dPI">
564+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
565+ <autoresizingMask key="autoresizingMask"/>
566+ </tableViewCellContentView>
567+ </tableViewCell>
568+ </cells>
569+ </tableViewSection>
570+ <tableViewSection headerTitle="Opportunities" id="FhP-ZG-Wz1">
571+ <cells>
572+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="q4L-ZD-zVb" style="IBUITableViewCellStyleDefault" id="lrc-b1-1JB">
573+ <rect key="frame" x="0.0" y="155.5" width="375" height="44"/>
574+ <autoresizingMask key="autoresizingMask"/>
575+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="lrc-b1-1JB" id="4YN-xu-f78">
576+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
577+ <autoresizingMask key="autoresizingMask"/>
578+ <subviews>
579+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Leave chat" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="q4L-ZD-zVb">
580+ <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
581+ <autoresizingMask key="autoresizingMask"/>
582+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
583+ <color key="textColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
584+ <nil key="highlightedColor"/>
585+ </label>
586+ </subviews>
587+ </tableViewCellContentView>
588+ </tableViewCell>
589+ </cells>
590+ </tableViewSection>
591+ <tableViewSection headerTitle="Actions" id="oLK-Mz-9rh">
592+ <cells>
593+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="mO7-R4-T0a" style="IBUITableViewCellStyleDefault" id="6N5-8b-glu">
594+ <rect key="frame" x="0.0" y="255.5" width="375" height="44"/>
595+ <autoresizingMask key="autoresizingMask"/>
596+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6N5-8b-glu" id="pKT-jH-Ur5">
597+ <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
598+ <autoresizingMask key="autoresizingMask"/>
599+ <subviews>
600+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Show participants" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mO7-R4-T0a">
601+ <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
602+ <autoresizingMask key="autoresizingMask"/>
603+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
604+ <nil key="textColor"/>
605+ <nil key="highlightedColor"/>
606+ </label>
607+ </subviews>
608+ </tableViewCellContentView>
609+ </tableViewCell>
610+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="fXd-wg-rwW" style="IBUITableViewCellStyleDefault" id="VQR-WR-KA7">
611+ <rect key="frame" x="0.0" y="299.5" width="375" height="44"/>
612+ <autoresizingMask key="autoresizingMask"/>
613+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VQR-WR-KA7" id="mkm-sp-LKZ">
614+ <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
615+ <autoresizingMask key="autoresizingMask"/>
616+ <subviews>
617+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Add participants" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fXd-wg-rwW">
618+ <rect key="frame" x="16" y="0.0" width="343" height="43.5"/>
619+ <autoresizingMask key="autoresizingMask"/>
620+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
621+ <nil key="textColor"/>
622+ <nil key="highlightedColor"/>
623+ </label>
624+ </subviews>
625+ </tableViewCellContentView>
626+ </tableViewCell>
627+ </cells>
628+ </tableViewSection>
629+ </sections>
630+ <connections>
631+ <outlet property="dataSource" destination="Rfd-Hp-Qqv" id="ThC-G8-che"/>
632+ <outlet property="delegate" destination="Rfd-Hp-Qqv" id="1WG-zg-Ahf"/>
633+ </connections>
634+ </tableView>
635+ </tableViewController>
636+ <placeholder placeholderIdentifier="IBFirstResponder" id="KPW-41-EQd" userLabel="First Responder" sceneMemberID="firstResponder"/>
637+ </objects>
638+ <point key="canvasLocation" x="5057" y="938"/>
639+ </scene>
549 <!--Channel View Controller-->
640 <!--Channel View Controller-->
550 <scene sceneID="myW-UY-uGB">
641 <scene sceneID="myW-UY-uGB">
551 <objects>
642 <objects>
@@ -593,7 +684,7 @@
593 </tableViewController>
684 </tableViewController>
594 <placeholder placeholderIdentifier="IBFirstResponder" id="W3K-lW-jpq" userLabel="First Responder" sceneMemberID="firstResponder"/>
685 <placeholder placeholderIdentifier="IBFirstResponder" id="W3K-lW-jpq" userLabel="First Responder" sceneMemberID="firstResponder"/>
595 </objects>
686 </objects>
596− <point key="canvasLocation" x="5531" y="656"/>
687+ <point key="canvasLocation" x="5844" y="448"/>
597 </scene>
688 </scene>
598 <!--Add To ChannelVC-->
689 <!--Add To ChannelVC-->
599 <scene sceneID="Qir-mq-wma">
690 <scene sceneID="Qir-mq-wma">
@@ -621,7 +712,7 @@
621 </tableViewController>
712 </tableViewController>
622 <placeholder placeholderIdentifier="IBFirstResponder" id="kT3-kK-tSX" userLabel="First Responder" sceneMemberID="firstResponder"/>
713 <placeholder placeholderIdentifier="IBFirstResponder" id="kT3-kK-tSX" userLabel="First Responder" sceneMemberID="firstResponder"/>
623 </objects>
714 </objects>
624− <point key="canvasLocation" x="6287" y="653"/>
715+ <point key="canvasLocation" x="6548" y="448"/>
625 </scene>
716 </scene>
626 <!--Posts-->
717 <!--Posts-->
627 <scene sceneID="RSd-UJ-34B">
718 <scene sceneID="RSd-UJ-34B">
@@ -709,5 +800,6 @@
709 <resources>
800 <resources>
710 <image name="1" width="30" height="30"/>
801 <image name="1" width="30" height="30"/>
711 <image name="5" width="30" height="30"/>
802 <image name="5" width="30" height="30"/>
803+ <image name="chat" width="30" height="30"/>
712 </resources>
804 </resources>
713</document>
805</document>
GDproject/Controller/ News and channels/ChannelViewController.swift+1−1
@@ -129,7 +129,7 @@ class ChannelViewController: UITableViewController, UpdatableName, UpdatableChan
129 let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
129 let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
130
130
131 if section == 1 {
131 if section == 1 {
132− cell.textLabel?.text = Model.Channels.fullPeopleDict[channel?.people[row-1] ?? 0]?.fullName()
132+ cell.textLabel?.text = "👤 \(Model.Channels.fullPeopleDict[channel?.people[row-1] ?? 0]!.fullName())"
133 } else {
133 } else {
134 cell.textLabel?.text = "# \(channel!.tags[row-1])"
134 cell.textLabel?.text = "# \(channel!.tags[row-1])"
135 }
135 }
GDproject/Controller/Messages/ChatInfoViewController.swiftnew file+94
@@ -0,0 +1,94 @@
1+//
2+// ChatInfoViewController.swift
3+// GDproject
4+//
5+// Created by cstore on 02/05/2019.
6+// Copyright © 2019 drHSE. All rights reserved.
7+//
8+
9+import UIKit
10+
11+
12+/// Class for displaying chat info
13+///
14+class ChatInfoViewController: UITableViewController {
15+
16+
17+ override func viewDidLoad() {
18+ super.viewDidLoad()
19+
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
25+ }
26+
27+ // MARK: - Table view data source
28+
29+ override func numberOfSections(in tableView: UITableView) -> Int {
30+ // #warning Incomplete implementation, return the number of sections
31+ return 0
32+ }
33+
34+ override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
35+ // #warning Incomplete implementation, return the number of rows
36+ return 0
37+ }
38+
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...
44+
45+ return cell
46+ }
47+ */
48+
49+ /*
50+ // Override to support conditional editing of the table view.
51+ override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
52+ // Return false if you do not want the specified item to be editable.
53+ return true
54+ }
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+
73+ }
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
81+ }
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+
94+}
GDproject/Controller/Messages/DialogViewController.swift+2
@@ -9,6 +9,8 @@
9import UIKit
9import UIKit
10
10
11class DialogViewController: UITableViewController {
11class DialogViewController: UITableViewController {
12+
13+ var onInfoShow: (()->())?
12
14
13 var currentDialog: (id: Int, name: String)?
15 var currentDialog: (id: Int, name: String)?
14
16
GDproject/Controller/Messages/PeopleToWriteViewController.swift+2
@@ -10,6 +10,8 @@ import UIKit
10
10
11class PeopleToWriteViewController: UITableViewController {
11class PeopleToWriteViewController: UITableViewController {
12
12
13+ // TODO: - edit button when it's used for selection
14+
13 let searchC = UISearchController(searchResultsController: nil)
15 let searchC = UISearchController(searchResultsController: nil)
14
16
15 let users = [(id: 9,name: "Anna Mikhaleva")]
17 let users = [(id: 9,name: "Anna Mikhaleva")]
GDproject/Supporting files/Assets.xcassets/chat.imageset/Contents.jsonnew file+21
@@ -0,0 +1,21 @@
1+{
2+ "images" : [
3+ {
4+ "idiom" : "universal",
5+ "filename" : "chat.pdf",
6+ "scale" : "1x"
7+ },
8+ {
9+ "idiom" : "universal",
10+ "scale" : "2x"
11+ },
12+ {
13+ "idiom" : "universal",
14+ "scale" : "3x"
15+ }
16+ ],
17+ "info" : {
18+ "version" : 1,
19+ "author" : "xcode"
20+ }
21+}
GDproject/Supporting files/Assets.xcassets/chat.imageset/chat.pdfnew file

Binary file not shown.