Merge pull request #8 from hitenkmr/master

Settings section
actifit · Aug 21, 2018 · d3093b5 · d3093b5
2 parents 6d88e2b + bec4a59
commit d3093b5
Show file tree

Hide file tree

Showing 17 changed files with 754 additions and 26 deletions.
diff --git a/Actifit/Actifit.xcodeproj/project.pbxproj b/Actifit/Actifit.xcodeproj/project.pbxproj
@@ -34,6 +34,9 @@
 		BE272637211452890020E32D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BE272635211452890020E32D /* Main.storyboard */; };
 		BE272639211452940020E32D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BE272638211452940020E32D /* Assets.xcassets */; };
 		BE27263C211452940020E32D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BE27263A211452940020E32D /* LaunchScreen.storyboard */; };
+		BE3D8FE0212B3B9A00178152 /* SettingsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE3D8FDF212B3B9A00178152 /* SettingsVC.swift */; };
+		BE3D8FE2212B403100178152 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE3D8FE1212B403100178152 /* Settings.swift */; };
+		BE3D8FE5212C81BA00178152 /* Charity.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE3D8FE4212C81BA00178152 /* Charity.swift */; };
 		BE925D8D2125E6D800C87803 /* DailyLeaderBoardBVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE925D8C2125E6D800C87803 /* DailyLeaderBoardBVC.swift */; };
 		BE925D8F2125EA9F00C87803 /* DailyLeaderboardTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE925D8E2125EA9F00C87803 /* DailyLeaderboardTableCell.swift */; };
 		BE925D9421260BA800C87803 /* SwiftLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE925D9321260BA800C87803 /* SwiftLoader.swift */; };
@@ -75,6 +78,9 @@
 		BE272638211452940020E32D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		BE27263B211452940020E32D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		BE27263D211452940020E32D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		BE3D8FDF212B3B9A00178152 /* SettingsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsVC.swift; sourceTree = "<group>"; };
+		BE3D8FE1212B403100178152 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
+		BE3D8FE4212C81BA00178152 /* Charity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Charity.swift; sourceTree = "<group>"; };
 		BE925D8C2125E6D800C87803 /* DailyLeaderBoardBVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyLeaderBoardBVC.swift; sourceTree = "<group>"; };
 		BE925D8E2125EA9F00C87803 /* DailyLeaderboardTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyLeaderboardTableCell.swift; sourceTree = "<group>"; };
 		BE925D9321260BA800C87803 /* SwiftLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftLoader.swift; sourceTree = "<group>"; };
@@ -116,9 +122,9 @@
 		BE0AB40F211A2993000E9AEA /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				BE0AB410211A29B1000E9AEA /* Activity.swift */,
-				BE222CF02123652100AD025F /* User.swift */,
+				BE3D8FE3212B403E00178152 /* Realm Models */,
 				BE925D9721273E0800C87803 /* Transaction.swift */,
+				BE3D8FE4212C81BA00178152 /* Charity.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -141,6 +147,7 @@
 				BE0AB441211F68A3000E9AEA /* PostToSteemitVC.swift */,
 				BE925D8C2125E6D800C87803 /* DailyLeaderBoardBVC.swift */,
 				BE925D952127399800C87803 /* WalletVC.swift */,
+				BE3D8FDF212B3B9A00178152 /* SettingsVC.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -236,6 +243,16 @@
 			path = Actifit;
 			sourceTree = "<group>";
 		};
+		BE3D8FE3212B403E00178152 /* Realm Models */ = {
+			isa = PBXGroup;
+			children = (
+				BE0AB410211A29B1000E9AEA /* Activity.swift */,
+				BE222CF02123652100AD025F /* User.swift */,
+				BE3D8FE1212B403100178152 /* Settings.swift */,
+			);
+			path = "Realm Models";
+			sourceTree = "<group>";
+		};
 		BE925D9221260B9A00C87803 /* External */ = {
 			isa = PBXGroup;
 			children = (
@@ -404,8 +421,11 @@
 				BE0AB423211BF45A000E9AEA /* TrackingHistoryVC.swift in Sources */,
 				BE925D9C21273F7E00C87803 /* TransactionTableViewCell.swift in Sources */,
 				BE0AB426211BF641000E9AEA /* ActivityHistoryCell.swift in Sources */,
+				BE3D8FE2212B403100178152 /* Settings.swift in Sources */,
 				BE222CE72120BC2E00AD025F /* ConstaintMaker.swift in Sources */,
 				BE0AB442211F68A3000E9AEA /* PostToSteemitVC.swift in Sources */,
+				BE3D8FE5212C81BA00178152 /* Charity.swift in Sources */,
+				BE3D8FE0212B3B9A00178152 /* SettingsVC.swift in Sources */,
 				BE925D8F2125EA9F00C87803 /* DailyLeaderboardTableCell.swift in Sources */,
 				BE925D962127399800C87803 /* WalletVC.swift in Sources */,
 			);

diff --git a/...t/Actifit.xcworkspace/xcuserdata/hitenderkumar.xcuserdatad/UserInterfaceState.xcuserstate b/...t/Actifit.xcworkspace/xcuserdata/hitenderkumar.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...fit.xcworkspace/xcuserdata/hitenderkumar.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...fit.xcworkspace/xcuserdata/hitenderkumar.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,38 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Actifit/Controllers/PostToSteemitVC.swift"
+            timestampString = "556570305.41231"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "171"
+            endingLineNumber = "171"
+            landmarkName = "postToSteemitBtnAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Actifit/Controllers/PostToSteemitVC.swift"
+            timestampString = "556570305.412493"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "156"
+            endingLineNumber = "156"
+            landmarkName = "postToSteemitBtnAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/Actifit/Actifit/API/API.swift b/Actifit/Actifit/API/API.swift
@@ -57,6 +57,13 @@ public class API : NSObject{
         self.forwardRequest(request: request, httpMethod: HttpMethods.HttpMethod_GET, completion: completion, failure: failure)
     }
 
+    func getCharities(completion : APICompletionHandler, failure : APIFailureHandler) {
+        let urlStr = ApiUrls.charities
+        let url = URL.init(string: urlStr)
+        var request = URLRequest.init(url: url!)
+        request.addBasicHeaderFields()
+        self.forwardRequest(request: request, httpMethod: HttpMethods.HttpMethod_GET, completion: completion, failure: failure)
+    }
 
     //MARK: Dispatching Request to server
 

diff --git a/Actifit/Actifit/Controllers/ActivityTrackingVC.swift b/Actifit/Actifit/Controllers/ActivityTrackingVC.swift
@@ -18,6 +18,7 @@ class ActivityTrackingVC: UIViewController {
     @IBOutlet weak var viewTrackingHistoryBtn : UIButton!
     @IBOutlet weak var viewDailyLeaderboardBtn : UIButton!
     @IBOutlet weak var viewWalletBtn : UIButton!
+    @IBOutlet weak var settingsBtn : UIButton!
 
     //MARK: INSTANCE VARIABLES
 
@@ -88,6 +89,11 @@ class ActivityTrackingVC: UIViewController {
 
     }
 
+    @IBAction func settingsBtnAction(_ sender : UIButton) {
+        self.navigationController?.pushViewController(SettingsVC.instantiateWithStoryboard(appStoryboard: .SB_Main), animated: true)
+
+    }
+
     //MARK : HELPERS
 
     @objc func appMovedToBackground() {