Skip to content
This repository was archived by the owner on May 18, 2021. It is now read-only.

Commit e767c65

Browse files
committed
Project 16 commit
1 parent 5689e62 commit e767c65

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

Project 16 - SlideMenu/SlideMenu/MasterTableViewCell.swift

+1-7
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@ class MasterTableViewCell: UITableViewCell {
1919
avatarImageView.layer.cornerRadius = avatarImageView.frame.width / 2
2020
avatarImageView.layer.masksToBounds = true
2121
}
22-
23-
func bind(news: NewsItem) {
24-
avatarImageView.image = news.authorImage
25-
coverImageView.image = news.coverImage
26-
titleLabel.text = news.title
27-
authorLabel.text = news.author
28-
}
2922
}
23+

Project 16 - SlideMenu/SlideMenu/MasterTableViewController.swift

+12-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MasterTableViewController: UITableViewController {
1212

1313
let menuTransitionManager = MenuTransitionManager()
1414

15-
private var newsGroup = [
15+
private let newsGroup = [
1616
NewsItem(title: "Love mountain.", author: "Allen Wang", authorImage: UIImage(named: "a")!, coverImage: UIImage(named: "1")!),
1717
NewsItem(title: "New graphic design - LIVE FREE", author: "Cole", authorImage: UIImage(named: "b")!, coverImage: UIImage(named: "2")!),
1818
NewsItem(title: "Summer sand", author: "Daniel Hooper", authorImage: UIImage(named: "c")!, coverImage: UIImage(named: "3")!),
@@ -27,7 +27,7 @@ class MasterTableViewController: UITableViewController {
2727
super.viewDidLoad()
2828

2929
menuTransitionManager.delegate = self
30-
title = "Everyday Moments"
30+
title = titles.first
3131
tableView.separatorStyle = .none
3232
view.backgroundColor = UIColor(red:0.062, green:0.062, blue:0.07, alpha:1)
3333

@@ -51,7 +51,6 @@ class MasterTableViewController: UITableViewController {
5151
let news = newsGroup[indexPath.item]
5252
cell.backgroundColor = .clear
5353
cell.bind(news: news)
54-
5554
return cell
5655
}
5756

@@ -78,3 +77,13 @@ extension MasterTableViewController:MenuTransitionManagerDelegate {
7877
dismiss(animated: true, completion: nil)
7978
}
8079
}
80+
81+
fileprivate extension MasterTableViewCell {
82+
83+
func bind(news: NewsItem) {
84+
avatarImageView.image = news.authorImage
85+
coverImageView.image = news.coverImage
86+
titleLabel.text = news.title
87+
authorLabel.text = news.author
88+
}
89+
}

Project 16 - SlideMenu/SlideMenu/MenuTableViewController.swift

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88

99
import UIKit
1010

11+
let titles = ["Everyday Moments", "Popular", "Editors", "Upcoming", "Fresh", "Stock-photos", "Trending"]
12+
1113
class MenuTableViewController: UITableViewController {
1214

13-
var menuItems = ["Everyday Moments", "Popular", "Editors", "Upcoming", "Fresh", "Stock-photos", "Trending"]
14-
var currentItem = "Everyday Moments"
15+
16+
var currentItem = titles.first
1517

1618
override func viewDidLoad() {
1719
super.viewDidLoad()
@@ -24,7 +26,7 @@ class MenuTableViewController: UITableViewController {
2426
// MARK: - Table view data source
2527

2628
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
27-
return menuItems.count
29+
return titles.count
2830
}
2931

3032
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -33,10 +35,9 @@ class MenuTableViewController: UITableViewController {
3335
fatalError("unexpected cell in storyboard")
3436
}
3537

36-
cell.titleLabel.text = menuItems[indexPath.row]
37-
cell.titleLabel.textColor = (menuItems[indexPath.row] == currentItem) ? .white : .gray
38-
cell.backgroundColor = .clear
39-
38+
cell.titleLabel.text = titles[indexPath.row]
39+
cell.titleLabel.textColor = (titles[indexPath.row] == currentItem) ? .white : .gray
40+
cell.backgroundColor = .clear
4041
return cell
4142
}
4243

@@ -48,7 +49,7 @@ class MenuTableViewController: UITableViewController {
4849
return
4950
}
5051
if let selectedRow = menuTableViewController.tableView.indexPathForSelectedRow?.row {
51-
currentItem = menuItems[selectedRow]
52+
currentItem = titles[selectedRow]
5253
}
5354
}
5455
}

0 commit comments

Comments
 (0)