home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-23 03:36:34 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/CatchChat/Yep into develop

Browse Source 
Conflicts:
	Yep/Info.plist
This commit is contained in:
kevinzhow
2015-09-22 21:07:39 +08:00
parent 1e5b2a8365 449b9628e4
commit 1bd7e5e3a2
57 changed files with 398 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Podfile.lock
+1 -1
View File
@@ -71,7 +71,7 @@ DEPENDENCIES:
EXTERNAL SOURCES:
MZFayeClient:
:path: "../CatchLib-iOS/MZFayeClient/"
:path: ../CatchLib-iOS/MZFayeClient/
Realm:
:branch: swift-2.0
:git: https://github.com/realm/realm-cocoa.git
Yep/AppDelegate.swift
+6 -6
View File
@@ -304,19 +304,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}()
let textAttributes = [
NSForegroundColorAttributeName: UIColor.yepTintColor(),
NSForegroundColorAttributeName: UIColor.yepNavgationBarTitleColor(),
NSShadowAttributeName: shadow,
NSFontAttributeName: UIFont.navigationBarTitleFont()
]
let barButtonTextAttributes = [
NSForegroundColorAttributeName: UIColor.yepTintColor(),
NSFontAttributeName: UIFont.barButtonFont()
]
// let barButtonTextAttributes = [
// NSForegroundColorAttributeName: UIColor.yepTintColor(),
// NSFontAttributeName: UIFont.barButtonFont()
// ]
UINavigationBar.appearance().titleTextAttributes = textAttributes
UINavigationBar.appearance().barTintColor = UIColor.whiteColor()
UIBarButtonItem.appearance().setTitleTextAttributes(barButtonTextAttributes, forState: UIControlState.Normal)
//UIBarButtonItem.appearance().setTitleTextAttributes(barButtonTextAttributes, forState: UIControlState.Normal)
//UINavigationBar.appearance().setBackgroundImage(UIImage(named:"white"), forBarMetrics: .Default)
//UINavigationBar.appearance().shadowImage = UIImage()
//UINavigationBar.appearance().translucent = false
Yep/Base.lproj/Intro.storyboard
+22 -21
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
</dependencies>
@@ -113,7 +114,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What's your name?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pw6-yh-kid">
<rect key="frame" x="223" y="124" width="154" height="21"/>
<rect key="frame" x="223" y="124" width="153.5" height="21"/>
<animations/>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
<nil key="highlightedColor"/>
@@ -132,13 +133,13 @@
<rect key="frame" x="0.0" y="145" width="600" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="By tap Next you agree to our terms." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h5A-MY-QLR">
<rect key="frame" x="163" y="14" width="274" height="21"/>
<rect key="frame" x="164.5" y="14.5" width="271.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="centerY" secondItem="h5A-MY-QLR" secondAttribute="centerY" id="twk-Oz-6CQ"/>
<constraint firstAttribute="centerX" secondItem="h5A-MY-QLR" secondAttribute="centerX" id="xeW-Fb-QfO"/>
@@ -185,13 +186,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You mobile number?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i8w-Yk-LWX">
<rect key="frame" x="218" y="124" width="165" height="21"/>
<rect key="frame" x="218.5" y="124" width="164.5" height="21"/>
<animations/>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rD8-Pa-pw2" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="195" width="60" height="60"/>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rD8-Pa-pw2" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="195" width="77" height="60"/>
<animations/>
<constraints>
<constraint firstAttribute="height" constant="60" id="Uzt-dE-3IR"/>
@@ -209,8 +210,8 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BMl-2s-Pwj" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="60" y="195" width="540" height="60"/>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BMl-2s-Pwj" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="77" y="195" width="523" height="60"/>
<animations/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="5y7-kD-E2s"/>
@@ -582,10 +583,10 @@
<rect key="frame" x="0.0" y="540" width="600" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ssh-a5-EGH">
<rect key="frame" x="260" y="5" width="80" height="50"/>
<rect key="frame" x="260" y="0.0" width="80" height="40"/>
<animations/>
<constraints>
<constraint firstAttribute="height" constant="50" id="oNI-Fk-e5A"/>
<constraint firstAttribute="height" constant="40" id="oNI-Fk-e5A"/>
</constraints>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
<inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -598,10 +599,10 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AY6-Bh-fXh">
<rect key="frame" x="273" y="5" width="54" height="50"/>
<rect key="frame" x="273" y="0.0" width="54" height="40"/>
<animations/>
<constraints>
<constraint firstAttribute="height" constant="50" id="Z7e-qU-8v2"/>
<constraint firstAttribute="height" constant="40" id="Z7e-qU-8v2"/>
</constraints>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
<inset key="contentEdgeInsets" minX="6" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -620,8 +621,8 @@
<constraint firstAttribute="centerX" secondItem="AY6-Bh-fXh" secondAttribute="centerX" id="Trr-6g-2dt"/>
<constraint firstAttribute="centerX" secondItem="Ssh-a5-EGH" secondAttribute="centerX" id="cON-1Z-JBr"/>
<constraint firstAttribute="height" constant="60" id="jdB-3f-yEa"/>
<constraint firstAttribute="centerY" secondItem="AY6-Bh-fXh" secondAttribute="centerY" id="l6a-zv-aRm"/>
<constraint firstAttribute="centerY" secondItem="Ssh-a5-EGH" secondAttribute="centerY" id="lc2-tG-IwL"/>
<constraint firstItem="Ssh-a5-EGH" firstAttribute="top" secondItem="VwP-wh-PsD" secondAttribute="top" id="m6P-lJ-RxV"/>
<constraint firstItem="AY6-Bh-fXh" firstAttribute="top" secondItem="Ssh-a5-EGH" secondAttribute="top" id="uxf-df-QXa"/>
</constraints>
</view>
</subviews>
@@ -689,13 +690,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You mobile number?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kW8-kQ-Gt5">
<rect key="frame" x="218" y="124" width="165" height="21"/>
<rect key="frame" x="218.5" y="124" width="164.5" height="21"/>
<animations/>
<fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lCp-RT-8MI" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="195" width="60" height="60"/>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lCp-RT-8MI" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="195" width="77" height="60"/>
<animations/>
<constraints>
<constraint firstAttribute="height" constant="60" id="LIQ-lH-fzY"/>
@@ -717,8 +718,8 @@
<color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FGO-sg-N4b" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="60" y="195" width="540" height="60"/>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FGO-sg-N4b" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="77" y="195" width="523" height="60"/>
<animations/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="U4j-Tg-Ig3"/>
Yep/Base.lproj/Main.storyboard
+29 -21
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
@@ -77,7 +78,7 @@
<rect key="frame" x="0.0" y="270" width="600" height="100"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swipe Up to Cancel" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zew-F7-znc">
<rect key="frame" x="235.5" y="62" width="129.5" height="18"/>
<rect key="frame" x="234" y="62" width="132.5" height="18"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="15"/>
<color key="textColor" red="1" green="0.0" blue="0.23529411764705882" alpha="1" colorSpace="calibratedRGB"/>
@@ -122,7 +123,7 @@
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="213.5" y="20" width="173" height="260"/>
<rect key="frame" x="213" y="20" width="173" height="260"/>
<animations/>
<state key="normal">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -133,7 +134,7 @@
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hg3-Ss-sqD" userLabel="Add Location Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="406.5" y="20" width="173.5" height="260"/>
<rect key="frame" x="406" y="20" width="173.5" height="260"/>
<animations/>
<state key="normal">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -899,18 +900,18 @@
</connections>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_profile_phone" translatesAutoresizingMaskIntoConstraints="NO" id="xcV-T4-317" userLabel="Phone Image View">
<rect key="frame" x="229" y="178" width="16" height="24"/>
<rect key="frame" x="227" y="178" width="16" height="24"/>
<animations/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="186-0235-4812" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bhV-NM-wXG" userLabel="Mobile Label">
<rect key="frame" x="253" y="180" width="119" height="21"/>
<rect key="frame" x="251" y="180.5" width="123" height="20.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zc6-4l-BNt" userLabel="Helper View">
<rect key="frame" x="229" y="175" width="143" height="30"/>
<rect key="frame" x="227" y="175" width="147" height="30"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
@@ -1046,7 +1047,7 @@
</connections>
</button>
<pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hap-y9-JVX">
<rect key="frame" x="0.0" y="389" width="600" height="162"/>
<rect key="frame" x="0.0" y="335" width="600" height="216"/>
<animations/>
<connections>
<outlet property="dataSource" destination="GqQ-V0-aYk" id="ruH-BN-Hig"/>
@@ -1148,19 +1149,19 @@
<rect key="frame" x="240" y="84" width="120" height="120"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Yep" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0gW-5K-DQz">
<rect key="frame" x="276" y="223" width="49" height="36"/>
<rect key="frame" x="275.5" y="223" width="50" height="36"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="102-IE-TP0">
<rect key="frame" x="264" y="267" width="71.5" height="17"/>
<rect key="frame" x="264.5" y="267" width="70.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2015 Catch Inc." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6nN-bl-dxT">
<rect key="frame" x="224" y="577" width="151" height="14.5"/>
<rect key="frame" x="220" y="577" width="159" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="12"/>
<color key="textColor" red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@@ -1207,11 +1208,14 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PodCell" textLabel="C1J-Nr-hJu" style="IBUITableViewCellStyleDefault" id="IC9-zO-JHD">
<rect key="frame" x="0.0" y="86" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IC9-zO-JHD" id="S8x-8A-E2F">
<rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C1J-Nr-hJu">
<rect key="frame" x="15" y="0.0" width="550" height="43.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -1250,7 +1254,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ" customClass="FeedbackTextView" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="164.5" width="600" height="121.5"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1293,8 +1297,10 @@
<tableViewSection id="TBf-1w-J6s">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="60" id="hf0-DA-HE1">
<rect key="frame" x="0.0" y="99" width="600" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hf0-DA-HE1" id="M5n-HW-GKn">
<rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="NIX" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="QU0-LQ-GUp">
@@ -1320,8 +1326,10 @@
<tableViewSection id="Osi-AX-ugj">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="250" id="rCs-Rg-jvK">
<rect key="frame" x="0.0" y="179" width="600" height="250"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rCs-Rg-jvK" id="Q18-jR-H2H">
<rect key="frame" x="0.0" y="0.0" width="600" height="249.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="enabled_badge_background" translatesAutoresizingMaskIntoConstraints="NO" id="bd9-dd-MZA" userLabel="Badge Enabled Image View">
@@ -1755,7 +1763,7 @@
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<view key="tableHeaderView" hidden="YES" contentMode="scaleToFill" id="TOk-uh-YYP">
<rect key="frame" x="0.0" y="0.0" width="600" height="230"/>
<rect key="frame" x="0.0" y="64" width="600" height="230"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="YwC-QR-xbE" userLabel="Avatar Image View">
@@ -1767,42 +1775,42 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="264" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zm7-GR-gdk" userLabel="Followers Count Label">
<rect key="frame" x="183" y="141" width="47" height="34"/>
<rect key="frame" x="179.5" y="141" width="54.5" height="33.5"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Followers" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oJN-WT-en7" userLabel="Followers Label">
<rect key="frame" x="181" y="183" width="50" height="14"/>
<rect key="frame" x="181" y="182.5" width="50" height="13.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="465" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AYA-Wt-nJZ" userLabel="Stars Count Label">
<rect key="frame" x="277" y="141" width="47" height="34"/>
<rect key="frame" x="273" y="141" width="55" height="33.5"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stars" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cGf-Ne-05g" userLabel="Stars Label">
<rect key="frame" x="287" y="183" width="27" height="14"/>
<rect key="frame" x="287" y="182.5" width="27.5" height="13.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odP-wn-O9l" userLabel="Following Count Label">
<rect key="frame" x="388" y="141" width="16" height="34"/>
<rect key="frame" x="387.5" y="141" width="17.5" height="33.5"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Following" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hSD-4E-AKI" userLabel="Following Label">
<rect key="frame" x="371" y="183" width="50" height="14"/>
<rect key="frame" x="371" y="182.5" width="50" height="13.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -1972,7 +1980,7 @@
<image name="yep_icon_solo" width="120" height="120"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="l4P-ds-ihU"/>
<segue reference="PTw-QB-dRp"/>
<segue reference="o3b-2D-AMq"/>
<segue reference="6No-Lc-7X4"/>
</inferredMetricsTieBreakers>
Yep/Configs/YepConfig.swift
+2 -2
View File
@@ -122,7 +122,7 @@ class YepConfig {
struct SocialWorkGithub {
struct Repo {
static let leftEdgeInset: CGFloat = Ruler.iPhoneHorizontal(20, 38, 40).value
static let leftEdgeInset: CGFloat = Ruler.iPhoneHorizontal(20, 40, 40).value
static let rightEdgeInset: CGFloat = leftEdgeInset
}
}
@@ -192,7 +192,7 @@ class YepConfig {
}
struct Feedback {
static let bottomMargin: CGFloat = 20
static let bottomMargin: CGFloat = Ruler.iPhoneVertical(10, 20, 40, 40).value
}
struct Location {
Yep/Extensions/UIColor+Yep.swift
+20 -2
View File
@@ -13,6 +13,22 @@ extension UIColor {
return UIColor(red: 50/255.0, green: 167/255.0, blue: 255/255.0, alpha: 1.0)
}
class func yepNavgationBarTitleColor() -> UIColor {
return UIColor(red: 0.247, green: 0.247, blue: 0.247, alpha: 1.0)
}
class func yepViewBackgroundColor() -> UIColor {
return UIColor(red: 0.98, green: 0.98, blue: 0.98, alpha: 1.0)
}
class func yepInputTextColor() -> UIColor {
return UIColor(red: 0.557, green: 0.557, blue: 0.576, alpha: 1.0)
}
class func yepMessageToolbarSubviewBorderColor() -> UIColor {
return UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1.0)
}
class func avatarBackgroundColor() -> UIColor {
return UIColor(red: 50/255.0, green: 167/255.0, blue: 255/255.0, alpha: 0.3)
}
@@ -30,7 +46,8 @@ extension UIColor {
}
class func rightWaveColor() -> UIColor {
return UIColor(white: 0.0, alpha: 0.15)
//return UIColor(white: 0.0, alpha: 0.15)
return UIColor(red:0.176, green:0.537, blue:0.878, alpha:1)
}
class func skillMasterColor() -> UIColor {
@@ -42,7 +59,8 @@ extension UIColor {
}
class func messageToolBarHighlightColor() -> UIColor {
return UIColor.yepTintColor()
//return UIColor.yepTintColor()
return UIColor(red:0.557, green:0.557, blue:0.576, alpha:1)
}
class func messageToolBarNormalColor() -> UIColor {
Yep/Extensions/UIFont+Yep.swift
+12 -6
View File
@@ -14,26 +14,32 @@ extension UIFont {
}
class func skillTextFont() -> UIFont {
return UIFont(name: "Helvetica-Light", size: 14)!
//return UIFont(name: "Helvetica-Light", size: 14)!
return UIFont.systemFontOfSize(14)
}
class func skillTextLargeFont() -> UIFont {
return UIFont(name: "Helvetica-Light", size: 20)!
//return UIFont(name: "Helvetica-Light", size: 20)!
return UIFont.systemFontOfSize(20)
}
class func skillHomeTextLargeFont() -> UIFont {
return UIFont(name: "Helvetica-Light", size: 18)!
//return UIFont(name: "Helvetica-Light", size: 18)!
return UIFont.systemFontOfSize(18)
}
class func skillHomeButtonFont() -> UIFont {
return UIFont(name: "Helvetica-Light", size: 16)!
//return UIFont(name: "Helvetica-Light", size: 16)!
return UIFont.systemFontOfSize(16)
}
class func barButtonFont() -> UIFont {
return UIFont(name: "Helvetica-Light", size: 14)!
//return UIFont(name: "Helvetica-Light", size: 14)!
return UIFont.systemFontOfSize(14)
}
class func navigationBarTitleFont() -> UIFont {
return UIFont(name: "Helvetica-Bold", size: 15)!
//return UIFont(name: "Helvetica-Bold", size: 15)!
return UIFont.boldSystemFontOfSize(15)
}
}
Yep/Images.xcassets/Contents.json
+6
View File
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf
Vendored
BIN
View File
Binary file not shown.
Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf
Vendored
BIN
View File
Binary file not shown.
Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf
Vendored
BIN
View File
Binary file not shown.
Yep/Images.xcassets/skill_bubble_large_empty.imageset/Contents.json
Vendored
+2 -2
View File
@@ -6,10 +6,10 @@
"resizing" : {
"mode" : "3-part-horizontal",
"center" : {
"mode" : "fill",
"mode" : "tile",
"width" : 1
},
"capInsets" : {
"cap-insets" : {
"right" : 17,
"left" : 17
}
Yep/Images.xcassets/skill_bubble_large_empty.imageset/skill_bubble_large_empty.pdf
Vendored
BIN
View File
Binary file not shown.
Yep/Info.plist
+4
View File
@@ -32,7 +32,11 @@
</dict>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>97</string>
=======
<string>94</string>
>>>>>>> 449b9628e41eae4b56f54892d002e837cd0331b6
<key>Fabric</key>
<dict>
<key>APIKey</key>
Yep/ViewControllers/Base/BaseViewController.swift
+1 -1
View File
@@ -32,7 +32,7 @@ class BaseViewController: UIViewController {
navigationController.navigationBar.setBackgroundImage(nil, forBarMetrics: UIBarMetrics.Default)
let textAttributes = [
NSForegroundColorAttributeName: UIColor.yepTintColor(),
NSForegroundColorAttributeName: UIColor.yepNavgationBarTitleColor(),
NSFontAttributeName: UIFont.navigationBarTitleFont()
]
Yep/ViewControllers/Conversation/ConversationViewController.swift
+17 -3
View File
@@ -121,6 +121,7 @@ class ConversationViewController: BaseViewController {
let samplingInterval = 6
@IBOutlet weak var conversationCollectionView: UICollectionView!
let conversationCollectionViewContentInsetYOffset: CGFloat = 10
@IBOutlet weak var messageToolbar: MessageToolbar!
@IBOutlet weak var messageToolbarBottomConstraint: NSLayoutConstraint!
@@ -262,6 +263,10 @@ class ConversationViewController: BaseViewController {
conversationCollectionView.bounces = true
let tap = UITapGestureRecognizer(target: self, action: "tapToCollapseMessageToolBar:")
conversationCollectionView.addGestureRecognizer(tap)
messageToolbarBottomConstraint.constant = 0
moreMessageTypesViewHeightConstraint.constant = moreMessageTypesViewDefaultHeight
@@ -917,10 +922,12 @@ class ConversationViewController: BaseViewController {
dispatch_async(dispatch_get_main_queue()) { [weak self] in
UIView.animateWithDuration(0.2, delay: 0.1, options: UIViewAnimationOptions.CurveEaseInOut, animations: {
self?.conversationCollectionView.contentInset.top = 64
if let strongSelf = self {
strongSelf.conversationCollectionView.contentInset.top = 64 + strongSelf.conversationCollectionViewContentInsetYOffset
friendRequestViewTop.constant -= FriendRequestView.height
self?.view.layoutIfNeeded()
friendRequestViewTop.constant -= FriendRequestView.height
strongSelf.view.layoutIfNeeded()
}
}, completion: { _ in
friendRequestView.removeFromSuperview()
@@ -1022,6 +1029,9 @@ class ConversationViewController: BaseViewController {
}
private func setConversaitonCollectionViewOriginalContentInset() {
conversationCollectionView.contentInset.top = 64 + conversationCollectionViewContentInsetYOffset
setConversaitonCollectionViewContentInsetBottom(CGRectGetHeight(messageToolbar.bounds) + sectionInsetBottom)
}
@@ -1202,6 +1212,10 @@ class ConversationViewController: BaseViewController {
// MARK: Actions
func tapToCollapseMessageToolBar(sender: UITapGestureRecognizer) {
messageToolbar.state = .Default
}
func checkTypingStatus() {
typingResetDelay = typingResetDelay - 0.5
Yep/ViewControllers/Feedback/FeedbackViewController.swift
+49 -1
View File
@@ -10,6 +10,52 @@ import UIKit
import KeyboardMan
import DeviceGuru
class FeedbackTextView: UITextView {
let lineColor: UIColor = UIColor(red: 0.898, green: 0.898, blue: 0.898, alpha: 1)
let lineWidth: CGFloat = 1
lazy var topLineLayer: CAShapeLayer = {
let layer = CAShapeLayer()
layer.lineWidth = self.lineWidth
layer.strokeColor = self.lineColor.CGColor
return layer
}()
lazy var bottomLineLayer: CAShapeLayer = {
let layer = CAShapeLayer()
layer.lineWidth = self.lineWidth
layer.strokeColor = self.lineColor.CGColor
return layer
}()
override func didMoveToSuperview() {
super.didMoveToSuperview()
backgroundColor = UIColor.whiteColor()
layer.addSublayer(topLineLayer)
layer.addSublayer(bottomLineLayer)
}
override func layoutSubviews() {
super.layoutSubviews()
let topPath = UIBezierPath()
topPath.moveToPoint(CGPoint(x: 0, y: 0))
topPath.addLineToPoint(CGPoint(x: CGRectGetWidth(bounds), y: 0))
topLineLayer.path = topPath.CGPath
let bottomPath = UIBezierPath()
bottomPath.moveToPoint(CGPoint(x: 0, y: CGRectGetHeight(bounds)))
bottomPath.addLineToPoint(CGPoint(x: CGRectGetWidth(bounds), y: CGRectGetHeight(bounds)))
bottomLineLayer.path = bottomPath.CGPath
}
}
class FeedbackViewController: UIViewController {
@IBOutlet weak var promptLabel: UILabel! {
@@ -19,7 +65,7 @@ class FeedbackViewController: UIViewController {
}
}
@IBOutlet weak var feedbackTextView: UITextView! {
@IBOutlet weak var feedbackTextView: FeedbackTextView! {
didSet {
feedbackTextView.text = ""
feedbackTextView.delegate = self
@@ -46,6 +92,8 @@ class FeedbackViewController: UIViewController {
title = NSLocalizedString("Feedback", comment: "")
view.backgroundColor = UIColor.yepViewBackgroundColor()
let doneBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: self, action: "done")
navigationItem.rightBarButtonItem = doneBarButtonItem
navigationItem.rightBarButtonItem?.enabled = false
Yep/ViewControllers/Login/LoginByMobileViewController.swift
+5
View File
@@ -30,6 +30,8 @@ class LoginByMobileViewController: BaseViewController {
animatedOnNavigationBar = false
view.backgroundColor = UIColor.yepViewBackgroundColor()
navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Login", comment: ""))
navigationItem.rightBarButtonItem = nextButton
@@ -37,11 +39,14 @@ class LoginByMobileViewController: BaseViewController {
pickMobileNumberPromptLabel.text = NSLocalizedString("What's your number?", comment: "")
areaCodeTextField.text = NSTimeZone.areaCode
areaCodeTextField.backgroundColor = UIColor.whiteColor()
areaCodeTextField.delegate = self
areaCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
//mobileNumberTextField.placeholder = ""
mobileNumberTextField.backgroundColor = UIColor.whiteColor()
mobileNumberTextField.textColor = UIColor.yepInputTextColor()
mobileNumberTextField.delegate = self
mobileNumberTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
+6 -2
View File
@@ -51,16 +51,20 @@ class LoginVerifyMobileViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.yepViewBackgroundColor()
navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Login", comment: ""))
navigationItem.rightBarButtonItem = nextButton
NSNotificationCenter.defaultCenter().addObserver(self, selector: "activeAgain:", name: AppDelegate.Notification.applicationDidBecomeActive, object: nil)
verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code send to", comment: "")
verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code sent to", comment: "")
phoneNumberLabel.text = "+" + areaCode + " " + mobile
//verifyCodeTextField.placeholder = ""
verifyCodeTextField.placeholder = " "
verifyCodeTextField.backgroundColor = UIColor.whiteColor()
verifyCodeTextField.textColor = UIColor.yepInputTextColor()
verifyCodeTextField.delegate = self
verifyCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
Yep/ViewControllers/Notifications/NotificationsViewController.swift
+1 -1
View File
@@ -339,7 +339,7 @@ extension NotificationsViewController: UITableViewDataSource, UITableViewDelegat
switch indexPath.row {
case DoNotDisturbPeriodRow.Switch.rawValue:
return 44
return 60
case DoNotDisturbPeriodRow.Period.rawValue:
return 60
Yep/ViewControllers/OAuth/OAuthViewController.swift
+5 -57
View File
@@ -19,10 +19,6 @@ class OAuthViewController: BaseViewController {
@IBOutlet weak var webView: UIWebView!
@IBOutlet weak var activityIndicator: UIActivityIndicatorView!
var authenticated = false
var failedRequest: NSURLRequest!
override func viewDidLoad() {
super.viewDidLoad()
@@ -50,7 +46,6 @@ class OAuthViewController: BaseViewController {
@IBAction func fillPassword(sender: AnyObject) {
OnePasswordExtension.sharedExtension().fillItemIntoWebView(webView, forViewController: self, sender: sender, showOnlyLogins: false) { (finish, error) -> Void in
}
}
@@ -64,21 +59,14 @@ class OAuthViewController: BaseViewController {
extension OAuthViewController: UIWebViewDelegate {
func webView(webView: UIWebView, shouldStartLoadWithRequest request: NSURLRequest, navigationType: UIWebViewNavigationType) -> Bool {
let result = authenticated
println(request.URL?.description)
if let newURLString = request.URL?.description {
handleWithRequestURL(newURLString)
}
if (!authenticated) {
failedRequest = request
//NSURLConnection(request: request, delegate: self)
}
return result
return true
}
private func handleWithRequestURL(url: String) {
@@ -98,9 +86,9 @@ extension OAuthViewController: UIWebViewDelegate {
dispatch_async(dispatch_get_main_queue()) { [weak self] in
if let strongSelf = self {
strongSelf.afterOAuthAction?(socialAccount: strongSelf.socialAccount)
strongSelf.dismissViewControllerAnimated(true, completion: nil)
strongSelf.dismissViewControllerAnimated(true) {
strongSelf.afterOAuthAction?(socialAccount: strongSelf.socialAccount)
}
}
}
})
@@ -125,43 +113,3 @@ extension OAuthViewController: UIWebViewDelegate {
}
}
// MARK: NSURLConnectionDelegate
extension OAuthViewController: NSURLConnectionDelegate {
func connection(connection: NSURLConnection, willSendRequestForAuthenticationChallenge challenge: NSURLAuthenticationChallenge) {
if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
let authURL = socialAccount.authURL
if challenge.protectionSpace.host == authURL.host, let trust = challenge.protectionSpace.serverTrust {
println("OAuthViewController trusting connection to host \(challenge.protectionSpace.host)")
let credential = NSURLCredential(trust: trust)
challenge.sender?.useCredential(credential, forAuthenticationChallenge: challenge)
}
}
challenge.sender?.continueWithoutCredentialForAuthenticationChallenge(challenge)
}
}
// MARK: NSURLConnectionDataDelegate
extension OAuthViewController: NSURLConnectionDataDelegate {
func connection(connection: NSURLConnection, didReceiveResponse response: NSURLResponse) {
println("OAuthViewController didReceiveResponse")
authenticated = true
connection.cancel()
webView.loadRequest(failedRequest)
}
}
Yep/ViewControllers/Profile/ProfileViewController.swift
+5
View File
@@ -1135,6 +1135,11 @@ class ProfileViewController: UIViewController {
}
self?.updateProfileCollectionView()
// OAuth 成功后，自动跳转去显示对应的 social work
delay(1) {
self?.performSegueWithIdentifier("showSocialWork\(socialAccount)", sender: providerName)
}
}
}
}
Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift
+2
View File
@@ -116,6 +116,8 @@ class RegisterPickAvatarViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.yepViewBackgroundColor()
navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Avatar", comment: ""))
navigationItem.rightBarButtonItem = nextButton
Yep/ViewControllers/Register/RegisterPickMobileViewController.swift
+5
View File
@@ -28,6 +28,8 @@ class RegisterPickMobileViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.yepViewBackgroundColor()
navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Sign up", comment: ""))
navigationItem.rightBarButtonItem = nextButton
@@ -35,11 +37,14 @@ class RegisterPickMobileViewController: UIViewController {
pickMobileNumberPromptLabel.text = NSLocalizedString("What's your number?", comment: "")
areaCodeTextField.text = NSTimeZone.areaCode
areaCodeTextField.backgroundColor = UIColor.whiteColor()
areaCodeTextField.delegate = self
areaCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
//mobileNumberTextField.placeholder = ""
mobileNumberTextField.backgroundColor = UIColor.whiteColor()
mobileNumberTextField.textColor = UIColor.yepInputTextColor()
mobileNumberTextField.delegate = self
mobileNumberTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
Yep/ViewControllers/Register/RegisterPickNameViewController.swift
+6 -2
View File
@@ -36,13 +36,15 @@ class RegisterPickNameViewController: BaseViewController {
animatedOnNavigationBar = false
view.backgroundColor = UIColor.yepViewBackgroundColor()
navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Sign up", comment: ""))
navigationItem.rightBarButtonItem = nextButton
pickNamePromptLabel.text = NSLocalizedString("What's your name?", comment: "")
let text = NSLocalizedString("By tap Next you agree to our terms.", comment: "")
let text = NSLocalizedString("By tapping Next you agree to our terms.", comment: "")
let textAttributes: [String: AnyObject] = [
NSFontAttributeName: UIFont.systemFontOfSize(14),
NSForegroundColorAttributeName: UIColor.grayColor(),
@@ -63,7 +65,9 @@ class RegisterPickNameViewController: BaseViewController {
let tap = UITapGestureRecognizer(target: self, action: "tapTerms")
promptTermsLabel.addGestureRecognizer(tap)
//nameTextField.placeholder = ""
nameTextField.backgroundColor = UIColor.whiteColor()
nameTextField.textColor = UIColor.yepInputTextColor()
nameTextField.placeholder = " "//NSLocalizedString("Nickname", comment: "")
nameTextField.delegate = self
nameTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
Yep/ViewControllers/Register/RegisterPickSkillsLayout.swift
+3 -1
View File
@@ -7,8 +7,10 @@
//
import UIKit
import Ruler
let registerPickSkillsLayoutLeftEdgeInset: CGFloat = 20
let registerPickSkillsLayoutLeftEdgeInset: CGFloat = Ruler.iPhoneHorizontal(20, 40, 40).value
let registerPickSkillsLayoutRightEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
class RegisterPickSkillsLayout: UICollectionViewFlowLayout {
Yep/ViewControllers/Register/RegisterPickSkillsViewController.swift
+1 -1
View File
@@ -40,7 +40,7 @@ class RegisterPickSkillsViewController: BaseViewController {
}()
let sectionLeftEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
let sectionRightEdgeInset: CGFloat = 20
let sectionRightEdgeInset: CGFloat = registerPickSkillsLayoutRightEdgeInset
let sectionBottomEdgeInset: CGFloat = 50
var skillCategories: [SkillCategory]?
Yep/ViewControllers/Register/RegisterSelectSkillsLayout.swift
+1 -1
View File
@@ -10,7 +10,7 @@ import UIKit
class RegisterSelectSkillsLayout: UICollectionViewFlowLayout {
let leftEdgeInset: CGFloat = 20
let leftEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
override func layoutAttributesForElementsInRect(rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
let layoutAttributes = super.layoutAttributesForElementsInRect(rect)
Yep/ViewControllers/Register/RegisterSelectSkillsViewController.swift
+1 -1
View File
@@ -48,7 +48,7 @@ class RegisterSelectSkillsViewController: UIViewController {
let skillTextAttributes = [NSFontAttributeName: UIFont.skillTextLargeFont()]
let sectionLeftEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
let sectionRightEdgeInset: CGFloat = 20
let sectionRightEdgeInset: CGFloat = registerPickSkillsLayoutRightEdgeInset
var skillCategories = [SkillCategory]()
var skillCategoryIndex: Int = 0
Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
+6 -2
View File
@@ -51,16 +51,20 @@ class RegisterVerifyMobileViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = UIColor.yepViewBackgroundColor()
navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Sign up", comment: ""))
navigationItem.rightBarButtonItem = nextButton
NSNotificationCenter.defaultCenter().addObserver(self, selector: "activeAgain:", name: AppDelegate.Notification.applicationDidBecomeActive, object: nil)
verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code send to", comment: "")
verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code sent to", comment: "")
phoneNumberLabel.text = "+" + areaCode + " " + mobile
//verifyCodeTextField.placeholder = ""
verifyCodeTextField.placeholder = " "
verifyCodeTextField.backgroundColor = UIColor.whiteColor()
verifyCodeTextField.textColor = UIColor.yepInputTextColor()
verifyCodeTextField.delegate = self
verifyCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift
+2
View File
@@ -84,6 +84,8 @@ class SocialWorkGithubViewController: BaseViewController {
githubTableView.registerNib(UINib(nibName: githubRepoCellIdentifier, bundle: nil), forCellReuseIdentifier: githubRepoCellIdentifier)
githubTableView.rowHeight = 100
githubTableView.contentInset.bottom = YepConfig.SocialWorkGithub.Repo.rightEdgeInset - 10
if let gestures = navigationController?.view.gestureRecognizers {
for recognizer in gestures {
Yep/Views/Cells/About/AboutCell.xib
+8 -7
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,17 +11,17 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Va3-0s-Lh3">
<rect key="frame" x="139" y="11" width="42" height="21"/>
<rect key="frame" x="139" y="11" width="42" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.20000000298023224" green="0.20000000298023224" blue="0.20000000298023224" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="Ol2-AJ-ZKk" userLabel="Accessory Image View">
<rect key="frame" x="289" y="12" width="11" height="20"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="Ol2-AJ-ZKk" userLabel="Accessory Image View">
<rect key="frame" x="292" y="15.5" width="8" height="13"/>
</imageView>
</subviews>
<constraints>
@@ -37,6 +38,6 @@
</tableViewCell>
</objects>
<resources>
<image name="icon_accessory" width="11" height="20"/>
<image name="icon_accessory_mini" width="8" height="13"/>
</resources>
</document>
Yep/Views/Cells/AddFriendMore/AddFriendMoreCell.xib
+9 -8
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,17 +11,17 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="More" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rFJ-sX-tIW" userLabel="Annotation Label">
<rect key="frame" x="20" y="11" width="40" height="22"/>
<rect key="frame" x="20" y="11.5" width="41.5" height="21.5"/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="kCv-aC-1z1" userLabel="Accessory Image View">
<rect key="frame" x="289" y="12" width="11" height="20"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="kCv-aC-1z1" userLabel="Accessory Image View">
<rect key="frame" x="292" y="15.5" width="8" height="13"/>
</imageView>
</subviews>
<constraints>
@@ -38,6 +39,6 @@
</tableViewCell>
</objects>
<resources>
<image name="icon_accessory" width="11" height="20"/>
<image name="icon_accessory_mini" width="8" height="13"/>
</resources>
</document>
Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
+7 -11
View File
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ChatRightAudioCell" id="gTV-IL-0wX" customClass="ChatRightAudioCell" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="3" width="316" height="105"/>
<rect key="frame" x="0.0" y="0.0" width="316" height="105"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="316" height="105"/>
@@ -52,8 +53,8 @@
</subviews>
<animations/>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="dkr-y8-xRJ" userLabel="Dot Image View">
<rect key="frame" x="95" y="50" width="6" height="6"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="dkr-y8-xRJ" userLabel="Dot Image View">
<rect key="frame" x="95" y="50" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<animations/>
</imageView>
@@ -76,13 +77,8 @@
</collectionViewCell>
</objects>
<resources>
<image name="icon_dot_sending" width="8" height="8"/>
<image name="icon_dot_sending" width="10" height="10"/>
<image name="icon_play" width="30" height="30"/>
<image name="right_tail_bubble" width="48" height="40"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>
Yep/Views/Cells/ChatRightBase/ChatRightBaseCell.swift
+1 -1
View File
@@ -74,7 +74,7 @@ class ChatRightBaseCell: ChatBaseCell {
let animation = CABasicAnimation(keyPath: "transform.rotation.z")
animation.fromValue = 0.0
animation.toValue = 2 * M_PI
animation.duration = 3.0
animation.duration = 1.0
animation.repeatCount = MAXFLOAT
dotImageView.layer.addAnimation(animation, forKey: sendingAnimationName)
Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
+6 -10
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -20,8 +21,8 @@
<rect key="frame" x="50" y="0.0" width="151" height="121"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="C9m-E2-m8h" userLabel="Dot Image View">
<rect key="frame" x="39" y="58" width="6" height="6"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="C9m-E2-m8h" userLabel="Dot Image View">
<rect key="frame" x="39" y="58" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
@@ -37,11 +38,6 @@
</collectionViewCell>
</objects>
<resources>
<image name="icon_dot_sending" width="8" height="8"/>
<image name="icon_dot_sending" width="10" height="10"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>
Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
+7 -11
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -20,15 +21,15 @@
<rect key="frame" x="57" y="0.0" width="192" height="108"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="eTJ-7c-9qB" userLabel="Dot Image View">
<rect key="frame" x="46" y="56" width="6" height="6"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="eTJ-7c-9qB" userLabel="Dot Image View">
<rect key="frame" x="46" y="56" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LcY-WJ-YG7" userLabel="Location Name Label">
<rect key="frame" x="77" y="88" width="152" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
@@ -45,11 +46,6 @@
</collectionViewCell>
</objects>
<resources>
<image name="icon_dot_sending" width="8" height="8"/>
<image name="icon_dot_sending" width="10" height="10"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>
Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
+6 -10
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -28,8 +29,8 @@
<animations/>
<color key="tintColor" red="0.80000001192092896" green="0.40000000596046448" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="tB7-GG-3Zd" userLabel="Dot Image View">
<rect key="frame" x="310" y="62.5" width="6" height="6"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="tB7-GG-3Zd" userLabel="Dot Image View">
<rect key="frame" x="310" y="62.5" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<animations/>
</imageView>
@@ -69,11 +70,6 @@
<resources>
<image name="bubble_body" width="42" height="40"/>
<image name="bubble_right_tail" width="13" height="14"/>
<image name="icon_dot_sending" width="8" height="8"/>
<image name="icon_dot_sending" width="10" height="10"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>
Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
+6 -10
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -27,8 +28,8 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<animations/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="t6J-8M-Prm" userLabel="Dot Image View">
<rect key="frame" x="52" y="55" width="6" height="6"/>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="t6J-8M-Prm" userLabel="Dot Image View">
<rect key="frame" x="52" y="55" width="10" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<animations/>
</imageView>
@@ -48,12 +49,7 @@
</collectionViewCell>
</objects>
<resources>
<image name="icon_dot_sending" width="8" height="8"/>
<image name="icon_dot_sending" width="10" height="10"/>
<image name="icon_playvideo" width="30" height="30"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>
Yep/Views/Cells/Contacts/ContactsCell.xib
+9 -8
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15A204h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
@@ -12,7 +13,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yGz-R6-Ojm">
@@ -24,7 +25,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last seen just now" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GZ1-Eh-QgO">
<rect key="frame" x="152" y="10" width="160" height="15"/>
<rect key="frame" x="147.5" y="10.5" width="164.5" height="14.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
@@ -38,18 +39,18 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ivk-sQ-ylu">
<rect key="frame" x="85" y="9" width="39" height="17"/>
<rect key="frame" x="85" y="9" width="38.5" height="17"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" white="0.24954602940000001" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="tcJ-0E-OaK" userLabel="Badge Image View">
<rect key="frame" x="128" y="8" width="20" height="20"/>
<rect key="frame" x="127.5" y="9.5" width="16" height="16"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="20" id="13c-mN-wTw"/>
<constraint firstAttribute="height" constant="20" id="ym9-Np-uSB"/>
<constraint firstAttribute="width" constant="16" id="13c-mN-wTw"/>
<constraint firstAttribute="height" constant="16" id="ym9-Np-uSB"/>
</constraints>
</imageView>
</subviews>
Yep/Views/Cells/DoNotDisturb/DoNotDisturbPeriodCell.xib
+13 -12
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
</dependencies>
<objects>
@@ -11,39 +12,39 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="79"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="78.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Enb-xl-VLt">
<rect key="frame" x="20" y="17" width="40.5" height="21.5"/>
<rect key="frame" x="20" y="17" width="41.5" height="21.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GaZ-e1-aRj">
<rect key="frame" x="20" y="39" width="18.5" height="21.5"/>
<rect key="frame" x="20" y="39" width="19.5" height="21.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="22:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Un-Ye-CSh">
<rect key="frame" x="236" y="18" width="43" height="20.5"/>
<rect key="frame" x="236.5" y="18" width="45.5" height="20.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="07:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZm-zG-HSh">
<rect key="frame" x="236" y="39" width="43" height="20.5"/>
<rect key="frame" x="237.5" y="39" width="44.5" height="20.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="79s-Vw-btR">
<rect key="frame" x="289" y="30" width="11" height="20"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="79s-Vw-btR">
<rect key="frame" x="292" y="33.5" width="8" height="13"/>
</imageView>
</subviews>
<animations/>
@@ -72,6 +73,6 @@
</tableViewCell>
</objects>
<resources>
<image name="icon_accessory" width="11" height="20"/>
<image name="icon_accessory_mini" width="8" height="13"/>
</resources>
</document>
Yep/Views/Cells/EditProfileLessInfo/EditProfileLessInfoCell.xib
+8 -7
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15A204h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,17 +11,17 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="87.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Annotation" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0FC-Jf-4Gf" userLabel="Annotation Label">
<rect key="frame" x="20" y="33" width="84" height="22"/>
<rect key="frame" x="20" y="33.5" width="87.5" height="21.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="0NC-W7-akb" userLabel="Accessory Image View">
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="0NC-W7-akb" userLabel="Accessory Image View">
<rect key="frame" x="289" y="34" width="11" height="20"/>
<animations/>
<constraints>
@@ -33,7 +34,7 @@
<animations/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Info" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGP-fu-MyB" userLabel="Info Label">
<rect key="frame" x="114" y="33" width="129" height="22"/>
<rect key="frame" x="117.5" y="33.5" width="125.5" height="21.5"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
@@ -66,6 +67,6 @@
</objects>
<resources>
<image name="badge_heart" width="30" height="30"/>
<image name="icon_accessory" width="11" height="20"/>
<image name="icon_accessory_mini" width="8" height="13"/>
</resources>
</document>
Yep/Views/Cells/SettingsMore/SettingsMoreCell.xib
+8 -7
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,16 +11,16 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="72"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="71.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="More" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rWz-Jb-Xgj" userLabel="Annotation Label">
<rect key="frame" x="20" y="25" width="40" height="22"/>
<rect key="frame" x="20" y="25.5" width="41.5" height="21.5"/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="g81-Zw-MIi" userLabel="Accessory Image View">
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="g81-Zw-MIi" userLabel="Accessory Image View">
<rect key="frame" x="289" y="26" width="11" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Vcq-kU-dBt"/>
@@ -43,6 +44,6 @@
</tableViewCell>
</objects>
<resources>
<image name="icon_accessory" width="11" height="20"/>
<image name="icon_accessory_mini" width="8" height="13"/>
</resources>
</document>
Yep/Views/Cells/SettingsUser/SettingsUserCell.xib
+10 -9
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
</dependencies>
<objects>
@@ -11,7 +12,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="123"/>
<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="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="122.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ibs-9N-MGR" userLabel="Avatar Image View">
@@ -22,18 +23,18 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NIX" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gbe-2T-8A9" userLabel="Name Label">
<rect key="frame" x="120" y="30" width="27" height="22"/>
<rect key="frame" x="120" y="30" width="28.5" height="21.5"/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VeK-Pq-9Rc" userLabel="Intro Label">
<rect key="frame" x="120" y="60" width="29" height="15"/>
<rect key="frame" x="120" y="59.5" width="30.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="12"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="8aX-g5-iad" userLabel="Accessory Image View">
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="8aX-g5-iad" userLabel="Accessory Image View">
<rect key="frame" x="289" y="51" width="11" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="JYu-OH-0FU"/>
@@ -65,6 +66,6 @@
</tableViewCell>
</objects>
<resources>
<image name="icon_accessory" width="11" height="20"/>
<image name="icon_accessory_mini" width="8" height="13"/>
</resources>
</document>
Yep/Views/Cells/SkillCategory/SkillCategoryCell.swift
+1 -1
View File
@@ -10,7 +10,7 @@ import UIKit
class SkillCategoryCell: UICollectionViewCell {
static let skillCategoryButtonWidth: CGFloat = CGRectGetWidth(UIScreen.mainScreen().bounds) - 20 * 2
static let skillCategoryButtonWidth: CGFloat = 280//CGRectGetWidth(UIScreen.mainScreen().bounds) - 20 * 2
static let skillCategoryButtonHeight: CGFloat = 60
@IBOutlet weak var skillCategoryButton: SkillCategoryButton!
Yep/Views/ConversationMore/ConversationMoreView.swift
+3 -2
View File
@@ -122,13 +122,14 @@ class ConversationMoreColorTitleCell: UITableViewCell {
colorTitleLabel.text = NSLocalizedString("Block", comment: "")
}
colorTitleLabelTextColor = blocked ? UIColor.redColor() : UIColor.yepTintColor()
//colorTitleLabelTextColor = blocked ? UIColor.redColor() : UIColor.yepTintColor()
colorTitleLabelTextColor = UIColor.redColor()
}
}
class ConversationMoreView: UIView {
let totalHeight: CGFloat = 240
let totalHeight: CGFloat = 60 * 5
lazy var containerView: UIView = {
let view = UIView()
Yep/Views/DiscoverFilter/DiscoverFilterView.swift
+11 -13
View File
@@ -26,11 +26,9 @@ class DiscoverFilterCell: UITableViewCell {
return label
}()
lazy var checkLabel: UILabel = {
let label = UILabel()
label.text = "✓"
label.textColor = UIColor.yepTintColor()
return label
lazy var checkImageView: UIImageView = {
let imageView = UIImageView(image: UIImage(named: "icon_location_checkmark"))
return imageView
}()
var colorTitleLabelTextColor: UIColor = UIColor.yepTintColor() {
@@ -58,9 +56,9 @@ class DiscoverFilterCell: UITableViewCell {
func makeUI() {
contentView.addSubview(colorTitleLabel)
contentView.addSubview(checkLabel)
contentView.addSubview(checkImageView)
colorTitleLabel.translatesAutoresizingMaskIntoConstraints = false
checkLabel.translatesAutoresizingMaskIntoConstraints = false
checkImageView.translatesAutoresizingMaskIntoConstraints = false
let centerY = NSLayoutConstraint(item: colorTitleLabel, attribute: .CenterY, relatedBy: .Equal, toItem: contentView, attribute: .CenterY, multiplier: 1, constant: 0)
let centerX = NSLayoutConstraint(item: colorTitleLabel, attribute: .CenterX, relatedBy: .Equal, toItem: contentView, attribute: .CenterX, multiplier: 1, constant: 0)
@@ -68,10 +66,10 @@ class DiscoverFilterCell: UITableViewCell {
NSLayoutConstraint.activateConstraints([centerY, centerX])
let checkLabelCenterY = NSLayoutConstraint(item: checkLabel, attribute: .CenterY, relatedBy: .Equal, toItem: contentView, attribute: .CenterY, multiplier: 1, constant: 0)
let checkLabelTrailing = NSLayoutConstraint(item: checkLabel, attribute: .Trailing, relatedBy: .Equal, toItem: contentView, attribute: .Trailing, multiplier: 1, constant: -20)
let checkImageViewCenterY = NSLayoutConstraint(item: checkImageView, attribute: .CenterY, relatedBy: .Equal, toItem: contentView, attribute: .CenterY, multiplier: 1, constant: 0)
let checkImageViewTrailing = NSLayoutConstraint(item: checkImageView, attribute: .Trailing, relatedBy: .Equal, toItem: contentView, attribute: .Trailing, multiplier: 1, constant: -20)
NSLayoutConstraint.activateConstraints([checkLabelCenterY, checkLabelTrailing])
NSLayoutConstraint.activateConstraints([checkImageViewCenterY, checkImageViewTrailing])
}
}
@@ -269,7 +267,7 @@ extension DiscoverFilterView: UITableViewDataSource, UITableViewDelegate {
cell.colorTitleLabelTextColor = UIColor.yepTintColor()
cell.colorTitleLabelFontStyle = .Light
cell.checkLabel.hidden = !(currentDiscoveredUserSortStyle == .Distance)
cell.checkImageView.hidden = !(currentDiscoveredUserSortStyle == .Distance)
return cell
@@ -281,7 +279,7 @@ extension DiscoverFilterView: UITableViewDataSource, UITableViewDelegate {
cell.colorTitleLabelTextColor = UIColor.yepTintColor()
cell.colorTitleLabelFontStyle = .Light
cell.checkLabel.hidden = !(currentDiscoveredUserSortStyle == .LastSignIn)
cell.checkImageView.hidden = !(currentDiscoveredUserSortStyle == .LastSignIn)
return cell
@@ -293,7 +291,7 @@ extension DiscoverFilterView: UITableViewDataSource, UITableViewDelegate {
cell.colorTitleLabelTextColor = UIColor.yepTintColor()
cell.colorTitleLabelFontStyle = .Light
cell.checkLabel.hidden = !(currentDiscoveredUserSortStyle == .Default)
cell.checkImageView.hidden = !(currentDiscoveredUserSortStyle == .Default)
return cell
Yep/Views/Labels/NavigationTitleLabel.swift
+1 -1
View File
@@ -21,7 +21,7 @@ class NavigationTitleLabel: UILabel {
textAlignment = .Center
font = UIFont.navigationBarTitleFont()
textColor = UIColor.yepTintColor()
textColor = UIColor.yepNavgationBarTitleColor()
sizeToFit()
}
Yep/Views/MessageToolbar/MessageToolbar.swift
+8 -5
View File
@@ -156,7 +156,7 @@ class MessageToolbar: UIToolbar {
textView.textContainerInset = UIEdgeInsets(top: 8, left: 4, bottom: 8, right: 4)
textView.font = UIFont.systemFontOfSize(15)
textView.layer.borderWidth = 1
textView.layer.borderColor = UIColor.messageToolBarHighlightColor().CGColor
textView.layer.borderColor = UIColor.yepMessageToolbarSubviewBorderColor().CGColor
textView.layer.cornerRadius = self.normalCornerRadius
textView.delegate = self
textView.scrollEnabled = false // 重要：若没有它，换行时可能有 top inset 不正确
@@ -169,7 +169,7 @@ class MessageToolbar: UIToolbar {
button.backgroundColor = UIColor.whiteColor()
button.layer.cornerRadius = self.normalCornerRadius
button.layer.borderWidth = 1
button.layer.borderColor = UIColor.messageToolBarHighlightColor().CGColor
button.layer.borderColor = UIColor.yepMessageToolbarSubviewBorderColor().CGColor
button.tintColor = UIColor.messageToolBarHighlightColor()
button.touchesBegin = { [weak self] in
@@ -389,17 +389,20 @@ class MessageToolbar: UIToolbar {
}
func tryVoiceRecordBegin() {
voiceRecordButton.backgroundColor = UIColor.lightGrayColor()
//voiceRecordButton.backgroundColor = UIColor.lightGrayColor()
voiceRecordButton.stateTintColor = UIColor.yepTintColor()
voiceRecordBeginAction?(messageToolBar: self)
}
func tryVoiceRecordEnd() {
voiceRecordButton.backgroundColor = UIColor.whiteColor()
//voiceRecordButton.backgroundColor = UIColor.whiteColor()
voiceRecordButton.stateTintColor = UIColor.yepMessageToolbarSubviewBorderColor()
voiceRecordEndAction?(messageToolBar: self)
}
func tryVoiceRecordCancel() {
voiceRecordButton.backgroundColor = UIColor.whiteColor()
//voiceRecordButton.backgroundColor = UIColor.whiteColor()
voiceRecordButton.stateTintColor = UIColor.yepMessageToolbarSubviewBorderColor()
voiceRecordCancelAction?(messageToolBar: self)
}
Yep/Views/MessageToolbar/VoiceRecordButton.swift
+27
View File
@@ -20,24 +20,45 @@ class VoiceRecordButton: UIView {
var abort = false
var titleLabel: UILabel?
var leftVoiceImageView: UIImageView?
var rightVoiceImageView: UIImageView?
var stateTintColor: UIColor? {
willSet {
if let color = newValue {
layer.borderColor = color.CGColor
titleLabel?.textColor = color
leftVoiceImageView?.tintColor = color
rightVoiceImageView?.tintColor = color
}
}
}
override func touchesBegan(touches: Set<UITouch>, withEvent event: UIEvent?) {
super.touchesBegan(touches, withEvent: event)
abort = false
touchesBegin?()
titleLabel?.text = NSLocalizedString("Release to Send", comment: "")
}
override func touchesEnded(touches: Set<UITouch>, withEvent event: UIEvent?) {
super.touchesEnded(touches, withEvent: event)
touchesEnded?(needAbort: abort)
titleLabel?.text = NSLocalizedString("Hold for Voice", comment: "")
}
override func touchesCancelled(touches: Set<UITouch>?, withEvent event: UIEvent?) {
super.touchesCancelled(touches, withEvent: event)
touchesCancelled?()
titleLabel?.text = NSLocalizedString("Hold for Voice", comment: "")
}
override func touchesMoved(touches: Set<UITouch>, withEvent event: UIEvent?) {
@@ -66,6 +87,8 @@ class VoiceRecordButton: UIView {
titleLabel.textAlignment = .Center
titleLabel.textColor = self.tintColor
self.titleLabel = titleLabel
self.addSubview(titleLabel)
titleLabel.translatesAutoresizingMaskIntoConstraints = false
@@ -73,6 +96,8 @@ class VoiceRecordButton: UIView {
leftVoiceImageView.contentMode = .Center
leftVoiceImageView.tintColor = self.tintColor
self.leftVoiceImageView = leftVoiceImageView
self.addSubview(leftVoiceImageView)
leftVoiceImageView.translatesAutoresizingMaskIntoConstraints = false
@@ -80,6 +105,8 @@ class VoiceRecordButton: UIView {
rightVoiceImageView.contentMode = .Center
rightVoiceImageView.tintColor = self.tintColor
self.rightVoiceImageView = rightVoiceImageView
self.addSubview(rightVoiceImageView)
rightVoiceImageView.translatesAutoresizingMaskIntoConstraints = false
Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.swift
+8
View File
@@ -7,6 +7,7 @@
//
import UIKit
import Ruler
class AddSkillsReusableView: UICollectionReusableView {
@@ -17,4 +18,11 @@ class AddSkillsReusableView: UICollectionReusableView {
}
@IBOutlet weak var skillTypeLabel: UILabel!
@IBOutlet weak var skillTypeLabelLeadingConstraint: NSLayoutConstraint!
override func awakeFromNib() {
super.awakeFromNib()
skillTypeLabelLeadingConstraint.constant = registerPickSkillsLayoutLeftEdgeInset
}
}
Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.xib
+6 -4
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15A178w" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -11,10 +12,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Skill Type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zXh-oX-lPA" userLabel="Skill Type Label">
<rect key="frame" x="20" y="23" width="119" height="36"/>
<rect key="frame" x="20" y="23" width="121.5" height="36"/>
<animations/>
<fontDescription key="fontDescription" type="system" weight="light" pointSize="30"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
@@ -25,6 +26,7 @@
</constraints>
<connections>
<outlet property="skillTypeLabel" destination="zXh-oX-lPA" id="qEO-HY-0G3"/>
<outlet property="skillTypeLabelLeadingConstraint" destination="eii-nG-1pk" id="VPV-a8-3Dm"/>
</connections>
<point key="canvasLocation" x="318" y="411"/>
</collectionReusableView>
Yep/Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib
+3 -2
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Yep/Views/SkillHomeHeaderView/SkillHomeHeaderView.swift
+1 -1
View File
@@ -84,5 +84,5 @@ class SkillHomeHeaderView: UIView {
learningButton.updateHightLightBounce()
}
}
Yep/Views/SkillHomeSectionButton/SkillHomeSectionButton.swift
+2 -2
View File
@@ -61,8 +61,8 @@ class SkillHomeSectionButton: UIButton {
func createSkillHomeButtonWithText(text: String, width: CGFloat, height: CGFloat) -> SkillHomeSectionButton {
let button = UIButton(type: UIButtonType.Custom) as! SkillHomeSectionButton
let button = SkillHomeSectionButton()
button.frame = CGRectMake(0, 0, width, height)
button.setTitle(text, forState: UIControlState.Normal)
Yep/en.lproj/Localizable.strings
+4 -2
View File
@@ -66,7 +66,7 @@
/* No comment provided by engineer. */
"Build world together" = "Build world together";
"By tap Next you agree to our terms." = "By tap Next you agree to our terms.";
"By tapping Next you agree to our terms." = "By tapping Next you agree to our terms.";
/* No comment provided by engineer. */
"Call me" = "Call me";
@@ -207,7 +207,7 @@
"Hold for Voice" = "Hold for Voice";
/* No comment provided by engineer. */
"Input verification code send to" = "Input verification code send to";
"Input verification code sent to" = "Input verification code sent to";
/* No comment provided by engineer. */
"Introduce yourself here." = "Introduce yourself here.";
@@ -616,3 +616,5 @@
/* No comment provided by engineer. */
"Set username failed!" = "Set username failed!";
"Release to Send" = "Release to Send";
Yep/zh-Hans.lproj/Localizable.strings
+5 -3
View File
@@ -66,7 +66,7 @@
/* No comment provided by engineer. */
"Build world together" = "共建世界";
"By tap Next you agree to our terms." = "点击下一步表示您同意我们的条款。";
"By tapping Next you agree to our terms." = "点击下一步表示您同意我们的条款。";
/* No comment provided by engineer. */
"Call me" = "呼叫我";
@@ -203,10 +203,10 @@
"Meet with genius" = "Meet with genius";
/* No comment provided by engineer. */
"Hold for Voice" = "长按录制声音";
"Hold for Voice" = "按住 录音";
/* No comment provided by engineer. */
"Input verification code send to" = "输入收到的短信验证码";
"Input verification code sent to" = "输入收到的短信验证码";
/* No comment provided by engineer. */
"Introduce yourself here." = "此处是自我介绍";
@@ -618,3 +618,5 @@
/* No comment provided by engineer. */
"Set username failed!" = "设置用户名失败！";
"Release to Send" = "松开 发送";