phong / Lifelog

Browse Code »

Commit c4525f8715e07da1592b4c4d3b74f68869d8c367

Authored by nvtu11790@gmail.com 2017-08-05 23:36:16 +0900

1 parent b94abc619f

Exists in master and in 1 other branch

Add API for request history in today with selected type and mode

Showing 19 changed files with 376 additions and 33 deletions Inline Diff

LifeLog/LifeLog.xcodeproj/project.pbxproj
LifeLog/LifeLog/Assets.xcassets/History/Contents.json
LifeLog/LifeLog/Assets.xcassets/History/arrow_back.imageset/Contents.json
LifeLog/LifeLog/Assets.xcassets/History/arrow_back.imageset/arrow_back.png
LifeLog/LifeLog/Assets.xcassets/History/arrow_next.imageset/Contents.json
LifeLog/LifeLog/Assets.xcassets/History/arrow_next.imageset/arrow_next.png
LifeLog/LifeLog/AutoTransLabel.h
LifeLog/LifeLog/AutoTransLabel.m
LifeLog/LifeLog/CollectionView.h
LifeLog/LifeLog/CollectionView.m
LifeLog/LifeLog/Entities.h
LifeLog/LifeLog/HistoryObject.h
LifeLog/LifeLog/HistoryObject.m
LifeLog/LifeLog/HistoryViewController.h
LifeLog/LifeLog/HistoryViewController.m
LifeLog/LifeLog/HistoryViewController.xib
LifeLog/LifeLog/Localizable.strings
LifeLog/LifeLog/ServerAPI.h
LifeLog/LifeLog/ServerAPI.m

LifeLog/LifeLog.xcodeproj/project.pbxproj

Diff comments View file @ c4525f8

 // !$*UTF8*$!
 {
 	archiveVersion = 1;
 	classes = {
 	};
 	objectVersion = 46;
 	objects = {
 /* Begin PBXBuildFile section */
 		011799F0F2B47D80472673CE /* Pods_LifeLog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D9F4ED6F06C8F252B9EAF48 /* Pods_LifeLog.framework */; };
 		6E18CED31F2E39DB0029891F /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E18CED11F2E39DB0029891F /* LoginViewController.m */; };
 		6E18CED41F2E39DB0029891F /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E18CED21F2E39DB0029891F /* LoginViewController.xib */; };
 		6E18CED81F2E3C840029891F /* ServerAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E18CED71F2E3C840029891F /* ServerAPI.m */; };
 		6E18CEDC1F2E40F50029891F /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E18CEDB1F2E40F50029891F /* User.m */; };
 		6E48AF0D1F2F9D3300C1D184 /* CustomTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E48AF0C1F2F9D3200C1D184 /* CustomTextField.m */; };
 		6E7F93421F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F933B1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m */; };
 		6E7F93431F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F933D1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m */; };
 		6E7F93441F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F933F1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m */; };
 		6E7F93451F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E7F93411F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m */; };
 		6E84E3761F27A701001EB88E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3751F27A701001EB88E /* main.m */; };
 		6E84E3791F27A701001EB88E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3781F27A701001EB88E /* AppDelegate.m */; };
 		6E84E3811F27A701001EB88E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3801F27A701001EB88E /* Assets.xcassets */; };
 		6E84E3841F27A701001EB88E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3821F27A701001EB88E /* LaunchScreen.storyboard */; };
 		6E84E38F1F27A703001EB88E /* LifeLogTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E38E1F27A703001EB88E /* LifeLogTests.m */; };
 		6E84E39A1F27A703001EB88E /* LifeLogUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3991F27A703001EB88E /* LifeLogUITests.m */; };
 		6E84E3B01F27A975001EB88E /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3AE1F27A975001EB88E /* HomeViewController.m */; };
 		6E84E3B11F27A975001EB88E /* HomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3AF1F27A975001EB88E /* HomeViewController.xib */; };
 		6E84E3B51F27A98B001EB88E /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3B31F27A98B001EB88E /* HistoryViewController.m */; };
 		6E84E3B61F27A98B001EB88E /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3B41F27A98B001EB88E /* HistoryViewController.xib */; };
 		6E84E3BA1F27A9A0001EB88E /* RankingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3B81F27A9A0001EB88E /* RankingViewController.m */; };
 		6E84E3BB1F27A9A0001EB88E /* RankingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */; };
 		6E84E3BF1F27A9B1001EB88E /* SNSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */; };
 		6E84E3C01F27A9B1001EB88E /* SNSViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3BE1F27A9B1001EB88E /* SNSViewController.xib */; };
 		6E84E3C51F27ACAE001EB88E /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E84E3C31F27ACAE001EB88E /* MapViewController.m */; };
 		6E84E3C61F27ACAE001EB88E /* MapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E84E3C41F27ACAE001EB88E /* MapViewController.xib */; };
 		6E8DA0F71F2BAC3400CCE941 /* TodayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E8DA0F51F2BAC3400CCE941 /* TodayViewController.m */; };
 		6E8DA0F81F2BAC3500CCE941 /* TodayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6E8DA0F61F2BAC3400CCE941 /* TodayViewController.xib */; };
 		6ECC40711F2A5FEB00AAEB97 /* NSDate+helper.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECC40701F2A5FEB00AAEB97 /* NSDate+helper.m */; };
 		6EDC8BEE1F2C2FB800765ACC /* Utilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EDC8BED1F2C2FB800765ACC /* Utilities.m */; };
 		6EDC8BF41F2C68D700765ACC /* CMMotionActivityExtra.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EDC8BF31F2C68D700765ACC /* CMMotionActivityExtra.m */; };
 		6EF1630A1F29069300DA306C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6EF163091F29069300DA306C /* Localizable.strings */; };
 		9CA8AEEA1F31BB4600C5FC74 /* ConfirmForgetPassViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CA8AEE81F31BB4600C5FC74 /* ConfirmForgetPassViewController.m */; };
 		9CA8AEEB1F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9CA8AEE91F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib */; };
 		9CBDA0FA1F2ECE2C0055DED1 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CBDA0F91F2ECE2C0055DED1 /* BaseViewController.m */; };
 		9CBDA0FF1F2F03810055DED1 /* RegisterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CBDA0FD1F2F03810055DED1 /* RegisterViewController.m */; };
 		9CBDA1001F2F03810055DED1 /* RegisterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9CBDA0FE1F2F03810055DED1 /* RegisterViewController.xib */; };
