From d7d8316d30dbe48e3f76dd353ca8c6763f4dbed4 Mon Sep 17 00:00:00 2001 From: Joscha <joscha@virtual-artz.de> Date: Fri, 7 Oct 2016 18:14:28 +0200 Subject: [PATCH] Highlight tapped row in InboxCell; use currentLocale on time and date strings --- .../Base.lproj/InboxTableViewCell.xib | 26 ++++++++--------- enzevalos_iphone/Base.lproj/Main.storyboard | 28 ++++++++----------- enzevalos_iphone/InboxTableViewCell.swift | 8 ++++++ enzevalos_iphone/MailObject.swift | 2 +- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/enzevalos_iphone/Base.lproj/InboxTableViewCell.xib b/enzevalos_iphone/Base.lproj/InboxTableViewCell.xib index 5c8354e2..45ccd3d4 100644 --- a/enzevalos_iphone/Base.lproj/InboxTableViewCell.xib +++ b/enzevalos_iphone/Base.lproj/InboxTableViewCell.xib @@ -54,6 +54,11 @@ <constraint firstAttribute="height" constant="0.5" id="iGw-4L-rQm"/> </constraints> </view> + <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d9Z-AX-rvb" userLabel="Second Row"> + <connections> + <action selector="secondButtonPressed:" destination="CFu-ns-kay" eventType="touchUpInside" id="bkj-Q4-ZwY"/> + </connections> + </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p7w-rZ-MsF"> <fontDescription key="fontDescription" type="system" pointSize="15"/> <color key="textColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -69,17 +74,17 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> - <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d9Z-AX-rvb" userLabel="Second Row"> - <connections> - <action selector="secondButtonPressed:" destination="CFu-ns-kay" eventType="touchUpInside" id="bkj-Q4-ZwY"/> - </connections> - </button> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Ac-fp-DaH" userLabel="Seperator"> <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.5" id="4mk-1j-mQw"/> </constraints> </view> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Woe-Z6-TzX" userLabel="First Row"> + <connections> + <action selector="firstButtonPressed:" destination="CFu-ns-kay" eventType="touchUpInside" id="YFb-kT-nNt"/> + </connections> + </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="252" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="Datum" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nu7-tF-hGe"> <fontDescription key="fontDescription" type="system" pointSize="15"/> <color key="textColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -95,11 +100,6 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Woe-Z6-TzX" userLabel="First Row"> - <connections> - <action selector="firstButtonPressed:" destination="CFu-ns-kay" eventType="touchUpInside" id="YFb-kT-nNt"/> - </connections> - </button> </subviews> <constraints> <constraint firstItem="Woe-Z6-TzX" firstAttribute="leading" secondItem="6Ac-fp-DaH" secondAttribute="trailing" constant="-498" id="1Xo-Rd-5M9"/> @@ -122,7 +122,7 @@ <constraint firstAttribute="trailingMargin" secondItem="Nu7-tF-hGe" secondAttribute="trailing" id="Iun-11-1dU"/> <constraint firstItem="6Ac-fp-DaH" firstAttribute="leading" secondItem="iQP-01-jFC" secondAttribute="leadingMargin" constant="94" id="JmJ-3n-YQE"/> <constraint firstItem="6Ac-fp-DaH" firstAttribute="leading" secondItem="XJ6-AX-Txg" secondAttribute="leading" id="K4E-pM-i1g"/> - <constraint firstAttribute="topMargin" secondItem="Woe-Z6-TzX" secondAttribute="top" id="M24-q2-8rU"/> + <constraint firstAttribute="topMargin" secondItem="Woe-Z6-TzX" secondAttribute="top" constant="8" id="M24-q2-8rU"/> <constraint firstItem="5es-fE-2Ig" firstAttribute="baseline" secondItem="aNQ-sk-gux" secondAttribute="baseline" priority="996" id="MIK-Lm-sHl"/> <constraint firstAttribute="trailingMargin" secondItem="p7w-rZ-MsF" secondAttribute="trailing" id="MU1-O9-owp"/> <constraint firstItem="p7w-rZ-MsF" firstAttribute="baseline" secondItem="aNQ-sk-gux" secondAttribute="baseline" id="PnO-9W-e9y"/> @@ -133,7 +133,7 @@ <constraint firstItem="5es-fE-2Ig" firstAttribute="top" secondItem="6Ac-fp-DaH" secondAttribute="bottom" priority="999" constant="14" id="XsK-mj-NRJ"/> <constraint firstItem="TqY-sR-0LV" firstAttribute="leading" secondItem="XJ6-AX-Txg" secondAttribute="trailing" constant="8" symbolic="YES" id="Y9Z-b9-Ca2"/> <constraint firstItem="fkg-yw-zDk" firstAttribute="leading" secondItem="ixt-EX-9TM" secondAttribute="trailing" constant="10" id="YJm-fA-Eel"/> - <constraint firstItem="d9Z-AX-rvb" firstAttribute="leading" secondItem="XJ6-AX-Txg" secondAttribute="leading" id="Z7w-xf-juK"/> + <constraint firstItem="d9Z-AX-rvb" firstAttribute="leading" secondItem="XJ6-AX-Txg" secondAttribute="leading" constant="-4" id="Z7w-xf-juK"/> <constraint firstItem="5es-fE-2Ig" firstAttribute="leading" secondItem="aNQ-sk-gux" secondAttribute="trailing" priority="750" constant="8" symbolic="YES" id="Z9J-Kl-kAw"/> <constraint firstItem="p7w-rZ-MsF" firstAttribute="centerY" secondItem="aNQ-sk-gux" secondAttribute="centerY" id="eUr-AB-yat"/> <constraint firstItem="KQh-Jo-J47" firstAttribute="top" secondItem="d9Z-AX-rvb" secondAttribute="bottom" id="fax-Ug-Gtq"/> @@ -142,7 +142,7 @@ <constraint firstItem="Nu7-tF-hGe" firstAttribute="baseline" secondItem="XJ6-AX-Txg" secondAttribute="baseline" id="lQy-MO-OWJ"/> <constraint firstItem="KQh-Jo-J47" firstAttribute="top" secondItem="aNQ-sk-gux" secondAttribute="bottom" constant="10" id="lmp-y0-nyw"/> <constraint firstItem="Nu7-tF-hGe" firstAttribute="leading" secondItem="TqY-sR-0LV" secondAttribute="trailing" constant="8" symbolic="YES" id="nQC-RK-V7a"/> - <constraint firstItem="Woe-Z6-TzX" firstAttribute="leading" secondItem="XJ6-AX-Txg" secondAttribute="leading" id="nkk-hf-1Ge"/> + <constraint firstItem="Woe-Z6-TzX" firstAttribute="leading" secondItem="XJ6-AX-Txg" secondAttribute="leading" constant="-4" id="nkk-hf-1Ge"/> <constraint firstItem="XJ6-AX-Txg" firstAttribute="top" secondItem="iQP-01-jFC" secondAttribute="topMargin" constant="6" id="nvi-xd-cL6"/> <constraint firstItem="6Ac-fp-DaH" firstAttribute="leading" secondItem="KQh-Jo-J47" secondAttribute="trailing" constant="-438" id="oKz-Cf-6UQ"/> <constraint firstItem="aNQ-sk-gux" firstAttribute="top" secondItem="6Ac-fp-DaH" secondAttribute="bottom" constant="10" id="qKv-R6-ynv"/> diff --git a/enzevalos_iphone/Base.lproj/Main.storyboard b/enzevalos_iphone/Base.lproj/Main.storyboard index c658efbf..e215bd0e 100644 --- a/enzevalos_iphone/Base.lproj/Main.storyboard +++ b/enzevalos_iphone/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Amm-QN-vA7"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Amm-QN-vA7"> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/> @@ -30,19 +30,18 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Absender" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YIc-GU-Crs"> - <frame key="frameInset" minX="58" minY="13" width="534" height="29"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" text="Absender" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YIc-GU-Crs"> <fontDescription key="fontDescription" type="system" pointSize="24"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> </subviews> <constraints> - <constraint firstItem="YIc-GU-Crs" firstAttribute="width" secondItem="Zam-cw-cBg" secondAttribute="width" constant="-66" id="Dkd-fU-UBk"/> - <constraint firstItem="YIc-GU-Crs" firstAttribute="leading" secondItem="Zam-cw-cBg" secondAttribute="leadingMargin" constant="50" id="IV6-EH-9DA"/> <constraint firstItem="Yii-bz-1Cd" firstAttribute="leading" secondItem="Zam-cw-cBg" secondAttribute="leadingMargin" constant="7" id="Lba-q3-xGX"/> <constraint firstAttribute="topMargin" secondItem="Yii-bz-1Cd" secondAttribute="top" id="Wce-le-hJx"/> - <constraint firstAttribute="topMargin" secondItem="YIc-GU-Crs" secondAttribute="top" constant="7" id="kn0-V2-c1Y"/> + <constraint firstItem="YIc-GU-Crs" firstAttribute="baseline" secondItem="Yii-bz-1Cd" secondAttribute="baseline" id="c8L-Nl-zDZ"/> + <constraint firstItem="YIc-GU-Crs" firstAttribute="leading" secondItem="Yii-bz-1Cd" secondAttribute="trailing" constant="8" symbolic="YES" id="n6y-I3-kpe"/> + <constraint firstAttribute="trailingMargin" secondItem="YIc-GU-Crs" secondAttribute="trailing" id="p0r-dn-Xyh"/> </constraints> <edgeInsets key="layoutMargins" top="20" left="8" bottom="8" right="8"/> </tableViewCellContentView> @@ -81,8 +80,7 @@ <frame key="frameInset" width="375" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Subject" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ywe-G2-0wJ"> - <frame key="frameInset" minX="15" minY="12" width="573" height="21"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ywe-G2-0wJ"> <accessibility key="accessibilityConfiguration"> <accessibilityTraits key="traits" none="YES"/> </accessibility> @@ -110,8 +108,7 @@ <frame key="frameInset" width="375" height="71"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Achtung!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7LX-pr-0Pd"> - <frame key="frameInset" minX="252" minY="11" width="97" height="20"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Achtung!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7LX-pr-0Pd"> <constraints> <constraint firstAttribute="width" constant="97" id="0iB-La-r8H"/> </constraints> @@ -119,8 +116,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Diese E-Mail könnte verändert worden sein! Bitte misstrauen Sie dem Inhalt, falls Sie ihn trotzdem lesen möchten. " textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lYr-bv-gD0"> - <frame key="frameInset" minX="64" minY="35" width="528" height="21"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Diese E-Mail könnte verändert worden sein! Bitte misstrauen Sie dem Inhalt, falls Sie ihn trotzdem lesen möchten. " textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lYr-bv-gD0"> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -168,8 +164,7 @@ <frame key="frameInset" width="375" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <stackView opaque="NO" tag="2" contentMode="scaleToFill" semanticContentAttribute="spatial" misplaced="YES" distribution="equalCentering" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="3eI-t6-Pay"> - <frame key="frameInset" minX="8" width="359" height="1001"/> + <stackView opaque="NO" tag="2" contentMode="scaleToFill" semanticContentAttribute="spatial" distribution="equalCentering" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="3eI-t6-Pay"> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I7i-jf-aSX"> <constraints> @@ -228,8 +223,7 @@ <frame key="frameInset" width="375" height="43"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Message" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="djb-A5-Dwe"> - <frame key="frameInset" minX="8" minY="12" width="584" height="24"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="djb-A5-Dwe"> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> diff --git a/enzevalos_iphone/InboxTableViewCell.swift b/enzevalos_iphone/InboxTableViewCell.swift index a4e03e9b..f78c1204 100644 --- a/enzevalos_iphone/InboxTableViewCell.swift +++ b/enzevalos_iphone/InboxTableViewCell.swift @@ -27,12 +27,14 @@ class InboxTableViewCell: UITableViewCell { @IBAction func firstButtonPressed(sender: AnyObject) { if let delegate = delegate where firstMail != nil { + firstButton.backgroundColor = UIColor(red:0.85, green:0.85, blue:0.85, alpha:1.0) delegate.callSegueFromCell(firstMail) } } @IBAction func secondButtonPressed(sender: AnyObject) { if let delegate = delegate where secondMail != nil { + secondButton.backgroundColor = UIColor(red:0.85, green:0.85, blue:0.85, alpha:1.0) delegate.callSegueFromCell(secondMail) } } @@ -42,6 +44,12 @@ class InboxTableViewCell: UITableViewCell { delegate.callSegueFromCell(enzContact) } } + + override func layoutSubviews() { + super.layoutSubviews() + firstButton.backgroundColor = UIColor.clearColor() + secondButton.backgroundColor = UIColor.clearColor() + } var enzContact: EnzevalosContact? { didSet { diff --git a/enzevalos_iphone/MailObject.swift b/enzevalos_iphone/MailObject.swift index 6cc5c514..7435d2ed 100644 --- a/enzevalos_iphone/MailObject.swift +++ b/enzevalos_iphone/MailObject.swift @@ -32,7 +32,7 @@ class Mail: Comparable { var timeString: String { var returnString = "" let dateFormatter = NSDateFormatter() - dateFormatter.locale = NSLocale(localeIdentifier: "de_DE") + dateFormatter.locale = NSLocale.currentLocale() if let mailTime = self.time { let interval = NSDate().timeIntervalSinceDate(mailTime) switch interval { -- GitLab