Newly created parties get fetched instantly, added prettier UI lock when doing full refresh, updated project and sdks to 10.2

Author: murph3d

App2Night.xcodeproj/project.pbxproj

@@ -377,7 +377,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -421,7 +421,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -439,7 +439,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = de.dhbw.App2Night;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0.1;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -454,7 +454,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = de.dhbw.App2Night;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0.1;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

App2Night/PartyCollectionViewCell.swift

@@ -171,10 +171,10 @@ extension PartyCollectionViewController {
 			//rating.centerYAnchor.constraint(equalTo: self.centerYAnchor).isActive = true
 
 			// labels
-			_ = name.anchor(nil, left: thumbnail.rightAnchor, bottom: nil, right: distance.leftAnchor, topConstant: 0, leftConstant: 13, bottomConstant: 0, rightConstant: 13, widthConstant: 0, heightConstant: 24)
+			_ = name.anchor(nil, left: thumbnail.rightAnchor, bottom: nil, right: distance.leftAnchor, topConstant: 0, leftConstant: 13, bottomConstant: 0, rightConstant: 4, widthConstant: 0, heightConstant: 24)
 			name.centerYAnchor.constraint(equalTo: self.centerYAnchor, constant: -24).isActive = true
 
-			_ = subtitle.anchor(name.bottomAnchor, left: thumbnail.rightAnchor, bottom: nil, right: distance.leftAnchor, topConstant: 0, leftConstant: 13, bottomConstant: 0, rightConstant: 13, widthConstant: 0, heightConstant: 24)
+			_ = subtitle.anchor(name.bottomAnchor, left: thumbnail.rightAnchor, bottom: nil, right: distance.leftAnchor, topConstant: 0, leftConstant: 13, bottomConstant: 0, rightConstant: 4, widthConstant: 0, heightConstant: 24)
 
 			// seperator lines
 			_ = upperDivider.anchor(self.topAnchor, left: self.leftAnchor, bottom: nil, right: self.rightAnchor, topConstant: 0, leftConstant: 0, bottomConstant: 0, rightConstant: 0, widthConstant: 0, heightConstant: 0.5)

App2Night/PartyCollectionViewController.swift

@@ -13,6 +13,7 @@ import RealmSwift
 protocol PartyCollectionViewControllerDelegate: class {
 
 	func updateParties()
+	func reloadRealm()
 
 }
 
@@ -21,6 +22,9 @@ class PartyCollectionViewController: UICollectionViewController, UICollectionVie
 	// get parties from realm
 	var parties = try! Realm().objects(Party.self)
 
+	// cell lock based on refresh
+	var lock: Bool = false
+	
 	// location things
 	let locationManager = CLLocationManager()
 	var currentLocation = CLLocationCoordinate2D()
@@ -33,6 +37,11 @@ class PartyCollectionViewController: UICollectionViewController, UICollectionVie
 		return rc
 	}()
 
+	func reloadRealm() {
+		self.parties = try! Realm().objects(Party.self)
+		self.collectionView?.reloadData()
+	}
+	
 	// handle the refresh
 	func handleRefresh(_ refreshControl: UIRefreshControl) {
 		lockUI()
@@ -96,7 +105,9 @@ class PartyCollectionViewController: UICollectionViewController, UICollectionVie
 			let offset = self.collectionView?.contentOffset
 			self.refreshControl.endRefreshing()
 			self.refreshControl.beginRefreshing()
-			self.collectionView?.contentOffset = offset!
+			UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseOut, animations: {
+				self.collectionView?.contentOffset = offset!
+			}, completion: nil)
 		}
 	}
 
@@ -163,6 +174,15 @@ class PartyCollectionViewController: UICollectionViewController, UICollectionVie
 			break
 		}
 
+		if self.lock {
+			cell.isUserInteractionEnabled = false
+			// hacky way to call overlay
+			cell.isSelected = true
+		} else {
+			cell.isUserInteractionEnabled = true
+			cell.isSelected = false
+		}
+		
 		return cell
 	}
 
@@ -212,12 +232,14 @@ class PartyCollectionViewController: UICollectionViewController, UICollectionVie
 	}
 
 	func lockUI() {
-		self.collectionView?.isUserInteractionEnabled = false
+		self.lock = true
+		self.collectionView?.reloadData()
 		self.tabBarController?.tabBar.items?[1].isEnabled = false
 	}
 
 	func unlockUI() {
-		self.collectionView?.isUserInteractionEnabled = true
+		self.lock = false
+		self.collectionView?.reloadData()
 		self.tabBarController?.tabBar.items?[1].isEnabled = true
 	}
 

App2Night/PartyCreateFormViewController.swift

@@ -166,23 +166,28 @@ class PartyCreateFormViewController: FormViewController {
 					SwaggerCommunication.shared.validateLocation(with: assembledParty.toLocationRawData()) { (success) in
 						if success {
 							SwiftSpinner.show("Deine Party wird gepostet...")
-							SwaggerCommunication.shared.postParty(with: assembledParty.toPartyRawData()) { (success) in
+							SwaggerCommunication.shared.postParty(with: assembledParty.toPartyRawData()) { (success, id) in
 								if success {
 									print("POST OK.")
-									
-									// start updating parties after succesful post
-									// self.delegate?.updateParties()
-									// stop the spinner
-									SwiftSpinner.hide()
-									// dismiss this view
-									self.dismissView()
+									SwiftSpinner.show("Deine Party wird geladen...")
+									SwaggerCommunication.shared.getParty(for: id!) { (success) in
+										if success {
+											// update previous view
+											self.delegate?.reloadRealm()
+											SwiftSpinner.hide()
+											self.dismissView()
+										} else {
+											SwiftSpinner.hide()
+											self.displayAlert(title: "Party wurde nicht geladen!", message: "Laden ist schiefgelaufen.", buttonTitle: "Okay")
+										}
+									}
 								} else {
 									print("POST FAILED.")
 
 									// stop the spinner
 									SwiftSpinner.hide()
 
-									self.displayAlert(title: "Party wurde nicht gepostet!", message: "Irgendetwas ist schiefgelaufen.", buttonTitle: "Okay")
+									self.displayAlert(title: "Party wurde nicht gepostet!", message: "Posten ist schiefgelaufen.", buttonTitle: "Okay")
 								}
 							}
 						} else {

App2Night/SwaggerCommunication.swift

@@ -100,7 +100,7 @@ class SwaggerCommunication {
 	}
 
 	// posts a party with authorization
-	func postParty(with party: Data, completionHandler: @escaping (Bool) -> ()) {
+	func postParty(with party: Data, completionHandler: @escaping (Bool, String?) -> ()) {
 		let currentUser = try! Realm().object(ofType: You.self, forPrimaryKey: "0")
 
 		let tokenType = (currentUser?.tokenType)!
@@ -125,12 +125,13 @@ class SwaggerCommunication {
 			switch response.result {
 			case .success:
 				DispatchQueue.main.async(execute: { () -> Void in
-					completionHandler(true)
+					let json = JSON(response.result.value!)
+					completionHandler(true, json.stringValue)
 				})
 			case .failure(let e):
 				print(e)
 				DispatchQueue.main.async(execute: { () -> Void in
-					completionHandler(false)
+					completionHandler(false, nil)
 				})
 			}
 			}.resume()