+		E9373E471F3596940059355A /* AutoTransLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E461F3596940059355A /* AutoTransLabel.m */; };
+		E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = E9373E491F35AA180059355A /* HistoryObject.m */; };
 		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 */; };
 		E99E13B21F33720600C78787 /* LabelCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */; };
 		E9F73DCC1F338A0F004A3A6F /* HistoryListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */; };
 		E9F73DCD1F338A0F004A3A6F /* HistoryListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
 		6E84E38B1F27A703001EB88E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6E84E3691F27A700001EB88E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 6E84E3701F27A700001EB88E;
 			remoteInfo = LifeLog;
 		};
 		6E84E3961F27A703001EB88E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6E84E3691F27A700001EB88E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 6E84E3701F27A700001EB88E;
 			remoteInfo = LifeLog;
 		};
 /* End PBXContainerItemProxy section */
 /* Begin PBXFileReference section */
 		0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LifeLog.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog.debug.xcconfig"; sourceTree = "<group>"; };
 		2D9F4ED6F06C8F252B9EAF48 /* Pods_LifeLog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LifeLog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LifeLog.release.xcconfig"; path = "Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog.release.xcconfig"; sourceTree = "<group>"; };
 		6E18CED01F2E39DB0029891F /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
 		6E18CED11F2E39DB0029891F /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		6E18CED21F2E39DB0029891F /* LoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginViewController.xib; sourceTree = "<group>"; };
 		6E18CED61F2E3C840029891F /* ServerAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerAPI.h; sourceTree = "<group>"; };
 		6E18CED71F2E3C840029891F /* ServerAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerAPI.m; sourceTree = "<group>"; };
 		6E18CEDA1F2E40F50029891F /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = User.h; sourceTree = "<group>"; };
 		6E18CEDB1F2E40F50029891F /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = User.m; sourceTree = "<group>"; };
 		6E18CEDD1F2E46570029891F /* Entities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Entities.h; sourceTree = "<group>"; };
 		6E48AF0B1F2F9D3200C1D184 /* CustomTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTextField.h; sourceTree = "<group>"; };
 		6E48AF0C1F2F9D3200C1D184 /* CustomTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomTextField.m; sourceTree = "<group>"; };
 		6E7F933A1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingCollectionView.h; sourceTree = "<group>"; };
 		6E7F933B1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingCollectionView.m; sourceTree = "<group>"; };
 		6E7F933C1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingScrollView.h; sourceTree = "<group>"; };
 		6E7F933D1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingScrollView.m; sourceTree = "<group>"; };
 		6E7F933E1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingTableView.h; sourceTree = "<group>"; };
 		6E7F933F1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingTableView.m; sourceTree = "<group>"; };
 		6E7F93401F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+TPKeyboardAvoidingAdditions.h"; sourceTree = "<group>"; };
 		6E7F93411F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+TPKeyboardAvoidingAdditions.m"; sourceTree = "<group>"; };
 		6E84E3711F27A700001EB88E /* LifeLog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LifeLog.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E84E3751F27A701001EB88E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		6E84E3771F27A701001EB88E /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		6E84E3781F27A701001EB88E /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		6E84E3801F27A701001EB88E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		6E84E3831F27A701001EB88E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		6E84E3851F27A701001EB88E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E84E38A1F27A703001EB88E /* LifeLogTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LifeLogTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E84E38E1F27A703001EB88E /* LifeLogTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LifeLogTests.m; sourceTree = "<group>"; };
 		6E84E3901F27A703001EB88E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E84E3951F27A703001EB88E /* LifeLogUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LifeLogUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E84E3991F27A703001EB88E /* LifeLogUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LifeLogUITests.m; sourceTree = "<group>"; };
 		6E84E39B1F27A703001EB88E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6E84E3AD1F27A975001EB88E /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
 		6E84E3AE1F27A975001EB88E /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		6E84E3AF1F27A975001EB88E /* HomeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HomeViewController.xib; sourceTree = "<group>"; };
 		6E84E3B21F27A98B001EB88E /* HistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryViewController.h; sourceTree = "<group>"; };
 		6E84E3B31F27A98B001EB88E /* HistoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryViewController.m; sourceTree = "<group>"; };
 		6E84E3B41F27A98B001EB88E /* HistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryViewController.xib; sourceTree = "<group>"; };
 		6E84E3B71F27A9A0001EB88E /* RankingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingViewController.h; sourceTree = "<group>"; };
 		6E84E3B81F27A9A0001EB88E /* RankingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingViewController.m; sourceTree = "<group>"; };
 		6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RankingViewController.xib; sourceTree = "<group>"; };
 		6E84E3BC1F27A9B1001EB88E /* SNSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SNSViewController.h; sourceTree = "<group>"; };
 		6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SNSViewController.m; sourceTree = "<group>"; };
 		6E84E3BE1F27A9B1001EB88E /* SNSViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SNSViewController.xib; sourceTree = "<group>"; };
 		6E84E3C21F27ACAE001EB88E /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapViewController.h; sourceTree = "<group>"; };
 		6E84E3C31F27ACAE001EB88E /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewController.m; sourceTree = "<group>"; };
 		6E84E3C41F27ACAE001EB88E /* MapViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MapViewController.xib; sourceTree = "<group>"; };
 		6E8DA0F41F2BAC3400CCE941 /* TodayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TodayViewController.h; sourceTree = "<group>"; };
 		6E8DA0F51F2BAC3400CCE941 /* TodayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TodayViewController.m; sourceTree = "<group>"; };
 		6E8DA0F61F2BAC3400CCE941 /* TodayViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TodayViewController.xib; sourceTree = "<group>"; };
 		6ECC406F1F2A5FEB00AAEB97 /* NSDate+helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+helper.h"; sourceTree = "<group>"; };
 		6ECC40701F2A5FEB00AAEB97 /* NSDate+helper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+helper.m"; sourceTree = "<group>"; };
 		6EDC8BEC1F2C2FB800765ACC /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; };
 		6EDC8BED1F2C2FB800765ACC /* Utilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utilities.m; sourceTree = "<group>"; };
 		6EDC8BF21F2C68D700765ACC /* CMMotionActivityExtra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMMotionActivityExtra.h; sourceTree = "<group>"; };
 		6EDC8BF31F2C68D700765ACC /* CMMotionActivityExtra.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMMotionActivityExtra.m; sourceTree = "<group>"; };
 		6EF163091F29069300DA306C /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
 		9CA8AEE71F31BB4600C5FC74 /* ConfirmForgetPassViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfirmForgetPassViewController.h; sourceTree = "<group>"; };
 		9CA8AEE81F31BB4600C5FC74 /* ConfirmForgetPassViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConfirmForgetPassViewController.m; sourceTree = "<group>"; };
 		9CA8AEE91F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConfirmForgetPassViewController.xib; sourceTree = "<group>"; };
 		9CBDA0F81F2ECE2C0055DED1 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		9CBDA0F91F2ECE2C0055DED1 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
 		9CBDA0FC1F2F03810055DED1 /* RegisterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterViewController.h; sourceTree = "<group>"; };
 		9CBDA0FD1F2F03810055DED1 /* RegisterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegisterViewController.m; sourceTree = "<group>"; };
 		9CBDA0FE1F2F03810055DED1 /* RegisterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RegisterViewController.xib; sourceTree = "<group>"; };
+		E9373E451F3596940059355A /* AutoTransLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoTransLabel.h; sourceTree = "<group>"; };
+		E9373E461F3596940059355A /* AutoTransLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AutoTransLabel.m; sourceTree = "<group>"; };
+		E9373E481F35AA180059355A /* HistoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryObject.h; sourceTree = "<group>"; };
+		E9373E491F35AA180059355A /* HistoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryObject.m; sourceTree = "<group>"; };
 		E99E13A91F336F3600C78787 /* CollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionView.h; sourceTree = "<group>"; };
 		E99E13AA1F336F3600C78787 /* CollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionView.m; sourceTree = "<group>"; };
 		E99E13AC1F336F4500C78787 /* CollectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CollectionView.xib; sourceTree = "<group>"; };
 		E99E13AE1F33720600C78787 /* LabelCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelCollectionViewCell.h; sourceTree = "<group>"; };
 		E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LabelCollectionViewCell.m; sourceTree = "<group>"; };
 		E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LabelCollectionViewCell.xib; sourceTree = "<group>"; };
 		E9F73DC91F338A0F004A3A6F /* HistoryListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryListTableViewCell.h; sourceTree = "<group>"; };
 		E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryListTableViewCell.m; sourceTree = "<group>"; };
 		E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryListTableViewCell.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
 		6E84E36E1F27A700001EB88E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				011799F0F2B47D80472673CE /* Pods_LifeLog.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3871F27A703001EB88E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3921F27A703001EB88E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
 		020C1721B642EF36F31E1BB4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				2D9F4ED6F06C8F252B9EAF48 /* Pods_LifeLog.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		6E18CECF1F2E398C0029891F /* Login */ = {
 			isa = PBXGroup;
 			children = (
 				9CA8AEE61F31BB1200C5FC74 /* ConfirmForgetPass */,
 				6E18CED01F2E39DB0029891F /* LoginViewController.h */,
 				6E18CED11F2E39DB0029891F /* LoginViewController.m */,
 				6E18CED21F2E39DB0029891F /* LoginViewController.xib */,
 			);
 			name = Login;
 			sourceTree = "<group>";
 		};
 		6E18CED51F2E3C0E0029891F /* ServerAPI */ = {
 			isa = PBXGroup;
 			children = (
 				6E18CED61F2E3C840029891F /* ServerAPI.h */,
 				6E18CED71F2E3C840029891F /* ServerAPI.m */,
 			);
 			name = ServerAPI;
 			sourceTree = "<group>";
 		};
 		6E18CED91F2E40AE0029891F /* Model */ = {
 			isa = PBXGroup;
 			children = (
 				6E18CEDA1F2E40F50029891F /* User.h */,
 				6E18CEDB1F2E40F50029891F /* User.m */,
 				6E18CEDD1F2E46570029891F /* Entities.h */,
+				E9373E481F35AA180059355A /* HistoryObject.h */,
+				E9373E491F35AA180059355A /* HistoryObject.m */,
 			);
 			name = Model;
 			sourceTree = "<group>";
 		};
 		6E7F93391F35870F00EFBC71 /* TPKeyboardAvoiding */ = {
 			isa = PBXGroup;
 			children = (
 				6E7F933A1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.h */,
 				6E7F933B1F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m */,
 				6E7F933C1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.h */,
 				6E7F933D1F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m */,
 				6E7F933E1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.h */,
 				6E7F933F1F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m */,
 				6E7F93401F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.h */,
 				6E7F93411F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m */,
 			);
 			name = TPKeyboardAvoiding;
 			sourceTree = "<group>";
 		};
 		6E84E3681F27A700001EB88E = {
 			isa = PBXGroup;
 			children = (
 				6E84E3731F27A700001EB88E /* LifeLog */,
 				6E84E38D1F27A703001EB88E /* LifeLogTests */,
 				6E84E3981F27A703001EB88E /* LifeLogUITests */,
 				6E84E3721F27A700001EB88E /* Products */,
 				DE8269E957EA47CD771BAB33 /* Pods */,
 				020C1721B642EF36F31E1BB4 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 		6E84E3721F27A700001EB88E /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3711F27A700001EB88E /* LifeLog.app */,
 				6E84E38A1F27A703001EB88E /* LifeLogTests.xctest */,
 				6E84E3951F27A703001EB88E /* LifeLogUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 		6E84E3731F27A700001EB88E /* LifeLog */ = {
 			isa = PBXGroup;
 			children = (
 				6E18CED91F2E40AE0029891F /* Model */,
 				6E18CED51F2E3C0E0029891F /* ServerAPI */,
 				6EDC8BEB1F2C2F3300765ACC /* Common */,
 				6ECC406D1F2A5FA500AAEB97 /* Library */,
 				E99E13A71F336F0C00C78787 /* CustomView */,
 				6E84E3A81F27A8A9001EB88E /* ViewControllers */,
 				6E84E3A71F27A887001EB88E /* AppDelegate */,
 				6E84E3801F27A701001EB88E /* Assets.xcassets */,
 				6E84E3821F27A701001EB88E /* LaunchScreen.storyboard */,
 				6E84E3851F27A701001EB88E /* Info.plist */,
 				6E84E3741F27A701001EB88E /* Supporting Files */,
 			);
 			path = LifeLog;
 			sourceTree = "<group>";
 		};
 		6E84E3741F27A701001EB88E /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3751F27A701001EB88E /* main.m */,
 				6EF163091F29069300DA306C /* Localizable.strings */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		6E84E38D1F27A703001EB88E /* LifeLogTests */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E38E1F27A703001EB88E /* LifeLogTests.m */,
 				6E84E3901F27A703001EB88E /* Info.plist */,
 			);
 			path = LifeLogTests;
 			sourceTree = "<group>";
 		};
 		6E84E3981F27A703001EB88E /* LifeLogUITests */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3991F27A703001EB88E /* LifeLogUITests.m */,
 				6E84E39B1F27A703001EB88E /* Info.plist */,
 			);
 			path = LifeLogUITests;
 			sourceTree = "<group>";
 		};
 		6E84E3A71F27A887001EB88E /* AppDelegate */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3771F27A701001EB88E /* AppDelegate.h */,
 				6E84E3781F27A701001EB88E /* AppDelegate.m */,
 			);
 			name = AppDelegate;
 			sourceTree = "<group>";
 		};
 		6E84E3A81F27A8A9001EB88E /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
 				9CBDA0F71F2ECDFD0055DED1 /* BaseViewController */,
 				9CBDA0FB1F2F03490055DED1 /* Register */,
 				6E18CECF1F2E398C0029891F /* Login */,
 				6E84E3AC1F27A954001EB88E /* SNS */,
 				6E84E3C11F27AC89001EB88E /* Map */,
 				6E84E3AB1F27A946001EB88E /* Ranking */,
 				6E84E3AA1F27A924001EB88E /* History */,
 				6E84E3A91F27A915001EB88E /* Home */,
 			);
 			name = ViewControllers;
 			sourceTree = "<group>";
 		};
 		6E84E3A91F27A915001EB88E /* Home */ = {
 			isa = PBXGroup;
 			children = (
 				6E8DA0F31F2BAC0800CCE941 /* Today */,
 				6E84E3AD1F27A975001EB88E /* HomeViewController.h */,
 				6E84E3AE1F27A975001EB88E /* HomeViewController.m */,
 				6E84E3AF1F27A975001EB88E /* HomeViewController.xib */,
 			);
 			name = Home;
 			sourceTree = "<group>";
 		};
 		6E84E3AA1F27A924001EB88E /* History */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3B21F27A98B001EB88E /* HistoryViewController.h */,
 				6E84E3B31F27A98B001EB88E /* HistoryViewController.m */,
 				6E84E3B41F27A98B001EB88E /* HistoryViewController.xib */,
 				E9F73DC91F338A0F004A3A6F /* HistoryListTableViewCell.h */,
 				E9F73DCA1F338A0F004A3A6F /* HistoryListTableViewCell.m */,
 				E9F73DCB1F338A0F004A3A6F /* HistoryListTableViewCell.xib */,
 			);
 			name = History;
 			sourceTree = "<group>";
 		};
 		6E84E3AB1F27A946001EB88E /* Ranking */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3B71F27A9A0001EB88E /* RankingViewController.h */,
 				6E84E3B81F27A9A0001EB88E /* RankingViewController.m */,
 				6E84E3B91F27A9A0001EB88E /* RankingViewController.xib */,
 			);
 			name = Ranking;
 			sourceTree = "<group>";
 		};
 		6E84E3AC1F27A954001EB88E /* SNS */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3BC1F27A9B1001EB88E /* SNSViewController.h */,
 				6E84E3BD1F27A9B1001EB88E /* SNSViewController.m */,
 				6E84E3BE1F27A9B1001EB88E /* SNSViewController.xib */,
 			);
 			name = SNS;
 			sourceTree = "<group>";
 		};
 		6E84E3C11F27AC89001EB88E /* Map */ = {
 			isa = PBXGroup;
 			children = (
 				6E84E3C21F27ACAE001EB88E /* MapViewController.h */,
 				6E84E3C31F27ACAE001EB88E /* MapViewController.m */,
 				6E84E3C41F27ACAE001EB88E /* MapViewController.xib */,
 			);
 			name = Map;
 			sourceTree = "<group>";
 		};
 		6E8DA0F31F2BAC0800CCE941 /* Today */ = {
 			isa = PBXGroup;
 			children = (
 				6E8DA0F41F2BAC3400CCE941 /* TodayViewController.h */,
 				6E8DA0F51F2BAC3400CCE941 /* TodayViewController.m */,
 				6E8DA0F61F2BAC3400CCE941 /* TodayViewController.xib */,
 			);
 			name = Today;
 			sourceTree = "<group>";
 		};
 		6ECC406D1F2A5FA500AAEB97 /* Library */ = {
 			isa = PBXGroup;
 			children = (
 				6E7F93391F35870F00EFBC71 /* TPKeyboardAvoiding */,
 				6ECC406E1F2A5FB200AAEB97 /* Category */,
 			);
 			name = Library;
 			sourceTree = "<group>";
 		};
 		6ECC406E1F2A5FB200AAEB97 /* Category */ = {
 			isa = PBXGroup;
 			children = (
 				6ECC406F1F2A5FEB00AAEB97 /* NSDate+helper.h */,
 				6ECC40701F2A5FEB00AAEB97 /* NSDate+helper.m */,
 			);
 			name = Category;
 			sourceTree = "<group>";
 		};
 		6EDC8BEB1F2C2F3300765ACC /* Common */ = {
 			isa = PBXGroup;
 			children = (
 				6EDC8BEC1F2C2FB800765ACC /* Utilities.h */,
 				6EDC8BED1F2C2FB800765ACC /* Utilities.m */,
 				6EDC8BF21F2C68D700765ACC /* CMMotionActivityExtra.h */,
 				6EDC8BF31F2C68D700765ACC /* CMMotionActivityExtra.m */,
 			);
 			name = Common;
 			sourceTree = "<group>";
 		};
 		9CA8AEE61F31BB1200C5FC74 /* ConfirmForgetPass */ = {
 			isa = PBXGroup;
 			children = (
 				9CA8AEE71F31BB4600C5FC74 /* ConfirmForgetPassViewController.h */,
 				9CA8AEE81F31BB4600C5FC74 /* ConfirmForgetPassViewController.m */,
 				9CA8AEE91F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib */,
 			);
 			name = ConfirmForgetPass;
 			sourceTree = "<group>";
 		};
 		9CBDA0F71F2ECDFD0055DED1 /* BaseViewController */ = {
 			isa = PBXGroup;
 			children = (
 				9CBDA0F81F2ECE2C0055DED1 /* BaseViewController.h */,
 				9CBDA0F91F2ECE2C0055DED1 /* BaseViewController.m */,
 				6E48AF0B1F2F9D3200C1D184 /* CustomTextField.h */,
 				6E48AF0C1F2F9D3200C1D184 /* CustomTextField.m */,
 			);
 			name = BaseViewController;
 			sourceTree = "<group>";
 		};
 		9CBDA0FB1F2F03490055DED1 /* Register */ = {
 			isa = PBXGroup;
 			children = (
 				9CBDA0FC1F2F03810055DED1 /* RegisterViewController.h */,
 				9CBDA0FD1F2F03810055DED1 /* RegisterViewController.m */,
 				9CBDA0FE1F2F03810055DED1 /* RegisterViewController.xib */,
 			);
 			name = Register;
 			sourceTree = "<group>";
 		};
 		DE8269E957EA47CD771BAB33 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
 				0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */,
 				4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		E9373E441F35966D0059355A /* AutoTranslateView */ = {
+			isa = PBXGroup;
+			children = (
+				E9373E451F3596940059355A /* AutoTransLabel.h */,
+				E9373E461F3596940059355A /* AutoTransLabel.m */,
+			);
+			name = AutoTranslateView;
+			sourceTree = "<group>";
+		};
 		E99E13A71F336F0C00C78787 /* CustomView */ = {
 			isa = PBXGroup;
 			children = (
+				E9373E441F35966D0059355A /* AutoTranslateView */,
 				E99E13A81F336F1700C78787 /* CollectionView */,
 			);
 			name = CustomView;
 			sourceTree = "<group>";
 		};
 		E99E13A81F336F1700C78787 /* CollectionView */ = {
 			isa = PBXGroup;
 			children = (
 				E99E13AE1F33720600C78787 /* LabelCollectionViewCell.h */,
 				E99E13AF1F33720600C78787 /* LabelCollectionViewCell.m */,
 				E99E13B01F33720600C78787 /* LabelCollectionViewCell.xib */,
 				E99E13A91F336F3600C78787 /* CollectionView.h */,
 				E99E13AA1F336F3600C78787 /* CollectionView.m */,
 				E99E13AC1F336F4500C78787 /* CollectionView.xib */,
 			);
 			name = CollectionView;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
 		6E84E3701F27A700001EB88E /* LifeLog */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6E84E39E1F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLog" */;
 			buildPhases = (
 				2BB22CAEC0728AA1E086BCE3 /* [CP] Check Pods Manifest.lock */,
 				6E84E36D1F27A700001EB88E /* Sources */,
 				6E84E36E1F27A700001EB88E /* Frameworks */,
 				6E84E36F1F27A700001EB88E /* Resources */,
 				22F89B11794CEB4E265996AC /* [CP] Embed Pods Frameworks */,
 				96653BDB2C24A87C2866C897 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = LifeLog;
 			productName = LifeLog;
 			productReference = 6E84E3711F27A700001EB88E /* LifeLog.app */;
 			productType = "com.apple.product-type.application";
 		};
 		6E84E3891F27A703001EB88E /* LifeLogTests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6E84E3A11F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogTests" */;
 			buildPhases = (
 				6E84E3861F27A703001EB88E /* Sources */,
 				6E84E3871F27A703001EB88E /* Frameworks */,
 				6E84E3881F27A703001EB88E /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				6E84E38C1F27A703001EB88E /* PBXTargetDependency */,
 			);
 			name = LifeLogTests;
 			productName = LifeLogTests;
 			productReference = 6E84E38A1F27A703001EB88E /* LifeLogTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		6E84E3941F27A703001EB88E /* LifeLogUITests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6E84E3A41F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogUITests" */;
 			buildPhases = (
 				6E84E3911F27A703001EB88E /* Sources */,
 				6E84E3921F27A703001EB88E /* Frameworks */,
 				6E84E3931F27A703001EB88E /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				6E84E3971F27A703001EB88E /* PBXTargetDependency */,
 			);
 			name = LifeLogUITests;
 			productName = LifeLogUITests;
 			productReference = 6E84E3951F27A703001EB88E /* LifeLogUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
 /* End PBXNativeTarget section */
 /* Begin PBXProject section */
 		6E84E3691F27A700001EB88E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = PhongNV;
 				TargetAttributes = {
 					6E84E3701F27A700001EB88E = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = UXU4V3VUN4;
 						ProvisioningStyle = Manual;
 					};
 					6E84E3891F27A703001EB88E = {
 						CreatedOnToolsVersion = 8.3.3;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6E84E3701F27A700001EB88E;
 					};
 					6E84E3941F27A703001EB88E = {
 						CreatedOnToolsVersion = 8.3.3;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 6E84E3701F27A700001EB88E;
 					};
 				};
 			};
 			buildConfigurationList = 6E84E36C1F27A700001EB88E /* Build configuration list for PBXProject "LifeLog" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = 6E84E3681F27A700001EB88E;
 			productRefGroup = 6E84E3721F27A700001EB88E /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				6E84E3701F27A700001EB88E /* LifeLog */,
 				6E84E3891F27A703001EB88E /* LifeLogTests */,
 				6E84E3941F27A703001EB88E /* LifeLogUITests */,
 			);
 		};
 /* End PBXProject section */
 /* Begin PBXResourcesBuildPhase section */
 		6E84E36F1F27A700001EB88E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				9CBDA1001F2F03810055DED1 /* RegisterViewController.xib in Resources */,
 				6E18CED41F2E39DB0029891F /* LoginViewController.xib in Resources */,
 				E99E13AD1F336F4500C78787 /* CollectionView.xib in Resources */,
 				6E84E3BB1F27A9A0001EB88E /* RankingViewController.xib in Resources */,
 				9CA8AEEB1F31BB4600C5FC74 /* ConfirmForgetPassViewController.xib in Resources */,
 				6E84E3C01F27A9B1001EB88E /* SNSViewController.xib in Resources */,
 				6E8DA0F81F2BAC3500CCE941 /* TodayViewController.xib in Resources */,
 				6E84E3841F27A701001EB88E /* LaunchScreen.storyboard in Resources */,
 				6E84E3811F27A701001EB88E /* Assets.xcassets in Resources */,
 				6E84E3C61F27ACAE001EB88E /* MapViewController.xib in Resources */,
 				6EF1630A1F29069300DA306C /* Localizable.strings in Resources */,
 				6E84E3B11F27A975001EB88E /* HomeViewController.xib in Resources */,
 				6E84E3B61F27A98B001EB88E /* HistoryViewController.xib in Resources */,
 				E99E13B21F33720600C78787 /* LabelCollectionViewCell.xib in Resources */,
 				E9F73DCD1F338A0F004A3A6F /* HistoryListTableViewCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3881F27A703001EB88E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3931F27A703001EB88E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
 		22F89B11794CEB4E265996AC /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		2BB22CAEC0728AA1E086BCE3 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		96653BDB2C24A87C2866C897 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LifeLog/Pods-LifeLog-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
 		6E84E36D1F27A700001EB88E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				6E18CED81F2E3C840029891F /* ServerAPI.m in Sources */,
 				6E7F93431F35872B00EFBC71 /* TPKeyboardAvoidingScrollView.m in Sources */,
 				6E7F93421F35872B00EFBC71 /* TPKeyboardAvoidingCollectionView.m in Sources */,
 				9CBDA0FA1F2ECE2C0055DED1 /* BaseViewController.m in Sources */,
 				6E8DA0F71F2BAC3400CCE941 /* TodayViewController.m in Sources */,
 				6E7F93451F35872B00EFBC71 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */,
 				6E48AF0D1F2F9D3300C1D184 /* CustomTextField.m in Sources */,
 				E99E13AB1F336F3600C78787 /* CollectionView.m in Sources */,
 				6E84E3B01F27A975001EB88E /* HomeViewController.m in Sources */,
