felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/5793_deleted_media_files_simple_solution' into 'develop'

Browse Source 
MESSENGER-5793 simple solution

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!342
This commit is contained in:
Frank Rotermund
2024-04-02 13:42:17 +00:00
parent 9bfde91b19 5d75cef038
commit 779dbbcf78
8 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bwi/ContentScanner/UI/Status/ContentScannerStatus.swift
View File

@@ -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
}
}

7
bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnail.swift
View File

@@ -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