M4 completed.

ShayanSolution · Aug 19, 2019 · 3c844c2 · 3c844c2
1 parent d82a3fb
commit 3c844c2
Show file tree

Hide file tree

Showing 19 changed files with 187 additions and 46 deletions.
diff --git a/Invited Dev-Info.plist b/Invited Dev-Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Invited Dev</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.18</string>
+	<string>2.2.19</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -36,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2.21</string>
+	<string>2.2.23</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>googlechromes</string>

diff --git a/Invited.xcodeproj/project.pbxproj b/Invited.xcodeproj/project.pbxproj
@@ -823,12 +823,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Invited/Invited.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 478G9X48NY;
+				DEVELOPMENT_TEAM = KWEJ2K5QR3;
 				INFOPLIST_FILE = "Invited Dev-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-D\" \"DEVELOPMENT\"";
-				PRODUCT_BUNDLE_IDENTIFIER = com.shayansolutions.InvitedDev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shayansolutions.InvitedDev2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Invited/ServerManager/Invited-Bridging-Header.h";
@@ -847,12 +847,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Invited/Invited.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 478G9X48NY;
+				DEVELOPMENT_TEAM = KWEJ2K5QR3;
 				INFOPLIST_FILE = "Invited Dev-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-D\" \"DEVELOPMENT\"";
-				PRODUCT_BUNDLE_IDENTIFIER = com.shayansolutions.InvitedDev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shayansolutions.InvitedDev2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Invited/ServerManager/Invited-Bridging-Header.h";
@@ -980,14 +980,14 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Invited/Invited.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 478G9X48NY;
+				DEVELOPMENT_TEAM = KWEJ2K5QR3;
 				INFOPLIST_FILE = Invited/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.shayansolutions.Invited;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "Invited/ServerManager/Invited-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "/Users/user/Documents/Haider/Invited (version2.1)/Invited/ServerManager/Invited-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1002,14 +1002,14 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Invited/Invited.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 478G9X48NY;
+				DEVELOPMENT_TEAM = KWEJ2K5QR3;
 				INFOPLIST_FILE = Invited/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.shayansolutions.Invited;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "Invited/ServerManager/Invited-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "/Users/user/Documents/Haider/Invited (version2.1)/Invited/ServerManager/Invited-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};

diff --git a/Invited.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/Invited.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Invited Dev.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>Invited.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Invited.xcworkspace/xcuserdata/user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Invited.xcworkspace/xcuserdata/user.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+</Bucket>
diff --git a/Invited/AppDelegate.swift b/Invited/AppDelegate.swift
@@ -31,8 +31,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate,UNUserNotificationCenterDe
         // Override point for customization after application launch.
 
 
-        GMSPlacesClient.provideAPIKey("")
-        GMSServices.provideAPIKey("")
+        GMSPlacesClient.provideAPIKey("AIzaSyBzPGNnwW86_v95lVaHHmcqDwZgIQ2QKF8")
+        GMSServices.provideAPIKey("AIzaSyBzPGNnwW86_v95lVaHHmcqDwZgIQ2QKF8")
 
 
 //        AIzaSyBzPGNnwW86_v95lVaHHmcqDwZgIQ2QKF8
@@ -60,6 +60,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate,UNUserNotificationCenterDe
             kBaseURL = baseURL!
         }
 
+//        if #available(iOS 10.0, *) {
+//            Timer.scheduledTimer(withTimeInterval: 40, repeats: true) { (Timer) in
+//                
+//                BasicFunctions.updateLocationOnServer(city: kCity ?? "")
+//            }
+//        } else {
+//            // Fallback on earlier versions
+//        }
+
 
         if BasicFunctions.getIfUserLoggedIn()
         {
@@ -93,6 +102,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,UNUserNotificationCenterDe
         return true
     }
 