+				E9373E471F3596940059355A /* AutoTransLabel.m in Sources */,
 				6E84E3791F27A701001EB88E /* AppDelegate.m in Sources */,
 				6E84E3BA1F27A9A0001EB88E /* RankingViewController.m in Sources */,
 				6E7F93441F35872B00EFBC71 /* TPKeyboardAvoidingTableView.m in Sources */,
 				E9F73DCC1F338A0F004A3A6F /* HistoryListTableViewCell.m in Sources */,
 				6EDC8BF41F2C68D700765ACC /* CMMotionActivityExtra.m in Sources */,
 				9CBDA0FF1F2F03810055DED1 /* RegisterViewController.m in Sources */,
+				E9373E4A1F35AA180059355A /* HistoryObject.m in Sources */,
 				9CA8AEEA1F31BB4600C5FC74 /* ConfirmForgetPassViewController.m in Sources */,
 				E99E13B11F33720600C78787 /* LabelCollectionViewCell.m in Sources */,
 				6EDC8BEE1F2C2FB800765ACC /* Utilities.m in Sources */,
 				6E84E3C51F27ACAE001EB88E /* MapViewController.m in Sources */,
 				6E18CEDC1F2E40F50029891F /* User.m in Sources */,
 				6ECC40711F2A5FEB00AAEB97 /* NSDate+helper.m in Sources */,
 				6E18CED31F2E39DB0029891F /* LoginViewController.m in Sources */,
 				6E84E3761F27A701001EB88E /* main.m in Sources */,
 				6E84E3B51F27A98B001EB88E /* HistoryViewController.m in Sources */,
 				6E84E3BF1F27A9B1001EB88E /* SNSViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3861F27A703001EB88E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				6E84E38F1F27A703001EB88E /* LifeLogTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		6E84E3911F27A703001EB88E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				6E84E39A1F27A703001EB88E /* LifeLogUITests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 /* Begin PBXTargetDependency section */
 		6E84E38C1F27A703001EB88E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 6E84E3701F27A700001EB88E /* LifeLog */;
 			targetProxy = 6E84E38B1F27A703001EB88E /* PBXContainerItemProxy */;
 		};
 		6E84E3971F27A703001EB88E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 6E84E3701F27A700001EB88E /* LifeLog */;
 			targetProxy = 6E84E3961F27A703001EB88E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 /* Begin PBXVariantGroup section */
 		6E84E3821F27A701001EB88E /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
 				6E84E3831F27A701001EB88E /* Base */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 /* Begin XCBuildConfiguration section */
 		6E84E39C1F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
 		6E84E39D1F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
 		6E84E39F1F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 0FC2D57087AF4571C57FAE08 /* Pods-LifeLog.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = UXU4V3VUN4;
 				INFOPLIST_FILE = LifeLog/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
 					"\"CircleProgressBar\"",
 					"-all_load",
 					"-ObjC",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "556082e4-d9c1-4ce1-bab1-13515289a7fd";
 				PROVISIONING_PROFILE_SPECIFIER = Lifelog_Development;
 			};
 			name = Debug;
 		};
 		6E84E3A01F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4CFDA5714AF852358A1EB515 /* Pods-LifeLog.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				DEVELOPMENT_TEAM = UXU4V3VUN4;
 				INFOPLIST_FILE = LifeLog/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
 					"\"CircleProgressBar\"",
 					"-all_load",
 					"-ObjC",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = mobileworld.jp.lifelog;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "ffe70c33-5b08-4c2e-b96d-4e1bcb971ccb";
 				PROVISIONING_PROFILE_SPECIFIER = Lifelog_Distribution;
 			};
 			name = Release;
 		};
 		6E84E3A21F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = LifeLogTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LifeLog.app/LifeLog";
 			};
 			name = Debug;
 		};
 		6E84E3A31F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = LifeLogTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LifeLog.app/LifeLog";
 			};
 			name = Release;
 		};
 		6E84E3A51F27A703001EB88E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = LifeLogUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_TARGET_NAME = LifeLog;
 			};
 			name = Debug;
 		};
 		6E84E3A61F27A703001EB88E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				INFOPLIST_FILE = LifeLogUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mav.LifeLogUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_TARGET_NAME = LifeLog;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 /* Begin XCConfigurationList section */
 		6E84E36C1F27A700001EB88E /* Build configuration list for PBXProject "LifeLog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E39C1F27A703001EB88E /* Debug */,
 				6E84E39D1F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		6E84E39E1F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLog" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E39F1F27A703001EB88E /* Debug */,
 				6E84E3A01F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		6E84E3A11F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E3A21F27A703001EB88E /* Debug */,
 				6E84E3A31F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		6E84E3A41F27A703001EB88E /* Build configuration list for PBXNativeTarget "LifeLogUITests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6E84E3A51F27A703001EB88E /* Debug */,
 				6E84E3A61F27A703001EB88E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 6E84E3691F27A700001EB88E /* Project object */;
 }

LifeLog/LifeLog/Assets.xcassets/History/Contents.json

Diff comments View file @ c4525f8

File was created	1	{
	2	"info" : {
	3	"version" : 1,
	4	"author" : "xcode"
	5	}
	6	}

LifeLog/LifeLog/Assets.xcassets/History/arrow_back.imageset/Contents.json

Diff comments View file @ c4525f8

File was created	1	{
	2	"images" : [
	3	{
	4	"idiom" : "universal",
	5	"scale" : "1x"
	6	},
	7	{
	8	"idiom" : "universal",
	9	"filename" : "arrow_back.png",
	10	"scale" : "2x"
	11	},
	12	{
	13	"idiom" : "universal",
	14	"scale" : "3x"
	15	}
	16	],
	17	"info" : {
	18	"version" : 1,
	19	"author" : "xcode"
	20	}
	21	}

LifeLog/LifeLog/Assets.xcassets/History/arrow_back.imageset/arrow_back.png

Diff comments View file @ c4525f8

319 Bytes

LifeLog/LifeLog/Assets.xcassets/History/arrow_next.imageset/Contents.json

Diff comments View file @ c4525f8

File was created	1	{
	2	"images" : [
	3	{
	4	"idiom" : "universal",
	5	"scale" : "1x"
	6	},
	7	{
	8	"idiom" : "universal",
	9	"filename" : "arrow_next.png",
	10	"scale" : "2x"
	11	},
	12	{
	13	"idiom" : "universal",
	14	"scale" : "3x"
	15	}
	16	],
	17	"info" : {
	18	"version" : 1,
	19	"author" : "xcode"
	20	}
	21	}

LifeLog/LifeLog/Assets.xcassets/History/arrow_next.imageset/arrow_next.png

Diff comments View file @ c4525f8

332 Bytes

LifeLog/LifeLog/AutoTransLabel.h

Diff comments View file @ c4525f8

File was created	1	//
	2	// AutoTransLabel.h
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/5/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import <UIKit/UIKit.h>
	10
	11	IB_DESIGNABLE
	12
	13	@interface AutoTransLabel : UILabel
	14
	15	@property (nonatomic) IBInspectable NSString *localizeKey;
	16
	17	@end
	18

LifeLog/LifeLog/AutoTransLabel.m

Diff comments View file @ c4525f8

File was created	1	//
	2	// AutoTransLabel.m
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/5/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import "AutoTransLabel.h"
	10
	11	@implementation AutoTransLabel
	12
	13	-(void) awakeFromNib {
	14	[super awakeFromNib];
	15	if(![self.localizeKey isEqual: @""]) {
	16	self.text = NSLocalizedString(self.localizeKey, nil);
	17	}
	18	}
	19	@end
	20

