git.iko.soy/dashared/GDproject
on master help sign in
minor changes: fixed a few bugs
25c84f2Darya Rednikina
GDproject/Base.lproj/Main.storyboard+3−2
compare with master
unifiedsplit
@@ -223,7 +223,7 @@
223 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
223 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
224 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
224 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
225 <prototypes>
225 <prototypes>
226− <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="cell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" textLabel="mZB-IA-VFq" detailTextLabel="6A8-yj-Eqe" style="IBUITableViewCellStyleSubtitle" id="6dT-km-gZC">
226+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="cell" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell1" textLabel="mZB-IA-VFq" detailTextLabel="6A8-yj-Eqe" style="IBUITableViewCellStyleSubtitle" id="6dT-km-gZC">
227 <rect key="frame" x="0.0" y="28" width="375" height="44"/>
227 <rect key="frame" x="0.0" y="28" width="375" height="44"/>
228 <autoresizingMask key="autoresizingMask"/>
228 <autoresizingMask key="autoresizingMask"/>
229 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6dT-km-gZC" id="h7U-va-4PX">
229 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="6dT-km-gZC" id="h7U-va-4PX">
@@ -256,7 +256,7 @@
256 </tableViewController>
256 </tableViewController>
257 <placeholder placeholderIdentifier="IBFirstResponder" id="731-nV-bC3" userLabel="First Responder" sceneMemberID="firstResponder"/>
257 <placeholder placeholderIdentifier="IBFirstResponder" id="731-nV-bC3" userLabel="First Responder" sceneMemberID="firstResponder"/>
258 </objects>
258 </objects>
259− <point key="canvasLocation" x="4445.6000000000004" y="-598.65067466266873"/>
259+ <point key="canvasLocation" x="4372" y="-598"/>
260 </scene>
260 </scene>
261 <!--Channel List Controller-->
261 <!--Channel List Controller-->
262 <scene sceneID="4eb-Jz-gcx">
262 <scene sceneID="4eb-Jz-gcx">
@@ -528,6 +528,7 @@
528 <objects>
528 <objects>
529 <navigationController storyboardIdentifier="root" id="609-2j-gc9" sceneMemberID="viewController">
529 <navigationController storyboardIdentifier="root" id="609-2j-gc9" sceneMemberID="viewController">
530 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Ah8-NU-AsD">
530 <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Ah8-NU-AsD">
531+ <rect key="frame" x="0.0" y="20" width="375" height="44"/>
531 <autoresizingMask key="autoresizingMask"/>
532 <autoresizingMask key="autoresizingMask"/>
532 </navigationBar>
533 </navigationBar>
533 </navigationController>
534 </navigationController>
GDproject/Controller/ News and channels/ChannelController.swift+7
@@ -45,10 +45,17 @@ class ChannelController: UIViewController, UITableViewDelegate, UITableViewDataS
45 tableView.reloadData()
45 tableView.reloadData()
46 }
46 }
47
47
48+ var reloadtable: Bool = false {
49+ didSet{
50+ tableView.reloadData()
51+ }
52+ }
53+
48 override func viewWillAppear(_ animated: Bool) {
54 override func viewWillAppear(_ animated: Bool) {
49 super.viewWillAppear(animated)
55 super.viewWillAppear(animated)
50 Model.getUsers(for: channel!.people) { [weak self] (people) in
56 Model.getUsers(for: channel!.people) { [weak self] (people) in
51 self?.dataSourcePeople = Array(people.values)
57 self?.dataSourcePeople = Array(people.values)
58+ self?.reloadtable = true
52 }
59 }
53 }
60 }
54
61
GDproject/Controller/ News and channels/ChannelListController.swift+2−2
@@ -151,7 +151,7 @@ class ChannelListController: UITableViewController, DataDelegate {
151 vc.channel = self?.dataSource[indexPath.row]
151 vc.channel = self?.dataSource[indexPath.row]
152 self?.navigationController?.pushViewController(vc, animated: true)
152 self?.navigationController?.pushViewController(vc, animated: true)
153 }
153 }
154− editButton.backgroundColor = .green
154+ editButton.backgroundColor = #colorLiteral(red: 0.8039215803, green: 0.8039215803, blue: 0.8039215803, alpha: 1)
155
155
156
156
157 let deleteButton = UITableViewRowAction(style: .normal, title: "Delete") { [weak self] (action, indexPath) in
157 let deleteButton = UITableViewRowAction(style: .normal, title: "Delete") { [weak self] (action, indexPath) in
@@ -170,7 +170,7 @@ class ChannelListController: UITableViewController, DataDelegate {
170 self?.tableView.endUpdates()
170 self?.tableView.endUpdates()
171 }
171 }
172
172
173− deleteButton.backgroundColor = .red
173+ deleteButton.backgroundColor = #colorLiteral(red: 1, green: 0.1491314173, blue: 0, alpha: 1)
174
174
175 return [editButton, deleteButton]
175 return [editButton, deleteButton]
176 }
176 }
GDproject/Controller/ News and channels/NewPostViewController.swift+7−1
@@ -26,6 +26,8 @@ class NewPostViewController: UIViewController, UITextViewDelegate {
26 var myProtocol: NewPostDelegate?
26 var myProtocol: NewPostDelegate?
27
27
28 static var draft: String = ""
28 static var draft: String = ""
29+ static var hashTagsDraft: [String] = []
30+
29 var textView: UITextView!
31 var textView: UITextView!
30
32
31 // buttons for attaching images
33 // buttons for attaching images
@@ -95,6 +97,8 @@ class NewPostViewController: UIViewController, UITextViewDelegate {
95 navigationController?.navigationBar.prefersLargeTitles = false
97 navigationController?.navigationBar.prefersLargeTitles = false
96 navigationItem.title = "New post"
98 navigationItem.title = "New post"
97 textView.text = NewPostViewController.draft
99 textView.text = NewPostViewController.draft
100+ tagsField.addTags(NewPostViewController.hashTagsDraft)
101+
98 }
102 }
99
103
100 func setUpAccessoryView(){
104 func setUpAccessoryView(){
@@ -227,6 +231,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate {
227 [weak self]
231 [weak self]
228 _ in
232 _ in
229 NewPostViewController.draft = self?.textView.text ?? ""
233 NewPostViewController.draft = self?.textView.text ?? ""
234+ NewPostViewController.hashTagsDraft = self?.tagsField.tags.map { $0.text } ?? []
230 self?.moveBackToParentVC()
235 self?.moveBackToParentVC()
231 }
236 }
232
237
@@ -235,6 +240,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate {
235 [weak self] (_)
240 [weak self] (_)
236 in
241 in
237 NewPostViewController.draft = ""
242 NewPostViewController.draft = ""
243+ NewPostViewController.hashTagsDraft = []
238 self?.moveBackToParentVC()
244 self?.moveBackToParentVC()
239 }
245 }
240
246
@@ -307,7 +313,7 @@ extension NewPostViewController: UITextFieldDelegate {
307
313
308 func textFieldShouldReturn(_ textField: UITextField) -> Bool {
314 func textFieldShouldReturn(_ textField: UITextField) -> Bool {
309 if textField == tagsField {
315 if textField == tagsField {
310− // hz
316+ textView.becomeFirstResponder()
311 }
317 }
312 return true
318 return true
313 }
319 }
GDproject/Controller/ News and channels/SimplifiedChannelsList.swift+5−3
@@ -24,9 +24,10 @@ class SimplifiedChannelsList: UITableViewController {
24 override func viewDidLoad() {
24 override func viewDidLoad() {
25 super.viewDidLoad()
25 super.viewDidLoad()
26 setUpNavigationButtons()
26 setUpNavigationButtons()
27+ navigationItem.title = "All channels"
27 navigationItem.largeTitleDisplayMode = .never
28 navigationItem.largeTitleDisplayMode = .never
28 self.navigationItem.setHidesBackButton(true, animated:true)
29 self.navigationItem.setHidesBackButton(true, animated:true)
29− tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell")
30+ tableView.register(UITableViewCell.self, forCellReuseIdentifier: "cell1")
30 }
31 }
31
32
32 override func viewWillAppear(_ animated: Bool) {
33 override func viewWillAppear(_ animated: Bool) {
@@ -56,6 +57,7 @@ class SimplifiedChannelsList: UITableViewController {
56
57
57 override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
58 override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
58 let viewHeader = UIView(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 30))
59 let viewHeader = UIView(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 30))
60+ viewHeader.backgroundColor = .white
59 let label = UILabel()
61 let label = UILabel()
60
62
61 label.text = "All channels"
63 label.text = "All channels"
@@ -82,10 +84,10 @@ class SimplifiedChannelsList: UITableViewController {
82 }
84 }
83
85
84 override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
86 override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
85− let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
87+ let cell = tableView.dequeueReusableCell(withIdentifier: "cell1", for: indexPath)
86
88
87 cell.textLabel?.text = dataSource![indexPath.row].name
89 cell.textLabel?.text = dataSource![indexPath.row].name
88− cell.detailTextLabel?.text = "\(dataSource![indexPath.row].id!)"
90+ cell.detailTextLabel?.text = "hello"
89
91
90 return cell
92 return cell
91 }
93 }
GDproject/Controller/Profile/ProfileViewController.swift+1−1
@@ -138,7 +138,7 @@ class ProfileViewController: UIViewController
138 // saved
138 // saved
139
139
140 let optionMenu = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
140 let optionMenu = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
141− let channelAction = UIAlertAction(title: "Add to the channel", style: .default){
141+ let channelAction = UIAlertAction(title: "Add to a channel", style: .default){
142 [weak self] (_) in
142 [weak self] (_) in
143
143
144 let vc = self?.storyboard?.instantiateViewController(withIdentifier: simplifiedChannelsList) as! SimplifiedChannelsList
144 let vc = self?.storyboard?.instantiateViewController(withIdentifier: simplifiedChannelsList) as! SimplifiedChannelsList