diff --git a/GME Remit/Modules/NotificationList/User Interface/View/NotificationList.storyboard b/GME Remit/Modules/NotificationList/User Interface/View/NotificationList.storyboard index ed0b7f87..b732976f 100644 --- a/GME Remit/Modules/NotificationList/User Interface/View/NotificationList.storyboard +++ b/GME Remit/Modules/NotificationList/User Interface/View/NotificationList.storyboard @@ -23,7 +23,7 @@ - + @@ -33,29 +33,29 @@ - + - + - + @@ -99,7 +100,7 @@ - + @@ -118,6 +119,9 @@ + + + diff --git a/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift b/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift index 43b7b7cd..ae984451 100644 --- a/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift +++ b/GME Remit/Modules/NotificationList/User Interface/View/NotificationListViewController.swift @@ -65,13 +65,14 @@ extension NotificationListViewController: UITableViewDelegate, UITableViewDataSo func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(withIdentifier: "NotificationListCell", for: indexPath) as! NotificationListCell let item = tableData[indexPath.row] + cell.setupView() cell.renderData(data: item) return cell } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { // return UITableView.automaticDimension - return 115 + return 125 } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { diff --git a/GME Remit/Modules/NotificationList/User Interface/View/cell/NotificationListCell.swift b/GME Remit/Modules/NotificationList/User Interface/View/cell/NotificationListCell.swift index 8e5083d2..ed0291da 100644 --- a/GME Remit/Modules/NotificationList/User Interface/View/cell/NotificationListCell.swift +++ b/GME Remit/Modules/NotificationList/User Interface/View/cell/NotificationListCell.swift @@ -20,6 +20,10 @@ class NotificationListCell: UITableViewCell { @IBOutlet weak var statusLabel: UILabel! @IBOutlet weak var statusImageView: UIImageView! + func setupView() { + cardView.set(cornerRadius: 12) + } + func renderData(data: NotificationList) { statusLabel.text = data.title statusDate.text = data.createDate diff --git a/GME Remit/Supported Files/Assets.xcassets/error.imageset/Contents.json b/GME Remit/Supported Files/Assets.xcassets/error.imageset/Contents.json index 8d95c25b..8759e42c 100644 --- a/GME Remit/Supported Files/Assets.xcassets/error.imageset/Contents.json +++ b/GME Remit/Supported Files/Assets.xcassets/error.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "error.svg", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "notify-error-color.png", "idiom" : "universal", "scale" : "3x" } diff --git a/GME Remit/Supported Files/Assets.xcassets/error.imageset/error.svg b/GME Remit/Supported Files/Assets.xcassets/error.imageset/error.svg deleted file mode 100644 index 7d8e479c..00000000 --- a/GME Remit/Supported Files/Assets.xcassets/error.imageset/error.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - diff --git a/GME Remit/Supported Files/Assets.xcassets/error.imageset/notify-error-color.png b/GME Remit/Supported Files/Assets.xcassets/error.imageset/notify-error-color.png new file mode 100644 index 00000000..8323656e Binary files /dev/null and b/GME Remit/Supported Files/Assets.xcassets/error.imageset/notify-error-color.png differ