pr and design suggestions

Author: Velin92

ElementX/Resources/Localizations/en-US.lproj/Localizable.strings

@@ -226,7 +226,7 @@
 "common_empty_file" = "Empty file";
 "common_encryption" = "Encryption";
 "common_encryption_enabled" = "Encryption enabled";
-"common_ends_in_time_ios" = "Ends %1$@";
+"common_ends_at" = "Ends at %1$@";
 "common_enter_your_pin" = "Enter your PIN";
 "common_error" = "Error";
 "common_everyone" = "Everyone";

ElementX/Resources/Localizations/en.lproj/Localizable.strings

@@ -226,7 +226,7 @@
 "common_empty_file" = "Empty file";
 "common_encryption" = "Encryption";
 "common_encryption_enabled" = "Encryption enabled";
-"common_ends_in_time_ios" = "Ends %1$@";
+"common_ends_at" = "Ends at %1$@";
 "common_enter_your_pin" = "Enter your PIN";
 "common_error" = "Error";
 "common_everyone" = "Everyone";

ElementX/Sources/Generated/Strings.swift

@@ -500,9 +500,9 @@ internal enum L10n {
   internal static var commonEncryption: String { return L10n.tr("Localizable", "common_encryption") }
   /// Encryption enabled
   internal static var commonEncryptionEnabled: String { return L10n.tr("Localizable", "common_encryption_enabled") }
-  /// Ends %1$@
-  internal static func commonEndsInTimeIos(_ p1: Any) -> String {
-    return L10n.tr("Localizable", "common_ends_in_time_ios", String(describing: p1))
+  /// Ends at %1$@
+  internal static func commonEndsAt(_ p1: Any) -> String {
+    return L10n.tr("Localizable", "common_ends_at", String(describing: p1))
   }
   /// Enter your PIN
   internal static var commonEnterYourPin: String { return L10n.tr("Localizable", "common_enter_your_pin") }

ElementX/Sources/Other/Extensions/Date.swift

@@ -34,6 +34,25 @@ extension Date {
         }
     }
 
+    /// The date of an expiration formatted with the minimal necessary units given how long in the future it is.
+    func formattedExpiration() -> String {
+        let calendar = Calendar.current
+        let now = Date.now
+        
+        guard let tomorrow = calendar.date(byAdding: .hour, value: 24, to: now),
+              let oneYearFromNow = calendar.date(byAdding: .year, value: 1, to: now) else {
+            return formatted(date: .omitted, time: .shortened)
+        }
+        
+        if self < tomorrow {
+            return formatted(date: .omitted, time: .shortened)
+        } else if self < oneYearFromNow {
+            return formatted(.dateTime.day().month())
+        } else {
+            return formatted(.dateTime.year())
+        }
+    }
+    
     /// Similar to ``formattedMinimal`` but returning "Today" instead of the time and
     /// including the year when it the date is from a previous year (rather than over a year ago).
     func formattedDateSeparator() -> String {
@@ -60,14 +79,15 @@ extension Date {
         formatted(date: .omitted, time: .shortened)
     }
 
-    /// A fixed date used for mocks, previews etc.
-    static var mock: Date {
-        DateComponents(calendar: .current, year: 2007, month: 1, day: 9, hour: 9, minute: 41).date ?? .now
+    /// A fixed date representing today at 4:20 AM, used for mocks and previews.
+    static var mockToday420: Date {
+        // swiftlint:disable:next force_unwrap
+        Calendar.current.date(bySettingHour: 4, minute: 20, second: 0, of: .now)!
     }
 
     /// A fixed date used for mocks, previews etc.
-    static var inOneMinute: Date {
-        Date.now.addingTimeInterval(60)
+    static var mock: Date {
+        DateComponents(calendar: .current, year: 2007, month: 1, day: 9, hour: 9, minute: 41).date ?? .now
     }
 }
 

ElementX/Sources/Other/SwiftUI/PreviewScrollView.swift

@@ -7,6 +7,9 @@
 
 import SwiftUI
 
+/// Only use in Previews! This useful scroll view allows you to still have a scroll view when previewing in Xcode
+/// but ignores it when running the tests, which allows you to still use it's content directly in preview tests
+/// and render the preview with `sizeThatFits` layout.
 struct PreviewScrollView<Content: View>: View {
     var content: () -> Content
 

ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift

@@ -9,91 +9,11 @@
 import Compound
 import SwiftUI
 
-enum LocationMarkerKind {
-    case pin
-    case staticUser(UserProfileProxy)
-    case liveUser(UserProfileProxy)
-    case placeholder
-    
-    var id: String {
-        switch self {
-        case .pin, .placeholder:
-            UUID().uuidString
-        case .staticUser(let profile), .liveUser(let profile):
-            profile.userID
-        }
-    }
-    
-    var displayName: String? {
-        switch self {
-        case .pin, .placeholder:
-            nil
-        case .staticUser(let profile), .liveUser(let profile):
-            profile.displayName
-        }
-    }
-    
-    var userProfile: UserProfileProxy? {
-        switch self {
-        case .pin, .placeholder:
-            nil
-        case .staticUser(let profile), .liveUser(let profile):
-            profile
-        }
-    }
-}
-
 struct LocationMarkerView: View {
     var kind: LocationMarkerKind
-    
-    var fillColor: Color {
-        switch kind {
-        case .pin, .staticUser:
-            .compound.bgCanvasDefault
-        case .liveUser:
-            .compound.iconAccentPrimary
-        case .placeholder:
-            .compound.bgSubtleSecondary
-        }
-    }
-    
-    var externalStrokeColor: Color {
-        switch kind {
-        case .pin, .staticUser:
-            .compound.iconSecondaryAlpha
-        case .liveUser:
-            .compound.iconAccentPrimary
-        case .placeholder:
-            .compound.iconDisabled
-        }
-    }
-    
-    var internalStrokeColor: Color {
-        switch kind {
-        case .pin, .staticUser:
-            .compound.iconSecondaryAlpha
-        case .liveUser:
-            .compound.bgCanvasDefault
-        case .placeholder:
-            .compound.iconDisabled
-        }
-    }
-    
-    var dotColor: Color {
-        switch kind {
-        case .placeholder:
-            .compound.iconDisabled
-        default:
-            .compound.iconPrimary
-        }
-    }
-    
     @ScaledMetric var size: CGFloat = 42
     var mediaProvider: MediaProviderProtocol?
 
-    private let circleCenter = CGPoint(x: 21, y: 21) // in SVG space
-    private let circleRadius: CGFloat = 6 // in SVG space
-    
     var body: some View {
         // Generated from the SVG
         Canvas { context, canvasSize in
@@ -163,6 +83,51 @@ struct LocationMarkerView: View {
             dimensions[.bottom]
         }
     }
+    
+    private let circleCenter = CGPoint(x: 21, y: 21) // in SVG space
+    private let circleRadius: CGFloat = 6 // in SVG space
+    
+    private var fillColor: Color {
+        switch kind {
+        case .pin, .staticUser:
+            .compound.bgCanvasDefault
+        case .liveUser:
+            .compound.iconAccentPrimary
+        case .placeholder:
+            .compound.bgSubtleSecondary
+        }
+    }
+    
+    private var externalStrokeColor: Color {
+        switch kind {
+        case .pin, .staticUser:
+            .compound.iconSecondaryAlpha
+        case .liveUser:
+            .compound.iconAccentPrimary
+        case .placeholder:
+            .compound.iconDisabled
+        }
+    }
+    
+    private var internalStrokeColor: Color {
+        switch kind {
+        case .pin, .staticUser:
+            .compound.iconSecondaryAlpha
+        case .liveUser:
+            .compound.bgCanvasDefault
+        case .placeholder:
+            .compound.iconDisabled
+        }
+    }
+    
+    private var dotColor: Color {
+        switch kind {
+        case .placeholder:
+            .compound.iconDisabled
+        default:
+            .compound.iconPrimary
+        }
+    }
 }
 
 struct LocationMarkerView_Previews: PreviewProvider, TestablePreview {

ElementX/Sources/Screens/LocationSharing/LocationSharingScreenModels.swift

@@ -34,6 +34,7 @@ struct LocationSharingScreenViewState: BindableState {
         self.mapURLBuilder = mapURLBuilder
         self.showLiveLocationSharingButton = showLiveLocationSharingButton
         self.ownUserID = ownUserID
+        
         userProfile = switch interactionMode {
         case .viewStatic(let locationData):
             .init(sender: locationData.sender)
@@ -51,6 +52,7 @@ struct LocationSharingScreenViewState: BindableState {
     let mapURLBuilder: MapTilerURLBuilderProtocol
     let showLiveLocationSharingButton: Bool
     let ownUserID: String
+    var userProfile: UserProfileProxy
 
     var isOwnUser: Bool {
         userProfile.userID == ownUserID
@@ -101,8 +103,6 @@ struct LocationSharingScreenViewState: BindableState {
         }
     }
 
-    var userProfile: UserProfileProxy
-    
     var locationMarkerKind: LocationMarkerKind {
         switch interactionMode {
         case .picker:
@@ -170,3 +170,37 @@ extension AlertInfo where T == LocationSharingViewError {
         }
     }
 }
+
+enum LocationMarkerKind {
+    case pin
+    case staticUser(UserProfileProxy)
+    case liveUser(UserProfileProxy)
+    case placeholder
+    
+    var id: String {
+        switch self {
+        case .pin, .placeholder:
+            UUID().uuidString
+        case .staticUser(let profile), .liveUser(let profile):
+            profile.userID
+        }
+    }
+    
+    var displayName: String? {
+        switch self {
+        case .pin, .placeholder:
+            nil
+        case .staticUser(let profile), .liveUser(let profile):
+            profile.displayName
+        }
+    }
+    
+    var userProfile: UserProfileProxy? {
+        switch self {
+        case .pin, .placeholder:
+            nil
+        case .staticUser(let profile), .liveUser(let profile):
+            profile
+        }
+    }
+}

ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift

@@ -272,8 +272,7 @@ private extension EventBasedTimelineItemProtocol {
                 properties.replyDetails != nil ||
                 properties.isThreaded ? defaultInsets : .zero
         case let liveLocationTimelineItem as LiveLocationRoomTimelineItem:
-            return liveLocationTimelineItem.content.lastLocation?.geoURI == nil ||
-                properties.replyDetails != nil ||
+            return properties.replyDetails != nil ||
                 properties.isThreaded ? defaultInsets : .zero
         default:
             return defaultInsets

ElementX/Sources/Screens/Timeline/View/Style/TimelineItemSendInfoLabel.swift

@@ -193,14 +193,10 @@ private extension TimelineItemSendInfo {
 
 private extension LiveLocationRoomTimelineItem {
     var layout: TimelineItemSendInfo.LayoutType {
-        if content.lastLocation != nil {
-            if content.isLive, isOutgoing {
-                .hidden
-            } else {
-                .overlay(capsuleStyle: true)
-            }
+        if content.isLive, isOutgoing {
+            .hidden
         } else {
-            .horizontal()
+            .overlay(capsuleStyle: true)
         }
     }
 }