Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Commit

Permalink
Version 2.2 Pre Release
Browse files Browse the repository at this point in the history
  • Loading branch information
sunnyyoung committed May 27, 2016
1 parent c6ede6f commit 4523a57
Show file tree
Hide file tree
Showing 65 changed files with 1,356 additions and 1,906 deletions.
1,971 changes: 556 additions & 1,415 deletions Meizi.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions Meizi/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

//Set Network
[AFNetworkActivityIndicatorManager sharedManager].enabled = YES;
[SYNetworkConfig sharedInstance].baseURL = BaseURL;

//Set SVProgressHUD
[SVProgressHUD setBackgroundColor:[UIColor colorWithWhite:0.0 alpha:0.9]];
[SVProgressHUD setForegroundColor:[UIColor whiteColor]];
[SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];

return YES;
}
Expand Down
116 changes: 43 additions & 73 deletions Meizi/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="U5B-CM-xhY">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="U5B-CM-xhY">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
Expand All @@ -15,90 +15,60 @@
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="TFI-yl-2OI" kind="relationship" relationship="rootViewController" id="eRn-ii-ZrT"/>
<segue destination="t6d-45-wh4" kind="relationship" relationship="rootViewController" id="d5h-c2-8v2"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dxp-QW-9J9" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="439" y="1264"/>
</scene>
<!--妹子-->
<scene sceneID="mDm-VO-W8b">
<!--Meizi View Controller-->
<scene sceneID="rrF-fR-yE0">
<objects>
<viewController id="TFI-yl-2OI" customClass="MeiziViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="KcW-bm-hKq"/>
<viewControllerLayoutGuide type="bottom" id="4BY-Zq-Ebl"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="EAJ-Pa-pW1">
<collectionViewController id="t6d-45-wh4" customClass="MeiziViewController" sceneMemberID="viewController">
<collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" id="Ncv-sT-fv8">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="NYQ-U1-gBQ">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="1" minimumInteritemSpacing="1" id="wuM-4a-yAD">
<size key="itemSize" width="100" height="100"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MeiziCell" id="Qk5-p0-ixM" customClass="MeiziCell">
<rect key="frame" x="1" y="64" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="1" minimumInteritemSpacing="1" id="FGM-xR-vzn">
<size key="itemSize" width="100" height="100"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MeiziCell" id="m8R-Ec-LuK" customClass="MeiziCell">
<rect key="frame" x="0.0" y="64" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Hvi-5o-yFN">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="JYK-mf-e2r">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<constraints>
<constraint firstItem="JYK-mf-e2r" firstAttribute="top" secondItem="Qk5-p0-ixM" secondAttribute="top" id="69a-HY-24d"/>
<constraint firstAttribute="trailing" secondItem="JYK-mf-e2r" secondAttribute="trailing" id="Dt0-xR-FuZ"/>
<constraint firstItem="JYK-mf-e2r" firstAttribute="leading" secondItem="Qk5-p0-ixM" secondAttribute="leading" id="LlF-pU-Mzu"/>
<constraint firstAttribute="bottom" secondItem="JYK-mf-e2r" secondAttribute="bottom" id="jZb-Uh-1Ym"/>
</constraints>
<connections>
<outlet property="imageView" destination="JYK-mf-e2r" id="RsP-zZ-9tW"/>
</connections>
</collectionViewCell>
</cells>
<connections>
<outlet property="dataSource" destination="TFI-yl-2OI" id="Pa3-n3-fzM"/>
<outlet property="delegate" destination="TFI-yl-2OI" id="A8f-Wh-LH7"/>
</connections>
</collectionView>
<view alpha="0.90000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nh1-hs-Bm6" customClass="MeiziCategoryMenuView">
<rect key="frame" x="0.0" y="64" width="600" height="40"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<constraints>
<constraint firstAttribute="height" constant="40" id="gg9-fi-Kmh"/>
<constraint firstAttribute="trailing" secondItem="Hvi-5o-yFN" secondAttribute="trailing" id="eWk-51-37P"/>
<constraint firstAttribute="bottom" secondItem="Hvi-5o-yFN" secondAttribute="bottom" id="gwB-6m-1bb"/>
<constraint firstItem="Hvi-5o-yFN" firstAttribute="leading" secondItem="m8R-Ec-LuK" secondAttribute="leading" id="jkt-h6-IGe"/>
<constraint firstItem="Hvi-5o-yFN" firstAttribute="top" secondItem="m8R-Ec-LuK" secondAttribute="top" id="lej-Vv-Wxc"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="NYQ-U1-gBQ" firstAttribute="top" secondItem="EAJ-Pa-pW1" secondAttribute="top" id="6gv-pq-iaw"/>
<constraint firstAttribute="bottom" secondItem="NYQ-U1-gBQ" secondAttribute="bottom" id="9RQ-u3-7s8"/>
<constraint firstItem="nh1-hs-Bm6" firstAttribute="top" secondItem="KcW-bm-hKq" secondAttribute="bottom" id="Grm-70-Ba2"/>
<constraint firstItem="NYQ-U1-gBQ" firstAttribute="leading" secondItem="EAJ-Pa-pW1" secondAttribute="leading" id="Xjp-QJ-hvS"/>
<constraint firstItem="nh1-hs-Bm6" firstAttribute="leading" secondItem="EAJ-Pa-pW1" secondAttribute="leading" id="a9Q-y7-nBy"/>
<constraint firstAttribute="trailing" secondItem="nh1-hs-Bm6" secondAttribute="trailing" id="lai-Jy-Ncj"/>
<constraint firstAttribute="trailing" secondItem="NYQ-U1-gBQ" secondAttribute="trailing" id="uj3-kk-e4u"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="妹子" id="zx7-wY-J7Y"/>
<connections>
<outlet property="cagegoryMenu" destination="nh1-hs-Bm6" id="rvc-gM-1bY"/>
<outlet property="collectionView" destination="NYQ-U1-gBQ" id="I8x-pH-1hq"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="e9e-xA-kCM" userLabel="First Responder" sceneMemberID="firstResponder"/>
<connections>
<outlet property="imageView" destination="Hvi-5o-yFN" id="iwW-Et-89m"/>
</connections>
</collectionViewCell>
</cells>
<connections>
<outlet property="dataSource" destination="t6d-45-wh4" id="TaF-gD-y2a"/>
<outlet property="delegate" destination="t6d-45-wh4" id="QMZ-IB-ln2"/>
</connections>
</collectionView>
<navigationItem key="navigationItem" id="xnW-Id-bel"/>
</collectionViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="rid-cu-B5b" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1151" y="1264"/>
</scene>
Expand Down
43 changes: 0 additions & 43 deletions Meizi/Constant.h