LifeLog/LifeLog/CollectionView.h

Diff comments View file @ c4525f8

 //
 //  CollectionView.h
 //  LifeLog
 //
 //  Created by nvtu on 8/3/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <UIKit/UIKit.h>
 @interface CollectionView : UIView <UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout> {
-    int         _number;
+    NSInteger   _number;
     int         _selectedIndex;
     float       _spacing;
     float       _cornerRadius;
     UIColor *   _highlightColor;
     UIColor *   _normalColor;
     UIColor *   _textColor;
     NSArray *   _arrayTitle;
 }
+@property (copy) void (^changeCurrentIndex)(int index);
 @property (weak, nonatomic) IBOutlet UIView *view;
 @property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
--(void) setButtonNumber: (int) number;
+-(void) setButtonNumber: (NSInteger) number;
 -(void) setSpacing: (float) spacing;
 -(void) setCornerRadius: (float) radius;
 -(void) setSelectedIndex: (int) index;
 -(void) setNormalColor: (UIColor *) normal highlightColor: (UIColor *) highlight textColor: (UIColor *) text;
 -(void) setArrayTitle: (NSArray *) title;
 -(int)  getCurrentIndex;
 @end

LifeLog/LifeLog/CollectionView.m

Diff comments View file @ c4525f8

 //
 //  CollectionView.m
 //  LifeLog
 //
 //  Created by nvtu on 8/3/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "CollectionView.h"
 #import "LabelCollectionViewCell.h"
 #import "Utilities.h"
 @implementation CollectionView
 -(id) initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
     if(self) {
         [[UINib nibWithNibName:@"CollectionView" bundle:nil] instantiateWithOwner:self options:nil];
         [self addSubview:self.view];
         self.view.frame = self.bounds;
         _number = 0;
         _spacing = 1;
         _cornerRadius = 5.0;
         _highlightColor = [Utilities convertHecToColor:0x999999];
         _normalColor = [UIColor whiteColor];
         _textColor = [UIColor blackColor];
     }
     return self;
 }
 -(void) awakeFromNib {
     [super awakeFromNib];
     [self.collectionView registerNib:[UINib nibWithNibName:@"LabelCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"LabelCell"];
 }
--(void) setButtonNumber: (int) number {
+-(void) setButtonNumber: (NSInteger) number {
     _number = number;
 }
 -(void) setSpacing: (float) spacing {
     _spacing = spacing;
 }
 -(void) setCornerRadius: (float) radius {
     _cornerRadius = radius;
 }
 -(void) setSelectedIndex: (int) index {
     _selectedIndex = index;
     [_collectionView reloadData];
 }
 -(void) setNormalColor: (UIColor *) normal highlightColor: (UIColor *) highlight textColor: (UIColor *) text {
     _normalColor = normal;
     _highlightColor = highlight;
     _textColor = text;
 }
 -(void) setArrayTitle: (NSArray *) title {
     _arrayTitle = title;
 }
--(int)  getCurrentIndex {
+-(int) getCurrentIndex {
     return _selectedIndex;
 }
 #pragma mark - UICollectionView Delegate
 - (NSInteger) numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
     return 1;
 }
 - (NSInteger) collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
     return _number;
 }
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     LabelCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"LabelCell" forIndexPath:indexPath];
     cell.lblTitle.text = [_arrayTitle objectAtIndex:indexPath.row];
     cell.lblTitle.textColor = _textColor;
     cell.lblTitle.layer.cornerRadius = _cornerRadius;
     cell.lblTitle.backgroundColor = (indexPath.row == _selectedIndex) ? _highlightColor : _normalColor;
     return cell;
 }
 - (CGSize) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
     return CGSizeMake((self.frame.size.width - (_spacing * _number)) / _number, collectionView.frame.size.height);
 }
 - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
     return _spacing;
 }
 -(void) collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
     _selectedIndex = indexPath.row;
     [collectionView reloadData];
+    self.changeCurrentIndex(_selectedIndex);
 }
 @end

LifeLog/LifeLog/Entities.h

Diff comments View file @ c4525f8

 //
 //  Entities.h
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #ifndef Entities_h
 #define Entities_h
+#import "HistoryObject.h"
 #import "User.h"
 #endif /* Entities_h */

LifeLog/LifeLog/HistoryObject.h

Diff comments View file @ c4525f8

File was created	1	//
	2	// HistoryObject.h
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/5/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import <Foundation/Foundation.h>
	10
	11	@interface HistoryObject : NSObject
	12
	13	@property (nonatomic) int step;
	14	@property (nonatomic) int missing;
	15	@property (nonatomic) int target;
	16	@property (nonatomic) float percent;
	17	@property (nonatomic) float distance;
	18	@property (nonatomic) float calories;
	19	@property (nonatomic, strong) NSString * time;
	20	@property (nonatomic, strong) NSDate *date;
	21
	22	-(id) initWithData : (NSDictionary *) dict;
	23
	24	@end
	25

LifeLog/LifeLog/HistoryObject.m

Diff comments View file @ c4525f8

File was created	1	//
	2	// HistoryObject.m
	3	// LifeLog
	4	//
	5	// Created by nvtu on 8/5/17.
	6	// Copyright © 2017 PhongNV. All rights reserved.
	7	//
	8
	9	#import "HistoryObject.h"
	10
	11	@implementation HistoryObject
	12
	13	-(id) initWithData : (NSDictionary *) dict {
	14	if([dict objectForKey:@"step"] != nil) {
	15	self.step = [dict[@"step"] intValue];
	16	}
	17	if([dict objectForKey:@"target"] != nil) {
	18	self.target = [dict[@"target"] intValue];
	19	}
	20	if([dict objectForKey:@"missing"] != nil) {
	21	self.missing = [dict[@"missing"] intValue];
	22	}
	23	if([dict objectForKey:@"percent"] != nil) {
	24	self.percent = [dict[@"percent"] floatValue];
	25	}
	26	if([dict objectForKey:@"distance"] != nil) {
	27	self.distance = [dict[@"distance"] floatValue];
	28	}
	29	if([dict objectForKey:@"kcal"] != nil) {
	30	self.calories = [dict[@"kcal"] floatValue];
	31	}
	32	if([dict objectForKey:@"time"] != nil) {
	33	self.time = dict[@"time"];
	34	}
	35	if([dict objectForKey:@"date"] != nil) {
	36	NSString *dateString = dict[@"time"];
	37	NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
	38	[dateFormat setDateFormat:@"yyyy-MM-dd"];
	39	self.date = [dateFormat dateFromString:dateString];
	40	}
	41	else {
	42	self.date = [NSDate date];
	43	}
	44	return self;
	45	}
	46	@end
	47

LifeLog/LifeLog/HistoryViewController.h

Diff comments View file @ c4525f8

 //
 //  HistoryViewController.h
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/25/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <UIKit/UIKit.h>
 #import <Charts/Charts-Swift.h>
 #import "CollectionView.h"
-@interface HistoryViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, UIScrollViewDelegate>
+#import "Entities.h"
+@interface HistoryViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, UIScrollViewDelegate> {
+    NSDate * _currentDate;
+    HistoryObject * _currentHistoryObject;
+}
 @property (weak, nonatomic) IBOutlet UILabel *lblHeader;
-@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionTime;
+@property (weak, nonatomic) IBOutlet UILabel *lblCircleStep;
+@property (weak, nonatomic) IBOutlet UILabel *lblCircleRemain;
+@property (weak, nonatomic) IBOutlet UILabel *lblStep;
+@property (weak, nonatomic) IBOutlet UILabel *lblRemaining;
+@property (weak, nonatomic) IBOutlet UILabel *lblPercent;
+@property (weak, nonatomic) IBOutlet UILabel *lblCalories;
+@property (weak, nonatomic) IBOutlet UILabel *lblDistance;
+@property (weak, nonatomic) IBOutlet UILabel *lblTime;
 @property (weak, nonatomic) IBOutlet CollectionView *viewCollectionType;
+@property (weak, nonatomic) IBOutlet CollectionView *viewCollectionMode;
 @property (weak, nonatomic) IBOutlet CollectionView *viewCollectionShare;
 @property (weak, nonatomic) IBOutlet BarChartView   *viewBarChart;
 @property (weak, nonatomic) IBOutlet UITableView *tableListHistory;
 @property (weak, nonatomic) IBOutlet UIScrollView *scrollView;
 - (IBAction)swipeAction:(UISwipeGestureRecognizer *)sender;
 @end

LifeLog/LifeLog/HistoryViewController.m

Diff comments View file @ c4525f8

 //
 //  HistoryViewController.m
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/25/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "HistoryViewController.h"
 #import "Utilities.h"
+#import "ServerAPI.h"
 #import "HistoryListTableViewCell.h"
 @interface HistoryViewController ()
 @end
 @implementation HistoryViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.
-    self.title = NSLocalizedString(@"lifelog.tapbar.history", nil);
+    self.title = NSLocalizedString(@"lifelog.history.title", nil);
-    self.lblHeader.text = NSLocalizedString(@"lifelog.tapbar.history", nil);
+    self.lblHeader.text = NSLocalizedString(@"lifelog.history.title", nil);
     [self setupView];
     [self setupChartView];
+    _currentDate = [NSDate date];
+    [self callRequestToUpdateData];
     //register nib for table view
     [self.tableListHistory registerNib:[UINib nibWithNibName:@"HistoryListTableViewCell" bundle:nil] forCellReuseIdentifier:@"HistoryListCell"];
 }
 - (void)viewDidAppear:(BOOL) animated
 {
     [super viewDidAppear:animated];
     self.scrollView.contentSize = CGSizeMake(self.view.frame.size.width, 400);
     [self.scrollView setNeedsLayout];
     [self.scrollView setNeedsUpdateConstraints];
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
 - (void)setupView {
-    [self.viewCollectionTime setButtonNumber:5];
+    NSArray *typeTitle = [NSArray arrayWithObjects:NSLocalizedString(@"lifelog.history.type.1", nil), NSLocalizedString(@"lifelog.history.type.2", nil), NSLocalizedString(@"lifelog.history.type.3", nil), NSLocalizedString(@"lifelog.history.type.4", nil), NSLocalizedString(@"lifelog.history.type.5", nil), nil];
-    [self.viewCollectionTime setSpacing:2];
+    [self.viewCollectionType setButtonNumber:typeTitle.count];
-    [self.viewCollectionTime setArrayTitle:[NSArray arrayWithObjects:@"1日", @"1週間", @"1ヶ月", @"3ヶ月", @"6ヶ月", nil]];
+    [self.viewCollectionType setSpacing:2];
+    [self.viewCollectionType setArrayTitle:typeTitle];
+    self.viewCollectionType.changeCurrentIndex = ^(int index){
+        [self callRequestToUpdateData];
+    };
-    [self.viewCollectionType setButtonNumber:3];
+    NSArray *modeTitle = [NSArray arrayWithObjects:NSLocalizedString(@"lifelog.history.mode.1", nil), NSLocalizedString(@"lifelog.history.mode.2", nil), NSLocalizedString(@"lifelog.history.mode.3", nil), nil];
-    [self.viewCollectionType setSpacing:0];
+    [self.viewCollectionMode setButtonNumber:modeTitle.count];
-    [self.viewCollectionType setCornerRadius:0];
+    [self.viewCollectionMode setSpacing:0];
-    [self.viewCollectionType setNormalColor:[Utilities convertHecToColor:0x191919] highlightColor:[Utilities convertHecToColor:0x474747] textColor:[UIColor whiteColor]];
+    [self.viewCollectionMode setCornerRadius:0];
-    [self.viewCollectionType setArrayTitle:[NSArray arrayWithObjects:@"BIKE", @"WALKING", @"RUNNING", nil]];
+    [self.viewCollectionMode setNormalColor:[Utilities convertHecToColor:0x191919] highlightColor:[Utilities convertHecToColor:0x474747] textColor:[UIColor whiteColor]];
+    [self.viewCollectionMode setArrayTitle:modeTitle];
+    self.viewCollectionMode.changeCurrentIndex = ^(int index){
+        [self callRequestToUpdateData];
+    };
-    [self.viewCollectionShare setButtonNumber:5];
+    NSArray *shareTitle = [NSArray arrayWithObjects:NSLocalizedString(@"lifelog.history.share.1", nil), NSLocalizedString(@"lifelog.history.share.2", nil), NSLocalizedString(@"lifelog.history.share.3", nil), NSLocalizedString(@"lifelog.history.share.4", nil), NSLocalizedString(@"lifelog.history.share.5", nil), nil];
+    [self.viewCollectionShare setButtonNumber:typeTitle.count];
     [self.viewCollectionShare setSpacing:3];
     [self.viewCollectionShare setSelectedIndex:-1];
-    [self.viewCollectionShare setArrayTitle:[NSArray arrayWithObjects:@"facebook", @"twitter", @"line", @"メール", @"その他", nil]];
+    [self.viewCollectionShare setArrayTitle:shareTitle];
 }
+-(void) updateView {
+    self.lblStep.text = [NSString stringWithFormat:@"%d", _currentHistoryObject.step];
+    self.lblRemaining.text = [NSString stringWithFormat:@"%d", _currentHistoryObject.missing];
+    self.lblPercent.text = [NSString stringWithFormat:@"%0.2f", _currentHistoryObject.percent * 100];
+    self.lblCalories.text = [NSString stringWithFormat:@"%1.0f", _currentHistoryObject.calories];
+    self.lblDistance.text = [NSString stringWithFormat:@"%0.1f", _currentHistoryObject.distance];
+    self.lblTime.text = _currentHistoryObject.time;
+}
 - (void)setupChartView {
     self.viewBarChart.chartDescription.enabled = NO;
     self.viewBarChart.leftAxis.drawGridLinesEnabled = NO;
     self.viewBarChart.rightAxis.drawGridLinesEnabled = NO;
     self.viewBarChart.legend.enabled = NO;
     ChartXAxis *xAxis = self.viewBarChart.xAxis;
     xAxis.labelPosition = XAxisLabelPositionBottom;
     xAxis.drawGridLinesEnabled = NO;
     xAxis.drawAxisLineEnabled = NO;
     xAxis.drawLabelsEnabled = YES;
     xAxis.labelPosition = XAxisLabelPositionBottom;
     xAxis.labelFont = [UIFont systemFontOfSize:10.f];
     xAxis.labelTextColor = [UIColor whiteColor];
     xAxis.granularity = 1.0; // only intervals of 1 day
     xAxis.labelCount = 8;
     self.viewBarChart.leftAxis.drawAxisLineEnabled = NO;
     self.viewBarChart.rightAxis.drawAxisLineEnabled = NO;
     /*fake data for test*/
     NSMutableArray *yVals = [[NSMutableArray alloc] init];
     for (int i = 0; i < 24; i++)
     {
         double val = (double) (arc4random_uniform(100));
         [yVals addObject:[[BarChartDataEntry alloc] initWithX:i y:val]];
     }
     BarChartDataSet *set1 = nil;
     if (self.viewBarChart.data.dataSetCount > 0)
     {
         set1 = (BarChartDataSet *)self.viewBarChart.data.dataSets[0];
         set1.values = yVals;
         [self.viewBarChart.data notifyDataChanged];
         [self.viewBarChart notifyDataSetChanged];
     }
     else
     {
         set1 = [[BarChartDataSet alloc] initWithValues:yVals label:@""];
         [set1 setColor:[UIColor whiteColor]];
         NSMutableArray *dataSets = [[NSMutableArray alloc] init];
         [dataSets addObject:set1];
         BarChartData *data = [[BarChartData alloc] initWithDataSets:dataSets];
         data.barWidth = 0.5f;
         self.viewBarChart.data = data;
     }
+}
+-(void) callRequestToUpdateData {
+    [[ServerAPI server] requestHistory:[[NSUserDefaults standardUserDefaults] stringForKey:kToken] atDate:_currentDate withType:self.viewCollectionType.getCurrentIndex andMode:self.viewCollectionMode.getCurrentIndex + 1 CompletionHandler:^(HistoryObject *object, NSError *error) {
+        HistoryViewController __weak *weakSelf = self;
+        if(error == nil) {
+            _currentHistoryObject = object;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self updateView];
+            });
+        }
+        else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                NSString *message = [error.userInfo objectForKey:@"message"];
+                [Utilities showErrorMessage:message withViewController:weakSelf];
+            });
+        }
+    }];
 }
 #pragma mark IBAction
 -(void) swipeAction:(UISwipeGestureRecognizer *)sender {
     bool alphaValue = self.scrollView.alpha == 1.0 ? 1.0 : 0.0;
     [UIView animateWithDuration:0.5 animations:^{
         self.tableListHistory.alpha = alphaValue;
         self.scrollView.alpha = 1.0 - alphaValue;
     } completion:^(bool completed) {
     }];
 }
 #pragma mark UITableView Delegate
 - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return 4;
 }
 -  (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     HistoryListTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"HistoryListCell"];
     return cell;
 }
 @end

