diff --git a/Classes/Issues/IssueStatus+ButtonState.swift b/Classes/Issues/IssueStatus+ButtonState.swift
index a4cf02357..13d9ef601 100644
--- a/Classes/Issues/IssueStatus+ButtonState.swift
+++ b/Classes/Issues/IssueStatus+ButtonState.swift
@@ -9,7 +9,7 @@
import Foundation
extension IssueStatus {
- var buttonState: UIButton.State {
+ var buttonState: UIButton.IssueState {
switch self {
case .closed: return .closed
case .open: return .open
diff --git a/Classes/Issues/Referenced/IssueReferencedCell.swift b/Classes/Issues/Referenced/IssueReferencedCell.swift
index defd2c6ab..90e580f52 100644
--- a/Classes/Issues/Referenced/IssueReferencedCell.swift
+++ b/Classes/Issues/Referenced/IssueReferencedCell.swift
@@ -42,7 +42,7 @@ final class IssueReferencedCell: StyledTextViewCell {
func configure(_ model: IssueReferencedModel) {
set(renderer: model.string)
- let buttonState: UIButton.State
+ let buttonState: UIButton.IssueState
switch model.state {
case .closed: buttonState = .closed
case .merged: buttonState = .merged
diff --git a/Classes/Issues/StatusEvent/IssueStatusEvent+ButtonState.swift b/Classes/Issues/StatusEvent/IssueStatusEvent+ButtonState.swift
index 83d9938d9..4747b5d58 100644
--- a/Classes/Issues/StatusEvent/IssueStatusEvent+ButtonState.swift
+++ b/Classes/Issues/StatusEvent/IssueStatusEvent+ButtonState.swift
@@ -9,7 +9,7 @@
import Foundation
extension IssueStatusEvent {
- var buttonState: UIButton.State {
+ var buttonState: UIButton.IssueState {
switch self {
case .closed: return .closed
case .reopened: return .open
diff --git a/Classes/Notifications/NotificationModelController.swift b/Classes/Notifications/NotificationModelController.swift
index ae9e2c7da..d21143525 100644
--- a/Classes/Notifications/NotificationModelController.swift
+++ b/Classes/Notifications/NotificationModelController.swift
@@ -51,12 +51,15 @@ final class NotificationModelController {
width: CGFloat,
completion: @escaping (Result<([NotificationViewModel], Int?)>) -> Void
) {
+ let badge = githubClient.badge
let contentSizeCategory = UIContentSizeCategory.preferred
// TODO move handling + parsing to a single method?
if let repo = repo {
githubClient.client.send(V3RepositoryNotificationRequest(all: all, owner: repo.owner, repo: repo.name)) { result in
switch result {
case .success(let response):
+ badge.updateLocalNotificationCache(notifications: response.data, showAlert: false)
+
CreateNotificationViewModels(
width: width,
contentSizeCategory: contentSizeCategory,
@@ -72,6 +75,8 @@ final class NotificationModelController {
githubClient.client.send(V3NotificationRequest(all: all, page: page)) { result in
switch result {
case .success(let response):
+ badge.updateLocalNotificationCache(notifications: response.data, showAlert: false)
+
CreateNotificationViewModels(
width: width,
contentSizeCategory: contentSizeCategory,
diff --git a/Classes/Notifications/NotificationsViewController.swift b/Classes/Notifications/NotificationsViewController.swift
index 3ebecbe2d..9ca86c2b8 100644
--- a/Classes/Notifications/NotificationsViewController.swift
+++ b/Classes/Notifications/NotificationsViewController.swift
@@ -129,7 +129,7 @@ BaseListViewController2EmptyDataSource {
let hasUnread = unread > 0
navigationItem.rightBarButtonItem?.isEnabled = hasUnread
navigationController?.tabBarItem.badgeValue = hasUnread ? "\(unread)" : nil
- BadgeNotifications.update(count: unread)
+ BadgeNotifications.updateBadge(count: unread)
}
@objc func onMore(sender: UIBarButtonItem) {
@@ -227,7 +227,7 @@ BaseListViewController2EmptyDataSource {
generator.notificationOccurred(.success)
// clear all badges
- BadgeNotifications.update(count: 0)
+ BadgeNotifications.updateBadge(count: 0)
// change the spinner to the mark all item
// don't update state here; it is managed by `fetch`
diff --git a/Classes/Settings/Settings.storyboard b/Classes/Settings/Settings.storyboard
index fbb3eb8f6..f4d9a974e 100644
--- a/Classes/Settings/Settings.storyboard
+++ b/Classes/Settings/Settings.storyboard
@@ -20,7 +20,7 @@
-
+