This file was deleted.

33 changes: 20 additions & 13 deletions Meizi/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,79 @@
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Meizi_29pt_@2x.png",
"filename" : "Icon-29.0@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Meizi_29pt_@3x.png",
"filename" : "Icon-29.0@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Meizi_40pt@2x.png",
"filename" : "Icon-40.0@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Meizi_40pt_@3x.png",
"filename" : "Icon-40.0@3x.png",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Meizi_60pt_@2x.png",
"filename" : "Icon-60.0@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Meizi_60pt_@3x.png",
"filename" : "Icon-60.0@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Meizi/Images.xcassets/Arrow.imageset/Arrow.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions Meizi/Images.xcassets/Arrow.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Arrow.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
6 changes: 6 additions & 0 deletions Meizi/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
43 changes: 0 additions & 43 deletions Meizi/Images.xcassets/LaunchImage.launchimage/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions Meizi/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UILaunchStoryboardName</key>
<string>Launch Screen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
Expand Down
27 changes: 27 additions & 0 deletions Meizi/Launch Screen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="rnc-Hr-glj">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="hK8-22-cIs">
<objects>
<viewController id="rnc-Hr-glj" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="FMm-oZ-xad"/>
<viewControllerLayoutGuide type="bottom" id="QBi-7N-LzO"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="uPm-5T-TfA">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="lGt-eR-Khl" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="493" y="211"/>
</scene>
</scenes>
</document>
Loading

0 comments on commit 4523a57

Please sign in to comment.