LifeLog/LifeLog/HistoryViewController.xib

Diff comments View file @ c4525f8

 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HistoryViewController">
             <connections>
+                <outlet property="lblCalories" destination="dAE-C8-QLr" id="WaS-S3-Qxh"/>
+                <outlet property="lblCircleRemain" destination="Kr7-S0-Fpl" id="UQe-Bt-i0X"/>
+                <outlet property="lblCircleStep" destination="oWg-A8-aCr" id="Q9g-UY-hyv"/>
+                <outlet property="lblDistance" destination="1tR-JC-pyw" id="q4s-Ru-vLO"/>
                 <outlet property="lblHeader" destination="Ht6-rd-JXF" id="SSk-xp-GLP"/>
+                <outlet property="lblPercent" destination="8Ru-Jc-Ouv" id="ZHn-Kt-0Qk"/>
+                <outlet property="lblRemaining" destination="1NH-b3-ST8" id="hFc-q9-b0h"/>
+                <outlet property="lblStep" destination="0pf-fX-QXT" id="jK4-9Y-89Q"/>
+                <outlet property="lblTime" destination="PfZ-7x-LAR" id="NQv-fs-rl7"/>
                 <outlet property="scrollView" destination="rey-N3-l8b" id="s3w-fi-n5l"/>
                 <outlet property="tableListHistory" destination="FXQ-4O-sRc" id="VNN-sx-9xu"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="viewBarChart" destination="VqD-Y3-cYQ" id="RdJ-G5-pPy"/>
+                <outlet property="viewCollectionMode" destination="BVv-qD-EHM" id="A6n-32-oxg"/>
                 <outlet property="viewCollectionShare" destination="Iw2-nW-e7g" id="LW3-j0-yEY"/>
-                <outlet property="viewCollectionTime" destination="yxY-4d-tB6" id="jp8-TP-N5g"/>
+                <outlet property="viewCollectionType" destination="yxY-4d-tB6" id="K1D-Gc-kWV"/>
-                <outlet property="viewCollectionType" destination="BVv-qD-EHM" id="0MR-m4-P1Y"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="clL-JG-rbd" userLabel="ViewHeader">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
                     <subviews>
                         <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">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ytc-zM-ZGC">
                             <rect key="frame" x="0.0" y="5" width="70" height="36"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="70" id="xAE-oP-WEf"/>
                             </constraints>
                             <state key="normal" image="today_back_button"/>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CFx-sO-MAH">
                             <rect key="frame" x="330" y="0.0" width="45" height="46"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="45" id="V0g-Ii-pNQ"/>
                             </constraints>
                             <state key="normal" image="icon_menu"/>
                         </button>
                     </subviews>
                     <color key="backgroundColor" red="0.098039215686274508" green="0.098039215686274508" blue="0.098039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstItem="ytc-zM-ZGC" firstAttribute="leading" secondItem="clL-JG-rbd" secondAttribute="leading" id="LDb-Pq-Z5k"/>
                         <constraint firstAttribute="trailing" secondItem="CFx-sO-MAH" secondAttribute="trailing" id="PTh-vI-2DI"/>
                         <constraint firstItem="CFx-sO-MAH" firstAttribute="top" secondItem="clL-JG-rbd" secondAttribute="top" id="Uxg-Wl-DlF"/>
                         <constraint firstAttribute="bottom" secondItem="CFx-sO-MAH" secondAttribute="bottom" id="X9D-m3-QXF"/>
                         <constraint firstAttribute="bottom" secondItem="ytc-zM-ZGC" secondAttribute="bottom" constant="5" id="hWb-ga-1wm"/>
                         <constraint firstItem="ytc-zM-ZGC" firstAttribute="top" secondItem="clL-JG-rbd" secondAttribute="top" constant="5" id="vFt-FE-klC"/>
                         <constraint firstAttribute="height" constant="46" id="xGd-BD-bgs"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cf1-lP-zbB" userLabel="ViewTime">
                     <rect key="frame" x="10" y="46" width="355" height="35"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6T2-M9-9wV">
                             <rect key="frame" x="0.0" y="0.0" width="35" height="35"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="6T2-M9-9wV" secondAttribute="height" multiplier="1:1" id="RlM-6u-eer"/>
                             </constraints>
                             <state key="normal" backgroundImage="arrow_back"/>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Cwb-8M-pDi">
                             <rect key="frame" x="320" y="0.0" width="35" height="35"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <state key="normal" backgroundImage="arrow_next"/>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2017年1月1日　日曜日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EM7-vA-s1e">
                             <rect key="frame" x="40" y="2" width="275" height="31"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstItem="Cwb-8M-pDi" firstAttribute="top" secondItem="Cf1-lP-zbB" secondAttribute="top" id="4Jr-r7-y6d"/>
                         <constraint firstAttribute="bottom" secondItem="6T2-M9-9wV" secondAttribute="bottom" id="8bU-NI-m32"/>
                         <constraint firstItem="EM7-vA-s1e" firstAttribute="leading" secondItem="6T2-M9-9wV" secondAttribute="trailing" constant="5" id="9G1-I6-nSV"/>
                         <constraint firstItem="EM7-vA-s1e" firstAttribute="top" secondItem="Cf1-lP-zbB" secondAttribute="top" constant="2" id="9Yk-sv-gkx"/>
                         <constraint firstItem="Cwb-8M-pDi" firstAttribute="leading" secondItem="EM7-vA-s1e" secondAttribute="trailing" constant="5" id="JQI-18-cWP"/>
                         <constraint firstAttribute="height" constant="35" id="Pdg-IR-g8y"/>
                         <constraint firstItem="6T2-M9-9wV" firstAttribute="leading" secondItem="Cf1-lP-zbB" secondAttribute="leading" id="Pgh-zZ-vrG"/>
                         <constraint firstAttribute="bottom" secondItem="Cwb-8M-pDi" secondAttribute="bottom" id="WWs-Ey-osm"/>
                         <constraint firstItem="Cwb-8M-pDi" firstAttribute="width" secondItem="Cwb-8M-pDi" secondAttribute="height" multiplier="1:1" id="YHa-MU-GKi"/>
                         <constraint firstItem="6T2-M9-9wV" firstAttribute="top" secondItem="Cf1-lP-zbB" secondAttribute="top" id="fiM-o3-Us0"/>
                         <constraint firstAttribute="trailing" secondItem="Cwb-8M-pDi" secondAttribute="trailing" id="oCE-RP-EmX"/>
                         <constraint firstAttribute="bottom" secondItem="EM7-vA-s1e" secondAttribute="bottom" constant="2" id="oOd-ip-MZy"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yxY-4d-tB6" customClass="CollectionView">
                     <rect key="frame" x="2" y="96" width="371" height="40"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="U7Q-wa-CDi"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BVv-qD-EHM" customClass="CollectionView">
                     <rect key="frame" x="0.0" y="567" width="375" height="40"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="6wc-NQ-UAH"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FLa-rV-Aas" userLabel="ViewContent">
                     <rect key="frame" x="0.0" y="151" width="375" height="411"/>
                     <subviews>
                         <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">
                             <rect key="frame" x="5" y="0.0" width="365" height="411"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <connections>
                                 <outlet property="dataSource" destination="-1" id="GQy-lg-1Af"/>
                                 <outlet property="delegate" destination="-1" id="Jka-Ij-zNq"/>
                             </connections>
                         </tableView>
                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rey-N3-l8b">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="411"/>
                             <subviews>
                                 <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Cam-ML-IEO">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="411"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kzk-mN-AOf">
                                             <rect key="frame" x="20" y="30" width="120" height="120"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="500 step" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oWg-A8-aCr">
                                                     <rect key="frame" x="18" y="35" width="82" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="zOX-0d-IVv"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kr7-S0-Fpl">
                                                     <rect key="frame" x="20.5" y="61" width="80" height="42"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="80" id="IOc-sB-dA2"/>
                                                         <constraint firstAttribute="height" constant="42" id="zRP-Fu-qZ9"/>
                                                     </constraints>
                                                     <string key="text">目標まであと
 500 stepです</string>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstItem="Kr7-S0-Fpl" firstAttribute="top" secondItem="oWg-A8-aCr" secondAttribute="bottom" constant="5" id="2KK-Lm-h74"/>
                                                 <constraint firstItem="oWg-A8-aCr" firstAttribute="leading" secondItem="Kzk-mN-AOf" secondAttribute="leading" constant="18" id="CdG-qa-ud5"/>
                                                 <constraint firstAttribute="width" constant="120" id="E48-cC-dsc"/>
                                                 <constraint firstAttribute="height" constant="120" id="SlY-sr-tR9"/>
                                                 <constraint firstItem="Kr7-S0-Fpl" firstAttribute="centerX" secondItem="Kzk-mN-AOf" secondAttribute="centerX" id="jJV-RH-pk1"/>
                                                 <constraint firstItem="oWg-A8-aCr" firstAttribute="top" secondItem="Kzk-mN-AOf" secondAttribute="top" constant="35" id="oBl-zo-td5"/>
                                                 <constraint firstAttribute="trailing" secondItem="oWg-A8-aCr" secondAttribute="trailing" constant="20" id="xgh-d4-jOF"/>
                                             </constraints>
                                             <userDefinedRuntimeAttributes>
                                                 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                                     <integer key="value" value="60"/>
                                                 </userDefinedRuntimeAttribute>
                                             </userDefinedRuntimeAttributes>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4ix-HE-d9T">
                                             <rect key="frame" x="148" y="30" width="219" height="120"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="目標" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YE6-wh-77T">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="目標" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YE6-wh-77T" customClass="AutoTransLabel">
                                                     <rect key="frame" x="10" y="37.5" width="45" height="15"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="45" id="6Ce-YE-wbx"/>
                                                         <constraint firstAttribute="height" constant="15" id="eFR-Ao-75U"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.total"/>
+                                                    </userDefinedRuntimeAttributes>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="残歩数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOl-Tj-xiT">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="残歩数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HOl-Tj-xiT" customClass="AutoTransLabel">
                                                     <rect key="frame" x="10" y="52.5" width="45" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.remaining"/>
