Skip to content

Commit

Permalink
Showing user saved activity history in when user clicks on 'VIEW TRAC…
Browse files Browse the repository at this point in the history
…KING HISTORY'
  • Loading branch information
hitenkmr committed Aug 9, 2018
1 parent 5fd1e30 commit 5582cb9
Show file tree
Hide file tree
Showing 12 changed files with 393 additions and 3 deletions.
Binary file modified Actifit/.DS_Store
Binary file not shown.
28 changes: 28 additions & 0 deletions Actifit/Actifit.xcodeproj/project.pbxproj
Expand Up @@ -10,6 +10,9 @@
5F912D2BD619DE8C3FE85463 /* Pods_Actifit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0FDABFA1F3E07474B668EE1A /* Pods_Actifit.framework */; };
BE0AB411211A29B1000E9AEA /* Activity.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0AB410211A29B1000E9AEA /* Activity.swift */; };
BE0AB413211A2C89000E9AEA /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0AB412211A2C89000E9AEA /* Constants.swift */; };
BE0AB423211BF45A000E9AEA /* TrackingHistoryVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0AB422211BF45A000E9AEA /* TrackingHistoryVC.swift */; };
BE0AB426211BF641000E9AEA /* ActivityHistoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0AB425211BF641000E9AEA /* ActivityHistoryCell.swift */; };
BE0AB428211BF64D000E9AEA /* StoryboardInstantiation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0AB427211BF64D000E9AEA /* StoryboardInstantiation.swift */; };
BE272632211452890020E32D /* AFAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE272631211452890020E32D /* AFAppDelegate.swift */; };
BE272634211452890020E32D /* ActivityTrackingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE272633211452890020E32D /* ActivityTrackingVC.swift */; };
BE272637211452890020E32D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BE272635211452890020E32D /* Main.storyboard */; };
Expand All @@ -23,6 +26,9 @@
B9C0610DDDC898B29A3927DD /* Pods-Actifit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Actifit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Actifit/Pods-Actifit.debug.xcconfig"; sourceTree = "<group>"; };
BE0AB410211A29B1000E9AEA /* Activity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Activity.swift; sourceTree = "<group>"; };
BE0AB412211A2C89000E9AEA /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
BE0AB422211BF45A000E9AEA /* TrackingHistoryVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrackingHistoryVC.swift; sourceTree = "<group>"; };
BE0AB425211BF641000E9AEA /* ActivityHistoryCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivityHistoryCell.swift; sourceTree = "<group>"; };
BE0AB427211BF64D000E9AEA /* StoryboardInstantiation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardInstantiation.swift; sourceTree = "<group>"; };
BE27262E211452890020E32D /* Actifit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Actifit.app; sourceTree = BUILT_PRODUCTS_DIR; };
BE272631211452890020E32D /* AFAppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AFAppDelegate.swift; sourceTree = "<group>"; };
BE272633211452890020E32D /* ActivityTrackingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityTrackingVC.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -83,10 +89,27 @@
children = (
BE272635211452890020E32D /* Main.storyboard */,
BE272633211452890020E32D /* ActivityTrackingVC.swift */,
BE0AB422211BF45A000E9AEA /* TrackingHistoryVC.swift */,
);
path = Controllers;
sourceTree = "<group>";
};
BE0AB424211BF625000E9AEA /* Views */ = {
isa = PBXGroup;
children = (
BE0AB425211BF641000E9AEA /* ActivityHistoryCell.swift */,
);
path = Views;
sourceTree = "<group>";
};
BE0AB429211BF651000E9AEA /* Inline Helpers */ = {
isa = PBXGroup;
children = (
BE0AB427211BF64D000E9AEA /* StoryboardInstantiation.swift */,
);
path = "Inline Helpers";
sourceTree = "<group>";
};
BE272625211452890020E32D = {
isa = PBXGroup;
children = (
Expand All @@ -108,7 +131,9 @@
BE272630211452890020E32D /* Actifit */ = {
isa = PBXGroup;
children = (
BE0AB429211BF651000E9AEA /* Inline Helpers */,
BE0AB414211A2C8D000E9AEA /* AppDelegate */,
BE0AB424211BF625000E9AEA /* Views */,
BE0AB415211A302D000E9AEA /* Controllers */,
BE0AB40F211A2993000E9AEA /* Models */,
BE272638211452940020E32D /* Assets.xcassets */,
Expand Down Expand Up @@ -234,7 +259,10 @@
BE0AB411211A29B1000E9AEA /* Activity.swift in Sources */,
BE272634211452890020E32D /* ActivityTrackingVC.swift in Sources */,
BE272632211452890020E32D /* AFAppDelegate.swift in Sources */,
BE0AB428211BF64D000E9AEA /* StoryboardInstantiation.swift in Sources */,
BE0AB413211A2C89000E9AEA /* Constants.swift in Sources */,
BE0AB423211BF45A000E9AEA /* TrackingHistoryVC.swift in Sources */,
BE0AB426211BF641000E9AEA /* ActivityHistoryCell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file not shown.
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.723784"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "53"
endingLineNumber = "53"
landmarkName = "viewWillDisappear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.724347"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "46"
endingLineNumber = "46"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.724736"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "141"
endingLineNumber = "141"
landmarkName = "setTotalStepsCountsUpFromMidnight()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.7251019"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "181"
endingLineNumber = "181"
landmarkName = "startCountingSteps()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.725454"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "192"
endingLineNumber = "192"
landmarkName = "showStepsCount(count:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
15 changes: 15 additions & 0 deletions Actifit/Actifit/Assets.xcassets/back_black.imageset/Contents.json
@@ -0,0 +1,15 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "back_black.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
5 changes: 4 additions & 1 deletion Actifit/Actifit/Controllers/ActivityTrackingVC.swift
Expand Up @@ -41,13 +41,16 @@ class ActivityTrackingVC: UIViewController {

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
//resetting the start date when wiew appears
self.startDate = Date()
self.navigationController?.isNavigationBarHidden = true
self.setTotalStepsCountsUpFromMidnight()
self.onStart()
}

override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
//resetting total steps count(of global variable) from midnight to 0
self.upToPreviousSessionStepsfromTodayMidnight = 0
self.onStop()
}
Expand All @@ -59,7 +62,7 @@ class ActivityTrackingVC: UIViewController {
}

@IBAction func viewTrackingHistoryBtnAction(_ sender : UIButton) {

self.navigationController?.pushViewController(TrackingHistoryVC.instantiateWithStoryboard(appStoryboard: .SB_Main), animated: true)
}

@IBAction func viewDailyLeaderboardBtnAction(_ sender : UIButton) {
Expand Down

0 comments on commit 5582cb9

Please sign in to comment.