+
     func registerForPushNotifications(application: UIApplication) {
 
         if #available(iOS 10.0, *){

diff --git a/Invited/BasicFunctions/BasicFunctions.swift b/Invited/BasicFunctions/BasicFunctions.swift
@@ -817,6 +817,23 @@ class BasicFunctions: NSObject {
 
     }
 
+    class func updateLocationOnServer(city:String)
+    {
+        //        BasicFunctions.showActivityIndicator(vu: self.view)
+        var postParams = [String : Any]()
+        postParams["user_id"] = BasicFunctions.getPreferences(kUserID)
+        postParams["address"] = city
+
+        ServerManager.updateLocation(postParams,withBaseURL : kBaseURL,accessToken: BasicFunctions.getPreferences(kAccessToken) as? String) { (result) in
+
+
+            //            BasicFunctions.stopActivityIndicator(vu: self.view)
+            //            self.handleServerResponseOfSendReport(json: result as! [String : Any])
+
+
+        }
+    }
+
 
 
 //    class func getImageDataFromContactList(phoneNumber : String) -> Data

diff --git a/Invited/Custom Cells/ReceivedEventsCell.xib b/Invited/Custom Cells/ReceivedEventsCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

diff --git a/Invited/Custom Cells/RequestEventCell.xib b/Invited/Custom Cells/RequestEventCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

diff --git a/Invited/Custom Cells/YourEventsCell.xib b/Invited/Custom Cells/YourEventsCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

diff --git a/Invited/Custom Views/AcceptByMeView.xib b/Invited/Custom Views/AcceptByMeView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -314,7 +314,7 @@
     </objects>
     <resources>
         <image name="icArrowBack" width="24" height="24"/>
-        <image name="iconCalender" width="20" height="20"/>
+        <image name="iconCalender" width="20.5" height="20"/>
         <image name="iconLocation" width="15" height="20"/>
     </resources>
 </document>
diff --git a/Invited/Custom Views/DetailView.xib b/Invited/Custom Views/DetailView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -339,7 +339,7 @@
     <resources>
         <image name="DefaultProfileImage" width="60" height="60"/>
         <image name="icArrowBack" width="24" height="24"/>
-        <image name="iconCalender" width="20" height="20"/>
+        <image name="iconCalender" width="20.5" height="20"/>
         <image name="iconLocation" width="15" height="20"/>
     </resources>
 </document>
diff --git a/Invited/Custom Views/EventDetailView.xib b/Invited/Custom Views/EventDetailView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -315,8 +315,8 @@
     </objects>
     <resources>
         <image name="icArrowBack" width="24" height="24"/>
-        <image name="iconCalender" width="20" height="20"/>
+        <image name="iconCalender" width="20.5" height="20"/>
         <image name="iconLocation" width="15" height="20"/>
-        <image name="iconPersonInvied" width="27" height="20"/>
+        <image name="iconPersonInvied" width="27.5" height="20.5"/>
     </resources>
 </document>
diff --git a/Invited/Custom Views/SentByMeView.xib b/Invited/Custom Views/SentByMeView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -374,8 +374,8 @@
     </objects>
     <resources>
         <image name="icArrowBack" width="24" height="24"/>
-        <image name="iconCalender" width="20" height="20"/>
+        <image name="iconCalender" width="20.5" height="20"/>
         <image name="iconLocation" width="15" height="20"/>
-        <image name="iconPersonInvied" width="27" height="20"/>
+        <image name="iconPersonInvied" width="27.5" height="20.5"/>
     </resources>
 </document>
diff --git a/Invited/Globals/Globals.swift b/Invited/Globals/Globals.swift
@@ -19,6 +19,7 @@ var kImage : UIImage?
 var kIsDisplayOnlyImage : Bool!
 var kSelectedLocation : CLLocationCoordinate2D?
 var kSelectedAddress : String?
+var kCity : String?
 var kNotificationData : [String : Any]?
 
 let kIfUserLoggedIn = "isUserLoggedIn"