diff options
-rw-r--r-- | Juick/Colors.xcassets/Title.colorset/Contents.json | 18 | ||||
-rw-r--r-- | Juick/Views/ContentLoadingCell.xib | 52 | ||||
-rw-r--r-- | Juick/Views/ConversationCell.xib | 25 |
3 files changed, 67 insertions, 28 deletions
diff --git a/Juick/Colors.xcassets/Title.colorset/Contents.json b/Juick/Colors.xcassets/Title.colorset/Contents.json index 2456f54..be55d4c 100644 --- a/Juick/Colors.xcassets/Title.colorset/Contents.json +++ b/Juick/Colors.xcassets/Title.colorset/Contents.json @@ -15,6 +15,24 @@ "green" : "0x66" } } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.765", + "alpha" : "1.000", + "blue" : "0.333", + "green" : "0.533" + } + } } ] }
\ No newline at end of file diff --git a/Juick/Views/ContentLoadingCell.xib b/Juick/Views/ContentLoadingCell.xib index e58af72..fea4046 100644 --- a/Juick/Views/ContentLoadingCell.xib +++ b/Juick/Views/ContentLoadingCell.xib @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -16,18 +15,19 @@ <rect key="frame" x="0.0" y="0.0" width="310" height="230"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> - <rect key="frame" x="0.0" y="0.0" width="310" height="229.5"/> + <rect key="frame" x="0.0" y="0.0" width="310" height="230"/> <autoresizingMask key="autoresizingMask"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" axis="vertical" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="33o-rP-dfk"> - <rect key="frame" x="24" y="12" width="262" height="205.5"/> + <rect key="frame" x="24" y="12" width="262" height="206"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="255" verticalCompressionResistancePriority="748" alignment="center" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="Bqm-4Y-1yg"> <rect key="frame" x="0.0" y="0.0" width="262" height="48"/> <subviews> <view contentMode="scaleToFill" verticalCompressionResistancePriority="748" translatesAutoresizingMaskIntoConstraints="NO" id="Xfd-wK-nGQ"> <rect key="frame" x="0.0" y="0.0" width="48" height="48"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> <constraints> <constraint firstAttribute="height" constant="48" id="gWm-7q-ure"/> <constraint firstAttribute="width" constant="48" id="paR-BH-BPq"/> @@ -35,7 +35,8 @@ </view> <view contentMode="scaleToFill" verticalCompressionResistancePriority="748" translatesAutoresizingMaskIntoConstraints="NO" id="RpL-2E-Dtt"> <rect key="frame" x="60" y="12" width="202" height="24"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> <constraints> <constraint firstAttribute="height" constant="24" id="jxf-Sb-SeH"/> </constraints> @@ -43,27 +44,32 @@ </subviews> </stackView> <stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" verticalCompressionResistancePriority="752" axis="vertical" distribution="fillEqually" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="WY4-IV-5wO"> - <rect key="frame" x="0.0" y="72" width="262" height="133.5"/> + <rect key="frame" x="0.0" y="72" width="262" height="134"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TF4-pH-jy5"> <rect key="frame" x="0.0" y="0.0" width="262" height="17"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iLC-oW-h16"> - <rect key="frame" x="0.0" y="29" width="262" height="17"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <rect key="frame" x="0.0" y="29" width="262" height="17.5"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e26-WV-V2J"> - <rect key="frame" x="0.0" y="58" width="262" height="17.5"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <rect key="frame" x="0.0" y="58.5" width="262" height="17"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5HE-g4-DHe"> - <rect key="frame" x="0.0" y="87.5" width="262" height="17"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <rect key="frame" x="0.0" y="87.5" width="262" height="17.5"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O0R-kH-hzS"> - <rect key="frame" x="0.0" y="116.5" width="262" height="17"/> - <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <rect key="frame" x="0.0" y="117" width="262" height="17"/> + <color key="backgroundColor" name="Background"/> + <color key="tintColor" name="Title"/> </view> </subviews> </stackView> @@ -81,4 +87,12 @@ <point key="canvasLocation" x="139.19999999999999" y="226.6866566716642"/> </tableViewCell> </objects> + <resources> + <namedColor name="Background"> + <color red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </namedColor> + <namedColor name="Title"> + <color red="0.76470588235294112" green="0.53333333333333333" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </namedColor> + </resources> </document> diff --git a/Juick/Views/ConversationCell.xib b/Juick/Views/ConversationCell.xib index 7ee1cfe..39121c3 100644 --- a/Juick/Views/ConversationCell.xib +++ b/Juick/Views/ConversationCell.xib @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/> + <capability name="Named colors" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -15,7 +14,7 @@ <rect key="frame" x="0.0" y="0.0" width="324" height="238"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eKX-ht-IFf" id="3NU-ng-4QM"> - <rect key="frame" x="0.0" y="0.0" width="324" height="237.5"/> + <rect key="frame" x="0.0" y="0.0" width="324" height="238"/> <autoresizingMask key="autoresizingMask"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="6O8-u9-Jvc"> @@ -32,7 +31,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="●" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jW2-kr-sJn"> - <rect key="frame" x="18.5" y="56" width="15" height="20.5"/> + <rect key="frame" x="18.5" y="56" width="15.5" height="20.5"/> <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/> <color key="textColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <nil key="highlightedColor"/> @@ -49,14 +48,14 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TTg-gl-dzG"> <rect key="frame" x="0.0" y="0.0" width="248" height="20.5"/> <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="textColor" name="Text"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EiA-lG-gV5"> <rect key="frame" x="0.0" y="26.5" width="248" height="38"/> <string key="text">Lorem sdsdasds sdsada ddas dsad asdsadas dasd asdsa sadsa dasdsad asd asdas dasd asdas dasd asdas dasdasdasd asdasdasdadasdasd asdasd asdas dasdsa dasdasdasdasdas dasdas</string> <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/> - <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="textColor" name="Muted"/> <nil key="highlightedColor"/> </label> </subviews> @@ -80,4 +79,12 @@ <point key="canvasLocation" x="-1768" y="8.995502248875562"/> </tableViewCell> </objects> + <resources> + <namedColor name="Muted"> + <color red="0.75406885150000003" green="0.75408679249999999" blue="0.75407713649999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </namedColor> + <namedColor name="Text"> + <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </namedColor> + </resources> </document> |