From a5f12649c1e1c0d0a48e19dc667367631b66fc07 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 31 Jul 2023 14:14:08 +1000 Subject: [PATCH] link real data --- Session.xcodeproj/project.pbxproj | 6 ++--- .../MessageInfoView.swift | 26 ++++++++++++------- .../Shared}/SessionCarouselView+SwiftUI.swift | 4 +-- 3 files changed, 22 insertions(+), 14 deletions(-) rename {SessionUIKit/Components => Session/Shared}/SessionCarouselView+SwiftUI.swift (98%) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 80b66715e..d2bb6388e 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -159,9 +159,9 @@ 7BD477A827EC39F5004E2822 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD477A727EC39F5004E2822 /* Atomic.swift */; }; 7BD687D12A5D0D1200D8E455 /* MessageInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD687D02A5D0D1200D8E455 /* MessageInfoView.swift */; }; 7BD687D42A5E852600D8E455 /* ProfilePictureView+SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD687D32A5E852600D8E455 /* ProfilePictureView+SwiftUI.swift */; }; + 7BD976972A776C76001B466F /* SessionCarouselView+SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE2701D2A64C11500CEB71A /* SessionCarouselView+SwiftUI.swift */; }; 7BDCFC08242186E700641C39 /* NotificationServiceExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */; }; 7BDCFC0B2421EB7600641C39 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6F509951AA53F760068F56A /* Localizable.strings */; }; - 7BE2701E2A64C11500CEB71A /* SessionCarouselView+SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE2701D2A64C11500CEB71A /* SessionCarouselView+SwiftUI.swift */; }; 7BF8D1FB2A70AF57005F1D6E /* SwiftUI+Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8D1FA2A70AF57005F1D6E /* SwiftUI+Theme.swift */; }; 7BFA8AE32831D0D4001876F3 /* ContextMenuVC+EmojiReactsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFA8AE22831D0D4001876F3 /* ContextMenuVC+EmojiReactsView.swift */; }; 7BFD1A8A2745C4F000FB91B9 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A892745C4F000FB91B9 /* Permissions.swift */; }; @@ -2670,6 +2670,7 @@ FD52090828B59411006098F6 /* ScreenLockUI.swift */, FD37EA0828AA2D27003AE748 /* SessionTableViewModel.swift */, FD37EA0628AA2CCA003AE748 /* SessionTableViewController.swift */, + 7BE2701D2A64C11500CEB71A /* SessionCarouselView+SwiftUI.swift */, 7B3A39312980D02B002FE4AC /* SessionCarouselView.swift */, 7B2561C329874851005C086C /* SessionCarouselView+Info.swift */, 7B3A3933298882D6002FE4AC /* SessionCarouselViewDelegate.swift */, @@ -2934,7 +2935,6 @@ 7BD687D32A5E852600D8E455 /* ProfilePictureView+SwiftUI.swift */, FD71165A28E6DDBC00B47552 /* StyledNavigationController.swift */, FD0B77AF29B69A65009169BA /* TopBannerController.swift */, - 7BE2701D2A64C11500CEB71A /* SessionCarouselView+SwiftUI.swift */, ); path = Components; sourceTree = ""; @@ -5429,7 +5429,6 @@ FD37E9D328A1FCDB003AE748 /* Theme+OceanDark.swift in Sources */, FD71165928E436E800B47552 /* ConfirmationModal.swift in Sources */, 7BBBDC44286EAD2D00747E59 /* TappableLabel.swift in Sources */, - 7BE2701E2A64C11500CEB71A /* SessionCarouselView+SwiftUI.swift in Sources */, FD09B7E328865FDA00ED0B66 /* HighlightMentionBackgroundView.swift in Sources */, C331FFB82558FA8D00070591 /* DeviceUtilities.swift in Sources */, C331FFE72558FB0000070591 /* TextField.swift in Sources */, @@ -6063,6 +6062,7 @@ 45C0DC1B1E68FE9000E04C47 /* UIApplication+OWS.swift in Sources */, FDF222072818CECF000A4995 /* ConversationViewModel.swift in Sources */, 4539B5861F79348F007141FF /* PushRegistrationManager.swift in Sources */, + 7BD976972A776C76001B466F /* SessionCarouselView+SwiftUI.swift in Sources */, B8041A9525C8FA1D003C2166 /* MediaLoaderView.swift in Sources */, 45F32C232057297A00A300D5 /* MediaPageViewController.swift in Sources */, 7B9F71D42852EEE2006DFE7B /* Emoji+Name.swift in Sources */, diff --git a/Session/Media Viewing & Editing/MessageInfoView.swift b/Session/Media Viewing & Editing/MessageInfoView.swift index 0ec99cdaa..52379fcc4 100644 --- a/Session/Media Viewing & Editing/MessageInfoView.swift +++ b/Session/Media Viewing & Editing/MessageInfoView.swift @@ -27,7 +27,7 @@ struct MessageInfoView: View { spacing: 10 ) { // Message bubble snapshot - if let body: String = messageViewModel.body { + if let body: String = messageViewModel.body, !body.isEmpty { let (bubbleBackgroundColor, bubbleTextColor): (ThemeValue, ThemeValue) = ( messageViewModel.variant == .standardIncoming || messageViewModel.variant == .standardIncomingDeleted @@ -101,7 +101,7 @@ struct MessageInfoView: View { ZStack(alignment: .bottomTrailing) { if attachments.count > 1 { // Attachment carousel view - SessionCarouselView_SwiftUI(index: $index, contentInfos: [.orange, .gray, .blue, .yellow]) + SessionCarouselView_SwiftUI(index: $index, contentInfos: attachments) .frame( maxWidth: .infinity, maxHeight: .infinity, @@ -142,16 +142,17 @@ struct MessageInfoView: View { ) // Attachment Info + let attachment: Attachment = attachments[index - 1] ZStack { RoundedRectangle(cornerRadius: 17) - .fill(Color(red: 27.0/255, green: 27.0/255, blue: 27.0/255)) + .fill(themeColor: .backgroundSecondary) VStack( alignment: .leading, spacing: 16 ) { InfoBlock(title: "ATTACHMENT_INFO_FILE_ID".localized() + ":") { - Text("12378965485235985214") + Text(attachment.serverId ?? "") .font(.system(size: 16)) .foregroundColor(themeColor: .textPrimary) } @@ -160,7 +161,7 @@ struct MessageInfoView: View { alignment: .center ) { InfoBlock(title: "ATTACHMENT_INFO_FILE_TYPE".localized() + ":") { - Text(".PNG") + Text(attachment.contentType) .font(.system(size: 16)) .foregroundColor(themeColor: .textPrimary) } @@ -168,27 +169,34 @@ struct MessageInfoView: View { Spacer() InfoBlock(title: "ATTACHMENT_INFO_FILE_SIZE".localized() + ":") { - Text("6mb") + Text(Format.fileSize(attachment.byteCount)) .font(.system(size: 16)) .foregroundColor(themeColor: .textPrimary) } Spacer() } - HStack( alignment: .center ) { + let resolution: String = { + guard let width = attachment.width, let height = attachment.height else { return "N/A" } + return "\(width)×\(height)" + }() InfoBlock(title: "ATTACHMENT_INFO_RESOLUTION".localized() + ":") { - Text("550×550") + Text(resolution) .font(.system(size: 16)) .foregroundColor(themeColor: .textPrimary) } Spacer() + let duration: String = { + guard let duration = attachment.duration else { return "N/A" } + return floor(duration).formatted(format: .videoDuration) + }() InfoBlock(title: "ATTACHMENT_INFO_DURATION".localized() + ":") { - Text("N/A") + Text(duration) .font(.system(size: 16)) .foregroundColor(themeColor: .textPrimary) } diff --git a/SessionUIKit/Components/SessionCarouselView+SwiftUI.swift b/Session/Shared/SessionCarouselView+SwiftUI.swift similarity index 98% rename from SessionUIKit/Components/SessionCarouselView+SwiftUI.swift rename to Session/Shared/SessionCarouselView+SwiftUI.swift index 31ed23f56..114f84fd4 100644 --- a/SessionUIKit/Components/SessionCarouselView+SwiftUI.swift +++ b/Session/Shared/SessionCarouselView+SwiftUI.swift @@ -4,10 +4,10 @@ import SwiftUI public struct SessionCarouselView_SwiftUI: View { @Binding var index: Int - var contentInfos: [Color] + var contentInfos: [Attachment] let numberOfPages: Int - public init(index: Binding, contentInfos: [Color]) { + public init(index: Binding, contentInfos: [Attachment]) { self._index = index self.contentInfos = contentInfos self.numberOfPages = contentInfos.count