add conflict label

yar1vn · Feb 5, 2020 · e8ee24f · e8ee24f
1 parent e18e157
commit e8ee24f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Upcoming Events/App/Base.lproj/Main.storyboard b/Upcoming Events/App/Base.lproj/Main.storyboard
@@ -46,7 +46,7 @@
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="Tzn-sw-4Pr" userLabel="Details Stack View">
                                                     <rect key="frame" x="60" y="5.5" width="126.5" height="51.5"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Evening Picnic" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aqu-RP-rah">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" text="Evening Picnic" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aqu-RP-rah">
                                                             <rect key="frame" x="0.0" y="0.0" width="126.5" height="24"/>
                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                                             <nil key="textColor"/>

diff --git a/Upcoming Events/App/View Model/EventsViewModel.swift b/Upcoming Events/App/View Model/EventsViewModel.swift
@@ -26,7 +26,9 @@ struct EventViewModel {
     var title: String { model.title }
     var month: String { Self.monthFormatter.string(from: model.startDate).uppercased() }
     var day: String { "\(Calendar.current.component(.day, from: model.startDate))" }
-    var date: String { Self.dateFormatter.string(from: model.startDate, to: model.endDate) }
+    var date: String { Self.dateFormatter.string(from: model.startDate, to: model.endDate) + conflict }
+    var conflict: String { isConflicted ? "❗️" : "" }
+
     private(set) var isConflicted: Bool = false
     fileprivate let model: Event