+                                                    </userDefinedRuntimeAttributes>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="達成率" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l0h-qA-2Ai">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="達成率" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l0h-qA-2Ai" customClass="AutoTransLabel">
                                                     <rect key="frame" x="10" y="67.5" width="45" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.percent"/>
+                                                    </userDefinedRuntimeAttributes>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000 step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0pf-fX-QXT">
                                                     <rect key="frame" x="63" y="37.5" width="118" height="15"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="15" id="Z6o-LI-Eu9"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="500 step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1NH-b3-ST8">
                                                     <rect key="frame" x="63" y="52.5" width="118" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="50  %" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ru-Jc-Ouv">
                                                     <rect key="frame" x="63" y="67.5" width="118" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstItem="l0h-qA-2Ai" firstAttribute="top" secondItem="HOl-Tj-xiT" secondAttribute="bottom" id="0dv-3h-eHs"/>
                                                 <constraint firstItem="l0h-qA-2Ai" firstAttribute="leading" secondItem="YE6-wh-77T" secondAttribute="leading" id="7z3-ph-BM4"/>
                                                 <constraint firstItem="1NH-b3-ST8" firstAttribute="leading" secondItem="0pf-fX-QXT" secondAttribute="leading" id="ACu-BV-ieg"/>
                                                 <constraint firstItem="8Ru-Jc-Ouv" firstAttribute="top" secondItem="1NH-b3-ST8" secondAttribute="bottom" id="Abh-FK-4X7"/>
                                                 <constraint firstItem="1NH-b3-ST8" firstAttribute="top" secondItem="0pf-fX-QXT" secondAttribute="bottom" id="B3I-n2-Oks"/>
                                                 <constraint firstItem="1NH-b3-ST8" firstAttribute="height" secondItem="0pf-fX-QXT" secondAttribute="height" id="BAn-7O-jBX"/>
                                                 <constraint firstItem="0pf-fX-QXT" firstAttribute="leading" secondItem="YE6-wh-77T" secondAttribute="trailing" constant="8" id="G20-xx-HEH"/>
                                                 <constraint firstItem="8Ru-Jc-Ouv" firstAttribute="leading" secondItem="0pf-fX-QXT" secondAttribute="leading" id="NIm-Zw-fnf"/>
                                                 <constraint firstItem="8Ru-Jc-Ouv" firstAttribute="height" secondItem="0pf-fX-QXT" secondAttribute="height" id="PdQ-qd-Sqc"/>
                                                 <constraint firstItem="HOl-Tj-xiT" firstAttribute="width" secondItem="YE6-wh-77T" secondAttribute="width" id="WpC-o9-bDa"/>
                                                 <constraint firstItem="l0h-qA-2Ai" firstAttribute="height" secondItem="YE6-wh-77T" secondAttribute="height" id="bR8-Ki-lS1"/>
                                                 <constraint firstItem="HOl-Tj-xiT" firstAttribute="height" secondItem="YE6-wh-77T" secondAttribute="height" id="c0u-hz-5O9"/>
                                                 <constraint firstItem="1NH-b3-ST8" firstAttribute="leading" secondItem="0pf-fX-QXT" secondAttribute="leading" id="chf-kb-ClX"/>
                                                 <constraint firstItem="8Ru-Jc-Ouv" firstAttribute="leading" secondItem="0pf-fX-QXT" secondAttribute="leading" id="din-4T-V5w"/>
                                                 <constraint firstItem="l0h-qA-2Ai" firstAttribute="width" secondItem="YE6-wh-77T" secondAttribute="width" id="eo0-xw-d1f"/>
                                                 <constraint firstItem="8Ru-Jc-Ouv" firstAttribute="width" secondItem="0pf-fX-QXT" secondAttribute="width" id="gjt-3e-Pkx"/>
                                                 <constraint firstItem="1NH-b3-ST8" firstAttribute="width" secondItem="0pf-fX-QXT" secondAttribute="width" id="kOM-6S-Amv"/>
                                                 <constraint firstItem="HOl-Tj-xiT" firstAttribute="leading" secondItem="YE6-wh-77T" secondAttribute="leading" id="oOc-TB-k4j"/>
                                                 <constraint firstItem="1NH-b3-ST8" firstAttribute="centerY" secondItem="HOl-Tj-xiT" secondAttribute="centerY" id="pGW-dw-56G"/>
                                                 <constraint firstItem="HOl-Tj-xiT" firstAttribute="top" secondItem="YE6-wh-77T" secondAttribute="bottom" id="s6n-mU-Sp6"/>
                                                 <constraint firstItem="HOl-Tj-xiT" firstAttribute="centerY" secondItem="4ix-HE-d9T" secondAttribute="centerY" id="vB9-RR-pao"/>
                                                 <constraint firstAttribute="trailing" secondItem="0pf-fX-QXT" secondAttribute="trailing" constant="38" id="xiP-fg-Ozi"/>
                                                 <constraint firstItem="YE6-wh-77T" firstAttribute="leading" secondItem="4ix-HE-d9T" secondAttribute="leading" constant="10" id="xj6-In-ihz"/>
                                             </constraints>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iEh-Ze-suq">
                                             <rect key="frame" x="20" y="158" width="335" height="35"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UwA-5Q-gdv">
                                                     <rect key="frame" x="0.0" y="0.0" width="111.5" height="35"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="消費カロリー" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zRU-L6-Ed4">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="消費カロリー" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zRU-L6-Ed4" customClass="AutoTransLabel">
                                                             <rect key="frame" x="0.0" y="0.0" width="111.5" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="Ywp-RA-6am"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.calories"/>
+                                                            </userDefinedRuntimeAttributes>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000 kcal" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dAE-C8-QLr">
                                                             <rect key="frame" x="0.0" y="17" width="111.5" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="r0d-xi-3u7"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstItem="zRU-L6-Ed4" firstAttribute="leading" secondItem="UwA-5Q-gdv" secondAttribute="leading" id="Zbe-7f-cuR"/>
                                                         <constraint firstAttribute="bottom" secondItem="dAE-C8-QLr" secondAttribute="bottom" id="aZH-zh-M1V"/>
                                                         <constraint firstItem="zRU-L6-Ed4" firstAttribute="top" secondItem="UwA-5Q-gdv" secondAttribute="top" id="bsw-KU-Tcu"/>
                                                         <constraint firstAttribute="trailing" secondItem="zRU-L6-Ed4" secondAttribute="trailing" id="iMB-ch-u4B"/>
                                                         <constraint firstItem="dAE-C8-QLr" firstAttribute="leading" secondItem="UwA-5Q-gdv" secondAttribute="leading" id="qNu-WH-Jjj"/>
                                                         <constraint firstAttribute="trailing" secondItem="dAE-C8-QLr" secondAttribute="trailing" id="wRF-1x-XC1"/>
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BVs-KG-fDF">
                                                     <rect key="frame" x="111.5" y="0.0" width="112" height="35"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="距離" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XGt-pc-sd7">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="距離" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XGt-pc-sd7" customClass="AutoTransLabel">
                                                             <rect key="frame" x="0.0" y="0.0" width="112" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="tct-pY-7wo"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.distance"/>
+                                                            </userDefinedRuntimeAttributes>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.0 KM" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1tR-JC-pyw">
                                                             <rect key="frame" x="0.0" y="17" width="112" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="sNT-xl-BKH"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstItem="XGt-pc-sd7" firstAttribute="leading" secondItem="BVs-KG-fDF" secondAttribute="leading" id="Bd8-ZX-shc"/>
                                                         <constraint firstAttribute="trailing" secondItem="1tR-JC-pyw" secondAttribute="trailing" id="Mrw-gb-r3n"/>
                                                         <constraint firstAttribute="trailing" secondItem="XGt-pc-sd7" secondAttribute="trailing" id="cTc-te-Pc1"/>
                                                         <constraint firstItem="XGt-pc-sd7" firstAttribute="top" secondItem="BVs-KG-fDF" secondAttribute="top" id="cs1-A7-e5C"/>
                                                         <constraint firstAttribute="bottom" secondItem="1tR-JC-pyw" secondAttribute="bottom" id="vsZ-FE-X5m"/>
                                                         <constraint firstItem="1tR-JC-pyw" firstAttribute="leading" secondItem="BVs-KG-fDF" secondAttribute="leading" id="xOd-ZK-rZn"/>
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j5h-QD-Igf">
                                                     <rect key="frame" x="223.5" y="0.0" width="111.5" height="35"/>
                                                     <subviews>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="時間" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEO-l8-Ibg">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="時間" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OEO-l8-Ibg" customClass="AutoTransLabel">
                                                             <rect key="frame" x="0.0" y="0.0" width="111.5" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="EVe-qW-qqp"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.time"/>
