Commit 7f9c2f9ce5493320d7d79478ba9b3a67705724eb
1 parent
f4173d1653
Exists in
master
and in
1 other branch
Add ranking UI
Showing 13 changed files with 456 additions and 28 deletions Side-by-side Diff
- LifeLog/LifeLog.xcodeproj/project.pbxproj
- LifeLog/LifeLog/AppDelegate.m
- LifeLog/LifeLog/CollectionView.m
- LifeLog/LifeLog/CollectionView.xib
- LifeLog/LifeLog/HistoryViewController.xib
- LifeLog/LifeLog/LabelCollectionViewCell.xib
- LifeLog/LifeLog/Localizable.strings
- LifeLog/LifeLog/RankingTableViewCell.h
- LifeLog/LifeLog/RankingTableViewCell.m
- LifeLog/LifeLog/RankingTableViewCell.xib
- LifeLog/LifeLog/RankingViewController.h
- LifeLog/LifeLog/RankingViewController.m
- LifeLog/LifeLog/RankingViewController.xib
LifeLog/LifeLog.xcodeproj/project.pbxproj
| ... | ... | @@ -47,6 +47,8 @@ |
| 47 | 47 | E9373E471F3596940059355A /* AutoTransLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E461F3596940059355A /* AutoTransLabel.m */; }; |
| 48 | 48 | E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E491F35AA180059355A /* HistoryObject.m */; }; |
| 49 | 49 | E9373E4D1F361A230059355A /* HistoryGraphObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E4C1F361A230059355A /* HistoryGraphObject.m */; }; |
| 50 | + E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */; }; | |
| 51 | + E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */; }; | |
| 50 | 52 | E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E99E13AA1F336F3600C78787 /* CollectionView.m */; }; |
| 51 | 53 | E99E13AD1F336F4500C78787 /* CollectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E99E13AC1F336F4500C78787 /* CollectionView.xib */; }; |
| 52 | 54 | E99E13B11F33720600C78787 /* LabelCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */; }; |
| ... | ... | @@ -146,6 +148,9 @@ |
| 146 | 148 | E9373E491F35AA180059355A /* HistoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryObject.m; sourceTree = "<group>"; }; |
| 147 | 149 | E9373E4B1F361A230059355A /* HistoryGraphObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryGraphObject.h; sourceTree = "<group>"; }; |
| 148 | 150 | E9373E4C1F361A230059355A /* HistoryGraphObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryGraphObject.m; sourceTree = "<group>"; }; |
| 151 | + E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingTableViewCell.h; sourceTree = "<group>"; }; | |
| 152 | + E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingTableViewCell.m; sourceTree = "<group>"; }; | |
| 153 | + E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RankingTableViewCell.xib; sourceTree = "<group>"; }; | |
| 149 | 154 | E99E13A91F336F3600C78787 /* CollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionView.h; sourceTree = "<group>"; }; |
| 150 | 155 | E99E13AA1F336F3600C78787 /* CollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionView.m; sourceTree = "<group>"; }; |
| 151 | 156 | E99E13AC1F336F4500C78787 /* CollectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CollectionView.xib; sourceTree = "<group>"; }; |
| ... | ... | @@ -361,6 +366,9 @@ |
| 361 | 366 | 6E84E3B71F27A9A0001EB88E /* RankingViewController.h */, |
| 362 | 367 | 6E84E3B81F27A9A0001EB88E /* RankingViewController.m */, |
| 363 | 368 | 6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */, |
| 369 | + E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */, | |
| 370 | + E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */, | |
| 371 | + E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */, | |
| 364 | 372 | ); |
| 365 | 373 | name = Ranking; |
| 366 | 374 | sourceTree = "<group>"; |
| ... | ... | @@ -566,7 +574,7 @@ |
| 566 | 574 | 6E84E3701F27A700001EB88E = { |
| 567 | 575 | CreatedOnToolsVersion = 8.3.3; |
| 568 | 576 | DevelopmentTeam = UXU4V3VUN4; |
| 569 | - ProvisioningStyle = Manual; | |
| 577 | + ProvisioningStyle = Automatic; | |
| 570 | 578 | }; |
| 571 | 579 | 6E84E3891F27A703001EB88E = { |
| 572 | 580 | CreatedOnToolsVersion = 8.3.3; |
| ... | ... | @@ -611,6 +619,7 @@ |
| 611 | 619 | 6E84E3BB1F27A9A0001EB88E /* RankingViewController.xib in Resources */, |
| 612 | 620 | 9CA8AEEB1F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib in Resources */, |
| 613 | 621 | 6E84E3C01F27A9B1001EB88E /* SNSViewController.xib in Resources */, |
| 622 | + E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */, | |
| 614 | 623 | 6E8DA0F81F2BAC3500CCE941 /* TodayViewController.xib in Resources */, |
| 615 | 624 | 6E84E3841F27A701001EB88E /* LaunchScreen.storyboard in Resources */, |
| 616 | 625 | 6E84E3811F27A701001EB88E /* Assets.xcassets in Resources */, |
| ... | ... | @@ -698,6 +707,7 @@ |
| 698 | 707 | 9CBDA0FA1F2ECE2C0055DED1 /* BaseViewController.m in Sources */, |
| 699 | 708 | 6E8DA0F71F2BAC3400CCE941 /* TodayViewController.m in Sources */, |
| 700 | 709 | 6E7F93451F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */, |
| 710 | + E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */, | |
| 701 | 711 | 6E48AF0D1F2F9D3300C1D184 /* CustomTextField.m in Sources */, |
| 702 | 712 | E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */, |
| 703 | 713 | 6E84E3B01F27A975001EB88E /* HomeViewController.m in Sources */, |
| ... | ... | @@ -863,7 +873,8 @@ |
| 863 | 873 | baseConfigurationReference = 0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */; |
| 864 | 874 | buildSettings = { |
| 865 | 875 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 866 | - DEVELOPMENT_TEAM = UXU4V3VUN4; | |
| 876 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | |
| 877 | + DEVELOPMENT_TEAM = ""; | |
| 867 | 878 | INFOPLIST_FILE = LifeLog/Info.plist; |
| 868 | 879 | IPHONEOS_DEPLOYMENT_TARGET = 9.0; |
| 869 | 880 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; |
| ... | ... | @@ -876,8 +887,8 @@ |
| 876 | 887 | ); |
| 877 | 888 | PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog; |
| 878 | 889 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 879 | - PROVISIONING_PROFILE = "556082e4-d9c1-4ce1-bab1-13515289a7fd"; | |
| 880 | - PROVISIONING_PROFILE_SPECIFIER = Lifelog_Development; | |
| 890 | + PROVISIONING_PROFILE = ""; | |
| 891 | + PROVISIONING_PROFILE_SPECIFIER = ""; | |
| 881 | 892 | }; |
| 882 | 893 | name = Debug; |
| 883 | 894 | }; |
| ... | ... | @@ -886,8 +897,8 @@ |
| 886 | 897 | baseConfigurationReference = 4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */; |
| 887 | 898 | buildSettings = { |
| 888 | 899 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 889 | - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; | |
| 890 | - DEVELOPMENT_TEAM = UXU4V3VUN4; | |
| 900 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | |
| 901 | + DEVELOPMENT_TEAM = ""; | |
| 891 | 902 | INFOPLIST_FILE = LifeLog/Info.plist; |
| 892 | 903 | IPHONEOS_DEPLOYMENT_TARGET = 9.0; |
| 893 | 904 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; |
| ... | ... | @@ -900,8 +911,8 @@ |
| 900 | 911 | ); |
| 901 | 912 | PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog; |
| 902 | 913 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 903 | - PROVISIONING_PROFILE = "ffe70c33-5b08-4c2e-b96d-4e1bcb971ccb"; | |
| 904 | - PROVISIONING_PROFILE_SPECIFIER = Lifelog_Distribution; | |
| 914 | + PROVISIONING_PROFILE = ""; | |
| 915 | + PROVISIONING_PROFILE_SPECIFIER = ""; | |
| 905 | 916 | }; |
| 906 | 917 | name = Release; |
| 907 | 918 | }; |
LifeLog/LifeLog/AppDelegate.m
| ... | ... | @@ -88,7 +88,8 @@ |
| 88 | 88 | RankingViewController *rankingVC = [[RankingViewController alloc] initWithNibName:@"RankingViewController" bundle:nil]; |
| 89 | 89 | UINavigationController *naviRanking = [[UINavigationController alloc] initWithRootViewController:rankingVC]; |
| 90 | 90 | naviRanking.tabBarItem = [[UITabBarItem alloc] initWithTitle:NSLocalizedString(@"lifelog.tapbar.ranking", @"") image:[UIImage imageNamed:@"tapbar_ranking"] tag:3]; |
| 91 | - | |
| 91 | + naviRanking.navigationBar.hidden = YES; | |
| 92 | + | |
| 92 | 93 | MapViewController *mapVC = [[MapViewController alloc] initWithNibName:@"MapViewController" bundle:nil]; |
| 93 | 94 | UINavigationController *naviMap = [[UINavigationController alloc] initWithRootViewController:mapVC]; |
| 94 | 95 | naviMap.tabBarItem = [[UITabBarItem alloc] initWithTitle:NSLocalizedString(@"lifelog.tapbar.map", @"") image:[UIImage imageNamed:@"tapbar_map"] tag:4]; |
LifeLog/LifeLog/CollectionView.m
| ... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | - (CGSize) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { |
| 86 | - return CGSizeMake((self.frame.size.width - (_spacing * _number)) / _number, collectionView.frame.size.height); | |
| 86 | + return CGSizeMake((collectionView.frame.size.width - (_spacing * _number)) / _number, collectionView.frame.size.height); | |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { |
LifeLog/LifeLog/CollectionView.xib
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 3 | 3 | <device id="retina4_7" orientation="portrait"> |
| 4 | 4 | <adaptation id="fullscreen"/> |
| 5 | 5 | </device> |
| 6 | 6 | |
| ... | ... | @@ -19,9 +19,8 @@ |
| 19 | 19 | <rect key="frame" x="0.0" y="0.0" width="375" height="50"/> |
| 20 | 20 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 21 | 21 | <subviews> |
| 22 | - <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="ubI-h8-MKY"> | |
| 22 | + <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="ubI-h8-MKY"> | |
| 23 | 23 | <rect key="frame" x="0.0" y="0.0" width="375" height="50"/> |
| 24 | - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 25 | 24 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 26 | 25 | <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="3" minimumInteritemSpacing="0.0" id="Q46-34-Q0S"> |
| 27 | 26 | <size key="itemSize" width="50" height="50"/> |
| ... | ... | @@ -36,6 +35,12 @@ |
| 36 | 35 | </collectionView> |
| 37 | 36 | </subviews> |
| 38 | 37 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 38 | + <constraints> | |
| 39 | + <constraint firstAttribute="trailing" secondItem="ubI-h8-MKY" secondAttribute="trailing" id="2qr-KO-b6X"/> | |
| 40 | + <constraint firstItem="ubI-h8-MKY" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Ed3-m0-nTl"/> | |
| 41 | + <constraint firstAttribute="bottom" secondItem="ubI-h8-MKY" secondAttribute="bottom" id="jMb-yC-EPp"/> | |
| 42 | + <constraint firstItem="ubI-h8-MKY" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="lJg-28-TSi"/> | |
| 43 | + </constraints> | |
| 39 | 44 | <nil key="simulatedStatusBarMetrics"/> |
| 40 | 45 | <nil key="simulatedTopBarMetrics"/> |
| 41 | 46 | <nil key="simulatedBottomBarMetrics"/> |
LifeLog/LifeLog/HistoryViewController.xib
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 3 | 3 | <device id="retina4_7" orientation="portrait"> |
| 4 | 4 | <adaptation id="fullscreen"/> |
| 5 | 5 | </device> |
| 6 | 6 | |
| ... | ... | @@ -37,9 +37,8 @@ |
| 37 | 37 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="clL-JG-rbd" userLabel="ViewHeader"> |
| 38 | 38 | <rect key="frame" x="0.0" y="0.0" width="375" height="46"/> |
| 39 | 39 | <subviews> |
| 40 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="TODAY" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ht6-rd-JXF"> | |
| 40 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TODAY" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ht6-rd-JXF"> | |
| 41 | 41 | <rect key="frame" x="0.0" y="0.0" width="375" height="46"/> |
| 42 | - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 43 | 42 | <fontDescription key="fontDescription" type="system" pointSize="17"/> |
| 44 | 43 | <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 45 | 44 | <nil key="highlightedColor"/> |
| 46 | 45 | |
| 47 | 46 | |
| ... | ... | @@ -61,11 +60,15 @@ |
| 61 | 60 | </subviews> |
| 62 | 61 | <color key="backgroundColor" red="0.098039215686274508" green="0.098039215686274508" blue="0.098039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 63 | 62 | <constraints> |
| 63 | + <constraint firstAttribute="trailing" secondItem="Ht6-rd-JXF" secondAttribute="trailing" id="Fr9-Yj-q5e"/> | |
| 64 | 64 | <constraint firstItem="ytc-zM-ZGC" firstAttribute="leading" secondItem="clL-JG-rbd" secondAttribute="leading" id="LDb-Pq-Z5k"/> |
| 65 | 65 | <constraint firstAttribute="trailing" secondItem="CFx-sO-MAH" secondAttribute="trailing" id="PTh-vI-2DI"/> |
| 66 | + <constraint firstItem="Ht6-rd-JXF" firstAttribute="top" secondItem="clL-JG-rbd" secondAttribute="top" id="URG-nj-C2r"/> | |
| 66 | 67 | <constraint firstItem="CFx-sO-MAH" firstAttribute="top" secondItem="clL-JG-rbd" secondAttribute="top" id="Uxg-Wl-DlF"/> |
| 67 | 68 | <constraint firstAttribute="bottom" secondItem="CFx-sO-MAH" secondAttribute="bottom" id="X9D-m3-QXF"/> |
| 68 | 69 | <constraint firstAttribute="bottom" secondItem="ytc-zM-ZGC" secondAttribute="bottom" constant="5" id="hWb-ga-1wm"/> |
| 70 | + <constraint firstAttribute="bottom" secondItem="Ht6-rd-JXF" secondAttribute="bottom" id="iqI-Bi-QI1"/> | |
| 71 | + <constraint firstItem="Ht6-rd-JXF" firstAttribute="leading" secondItem="clL-JG-rbd" secondAttribute="leading" id="uzc-SO-7mw"/> | |
| 69 | 72 | <constraint firstItem="ytc-zM-ZGC" firstAttribute="top" secondItem="clL-JG-rbd" secondAttribute="top" constant="5" id="vFt-FE-klC"/> |
| 70 | 73 | <constraint firstAttribute="height" constant="46" id="xGd-BD-bgs"/> |
| 71 | 74 | </constraints> |
| 72 | 75 | |
| 73 | 76 | |
| ... | ... | @@ -116,17 +119,17 @@ |
| 116 | 119 | </constraints> |
| 117 | 120 | </view> |
| 118 | 121 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BVv-qD-EHM" customClass="CollectionView"> |
| 119 | - <rect key="frame" x="0.0" y="567" width="375" height="40"/> | |
| 122 | + <rect key="frame" x="0.0" y="577" width="375" height="40"/> | |
| 120 | 123 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 121 | 124 | <constraints> |
| 122 | 125 | <constraint firstAttribute="height" constant="40" id="6wc-NQ-UAH"/> |
| 123 | 126 | </constraints> |
| 124 | 127 | </view> |
| 125 | 128 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FLa-rV-Aas" userLabel="ViewContent"> |
| 126 | - <rect key="frame" x="0.0" y="151" width="375" height="411"/> | |
| 129 | + <rect key="frame" x="0.0" y="151" width="375" height="421"/> | |
| 127 | 130 | <subviews> |
| 128 | 131 | <tableView clipsSubviews="YES" alpha="0.0" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="100" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="FXQ-4O-sRc"> |
| 129 | - <rect key="frame" x="5" y="0.0" width="365" height="411"/> | |
| 132 | + <rect key="frame" x="5" y="0.0" width="365" height="421"/> | |
| 130 | 133 | <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> |
| 131 | 134 | <connections> |
| 132 | 135 | <outlet property="dataSource" destination="-1" id="GQy-lg-1Af"/> |
| ... | ... | @@ -464,7 +467,7 @@ |
| 464 | 467 | <constraint firstItem="yxY-4d-tB6" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="2" id="Jqg-nE-6dv"/> |
| 465 | 468 | <constraint firstAttribute="trailing" secondItem="BVv-qD-EHM" secondAttribute="trailing" id="MCi-Tl-hSp"/> |
| 466 | 469 | <constraint firstAttribute="trailing" secondItem="yxY-4d-tB6" secondAttribute="trailing" constant="2" id="Qs5-ky-nmB"/> |
| 467 | - <constraint firstAttribute="bottom" secondItem="BVv-qD-EHM" secondAttribute="bottom" constant="60" id="SbT-PG-8MJ"/> | |
| 470 | + <constraint firstAttribute="bottom" secondItem="BVv-qD-EHM" secondAttribute="bottom" constant="50" id="SbT-PG-8MJ"/> | |
| 468 | 471 | <constraint firstItem="BVv-qD-EHM" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="SqH-AA-Z2K"/> |
| 469 | 472 | <constraint firstItem="FLa-rV-Aas" firstAttribute="top" secondItem="yxY-4d-tB6" secondAttribute="bottom" constant="15" id="cWw-RX-1Kp"/> |
| 470 | 473 | <constraint firstItem="yxY-4d-tB6" firstAttribute="top" secondItem="Cf1-lP-zbB" secondAttribute="bottom" constant="15" id="dSN-ey-gQ7"/> |
LifeLog/LifeLog/LabelCollectionViewCell.xib
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 3 | 3 | <device id="retina4_7" orientation="portrait"> |
| 4 | 4 | <adaptation id="fullscreen"/> |
| 5 | 5 | </device> |
| 6 | 6 | |
| ... | ... | @@ -17,10 +17,10 @@ |
| 17 | 17 | <rect key="frame" x="0.0" y="0.0" width="246" height="175"/> |
| 18 | 18 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 19 | 19 | <subviews> |
| 20 | - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R7x-TO-3nQ"> | |
| 20 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="R7x-TO-3nQ"> | |
| 21 | 21 | <rect key="frame" x="0.0" y="0.0" width="246" height="175"/> |
| 22 | 22 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 23 | - <fontDescription key="fontDescription" type="system" pointSize="15"/> | |
| 23 | + <fontDescription key="fontDescription" type="system" pointSize="13"/> | |
| 24 | 24 | <nil key="textColor"/> |
| 25 | 25 | <nil key="highlightedColor"/> |
| 26 | 26 | </label> |
LifeLog/LifeLog/Localizable.strings
No preview for this file type
LifeLog/LifeLog/RankingTableViewCell.h
| 1 | +// | |
| 2 | +// RankingTableViewCell.h | |
| 3 | +// LifeLog | |
| 4 | +// | |
| 5 | +// Created by nvtu on 8/8/17. | |
| 6 | +// Copyright ยฉ 2017 PhongNV. All rights reserved. | |
| 7 | +// | |
| 8 | + | |
| 9 | +#import <UIKit/UIKit.h> | |
| 10 | + | |
| 11 | +@interface RankingTableViewCell : UITableViewCell | |
| 12 | +@property (weak, nonatomic) IBOutlet UILabel *lblIndex; | |
| 13 | +@property (weak, nonatomic) IBOutlet UILabel *lblName; | |
| 14 | +@property (weak, nonatomic) IBOutlet UILabel *lblStep; | |
| 15 | +@property (weak, nonatomic) IBOutlet UILabel *lblTime; | |
| 16 | +@property (weak, nonatomic) IBOutlet UILabel *lblDistance; | |
| 17 | + | |
| 18 | +@property (weak, nonatomic) IBOutlet UIImageView *imgAvatar; | |
| 19 | +@end |
LifeLog/LifeLog/RankingTableViewCell.m
| 1 | +// | |
| 2 | +// RankingTableViewCell.m | |
| 3 | +// LifeLog | |
| 4 | +// | |
| 5 | +// Created by nvtu on 8/8/17. | |
| 6 | +// Copyright ยฉ 2017 PhongNV. All rights reserved. | |
| 7 | +// | |
| 8 | + | |
| 9 | +#import "RankingTableViewCell.h" | |
| 10 | + | |
| 11 | +@implementation RankingTableViewCell | |
| 12 | + | |
| 13 | +- (void)awakeFromNib { | |
| 14 | + [super awakeFromNib]; | |
| 15 | + // Initialization code | |
| 16 | +} | |
| 17 | + | |
| 18 | +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { | |
| 19 | + [super setSelected:selected animated:animated]; | |
| 20 | + | |
| 21 | + // Configure the view for the selected state | |
| 22 | +} | |
| 23 | + | |
| 24 | +@end |
LifeLog/LifeLog/RankingTableViewCell.xib
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | |
| 3 | + <device id="retina4_7" orientation="portrait"> | |
| 4 | + <adaptation id="fullscreen"/> | |
| 5 | + </device> | |
| 6 | + <dependencies> | |
| 7 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/> | |
| 8 | + <capability name="Constraints to layout margins" minToolsVersion="6.0"/> | |
| 9 | + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | |
| 10 | + </dependencies> | |
| 11 | + <objects> | |
| 12 | + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | |
| 13 | + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | |
| 14 | + <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="RankCell" id="KGk-i7-Jjw" customClass="RankingTableViewCell"> | |
| 15 | + <rect key="frame" x="0.0" y="0.0" width="320" height="80"/> | |
| 16 | + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | |
| 17 | + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> | |
| 18 | + <rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/> | |
| 19 | + <autoresizingMask key="autoresizingMask"/> | |
| 20 | + <subviews> | |
| 21 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="8qq-of-Fwv"> | |
| 22 | + <rect key="frame" x="0.0" y="0.0" width="40" height="80"/> | |
| 23 | + <constraints> | |
| 24 | + <constraint firstAttribute="width" constant="40" id="9dX-af-kQI"/> | |
| 25 | + </constraints> | |
| 26 | + <fontDescription key="fontDescription" type="system" pointSize="20"/> | |
| 27 | + <nil key="textColor"/> | |
| 28 | + <nil key="highlightedColor"/> | |
| 29 | + </label> | |
| 30 | + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar_default" translatesAutoresizingMaskIntoConstraints="NO" id="1CW-Zi-SG6"> | |
| 31 | + <rect key="frame" x="48" y="15" width="50" height="50"/> | |
| 32 | + <constraints> | |
| 33 | + <constraint firstAttribute="width" constant="50" id="1kJ-7c-3b3"/> | |
| 34 | + <constraint firstAttribute="height" constant="50" id="LNu-c6-CgW"/> | |
| 35 | + </constraints> | |
| 36 | + </imageView> | |
| 37 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ใฆใผใถใผใใใใฏใใผใ " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zAG-NS-RSG"> | |
| 38 | + <rect key="frame" x="106" y="8" width="206" height="15"/> | |
| 39 | + <constraints> | |
| 40 | + <constraint firstAttribute="height" constant="15" id="RjF-Lj-HNO"/> | |
| 41 | + </constraints> | |
| 42 | + <fontDescription key="fontDescription" type="system" pointSize="12"/> | |
| 43 | + <nil key="textColor"/> | |
| 44 | + <nil key="highlightedColor"/> | |
| 45 | + </label> | |
| 46 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LgT-0e-lsD"> | |
| 47 | + <rect key="frame" x="106" y="31" width="78" height="15"/> | |
| 48 | + <constraints> | |
| 49 | + <constraint firstAttribute="height" constant="15" id="WXg-qM-mCv"/> | |
| 50 | + </constraints> | |
| 51 | + <string key="text" base64-UTF8="YES"> | |
| 52 | +MTIzNDUg5q2pAA | |
| 53 | +</string> | |
| 54 | + <fontDescription key="fontDescription" type="system" pointSize="12"/> | |
| 55 | + <nil key="textColor"/> | |
| 56 | + <nil key="highlightedColor"/> | |
| 57 | + </label> | |
| 58 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yeV-e1-xLt"> | |
| 59 | + <rect key="frame" x="194" y="28" width="78" height="15"/> | |
| 60 | + <constraints> | |
| 61 | + <constraint firstAttribute="height" constant="15" id="8uP-Oz-0UX"/> | |
| 62 | + </constraints> | |
| 63 | + <string key="text" base64-UTF8="YES"> | |
| 64 | +MTIzNDU2IGttAA | |
| 65 | +</string> | |
| 66 | + <fontDescription key="fontDescription" type="system" pointSize="12"/> | |
| 67 | + <nil key="textColor"/> | |
| 68 | + <nil key="highlightedColor"/> | |
| 69 | + </label> | |
| 70 | + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tapbar_today" translatesAutoresizingMaskIntoConstraints="NO" id="doD-2D-mUh"> | |
| 71 | + <rect key="frame" x="280" y="28" width="25" height="25"/> | |
| 72 | + <constraints> | |
| 73 | + <constraint firstAttribute="height" constant="25" id="m7H-Vi-MjX"/> | |
| 74 | + <constraint firstAttribute="width" constant="25" id="yJJ-70-k1M"/> | |
| 75 | + </constraints> | |
| 76 | + </imageView> | |
| 77 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A45-dY-zJ7"> | |
| 78 | + <rect key="frame" x="0.0" y="78" width="320" height="2"/> | |
| 79 | + <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> | |
| 80 | + <constraints> | |
| 81 | + <constraint firstAttribute="height" constant="2" id="RXE-vE-Bye"/> | |
| 82 | + </constraints> | |
| 83 | + </view> | |
| 84 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="11:22:33" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="esv-WJ-Jwb"> | |
| 85 | + <rect key="frame" x="106" y="54" width="78" height="15"/> | |
| 86 | + <constraints> | |
| 87 | + <constraint firstAttribute="height" constant="15" id="ZwB-X4-TCe"/> | |
| 88 | + </constraints> | |
| 89 | + <fontDescription key="fontDescription" type="system" pointSize="12"/> | |
| 90 | + <nil key="textColor"/> | |
| 91 | + <nil key="highlightedColor"/> | |
| 92 | + </label> | |
| 93 | + </subviews> | |
| 94 | + <constraints> | |
| 95 | + <constraint firstItem="doD-2D-mUh" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="57o-am-4IN"/> | |
| 96 | + <constraint firstItem="esv-WJ-Jwb" firstAttribute="top" secondItem="LgT-0e-lsD" secondAttribute="bottom" constant="8" id="6Bw-Lm-urU"/> | |
| 97 | + <constraint firstItem="yeV-e1-xLt" firstAttribute="leading" secondItem="LgT-0e-lsD" secondAttribute="trailing" constant="10" id="8hM-D0-kmc"/> | |
| 98 | + <constraint firstItem="LgT-0e-lsD" firstAttribute="top" secondItem="zAG-NS-RSG" secondAttribute="bottom" constant="8" id="Esk-56-nD6"/> | |
| 99 | + <constraint firstItem="zAG-NS-RSG" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" id="GMx-VQ-Jq1"/> | |
| 100 | + <constraint firstItem="doD-2D-mUh" firstAttribute="leading" secondItem="yeV-e1-xLt" secondAttribute="trailing" constant="8" id="Juh-q9-fxs"/> | |
| 101 | + <constraint firstItem="zAG-NS-RSG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="R9z-fc-ARl"/> | |
| 102 | + <constraint firstItem="esv-WJ-Jwb" firstAttribute="leading" secondItem="zAG-NS-RSG" secondAttribute="leading" id="Sfp-Ch-JEA"/> | |
| 103 | + <constraint firstItem="yeV-e1-xLt" firstAttribute="width" secondItem="LgT-0e-lsD" secondAttribute="width" id="Slm-k1-rIR"/> | |
| 104 | + <constraint firstAttribute="bottom" secondItem="8qq-of-Fwv" secondAttribute="bottom" id="VVC-Dv-8ey"/> | |