diff --git a/LifeLog/LifeLog.xcodeproj/project.pbxproj b/LifeLog/LifeLog.xcodeproj/project.pbxproj index 126f88c..3fb2046 100644 --- a/LifeLog/LifeLog.xcodeproj/project.pbxproj +++ b/LifeLog/LifeLog.xcodeproj/project.pbxproj @@ -47,6 +47,8 @@ E9373E471F3596940059355A /* AutoTransLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E461F3596940059355A /* AutoTransLabel.m */; }; E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E491F35AA180059355A /* HistoryObject.m */; }; E9373E4D1F361A230059355A /* HistoryGraphObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E4C1F361A230059355A /* HistoryGraphObject.m */; }; + E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */; }; + E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */; }; E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E99E13AA1F336F3600C78787 /* CollectionView.m */; }; E99E13AD1F336F4500C78787 /* CollectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E99E13AC1F336F4500C78787 /* CollectionView.xib */; }; E99E13B11F33720600C78787 /* LabelCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */; }; @@ -146,6 +148,9 @@ E9373E491F35AA180059355A /* HistoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryObject.m; sourceTree = ""; }; E9373E4B1F361A230059355A /* HistoryGraphObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryGraphObject.h; sourceTree = ""; }; E9373E4C1F361A230059355A /* HistoryGraphObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryGraphObject.m; sourceTree = ""; }; + E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingTableViewCell.h; sourceTree = ""; }; + E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingTableViewCell.m; sourceTree = ""; }; + E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RankingTableViewCell.xib; sourceTree = ""; }; E99E13A91F336F3600C78787 /* CollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionView.h; sourceTree = ""; }; E99E13AA1F336F3600C78787 /* CollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionView.m; sourceTree = ""; }; E99E13AC1F336F4500C78787 /* CollectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CollectionView.xib; sourceTree = ""; }; @@ -361,6 +366,9 @@ 6E84E3B71F27A9A0001EB88E /* RankingViewController.h */, 6E84E3B81F27A9A0001EB88E /* RankingViewController.m */, 6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */, + E9682E2B1F39675A00FE05A2 /* RankingTableViewCell.h */, + E9682E2C1F39675A00FE05A2 /* RankingTableViewCell.m */, + E9682E2D1F39675A00FE05A2 /* RankingTableViewCell.xib */, ); name = Ranking; sourceTree = ""; @@ -566,7 +574,7 @@ 6E84E3701F27A700001EB88E = { CreatedOnToolsVersion = 8.3.3; DevelopmentTeam = UXU4V3VUN4; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; }; 6E84E3891F27A703001EB88E = { CreatedOnToolsVersion = 8.3.3; @@ -611,6 +619,7 @@ 6E84E3BB1F27A9A0001EB88E /* RankingViewController.xib in Resources */, 9CA8AEEB1F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib in Resources */, 6E84E3C01F27A9B1001EB88E /* SNSViewController.xib in Resources */, + E9682E2F1F39675A00FE05A2 /* RankingTableViewCell.xib in Resources */, 6E8DA0F81F2BAC3500CCE941 /* TodayViewController.xib in Resources */, 6E84E3841F27A701001EB88E /* LaunchScreen.storyboard in Resources */, 6E84E3811F27A701001EB88E /* Assets.xcassets in Resources */, @@ -698,6 +707,7 @@ 9CBDA0FA1F2ECE2C0055DED1 /* BaseViewController.m in Sources */, 6E8DA0F71F2BAC3400CCE941 /* TodayViewController.m in Sources */, 6E7F93451F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */, + E9682E2E1F39675A00FE05A2 /* RankingTableViewCell.m in Sources */, 6E48AF0D1F2F9D3300C1D184 /* CustomTextField.m in Sources */, E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */, 6E84E3B01F27A975001EB88E /* HomeViewController.m in Sources */, @@ -863,7 +873,8 @@ baseConfigurationReference = 0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = UXU4V3VUN4; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LifeLog/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -876,8 +887,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "556082e4-d9c1-4ce1-bab1-13515289a7fd"; - PROVISIONING_PROFILE_SPECIFIER = Lifelog_Development; + PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -886,8 +897,8 @@ baseConfigurationReference = 4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - DEVELOPMENT_TEAM = UXU4V3VUN4; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LifeLog/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -900,8 +911,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "ffe70c33-5b08-4c2e-b96d-4e1bcb971ccb"; - PROVISIONING_PROFILE_SPECIFIER = Lifelog_Distribution; + PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; }; diff --git a/LifeLog/LifeLog/AppDelegate.m b/LifeLog/LifeLog/AppDelegate.m index 1336688..2acab68 100644 --- a/LifeLog/LifeLog/AppDelegate.m +++ b/LifeLog/LifeLog/AppDelegate.m @@ -88,7 +88,8 @@ RankingViewController *rankingVC = [[RankingViewController alloc] initWithNibName:@"RankingViewController" bundle:nil]; UINavigationController *naviRanking = [[UINavigationController alloc] initWithRootViewController:rankingVC]; naviRanking.tabBarItem = [[UITabBarItem alloc] initWithTitle:NSLocalizedString(@"lifelog.tapbar.ranking", @"") image:[UIImage imageNamed:@"tapbar_ranking"] tag:3]; - + naviRanking.navigationBar.hidden = YES; + MapViewController *mapVC = [[MapViewController alloc] initWithNibName:@"MapViewController" bundle:nil]; UINavigationController *naviMap = [[UINavigationController alloc] initWithRootViewController:mapVC]; naviMap.tabBarItem = [[UITabBarItem alloc] initWithTitle:NSLocalizedString(@"lifelog.tapbar.map", @"") image:[UIImage imageNamed:@"tapbar_map"] tag:4]; diff --git a/LifeLog/LifeLog/CollectionView.m b/LifeLog/LifeLog/CollectionView.m index 0af1402..11a8621 100644 --- a/LifeLog/LifeLog/CollectionView.m +++ b/LifeLog/LifeLog/CollectionView.m @@ -83,7 +83,7 @@ } - (CGSize) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake((self.frame.size.width - (_spacing * _number)) / _number, collectionView.frame.size.height); + return CGSizeMake((collectionView.frame.size.width - (_spacing * _number)) / _number, collectionView.frame.size.height); } - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { diff --git a/LifeLog/LifeLog/CollectionView.xib b/LifeLog/LifeLog/CollectionView.xib index c088d70..865300f 100644 --- a/LifeLog/LifeLog/CollectionView.xib +++ b/LifeLog/LifeLog/CollectionView.xib @@ -1,5 +1,5 @@ - + @@ -19,9 +19,8 @@ - + - @@ -36,6 +35,12 @@ + + + + + + diff --git a/LifeLog/LifeLog/HistoryViewController.xib b/LifeLog/LifeLog/HistoryViewController.xib index 4b2621c..ff7b934 100644 --- a/LifeLog/LifeLog/HistoryViewController.xib +++ b/LifeLog/LifeLog/HistoryViewController.xib @@ -1,5 +1,5 @@ - + @@ -37,9 +37,8 @@ - + + + + @@ -116,17 +119,17 @@ - + - + - + @@ -464,7 +467,7 @@ - + diff --git a/LifeLog/LifeLog/LabelCollectionViewCell.xib b/LifeLog/LifeLog/LabelCollectionViewCell.xib index 7128396..9fe8ef1 100644 --- a/LifeLog/LifeLog/LabelCollectionViewCell.xib +++ b/LifeLog/LifeLog/LabelCollectionViewCell.xib @@ -1,5 +1,5 @@ - + @@ -17,10 +17,10 @@ -