+                                                            </userDefinedRuntimeAttributes>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1:00 時間" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PfZ-7x-LAR">
                                                             <rect key="frame" x="0.0" y="17" width="111.5" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="lno-Dx-ZNm"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstAttribute="trailing" secondItem="PfZ-7x-LAR" secondAttribute="trailing" id="3Ir-mZ-xmI"/>
                                                         <constraint firstItem="OEO-l8-Ibg" firstAttribute="leading" secondItem="j5h-QD-Igf" secondAttribute="leading" id="5oW-CQ-vWi"/>
                                                         <constraint firstItem="PfZ-7x-LAR" firstAttribute="leading" secondItem="j5h-QD-Igf" secondAttribute="leading" id="Qur-SO-10d"/>
                                                         <constraint firstAttribute="trailing" secondItem="OEO-l8-Ibg" secondAttribute="trailing" id="WQn-Gv-plQ"/>
                                                         <constraint firstItem="OEO-l8-Ibg" firstAttribute="top" secondItem="j5h-QD-Igf" secondAttribute="top" id="lt7-Qt-rBM"/>
                                                         <constraint firstAttribute="bottom" secondItem="PfZ-7x-LAR" secondAttribute="bottom" id="qcA-M9-NYS"/>
                                                     </constraints>
                                                 </view>
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstAttribute="bottom" secondItem="j5h-QD-Igf" secondAttribute="bottom" id="IsO-UX-w9t"/>
                                                 <constraint firstItem="j5h-QD-Igf" firstAttribute="top" secondItem="iEh-Ze-suq" secondAttribute="top" id="Msr-oS-nFH"/>
                                                 <constraint firstItem="BVs-KG-fDF" firstAttribute="top" secondItem="iEh-Ze-suq" secondAttribute="top" id="Ohk-mJ-oCK"/>
                                                 <constraint firstItem="UwA-5Q-gdv" firstAttribute="top" secondItem="iEh-Ze-suq" secondAttribute="top" id="Pue-sC-wfB"/>
                                                 <constraint firstAttribute="height" constant="35" id="WDe-uC-4Qb"/>
                                                 <constraint firstItem="BVs-KG-fDF" firstAttribute="leading" secondItem="UwA-5Q-gdv" secondAttribute="trailing" id="f8Q-F0-hjc"/>
                                                 <constraint firstItem="BVs-KG-fDF" firstAttribute="width" secondItem="UwA-5Q-gdv" secondAttribute="width" id="fdz-YH-1kJ"/>
                                                 <constraint firstAttribute="bottom" secondItem="UwA-5Q-gdv" secondAttribute="bottom" id="gxD-wy-TgL"/>
                                                 <constraint firstItem="j5h-QD-Igf" firstAttribute="width" secondItem="UwA-5Q-gdv" secondAttribute="width" id="i3o-n4-fZN"/>
                                                 <constraint firstAttribute="trailing" secondItem="j5h-QD-Igf" secondAttribute="trailing" id="nT6-nS-H9z"/>
                                                 <constraint firstAttribute="bottom" secondItem="BVs-KG-fDF" secondAttribute="bottom" id="nqB-N3-F3F"/>
                                                 <constraint firstItem="UwA-5Q-gdv" firstAttribute="leading" secondItem="iEh-Ze-suq" secondAttribute="leading" id="oV9-IH-tYC"/>
                                                 <constraint firstItem="j5h-QD-Igf" firstAttribute="leading" secondItem="BVs-KG-fDF" secondAttribute="trailing" id="zOb-WE-3CI"/>
                                             </constraints>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VqD-Y3-cYQ" customClass="BarChartView" customModule="Charts">
                                             <rect key="frame" x="0.0" y="201" width="375" height="100"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="100" id="aQR-hf-MhR"/>
                                             </constraints>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Iw2-nW-e7g" customClass="CollectionView">
                                             <rect key="frame" x="20" y="316" width="335" height="50"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="50" id="Yzh-hD-r0n"/>
                                             </constraints>
                                         </view>
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <constraints>
                                         <constraint firstItem="VqD-Y3-cYQ" firstAttribute="top" secondItem="iEh-Ze-suq" secondAttribute="bottom" constant="8" id="0BA-6p-JLT"/>
                                         <constraint firstItem="Iw2-nW-e7g" firstAttribute="leading" secondItem="Cam-ML-IEO" secondAttribute="leading" constant="20" id="2lH-sF-Mp0"/>
                                         <constraint firstItem="iEh-Ze-suq" firstAttribute="top" secondItem="4ix-HE-d9T" secondAttribute="bottom" constant="8" id="9Sm-IQ-feL"/>
                                         <constraint firstItem="VqD-Y3-cYQ" firstAttribute="leading" secondItem="Cam-ML-IEO" secondAttribute="leading" id="Gbd-bD-rFf"/>
                                         <constraint firstItem="4ix-HE-d9T" firstAttribute="top" secondItem="Cam-ML-IEO" secondAttribute="top" constant="30" id="JyQ-KD-MhR"/>
                                         <constraint firstAttribute="trailing" secondItem="iEh-Ze-suq" secondAttribute="trailing" constant="20" id="RcZ-yN-56e"/>
                                         <constraint firstAttribute="trailing" secondItem="Iw2-nW-e7g" secondAttribute="trailing" constant="20" id="Xso-Or-Fgf"/>
                                         <constraint firstItem="Kzk-mN-AOf" firstAttribute="top" secondItem="Cam-ML-IEO" secondAttribute="top" constant="30" id="YzU-Mb-veC"/>
                                         <constraint firstAttribute="trailing" secondItem="4ix-HE-d9T" secondAttribute="trailing" constant="8" id="del-xz-Tos"/>
                                         <constraint firstItem="4ix-HE-d9T" firstAttribute="height" secondItem="Kzk-mN-AOf" secondAttribute="height" id="duV-wT-9wp"/>
                                         <constraint firstItem="Iw2-nW-e7g" firstAttribute="top" secondItem="VqD-Y3-cYQ" secondAttribute="bottom" constant="15" id="ekR-kS-L5v"/>
                                         <constraint firstItem="Kzk-mN-AOf" firstAttribute="leading" secondItem="Cam-ML-IEO" secondAttribute="leading" constant="20" id="hFq-WM-gLq"/>
                                         <constraint firstItem="4ix-HE-d9T" firstAttribute="leading" secondItem="Kzk-mN-AOf" secondAttribute="trailing" constant="8" id="hzO-hA-cNG"/>
                                         <constraint firstAttribute="trailing" secondItem="VqD-Y3-cYQ" secondAttribute="trailing" id="ptF-2O-CNR"/>
                                         <constraint firstItem="iEh-Ze-suq" firstAttribute="leading" secondItem="Cam-ML-IEO" secondAttribute="leading" constant="20" id="u5o-P4-qkL"/>
                                     </constraints>
                                 </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <constraints>
                                 <constraint firstItem="Cam-ML-IEO" firstAttribute="width" secondItem="rey-N3-l8b" secondAttribute="width" id="LbF-3h-cxa"/>
                                 <constraint firstAttribute="trailing" secondItem="Cam-ML-IEO" secondAttribute="trailing" id="UHb-6d-wF8"/>
                                 <constraint firstItem="Cam-ML-IEO" firstAttribute="leading" secondItem="rey-N3-l8b" secondAttribute="leading" id="Y4U-kD-V28"/>
                                 <constraint firstItem="Cam-ML-IEO" firstAttribute="top" secondItem="rey-N3-l8b" secondAttribute="top" id="ohS-iH-IIM"/>
                                 <constraint firstAttribute="bottom" secondItem="Cam-ML-IEO" secondAttribute="bottom" id="th8-dH-zv1"/>
                             </constraints>
                             <connections>
                                 <outlet property="delegate" destination="-1" id="3Fl-Qy-gjm"/>
                             </connections>
                         </scrollView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="FXQ-4O-sRc" secondAttribute="trailing" constant="5" id="5y0-NC-rHp"/>
                         <constraint firstItem="FXQ-4O-sRc" firstAttribute="leading" secondItem="FLa-rV-Aas" secondAttribute="leading" constant="5" id="C0U-21-SKl"/>
                         <constraint firstItem="FXQ-4O-sRc" firstAttribute="top" secondItem="FLa-rV-Aas" secondAttribute="top" id="CB0-VD-h5m"/>
                         <constraint firstAttribute="bottom" secondItem="FXQ-4O-sRc" secondAttribute="bottom" id="FbP-FY-h1E"/>
                         <constraint firstAttribute="trailing" secondItem="rey-N3-l8b" secondAttribute="trailing" id="KFD-f5-xci"/>
                         <constraint firstItem="rey-N3-l8b" firstAttribute="top" secondItem="FLa-rV-Aas" secondAttribute="top" id="SpB-31-H3a"/>
                         <constraint firstItem="rey-N3-l8b" firstAttribute="leading" secondItem="FLa-rV-Aas" secondAttribute="leading" id="YvS-I2-8Dg"/>
                         <constraint firstAttribute="bottom" secondItem="rey-N3-l8b" secondAttribute="bottom" id="enX-7g-Eib"/>
                     </constraints>
                     <connections>
                         <outletCollection property="gestureRecognizers" destination="Qjg-St-rCc" appends="YES" id="egt-sX-aBC"/>
                         <outletCollection property="gestureRecognizers" destination="VSZ-i0-Jhb" appends="YES" id="UKr-c3-9pp"/>
                     </connections>
                 </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <gestureRecognizers/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="Cf1-lP-zbB" secondAttribute="trailing" constant="10" id="20C-UL-MCu"/>
                 <constraint firstItem="clL-JG-rbd" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="3tf-ab-v41"/>
                 <constraint firstItem="Cf1-lP-zbB" firstAttribute="top" secondItem="clL-JG-rbd" secondAttribute="bottom" id="5vy-x5-G38"/>
                 <constraint firstItem="Cf1-lP-zbB" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="10" id="974-wJ-aRb"/>
                 <constraint firstItem="yxY-4d-tB6" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="2" id="Jqg-nE-6dv"/>
                 <constraint firstAttribute="trailing" secondItem="BVv-qD-EHM" secondAttribute="trailing" id="MCi-Tl-hSp"/>
                 <constraint firstAttribute="trailing" secondItem="yxY-4d-tB6" secondAttribute="trailing" constant="2" id="Qs5-ky-nmB"/>
                 <constraint firstAttribute="bottom" secondItem="BVv-qD-EHM" secondAttribute="bottom" constant="60" id="SbT-PG-8MJ"/>
                 <constraint firstItem="BVv-qD-EHM" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="SqH-AA-Z2K"/>
                 <constraint firstItem="FLa-rV-Aas" firstAttribute="top" secondItem="yxY-4d-tB6" secondAttribute="bottom" constant="15" id="cWw-RX-1Kp"/>
                 <constraint firstItem="yxY-4d-tB6" firstAttribute="top" secondItem="Cf1-lP-zbB" secondAttribute="bottom" constant="15" id="dSN-ey-gQ7"/>
                 <constraint firstItem="clL-JG-rbd" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="i5Z-XR-Msb"/>
                 <constraint firstItem="FLa-rV-Aas" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="iiN-Zj-1uu"/>
                 <constraint firstAttribute="trailing" secondItem="FLa-rV-Aas" secondAttribute="trailing" id="jme-cz-cFt"/>
                 <constraint firstItem="BVv-qD-EHM" firstAttribute="top" secondItem="FLa-rV-Aas" secondAttribute="bottom" constant="5" id="qbT-yT-phN"/>
                 <constraint firstAttribute="trailing" secondItem="clL-JG-rbd" secondAttribute="trailing" id="ri5-LG-xJH"/>
             </constraints>
             <point key="canvasLocation" x="26.5" y="52.5"/>
         </view>
         <swipeGestureRecognizer direction="left" id="Qjg-St-rCc">
             <connections>
                 <action selector="swipeAction:" destination="-1" id="2Vl-bM-Ta7"/>
             </connections>
         </swipeGestureRecognizer>
         <swipeGestureRecognizer direction="right" id="VSZ-i0-Jhb">
             <connections>
                 <action selector="swipeAction:" destination="-1" id="hoY-6M-DoS"/>
             </connections>
         </swipeGestureRecognizer>
     </objects>
     <resources>
         <image name="arrow_back" width="22" height="22"/>
         <image name="arrow_next" width="22" height="22"/>
         <image name="icon_menu" width="30" height="30"/>
         <image name="today_back_button" width="73" height="37"/>
     </resources>
 </document>

LifeLog/LifeLog/Localizable.strings

Diff comments View file @ c4525f8

 /*
   Localizable.strings
   LifeLog
   Created by Nguyen Van Phong on 7/27/17.
   Copyright © 2017 PhongNV. All rights reserved.
 */
 // Common
 "lifelog.common.year" = "年";
 "lifelog.common.month" = "月";
 "lifelog.common.day" = "日";
 "lifelog.common.email" = "メールアドレス";
 "lifelog.common.password" = "パスワード";
 "lifelog.common.back" = "戻る";
 // Login
 "lifelog.login.title" = "ライフログ";
 "lifelog.login.button.login" = "ログイン";
 "lifelog.login.label.register" = "登録がまだの方";
 "lifelog.login.button.register" = "新規登録";
 "lifelog.login.forget.password" = "パスワードをお忘れの方";
 // Register
 "lifelog.register.title" = "会員登録";
 "lifelog.register.username" = "ユーザー名";
 "lifelog.register.name" = "氏名";
 "lifelog.register.nickname" = "ニックネーム";
 "lifelog.register.confirmation.password" = "確認用パスワード";
 "lifelog.register.sex" = "性別";
 "lifelog.register.birthday" = "生年月日";
 "lifelog.register.height" = "身長";
 "lifelog.register.height.unit" = "cm";
 "lifelog.register.weight.unit" = "kg";
 "lifelog.register.weight" = "体重";
 "lifelog.register.fat.percentage" = "体脂肪率";
 "lifelog.register.fat.percentage.unit" = "%";
 "lifelog.register.daily.physical.activity.level" = "1日の身体活動レベル";
 "lifelog.register.low" = "低い";
 "lifelog.register.normal" = "普通";
 "lifelog.register.high" = "高い";
 "lifelog.register.area" = "お住いの地域";
 "lifelog.register.area.hokkaido" = "北海道";
 "lifelog.register.note" = "コメント";
 // Tapbar
 "lifelog.tapbar.today" = "今日";
 "lifelog.tapbar.history" = "履歴";
 "lifelog.tapbar.ranking" = "ランキング";
 "lifelog.tapbar.map" = "MAP";
 "lifelog.tapbar.sns" = "SNS";
 // Screen Home
 "lifelog.home.title" = "自宅";
 "lifelog.home.unit.step" = "step";
 "lifelog.home.progressHud.title" = "Processing...";
 "lifelog.home.notice" = "お知らせ";
 // Screen Today
 "lifelog.today.title" = "今日";
 "lifelog.today.remaining.step.1" = "目模まであと";
 "lifelog.today.remaining.step.2" = "歩です";
 "lifelog.today.total.other" = "目標";
 "lifelog.today.unit.step" = "歩";
 "lifelog.today.remaining.other" = "残歩数";
 "lifelog.today.text.percent" = "達成率";
 "lifelog.today.percent" = "%";
+// Screen History
+"lifelog.history.title" = "履歴";
+"lifelog.history.type.1" = "1日";
+"lifelog.history.type.2" = "1週間";
+"lifelog.history.type.3" = "1ヶ月";
+"lifelog.history.type.4" = "3ヶ月";
+"lifelog.history.type.5" = "6ヶ月";
+"lifelog.history.mode.1" = "BIKE";
+"lifelog.history.mode.2" = "WALKING";
+"lifelog.history.mode.3" = "RUNNING";
+"lifelog.history.share.1" = "facebook";
+"lifelog.history.share.2" = "twitter";
+"lifelog.history.share.3" = "line";
+"lifelog.history.share.4" = "メール";
+"lifelog.history.share.5" = "その他";
+"lifelog.history.title.total" = "目標";
+"lifelog.history.title.remaining" = "残歩数";
+"lifelog.history.title.percent" = "達成率";
+"lifelog.history.title.calories" = "消費カロリー";
+"lifelog.history.title.distance" = "距離";
+"lifelog.history.title.time" = "時間";
+"lifelog.history.circle.remaining" = "目標まであと\n%d stepです";

LifeLog/LifeLog/ServerAPI.h

Diff comments View file @ c4525f8

 //
 //  ServerAPI.h
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <Foundation/Foundation.h>
 #import "Entities.h"
 extern NSString *const kServerAddress;
 extern NSString *const kUser;
 extern NSString *const kToken;
 @interface ServerAPI : NSObject
 + (instancetype) server;
 @property (nonatomic, assign) NSTimeInterval timeOutInterval;
 - (void)loginWithEmail:(NSString *)email Password:(NSString *)password CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion;
 - (void)registerUserWithParams:(NSDictionary *)params CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion;
 - (void)uploadImage:(NSString *)token andImageData:(NSData *)data CompletionHandler:(void (^)(NSString *, NSError *)) completion;
 - (void)forgetPass:(NSString *)email CompletionHandler:(void (^)(NSError *)) completion;
 - (void)confirmForgetPass:(NSString *)email withConfirm:(NSString *)confirm CompletionHandler:(void (^)(NSError *)) completion;
+- (void) requestHistory:(NSString *)token atDate:(NSDate *)date withType:(int)type andMode:(int) mode CompletionHandler:(void (^)(HistoryObject *, NSError *)) completion;
 @end

LifeLog/LifeLog/ServerAPI.m

