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

split BlackList

Browse Source
This commit is contained in:
nixzhu
2015-11-04 17:42:03 +08:00
parent bfe1ad0ffd
commit 00e673d89f
3 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep.xcodeproj/project.pbxproj
+4
View File
@@ -256,6 +256,7 @@
50DEE04B1BEA071100015741 /* OAuth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04A1BEA071100015741 /* OAuth.storyboard */; };
50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */; };
50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04E1BEA092100015741 /* EditProfile.storyboard */; };
50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0501BEA09DD00015741 /* BlackList.storyboard */; };
50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; };
50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; };
50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; };
@@ -583,6 +584,7 @@
50DEE04A1BEA071100015741 /* OAuth.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OAuth.storyboard; path = ViewControllers/OAuth/OAuth.storyboard; sourceTree = "<group>"; };
50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditNicknameAndBadge.storyboard; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard; sourceTree = "<group>"; };
50DEE04E1BEA092100015741 /* EditProfile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditProfile.storyboard; path = ViewControllers/EditProfile/EditProfile.storyboard; sourceTree = "<group>"; };
50DEE0501BEA09DD00015741 /* BlackList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BlackList.storyboard; path = ViewControllers/BlackList/BlackList.storyboard; sourceTree = "<group>"; };
50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = "<group>"; };
50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = "<group>"; };
50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = "<group>"; };
@@ -1363,6 +1365,7 @@
isa = PBXGroup;
children = (
503ED2391B8ADCE70072187D /* BlackListViewController.swift */,
50DEE0501BEA09DD00015741 /* BlackList.storyboard */,
);
name = BlackList;
sourceTree = "<group>";
@@ -2277,6 +2280,7 @@
50DEE0431BE8B3CD00015741 /* Feedback.storyboard in Resources */,
508F8FC91B0161EF00461B0B /* ProfileSeparationLineCell.xib in Resources */,
5008A1931B8DB8B500E94274 /* Localizable.strings in Resources */,
50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */,
50894CF61AEA4A01000981AF /* SettingsUserCell.xib in Resources */,
6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */,
50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */,
Yep/Base.lproj/Main.storyboard
+6 -44
View File
@@ -594,7 +594,7 @@
<connections>
<outlet property="tableView" destination="Wph-To-rdc" id="oPg-I0-1HJ"/>
<segue destination="GqQ-V0-aYk" kind="show" identifier="showDoNotDisturbPeriod" id="Xrr-Gr-kjR"/>
<segue destination="QJb-lH-Xzw" kind="show" identifier="showBlackList" id="7b5-cg-kVp"/>
<segue destination="2mC-Fz-XyG" kind="show" identifier="showBlackList" id="bAw-VE-W9b"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="uH9-BS-amc" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -672,51 +672,13 @@
</objects>
<point key="canvasLocation" x="5352" y="-494"/>
</scene>
<!--Black List View Controller-->
<scene sceneID="Nh4-iA-RXh">
<!--BlackListViewController-->
<scene sceneID="3Zl-e2-cGc">
<objects>
<viewController id="QJb-lH-Xzw" customClass="BlackListViewController" customModule="Yep" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="tq8-dJ-AcZ"/>
<viewControllerLayoutGuide type="bottom" id="fNF-7l-2SE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="uhW-4e-43Y">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="aIs-4q-Red">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="dataSource" destination="QJb-lH-Xzw" id="Nzf-TH-j6n"/>
<outlet property="delegate" destination="QJb-lH-Xzw" id="rSW-gF-kl0"/>
</connections>
</tableView>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" misplaced="YES" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="mMi-L2-D7z">
<rect key="frame" x="290" y="140" width="20" height="20"/>
<animations/>
</activityIndicatorView>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="aIs-4q-Red" firstAttribute="top" secondItem="uhW-4e-43Y" secondAttribute="top" id="Xlv-pk-gRa"/>
<constraint firstItem="aIs-4q-Red" firstAttribute="leading" secondItem="uhW-4e-43Y" secondAttribute="leading" id="YvF-GI-Hal"/>
<constraint firstAttribute="bottom" secondItem="aIs-4q-Red" secondAttribute="bottom" id="aIW-Wd-JCK"/>
<constraint firstAttribute="trailing" secondItem="aIs-4q-Red" secondAttribute="trailing" id="dpf-gN-45W"/>
<constraint firstAttribute="centerX" secondItem="mMi-L2-D7z" secondAttribute="centerX" id="h4j-4t-hmX"/>
<constraint firstItem="mMi-L2-D7z" firstAttribute="top" secondItem="tq8-dJ-AcZ" secondAttribute="bottom" constant="120" id="jKZ-VD-7qo"/>
</constraints>
</view>
<connections>
<outlet property="activityIndicator" destination="mMi-L2-D7z" id="BFT-IV-ych"/>
<outlet property="blockedUsersTableView" destination="aIs-4q-Red" id="oDK-Df-Trp"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="kuH-Py-OGH" userLabel="First Responder" sceneMemberID="firstResponder"/>
<viewControllerPlaceholder storyboardName="BlackList" referencedIdentifier="BlackListViewController" id="2mC-Fz-XyG" sceneMemberID="viewController"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="1ul-c6-hUk" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5347" y="169"/>
<point key="canvasLocation" x="4904" y="-169"/>
</scene>
<!--EditProfileViewController-->
<scene sceneID="Wlt-ga-TIp">
Yep/ViewControllers/BlackList/BlackList.storyboard
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
</dependencies>
<scenes>
<!--Black List View Controller-->
<scene sceneID="hue-qV-QrE">
<objects>
<viewController storyboardIdentifier="BlackListViewController" id="lbn-k4-FDE" customClass="BlackListViewController" customModule="Yep" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="YNm-K7-xQI"/>
<viewControllerLayoutGuide type="bottom" id="DSU-Gq-5vE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="nko-4p-x37">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="0xT-am-Ydl">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="dataSource" destination="lbn-k4-FDE" id="IiS-jt-cEZ"/>
<outlet property="delegate" destination="lbn-k4-FDE" id="0LZ-dz-25B"/>
</connections>
</tableView>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="P4q-0B-nVS">
<rect key="frame" x="290" y="140" width="20" height="20"/>
</activityIndicatorView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="0xT-am-Ydl" secondAttribute="trailing" id="19S-5e-00k"/>
<constraint firstAttribute="centerX" secondItem="P4q-0B-nVS" secondAttribute="centerX" id="UoR-lS-eRr"/>
<constraint firstItem="P4q-0B-nVS" firstAttribute="top" secondItem="YNm-K7-xQI" secondAttribute="bottom" constant="120" id="WWR-9G-0Wm"/>
<constraint firstItem="0xT-am-Ydl" firstAttribute="leading" secondItem="nko-4p-x37" secondAttribute="leading" id="ZXY-qA-bYL"/>
<constraint firstAttribute="bottom" secondItem="0xT-am-Ydl" secondAttribute="bottom" id="cOD-hU-6W2"/>
<constraint firstItem="0xT-am-Ydl" firstAttribute="top" secondItem="nko-4p-x37" secondAttribute="top" id="dT9-Wu-i86"/>
</constraints>
</view>
<connections>
<outlet property="activityIndicator" destination="P4q-0B-nVS" id="b08-Yc-4NR"/>
<outlet property="blockedUsersTableView" destination="0xT-am-Ydl" id="vz6-1v-l20"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="2Pk-qA-k1c" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5347" y="169"/>
</scene>
</scenes>
</document>