diff --git a/Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/Contents.json b/Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/Contents.json new file mode 100644 index 000000000..ee52ad55a --- /dev/null +++ b/Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "media_file_unavailable.svg", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/media_file_unavailable.svg b/Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/media_file_unavailable.svg new file mode 100644 index 000000000..26963617e --- /dev/null +++ b/Riot/Assets/Images.xcassets/BWI/media_file_unavailable.imageset/media_file_unavailable.svg @@ -0,0 +1,3 @@ + + + diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings index 0d591a9b8..a426bc600 100644 --- a/Riot/Assets/de.lproj/Bwi.strings +++ b/Riot/Assets/de.lproj/Bwi.strings @@ -16,7 +16,7 @@ // MARK: - Content Scanner -"content_scan_status_failed" = "Fehler beim Laden"; +"content_scan_status_failed" = "Datei steht nicht mehr zur Verfügung"; "content_scan_status_in_progress" = "Scanne..."; "content_scan_status_infected" = "Blockiert"; "content_scan_status_trusted" = "✓ Sicher"; diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings index 610bd56f7..f51d235fb 100644 --- a/Riot/Assets/en.lproj/Bwi.strings +++ b/Riot/Assets/en.lproj/Bwi.strings @@ -16,7 +16,7 @@ // MARK: - Content Scanner -"content_scan_status_failed" = "Download failed"; +"content_scan_status_failed" = "File is unavailable."; "content_scan_status_in_progress" = "Scanning..."; "content_scan_status_infected" = "Blocked"; "content_scan_status_trusted" = "✓ Trusted"; diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift index a9edfa35f..be75e09bd 100644 --- a/Riot/Generated/BWIStrings.swift +++ b/Riot/Generated/BWIStrings.swift @@ -743,7 +743,7 @@ public class BWIL10n: NSObject { public static var collapse: String { return BWIL10n.tr("Bwi", "collapse") } - /// Fehler beim Laden + /// Datei steht nicht mehr zur Verfügung public static var contentScanStatusFailed: String { return BWIL10n.tr("Bwi", "content_scan_status_failed") } diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift index cd4d74fa3..04cf8d58d 100644 --- a/Riot/Generated/Images.swift +++ b/Riot/Generated/Images.swift @@ -63,6 +63,7 @@ internal class Asset: NSObject { internal static let introduceFederation2Dark = ImageAsset(name: "introduce_federation_2_dark") internal static let introduceFederation2Light = ImageAsset(name: "introduce_federation_2_light") internal static let introduceFederation3 = ImageAsset(name: "introduce_federation_3") + internal static let mediaFileUnavailable = ImageAsset(name: "media_file_unavailable") internal static let newFeatures = ImageAsset(name: "new_features") internal static let qrcodeViewfinder = ImageAsset(name: "qrcode_viewfinder") internal static let roomFederatedBumIconDark = ImageAsset(name: "room_federated_bum_icon_dark") diff --git a/bwi/ContentScanner/UI/Status/ContentScannerStatus.swift b/bwi/ContentScanner/UI/Status/ContentScannerStatus.swift index 63bc8c2db..6b0bc5ca2 100644 --- a/bwi/ContentScanner/UI/Status/ContentScannerStatus.swift +++ b/bwi/ContentScanner/UI/Status/ContentScannerStatus.swift @@ -35,6 +35,8 @@ class ContentScannerStatus: ObservableObject, ContentScannerContentDelegate { func render(with viewData: ContentScannerStatusViewData) { + theme = ThemeService.shared().theme + let scanStatus = viewData.scanStatus switch scanStatus { @@ -43,7 +45,8 @@ class ContentScannerStatus: ObservableObject, ContentScannerContentDelegate { case .infected: statusImagePath = Asset.Images.fileScanInfected.name case .unknown: - statusImagePath = Asset.Images.error.name + // bwi #5793 use new icon for unknown + statusImagePath = Asset.Images.mediaFileUnavailable.name case .trusted: statusImagePath = Asset.Images.fileAttachmentIcon.name @unknown default: @@ -58,7 +61,7 @@ class ContentScannerStatus: ObservableObject, ContentScannerContentDelegate { self.scanStatusVisibility = (scanStatus == .infected) ? false : true self.backgroundColor = (scanStatus == .infected) ? self.theme.warningColor : self.theme.baseColor - self.tintColor = (scanStatus != .infected) ? self.theme.backgroundColor : self.theme.warningColor + self.tintColor = (scanStatus != .infected) ? self.theme.textSecondaryColor : self.theme.warningColor self.statusColor = (scanStatus != .infected) ? self.theme.textPrimaryColor : self.theme.textSecondaryColor } } diff --git a/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnail.swift b/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnail.swift index 14ae40c99..a1a2e23a2 100644 --- a/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnail.swift +++ b/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnail.swift @@ -38,16 +38,19 @@ class ContentScannerThumbnail: ObservableObject, ContentScannerContentDelegate { let scanStatus = viewData.scanStatus + self.fileName = viewData.attachment + switch viewData.scanStatus { case .infected: imagePath = Asset.Images.fileScanInfected.name case .unknown: - imagePath = Asset.Images.error.name + // bwi #5793 use new text for unknown and remove filename for size + imagePath = Asset.Images.mediaFileUnavailable.name + self.fileName = "" default: imagePath = "" } - self.fileName = viewData.attachment self.status = self.scanStatusMessage(for: viewData.scanStatus) self.progressing = imagePath.isEmpty