IOS-2064 replace flag icon asset IOS-2064
authorMartin Brude
Thu, 12 Mar 2020 10:11:02 +0100
branchIOS-2064
changeset 122179011bf6f79dd
parent 12216 575318131f4d
child 12218 dcc00fac24d5
IOS-2064 replace flag icon asset
pEpForiOS/Base.lproj/Main.storyboard
pEpForiOS/UI/EmailDisplay/EmailDetailView/EmailDetailViewModel.swift
     1.1 --- a/pEpForiOS/Base.lproj/Main.storyboard	Thu Mar 12 09:55:57 2020 +0100
     1.2 +++ b/pEpForiOS/Base.lproj/Main.storyboard	Thu Mar 12 10:11:02 2020 +0100
     1.3 @@ -212,7 +212,7 @@
     1.4                  </viewController>
     1.5                  <placeholder placeholderIdentifier="IBFirstResponder" id="m6c-dF-C80" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
     1.6              </objects>
     1.7 -            <point key="canvasLocation" x="2942" y="-1845"/>
     1.8 +            <point key="canvasLocation" x="2941.5999999999999" y="-1845.4272863568217"/>
     1.9          </scene>
    1.10          <!--Navigation Controller-->
    1.11          <scene sceneID="pH2-0g-XGV">
    1.12 @@ -440,13 +440,13 @@
    1.13                                      <autoresizingMask key="autoresizingMask"/>
    1.14                                      <subviews>
    1.15                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Sender" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hnw-Tp-mga">
    1.16 -                                            <rect key="frame" x="20" y="11" width="331" height="33.5"/>
    1.17 +                                            <rect key="frame" x="20" y="11" width="331" height="33"/>
    1.18                                              <fontDescription key="fontDescription" name="SFUIText-Regular" family="SF UI Text" pointSize="13"/>
    1.19                                              <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
    1.20                                              <nil key="highlightedColor"/>
    1.21                                          </label>
    1.22                                          <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To: Recipients" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mfx-AS-hpP">
    1.23 -                                            <rect key="frame" x="20" y="50.5" width="331" height="15.5"/>
    1.24 +                                            <rect key="frame" x="20" y="50" width="331" height="16"/>
    1.25                                              <fontDescription key="fontDescription" name="SFUIText-Regular" family="SF UI Text" pointSize="13"/>
    1.26                                              <color key="textColor" red="0.5490196078431373" green="0.5490196078431373" blue="0.5490196078431373" alpha="1" colorSpace="calibratedRGB"/>
    1.27                                              <nil key="highlightedColor"/>
    1.28 @@ -983,6 +983,6 @@
    1.29      <inferredMetricsTieBreakers>
    1.30          <segue reference="cRe-YG-393"/>
    1.31          <segue reference="CKh-jT-ski"/>
    1.32 -        <segue reference="6by-Pi-xWQ"/>
    1.33 +        <segue reference="Bs0-pZ-8nY"/>
    1.34      </inferredMetricsTieBreakers>
    1.35  </document>
     2.1 --- a/pEpForiOS/UI/EmailDisplay/EmailDetailView/EmailDetailViewModel.swift	Thu Mar 12 09:55:57 2020 +0100
     2.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailDetailView/EmailDetailViewModel.swift	Thu Mar 12 10:11:02 2020 +0100
     2.3 @@ -154,10 +154,11 @@
     2.4                  Log.shared.info("Nothing shown")
     2.5                  return nil
     2.6          }
     2.7 +        
     2.8          if msg.imapFlags.flagged {
     2.9 -            return #imageLiteral(resourceName: "icon-flagged")
    2.10 +            return UIImage(named: "pEpForiOS-icon-flagged")
    2.11          } else {
    2.12 -            return #imageLiteral(resourceName: "icon-unflagged")
    2.13 +            return UIImage(named: "pEpForiOS-icon-unflagged")
    2.14          }
    2.15      }
    2.16