♿️ - Settings

Kickstarter-iOS/DataSources/SettingsPrivacyDataSource.swift

@@ -12,31 +12,40 @@ internal enum Section: Int {
   case deleteAccount
 }
 
-public struct SettingsPrivacyCellValue {
+public struct SettingsPrivacyStaticCellValue {
+  let cellType: SettingsStaticCellType
   let user: User
+}
+
+public struct SettingsPrivacySwitchCellValue {
   let cellType: SettingsSwitchCellType
+  let user: User
 }
 
 internal final class SettingsPrivacyDataSource: ValueCellDataSource {
   internal func load(user: User) {
-    self.set(values: [user],
+    let followingCellValue = SettingsPrivacyStaticCellValue(cellType: .following, user: user)
+
+    self.set(values: [followingCellValue],
              cellClass: SettingsFollowCell.self,
              inSection: Section.following.rawValue)
 
-    self.set(values: [Strings.When_following_is_on_you_can_follow_the_acticity_of_others()],
+    self.set(values: [followingCellValue.cellType.description],
              cellClass: SettingsPrivacyStaticCell.self,
              inSection: Section.followingFooter.rawValue)
 
-    self.set(values: [user],
+    let recommendationsCellValue = SettingsPrivacyStaticCellValue(cellType: .recommendations, user: user)
+
+    self.set(values: [recommendationsCellValue],
              cellClass: SettingsPrivacyRecommendationCell.self,
              inSection: Section.recommendations.rawValue)
 
-    self.set(values: [Strings.We_use_your_activity_internally_to_make_recommendations_for_you()],
+    self.set(values: [recommendationsCellValue.cellType.description],
              cellClass: SettingsPrivacyStaticCell.self,
              inSection: Section.recommendationsFooter.rawValue)
 
     if !user.isCreator {
-      let cellValue = SettingsPrivacyCellValue(user: user, cellType: .privacy)
+      let cellValue = SettingsPrivacySwitchCellValue(cellType: .privacy, user: user)
 
       self.set(values: [cellValue],
                cellClass: SettingsPrivacySwitchCell.self,
@@ -54,17 +63,17 @@ internal final class SettingsPrivacyDataSource: ValueCellDataSource {
 
   internal override func configureCell(tableCell cell: UITableViewCell, withValue value: Any) {
     switch (cell, value) {
-    case let (cell as SettingsFollowCell, value as User):
+    case let (cell as SettingsFollowCell, value as SettingsPrivacyStaticCellValue):
       cell.configureWith(value: value)
-    case let (cell as SettingsPrivacyRecommendationCell, value as User):
+    case let (cell as SettingsPrivacyRecommendationCell, value as SettingsPrivacyStaticCellValue):
       cell.configureWith(value: value)
     case let (cell as SettingsPrivacyRequestDataCell, value as User):
       cell.configureWith(value: value)
     case let (cell as SettingsPrivacyDeleteAccountCell, value as User):
       cell.configureWith(value: value)
     case let (cell as SettingsPrivacyStaticCell, value as String):
       cell.configureWith(value: value)
-    case let (cell as SettingsPrivacySwitchCell, value as SettingsPrivacyCellValue):
+    case let (cell as SettingsPrivacySwitchCell, value as SettingsPrivacySwitchCellValue):
       cell.configureWith(value: value)
     default:
       fatalError("Unrecognized combo (\(cell), \(value)).")

Kickstarter-iOS/Locales/Base.lproj/Localizable.strings

@@ -247,6 +247,7 @@
 "Manage_your_pledge_below" = "Manage your pledge below";
 "Manage_your_reward" = "Manage your reward";
 "Message_backer" = "Message backer";
+"Message_banner.accessibility.Double_tap_to_dismiss" = "Double tap to dismiss.";
 "Message_creator" = "Message creator";
 "Message_user_name" = "Message %{user_name}…";
 "Messages" = "Messages";
@@ -1449,4 +1450,4 @@
 "updates_count_updates.zero" = "%{updates_count} updates";
 "via_custom" = "via custom";
 "via_external" = "via external";
-"via_kickstarter" = "via Kickstarter";
+"via_kickstarter" = "via Kickstarter";

Kickstarter-iOS/Locales/de.lproj/Localizable.strings

@@ -247,6 +247,7 @@
 "Manage_your_pledge_below" = "Folgenden Beitrag verwalten";
 "Manage_your_reward" = "Belohnung verwalten";
 "Message_backer" = "Nachricht an Unterstützer senden";
+"Message_banner.accessibility.Double_tap_to_dismiss" = "Double tap to dismiss.";
 "Message_creator" = "Nachricht an Projektgründer senden";
 "Message_user_name" = "Nachricht senden an %{user_name}…";
 "Messages" = "Nachrichten";
@@ -1449,4 +1450,4 @@
 "updates_count_updates.zero" = "%{updates_count} Updates";
 "via_custom" = "Benutzerdefiniert";
 "via_external" = "Extern";
-"via_kickstarter" = "über Kickstarter";
+"via_kickstarter" = "über Kickstarter";

Kickstarter-iOS/Locales/es.lproj/Localizable.strings

@@ -247,6 +247,7 @@
 "Manage_your_pledge_below" = "Administra tu contribución:";
 "Manage_your_reward" = "Administra tu recompensa";
 "Message_backer" = "Enviar mensaje a patrocinador";
+"Message_banner.accessibility.Double_tap_to_dismiss" = "Double tap to dismiss.";
 "Message_creator" = "Enviar mensaje al creador";
 "Message_user_name" = "Mensaje a %{user_name}…";
 "Messages" = "Mensajes";
@@ -1449,4 +1450,4 @@
 "updates_count_updates.zero" = "%{updates_count} actualizaciones";
 "via_custom" = "a través de personalizados";
 "via_external" = "a través de externos";
-"via_kickstarter" = "a través de Kickstarter";
+"via_kickstarter" = "a través de Kickstarter";

Kickstarter-iOS/Locales/fr.lproj/Localizable.strings

@@ -247,6 +247,7 @@
 "Manage_your_pledge_below" = "Gérer mon engagement";
 "Manage_your_reward" = "Gérer votre récompense";
 "Message_backer" = "Envoyer un message au contributeur";
+"Message_banner.accessibility.Double_tap_to_dismiss" = "Double tap to dismiss.";
 "Message_creator" = "Envoyer un message au créateur";
 "Message_user_name" = "Envoyer un message à %{user_name}";
 "Messages" = "Messages";
@@ -1449,4 +1450,4 @@
 "updates_count_updates.zero" = "%{updates_count} actus";
 "via_custom" = "sites référents personnalisés";
 "via_external" = "sites référents externes";
-"via_kickstarter" = "Kickstarter";
+"via_kickstarter" = "Kickstarter";

Kickstarter-iOS/Locales/ja.lproj/Localizable.strings

@@ -247,6 +247,7 @@
 "Manage_your_pledge_below" = "以下のプレッジを変更";
 "Manage_your_reward" = "リワードの管理";
 "Message_backer" = "バッカーにメッセージする";
+"Message_banner.accessibility.Double_tap_to_dismiss" = "Double tap to dismiss.";
 "Message_creator" = "クリエーターにメッセージする";
 "Message_user_name" = "%{user_name} にメッセージ";
 "Messages" = "メッセージ";
@@ -1449,4 +1450,4 @@
 "updates_count_updates.zero" = "%{updates_count} 件のアップデート";
 "via_custom" = "リファラー経由";
 "via_external" = "外部を経由";
-"via_kickstarter" = "kickstarterを経由";
+"via_kickstarter" = "kickstarterを経由";

Kickstarter-iOS/Views/Cells/FindFriendsCell.swift

@@ -13,8 +13,10 @@ final class FindFriendsCell: UITableViewCell, ValueCell, NibLoading {
   private let viewModel: FindFriendsCellViewModelType = FindFriendsCellViewModel()
 
   func configureWith(value: SettingsCellValue) {
-    let user = value.user
-    self.viewModel.inputs.configure(with: user)
+    _ = self
+      |> \.accessibilityTraits .~ value.cellType.accessibilityTraits
+
+    self.viewModel.inputs.configure(with: value.user)
   }
 
   override func bindViewModel() {

Kickstarter-iOS/Views/Cells/ProjectNotificationCell.swift

@@ -17,14 +17,13 @@ internal final class ProjectNotificationCell: UITableViewCell, ValueCell {
   @IBOutlet fileprivate weak var notificationSwitch: UISwitch!
   @IBOutlet fileprivate weak var separatorView: UIView!
 
- internal override func awakeFromNib() {
+  internal override func awakeFromNib() {
     super.awakeFromNib()
 
-    self.notificationSwitch.addTarget(
-      self,
-      action: #selector(notificationTapped),
-      for: UIControl.Event.valueChanged
-    )
+    _ = self
+      |> \.accessibilityElements .~ [self.notificationSwitch]
+
+    self.notificationSwitch.addTarget(self, action: #selector(notificationTapped), for: .valueChanged)
   }
 
   internal override func bindStyles() {
@@ -46,6 +45,7 @@ internal final class ProjectNotificationCell: UITableViewCell, ValueCell {
     super.bindViewModel()
 
     self.nameLabel.rac.text = self.viewModel.outputs.name
+    self.notificationSwitch.rac.accessibilityLabel = self.viewModel.outputs.name
     self.notificationSwitch.rac.on = self.viewModel.outputs.notificationOn
 
     self.viewModel.outputs.notifyDelegateOfSaveError

Kickstarter-iOS/Views/Cells/SettingsAccountWarningCell.swift

@@ -9,8 +9,18 @@ final class SettingsAccountWarningCell: UITableViewCell, ValueCell, NibLoading {
   @IBOutlet fileprivate weak var warningIconImage: UIImageView!
 
   func configureWith(value shouldHideAlertIcon: Bool) {
+    _ = self
+      |> \.accessibilityTraits .~ .button
+
     _ = self.warningIconImage
-    |> \.isHidden .~ shouldHideAlertIcon
+      |> \.isHidden .~ shouldHideAlertIcon
+
+    if !shouldHideAlertIcon {
+      _ = self
+        |> \.accessibilityHint %~ { _ in
+          Strings.Email_unverified()
+      }
+    }
   }
 
   override func bindStyles() {

Kickstarter-iOS/Views/Cells/SettingsFollowCell.swift

@@ -20,8 +20,21 @@ internal final class SettingsFollowCell: UITableViewCell, ValueCell {
   @IBOutlet fileprivate weak var followingSwitch: UISwitch!
   @IBOutlet fileprivate var separatorView: [UIView]!
 
-  internal func configureWith(value user: User) {
-    self.viewModel.inputs.configureWith(user: user)
+  override func awakeFromNib() {
+    super.awakeFromNib()
+
+    _ = self
+      |> \.accessibilityElements .~ [self.followingSwitch]
+
+    _ = self.followingSwitch
+      |> \.accessibilityLabel %~ { _ in Strings.Following() }
+  }
+
+  internal func configureWith(value: SettingsPrivacyStaticCellValue) {
+    self.viewModel.inputs.configureWith(user: value.user)
+
+    _ = self.followingSwitch
+      |> \.accessibilityHint .~ value.cellType.description
   }
 
   internal override func bindStyles() {
@@ -63,6 +76,10 @@ internal final class SettingsFollowCell: UITableViewCell, ValueCell {
     self.followingSwitch.rac.on = self.viewModel.outputs.followingPrivacyOn
   }
 
+  func toggleOn(animated: Bool = true) {
+    self.followingSwitch.setOn(true, animated: animated)
+  }
+
   @IBAction func followingPrivacySwitchTapped(_ followingPrivacySwitch: UISwitch) {
     self.viewModel.inputs.followTapped(on: followingPrivacySwitch.isOn)
   }

Kickstarter-iOS/Views/Cells/SettingsNewslettersCell.swift

@@ -20,19 +20,28 @@ internal final class SettingsNewslettersCell: UITableViewCell, ValueCell {
 
   public weak var delegate: SettingsNewslettersCellDelegate?
 
-  func configureWith(value: (newsletter: Newsletter, user: User)) {
+  override func awakeFromNib() {
+    super.awakeFromNib()
+
+    _ = self
+      |> \.accessibilityElements .~ [self.newslettersSwitch]
+  }
 
+  func configureWith(value: (newsletter: Newsletter, user: User)) {
     self.viewModel.inputs.configureWith(value: value)
 
+    _ = self.newslettersSwitch
+      |> \.accessibilityLabel .~ value.newsletter.displayableName
+      |> \.accessibilityHint .~ value.newsletter.displayableDescription
+
     _ = self.newslettersLabel
-      |> UILabel.lens.text %~ { _ in value.newsletter.displayableName }
+      |> \.text .~ value.newsletter.displayableName
 
     _ = self.newslettersDescriptionLabel
-      |> UILabel.lens.text %~ { _ in value.newsletter.displayableDescription }
+      |> \.text .~ value.newsletter.displayableDescription
   }
 
   override func bindStyles() {
-
     _ = self.separatorViews
       ||> separatorStyle
 

Kickstarter-iOS/Views/Cells/SettingsNewslettersTopCell.swift

@@ -20,6 +20,23 @@ final internal class SettingsNewslettersTopCell: UITableViewCell, ValueCell {
 
   public weak var delegate: SettingsNewslettersTopCellDelegate?
 
+  override func awakeFromNib() {
+    super.awakeFromNib()
+
+    _ = self
+      |> \.accessibilityElements .~ [self.newsletterSwitch]
+
+    _ = self.descriptionLabel
+      |> \.text %~ { _ in Strings.Stay_up_to_date_newsletter() }
+
+    _ = self.newsletterSwitch
+      |> \.accessibilityLabel %~ { _ in Strings.profile_settings_newsletter_subscribe_all() }
+      |> \.accessibilityHint %~ { _ in Strings.Stay_up_to_date_newsletter() }
+
+    _ = self.titleLabel
+      |> \.text %~ { _ in Strings.profile_settings_newsletter_subscribe_all() }
+  }
+
   func configureWith(value: User) {
     self.viewModel.inputs.configureWith(value: value)
   }
@@ -29,9 +46,6 @@ final internal class SettingsNewslettersTopCell: UITableViewCell, ValueCell {
 
     _ = self.descriptionLabel
       |> settingsDescriptionLabelStyle
-      |> UILabel.lens.text %~ { _ in
-        Strings.Stay_up_to_date_newsletter()
-    }
 
     _ = self.newsletterSwitch
       |> settingsSwitchStyle
@@ -41,7 +55,6 @@ final internal class SettingsNewslettersTopCell: UITableViewCell, ValueCell {
 
     _ = self.titleLabel
       |> settingsTitleLabelStyle
-      |> UILabel.lens.text %~ { _ in Strings.profile_settings_newsletter_subscribe_all() }
   }
 
   override func bindViewModel() {

Kickstarter-iOS/Views/Cells/SettingsNotificationCell.swift

@@ -34,6 +34,9 @@ final class SettingsNotificationCell: UITableViewCell, NibLoading, ValueCell {
 
     viewModel.inputs.configure(with: cellValue)
 
+    _ = self
+      |> \.accessibilityTraits .~ cellValue.cellType.accessibilityTraits
+
     _ = titleLabel
       |> UILabel.lens.text .~ cellValue.cellType.title
 
@@ -95,8 +98,6 @@ final class SettingsNotificationCell: UITableViewCell, NibLoading, ValueCell {
     self.projectCountLabel.rac.text = viewModel.outputs.projectCountText
     self.pushNotificationsButton.rac.selected = viewModel.outputs.pushNotificationsEnabled
     self.pushNotificationsButton.rac.hidden = viewModel.outputs.pushNotificationButtonIsHidden
-    self.projectCountLabel.rac.accessibilityHint = viewModel.outputs
-      .manageProjectNotificationsButtonAccessibilityHint
 
     viewModel.outputs.enableButtonAnimation
     .observeForUI()

Kickstarter-iOS/Views/Cells/SettingsNotificationPickerCell.swift

@@ -13,6 +13,9 @@ final class SettingsNotificationPickerCell: UITableViewCell, NibLoading, ValueCe
   func configureWith(value: SettingsNotificationCellValue) {
     self.viewModel.inputs.configure(with: value)
 
+    _ = self
+      |> \.accessibilityTraits .~ value.cellType.accessibilityTraits
+
     _ = titleLabel
       |> UILabel.lens.text .~ value.cellType.title
   }

Kickstarter-iOS/Views/Cells/SettingsPrivacyDeleteAccountCell.swift

@@ -20,6 +20,12 @@ internal final class SettingsPrivacyDeleteAccountCell: UITableViewCell, ValueCel
   internal override func awakeFromNib() {
     super.awakeFromNib()
 
+    _ = self
+      |> \.accessibilityElements .~ [self.deleteAccountButton]
+
+    _ = self.deleteAccountButton
+      |> \.accessibilityLabel %~ { _ in Strings.Delete_my_Kickstarter_Account() }
+
     self.deleteAccountButton.addTarget(self, action: #selector(deleteAccountTapped), for: .touchUpInside)
   }
 

Kickstarter-iOS/Views/Cells/SettingsPrivacyRecommendationCell.swift

@@ -12,8 +12,21 @@ internal final class SettingsPrivacyRecommendationCell: UITableViewCell, ValueCe
   @IBOutlet fileprivate weak var recommendationsSwitch: UISwitch!
   @IBOutlet fileprivate var separatorView: [UIView]!
 
-  internal func configureWith(value user: User) {
-    self.viewModel.inputs.configureWith(user: user)
+  override func awakeFromNib() {
+    super.awakeFromNib()
+
+    _ = self
+      |> \.accessibilityElements .~ [self.recommendationsSwitch]
+
+    _ = self.recommendationsSwitch
+      |> \.accessibilityLabel %~ { _ in Strings.Recommendations() }
+  }
+
+  internal func configureWith(value: SettingsPrivacyStaticCellValue) {
+    self.viewModel.inputs.configureWith(user: value.user)
+
+    _ = self.recommendationsSwitch
+      |> \.accessibilityHint .~ value.cellType.description
   }
 
   internal override func bindStyles() {

Kickstarter-iOS/Views/Cells/SettingsPrivacyStaticCell.swift

@@ -5,6 +5,13 @@ import UIKit
 internal final class SettingsPrivacyStaticCell: UITableViewCell, ValueCell {
   @IBOutlet fileprivate weak var privacyInfoLabel: UILabel!
 
+  override func awakeFromNib() {
+    super.awakeFromNib()
+
+    _ = self
+      |> \.accessibilityElementsHidden .~ true
+  }
+
   func configureWith(value: String) {
     _ = self.privacyInfoLabel
       |> UILabel.lens.text %~ { _ in value }