Diff comments View file @ c4525f8

 //
 //  ServerAPI.m
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "ServerAPI.h"
 NSString *const kServerAddress = @"http://clover.timesfun.jp:9001/";
 NSString *const kUser = @"KEY_USER";
 NSString *const kToken = @"KEY_TOKEN";
 @implementation NSString (NSString_Extended)
 - (NSString *)urlencode {
     NSMutableString *output = [NSMutableString string];
     const unsigned char *source = (const unsigned char *)[self UTF8String];
     int sourceLen = (int)strlen((const char *)source);
     for (int i = 0; i < sourceLen; ++i) {
         const unsigned char thisChar = source[i];
         if (thisChar == ' '){
             [output appendString:@"+"];
         } else if (thisChar == '.' || thisChar == '-' || thisChar == '_' || thisChar == '~' ||
                    (thisChar >= 'a' && thisChar <= 'z') ||
                    (thisChar >= 'A' && thisChar <= 'Z') ||
                    (thisChar >= '0' && thisChar <= '9')) {
             [output appendFormat:@"%c", thisChar];
         } else {
             [output appendFormat:@"%%%02X", thisChar];
         }
     }
     return output;
 }
 @end
 @implementation ServerAPI
 static ServerAPI *_server = nil;
 @synthesize timeOutInterval = _timeOutInterval;
 + (instancetype)server
 {
     @synchronized(self) {
         if (_server == nil) {
             _server = [[ServerAPI alloc] init];
         }
     }
     return _server;
 }
 - (instancetype)init
 {
     self = [super init];
     if (self != nil) {
         self.timeOutInterval = 150;
     }
     return self;
 }
 // Login
 - (void)loginWithEmail:(NSString *)email Password:(NSString *)password CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion
 {
-    [self _request:[kServerAddress stringByAppendingFormat: @"login"] method:@"POST" paras:@{@"email":email, @"password": password} completion:^(NSData *data, NSError *error) {
+    [self _request:[kServerAddress stringByAppendingFormat: @"login"] method:@"POST" token:@"" paras:@{@"email":email, @"password": password} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 NSString *token = dataResult[@"result"][@"token"];
                 NSDictionary *dictUser = dataResult[@"result"][@"user"];
                 User *user = [[User alloc] init];
                 user.user_id = [NSString stringWithFormat:@"%@",dictUser[@"id"]];
                 user.username = [NSString stringWithFormat:@"%@",dictUser[@"username"]];
                 user.full_name = [NSString stringWithFormat:@"%@",dictUser[@"full_name"]];
                 user.nickname = [NSString stringWithFormat:@"%@",dictUser[@"nickname"]];
                 user.email = [NSString stringWithFormat:@"%@",dictUser[@"email"]];
                 user.password = [NSString stringWithFormat:@"%@",dictUser[@"password"]];
                 user.birthday = [NSString stringWithFormat:@"%@",dictUser[@"birthday"]];
                 user.address = [NSString stringWithFormat:@"%@",dictUser[@"address"]];
                 user.gender = [[NSString stringWithFormat:@"%@",dictUser[@"gender"]] intValue];
                 user.height = [[NSString stringWithFormat:@"%@",dictUser[@"height"]] floatValue];
                 user.weight = [[NSString stringWithFormat:@"%@",dictUser[@"weight"]] floatValue];
                 user.user_description = [NSString stringWithFormat:@"%@",dictUser[@"description"]];
                 user.created_at = [NSString stringWithFormat:@"%@",dictUser[@"created_at"]];
                 user.physical_activity = [NSString stringWithFormat:@"%@",dictUser[@"physical_activity"]];
                 user.profile_image = [NSString stringWithFormat:@"%@",dictUser[@"profile_image"]];
                 user.updated_at = [NSString stringWithFormat:@"%@",dictUser[@"updated_at"]];
                 user.delete_flag = [[NSString stringWithFormat:@"%@",dictUser[@"delete_flag"]] intValue];
                 user.fat_rate = [[NSString stringWithFormat:@"%@",dictUser[@"fat_rate"]] intValue];
                 user.profiles_share = [[NSString stringWithFormat:@"%@",dictUser[@"profiles_share"]] intValue];
                 user.remember_me = [[NSString stringWithFormat:@"%@",dictUser[@"remember_me"]] intValue];
                 user.sound_notifications_share = [[NSString stringWithFormat:@"%@",dictUser[@"sound_notifications_share"]] intValue];
                 user.spend_calo_in_day = [[NSString stringWithFormat:@"%@",dictUser[@"spend_calo_in_day"]] intValue];
                 user.target = [[NSString stringWithFormat:@"%@",dictUser[@"target"]] intValue];
                 completion(user, token, nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 NSError *loginFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(nil, nil, loginFaild);
             }
         }
         else
         {
             completion(nil, nil, error);
         }
     }];
 }
 // Register
 - (void)registerUserWithParams:(NSDictionary *)params CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion {
-    [self _request:[kServerAddress stringByAppendingFormat: @"register"] method:@"POST" paras:params completion:^(NSData *data, NSError *error) {
+    [self _request:[kServerAddress stringByAppendingFormat: @"register"] method:@"POST" token:@"" paras:params completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 NSString *token = dataResult[@"result"][@"token"];
                 NSDictionary *dictUser = dataResult[@"result"][@"user"];
                 User *user = [[User alloc] init];
                 user.user_id = [NSString stringWithFormat:@"%@",dictUser[@"id"]];
                 user.username = [NSString stringWithFormat:@"%@",dictUser[@"username"]];
                 user.full_name = [NSString stringWithFormat:@"%@",dictUser[@"full_name"]];
                 user.nickname = [NSString stringWithFormat:@"%@",dictUser[@"nickname"]];
                 user.email = [NSString stringWithFormat:@"%@",dictUser[@"email"]];
                 user.password = [NSString stringWithFormat:@"%@",dictUser[@"password"]];
                 user.birthday = [NSString stringWithFormat:@"%@",dictUser[@"birthday"]];
                 user.address = [NSString stringWithFormat:@"%@",dictUser[@"address"]];
                 user.gender = [[NSString stringWithFormat:@"%@",dictUser[@"gender"]] intValue];
                 user.height = [[NSString stringWithFormat:@"%@",dictUser[@"height"]] floatValue];
                 user.weight = [[NSString stringWithFormat:@"%@",dictUser[@"weight"]] floatValue];
                 user.user_description = [NSString stringWithFormat:@"%@",dictUser[@"description"]];
                 user.created_at = [NSString stringWithFormat:@"%@",dictUser[@"created_at"]];
                 user.physical_activity = [NSString stringWithFormat:@"%@",dictUser[@"physical_activity"]];
                 user.profile_image = [NSString stringWithFormat:@"%@",dictUser[@"profile_image"]];
                 user.updated_at = [NSString stringWithFormat:@"%@",dictUser[@"updated_at"]];
                 user.delete_flag = [[NSString stringWithFormat:@"%@",dictUser[@"delete_flag"]] intValue];
                 user.fat_rate = [[NSString stringWithFormat:@"%@",dictUser[@"fat_rate"]] intValue];
                 user.profiles_share = [[NSString stringWithFormat:@"%@",dictUser[@"profiles_share"]] intValue];
                 user.remember_me = [[NSString stringWithFormat:@"%@",dictUser[@"remember_me"]] intValue];
                 user.sound_notifications_share = [[NSString stringWithFormat:@"%@",dictUser[@"sound_notifications_share"]] intValue];
                 user.spend_calo_in_day = [[NSString stringWithFormat:@"%@",dictUser[@"spend_calo_in_day"]] intValue];
                 user.target = [[NSString stringWithFormat:@"%@",dictUser[@"target"]] intValue];
                 completion(user, token, nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 NSError *loginFaild = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(nil, nil, loginFaild);
             }
         }
         else
         {
             completion(nil, nil, error);
         }
     }];
 }
 - (void)forgetPass:(NSString *)email CompletionHandler:(void (^)(NSError *)) completion {
-    [self _request:[kServerAddress stringByAppendingFormat: @"forgetPass"] method:@"POST" paras:@{@"email":email} completion:^(NSData *data, NSError *error) {
+    [self _request:[kServerAddress stringByAppendingFormat: @"forgetPass"] method:@"POST" token:@"" paras:@{@"email":email} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 completion(nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 NSError *forgetPass = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(forgetPass);
             }
         }
         else
         {
             completion(error);
         }
     }];
 }
 - (void)confirmForgetPass:(NSString *)email withConfirm:(NSString *)confirm CompletionHandler:(void (^)(NSError *)) completion {
-    [self _request:[kServerAddress stringByAppendingFormat: @"forgetPass/confirm"] method:@"POST" paras:@{@"email":email, @"code_confirm": confirm} completion:^(NSData *data, NSError *error) {
+    [self _request:[kServerAddress stringByAppendingFormat: @"forgetPass/confirm"] method:@"POST" token:@"" paras:@{@"email":email, @"code_confirm": confirm} completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             int status = [dataResult[@"status"] intValue];
             if (status == 1) { // status = 1 success
                 completion(nil);
             }
             else { // status = 0 error
                 NSString *message = dataResult[@"message"];
                 NSError *confirmForgetPass = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
                 completion(confirmForgetPass);
             }
         }
         else
         {
             completion(error);
         }
   }];
 }
 - (void)uploadImage:(NSString *)token andImageData:(NSData *)data CompletionHandler:(void (^)(NSString *, NSError *)) completion {
     NSDictionary *dict = nil;
     NSString *base64Encoded = [data base64EncodedStringWithOptions:0];
     if (token != nil) {
         dict = @{@"token":token, @"img": base64Encoded};
     }
     else {
         dict = @{@"img": base64Encoded};
     }
-    [self _request:[kServerAddress stringByAppendingFormat: @"upload-image"] method:@"POST" paras:dict completion:^(NSData *data, NSError *error) {
+    [self _request:[kServerAddress stringByAppendingFormat: @"upload-image"] method:@"POST" token:token paras:dict completion:^(NSData *data, NSError *error) {
         if (completion == NULL) {
             return ;
         }
         if (error == nil)
         {
             NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
             NSString *image_profile = [NSString stringWithFormat:@"%@", dataResult[@"message"]];
             completion(image_profile, nil);
         }
         else
         {
             completion(nil, error);
         }
   }];
 }
+-(NSString *) convertIntToString : (int) type {
+    switch (type) {
+        case 1:
+            return @"week";
+            break;
+        case 2:
+            return @"oneMonth";
+            break;
+        case 3:
+            return @"threeMonth";
+            break;
+        case 4:
+            return @"sixMonth";
+            break;
+        default:
+            return @"today";
+            break;
+    }
+}
+#pragma mark - History Screen Function
+- (void) requestHistory:(NSString *)token atDate:(NSDate *)date withType:(int)type andMode:(int) mode CompletionHandler:(void (^)(HistoryObject *, NSError *)) completion {
+    NSString *url = [kServerAddress stringByAppendingFormat:@"/api/history/%@/%d", [self convertIntToString:type], mode];
+    NSLog(@"requestHistory link %@", url);
+    [self _request:url method:@"GET" token:token paras:nil completion:^(NSData *data, NSError *error) {
+        if (completion == NULL) {
+            return ;
+        }
+        if (error == nil)
+        {
+            NSDictionary *dataResult =  [NSJSONSerialization JSONObjectWithData:data options: NSJSONReadingAllowFragments error: &error];
+            NSLog(@"%@", dataResult);
+            int status = [dataResult[@"status"] intValue];
+            if (status == 1) { // status = 1 success
+                HistoryObject * object = [[HistoryObject alloc] initWithData:dataResult[@"result"]];
+                completion(object, nil);
+            }
+            else {
+                NSString *message = dataResult[@"message"];
+                NSError *errorObject = [NSError errorWithDomain:@"LifeLog_Domain" code:-1 userInfo:@{@"message":message}];
+                completion(nil, errorObject);
+            }
+        }
+        else
+        {
+            completion(nil, error);
+        }
+    }];
+}
 #pragma mark - Private Function
 - (NSData *) _encodeDictionary: (NSDictionary *) dictionary
 {
     NSMutableArray *parts = [[NSMutableArray alloc] init];
     for (id key in dictionary)
     {
         NSString *encodedValue = [[dictionary[key] description] urlencode];
         NSString *encodedKey = [[key description] urlencode];//[[key description] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
         NSString *part = [NSString stringWithFormat: @"%@=%@", encodedKey, encodedValue];
         [parts addObject:part];
     }
     NSString *encodedDictionary = [parts componentsJoinedByString:@"&"];
     return [encodedDictionary dataUsingEncoding: NSUTF8StringEncoding];
 }
-- (void) _request:(NSString *)address method:(NSString *)method paras:(NSDictionary *)paras completion:(void (^)(NSData *data, NSError *error))completion
+- (void) _request:(NSString *)address method:(NSString *)method token:(NSString *) token paras:(NSDictionary *)paras completion:(void (^)(NSData *data, NSError *error))completion
 {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL: [NSURL URLWithString:address]];
     request.HTTPMethod = method;
     [request setValue: @"application/json" forHTTPHeaderField: @"Accept"];
     [request setValue: @"application/json" forHTTPHeaderField: @"Content-Type"];
+    if(token != nil && ![token  isEqual: @""]) {
+        [request setValue: token forHTTPHeaderField: @"token"];
+    }
     [request setTimeoutInterval:self.timeOutInterval];
     if (paras != nil)
     {
         NSData *encodedData = [self _encodeDictionary: paras];
         [request setValue: [NSString stringWithFormat: @"%lu", (unsigned long) encodedData.length] forHTTPHeaderField: @"Content-Length"];
         [request setValue: @"application/x-www-form-urlencoded charset=utf-8" forHTTPHeaderField: @"Content-Type"];
         [request setHTTPBody: encodedData];
     }
     NSURLSession *session = [NSURLSession sharedSession];
     NSURLSessionDataTask *task = [session dataTaskWithRequest:request
                                             completionHandler:
                                   ^(NSData *data, NSURLResponse *response, NSError *error) {
                                       if (completion == NULL) {
                                           return ;
                                       }
                                       if (error == nil)
                                       {
                                           completion(data, nil);
                                       }
                                       else
                                       {
                                           completion(nil, error);
                                       }
                                   }];
     [task resume];
 }
 @end