- AccountControllerCell: add accessibility label and role, fixing iss…

…ue 6 in #1341 and improving on previous fix for #1333

ownCloudAppShared/Client/Collection Views/Cells/AccountControllerCell.swift

@@ -76,6 +76,12 @@ class AccountControllerCell: ThemeableCollectionViewListCell {
 		contentView.addSubview(infoView)
 
 		infoView.addSubview(disconnectButton)
+
+		titleLabel.isAccessibilityElement = false
+		detailLabel.isAccessibilityElement = false
+		statusIconView.isAccessibilityElement = false
+		isAccessibilityElement = true
+		accessibilityTraits = .button
 	}
 
 	func configureLayout() {
@@ -137,11 +143,13 @@ class AccountControllerCell: ThemeableCollectionViewListCell {
 	var title: String? {
 		didSet {
 			titleLabel.text = title
+			updateAccessibilityLabel()
 		}
 	}
 	var detail: String? {
 		didSet {
 			detailLabel.text = detail
+			updateAccessibilityLabel()
 		}
 	}
 
@@ -222,6 +230,8 @@ class AccountControllerCell: ThemeableCollectionViewListCell {
 			}
 
 			self.updateStatus(iconFor: accountController?.connection?.status)
+
+			updateAccessibilityLabel()
 		}
 	}
 
@@ -266,8 +276,9 @@ class AccountControllerCell: ThemeableCollectionViewListCell {
 			statusIconView.image = nil
 		}
 
-		statusIconView.isAccessibilityElement = statusDescription != nil
 		statusIconView.accessibilityLabel = statusDescription
+
+		updateAccessibilityLabel()
 	}
 
 	func updateStatus(from richStatus: AccountConnectionRichStatus?) {
@@ -286,6 +297,10 @@ class AccountControllerCell: ThemeableCollectionViewListCell {
 		}
 	}
 
+	func updateAccessibilityLabel() {
+		accessibilityLabel = "\("Account".localized) \(title ?? "") \(detail ?? "") \(statusIconView.accessibilityLabel != nil ? "Status".localized + " " + statusIconView.accessibilityLabel! : "")"
+	}
+
 	// MARK: - Message Badge
 	private var badgeLabel : RoundedLabel?