Removed several debug messages.

app/ActivitiesView.swift

@@ -89,7 +89,6 @@ class ActivitiesView: UIView {
 		do {
 			let searchResults = try self.context?.fetch(fetchRequest)
 			if searchResults?.count == 0{
-				NSLog(":ACTIVITIES:DEBUG: No future activities: \(String(describing: searchResults?.count))")
 				let row: RowLabel = RowLabel.init(s: "rowFutureActivity0", i: 0)
 				row.setText(text: "No hay actividades planeadas proximamente. Pronto organizaremos algo!")
 				self.futureList?.addArrangedSubview(row)

app/AlbumViewController.swift

@@ -206,7 +206,6 @@ class AlbumViewController: UIViewController, UIGestureRecognizerDelegate {
 	:sender: The calling view.
 	*/
 	override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-		NSLog(":GALLERYCONTROLLER:DEBUG: Preparing for segue '\(String(describing: segue.identifier))' with id \(self.passId)")
 		if segue.identifier == "SeguePhotoAlbum"{
 			(segue.destination as! PhotoViewController).albumId = passAlbum
 			(segue.destination as! PhotoViewController).photoId = passId
@@ -219,12 +218,9 @@ class AlbumViewController: UIViewController, UIGestureRecognizerDelegate {
 	:param: id The album id.
 	*/
 	func showPhoto(album: Int, photo: Int){
-		NSLog(":ALBUMCONTROLLER:DEBUG: Showing photo \(photo) of album \(album)")
-		// TODO: Set thoese variables and the prepare method
 		self.passAlbum = album
 		self.passId = photo
 		performSegue(withIdentifier: "SeguePhotoAlbum", sender: nil)
-		NSLog(":ALBUMCONTROLLER:DEBUG: PHOTO should be shown")
 	}
 	
 }

app/FetchLocation.swift

@@ -50,7 +50,6 @@ class FetchLocation{
 			if status == 200{
 			
 				guard let data = data else {
-					NSLog(":LOCATION:DEBUG: No data received.")
 					return
 				}
 

app/GalleryView.swift

@@ -164,7 +164,6 @@ class GalleryView: UIView {
 	*/
 	func openAlbum(_ sender:UITapGestureRecognizer? = nil){
 		let id = (sender?.view as! RowGallery).id
-		NSLog(":GALLERY:DEBUG: getting delegate and showing album \(id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showAlbum(id: id)
 	}
@@ -190,7 +189,6 @@ class GalleryView: UIView {
 	Handles the click events to open albums.
 	*/
 	func setUpRowsTapRecognizers(){
-		NSLog(":GALLERY:DEBUG: Setting up tap recognizers")
 		for row in self.rows{
 			let tapRecognizer = UITapGestureRecognizer(target: row, action: #selector(openAlbum(_:)))
 			row.isUserInteractionEnabled = true

app/HomeView.swift

@@ -490,13 +490,9 @@ class HomeView: UIView {
 					NSLog(":GALLERYCONTROLLER:ERROR: Error getting album info: \(error)")
 				}
 				
-				
-				
 				row.setImage(idx: i, filename: image)
 				row.photoIds[i] = id
-				NSLog(":HOME:DEBUG: Photo \(i)")
 				
-				//TODO Set click listener
 				i = i + 1
 			}
 		}
@@ -556,7 +552,6 @@ class HomeView: UIView {
 	Opens a post.
 	*/
 	func openPost(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":HOME:DEBUG: Getting delegate and showing post.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPost(id: (sender?.view as! RowHomeBlog).id)
 	}
@@ -566,7 +561,6 @@ class HomeView: UIView {
 	Opens the La Blanca section when tapping the section.
 	*/
 	func openLablanca(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":HOME:DEBUG: Getting delegate opening the La Blanca section.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showComponent(selected: 2)
 	}
@@ -576,7 +570,6 @@ class HomeView: UIView {
 	Opens the Location section when tapping the section.
 	*/
 	func openLocation(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":HOME:DEBUG: Getting delegate opening the location section.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showComponent(selected: 1)
 	}

app/LablancaView.swift

@@ -146,8 +146,6 @@ class LablancaView: UIView {
 			// Get info from festivals
 			let offerSearchResults = try context.fetch(offerFetchRequest)
 			
-			NSLog(":LABLANCA:DEBUG: \(offerSearchResults.count) offes found.")
-
 			var row: RowLablancaOffer
 			var count: Int = 0
 
@@ -245,10 +243,8 @@ class LablancaView: UIView {
 	:param: sender The view that triggered the event.
 	*/
 	func openSchedule(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":LABLANCA:DEBUG: Getting delegate and showing schedule.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showSchedule(margolari: false)
-		NSLog(":LABLANCA:DEBUG: Schedule should be shown.")
 	}
 
 
@@ -257,10 +253,8 @@ class LablancaView: UIView {
 	:param: sender The view that triggered the event.
 	*/
 	func openGMSchedule(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":LABLANCA:DEBUG: Getting delegate and showing GM schedule.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showSchedule(margolari: true)
-		NSLog(":LABLANCA:DEBUG: GM schedule should be shown.")
 	}
 
 	

app/LocationView.swift

@@ -92,7 +92,7 @@ class LocationView: UIView {
 	Get new location
 	*/
 	func getNewLocation(){
-		NSLog(":LOCATION:DEBUG: Setting marker.")
+		NSLog(":LOCATION:LOG: Recalculating location.")
 		let defaults = UserDefaults.standard
 		if (defaults.value(forKey: "GMLocLat") != nil && defaults.value(forKey: "GMLocLon") != nil){
 			let lat = defaults.value(forKey: "GMLocLat") as! Double
@@ -110,12 +110,10 @@ class LocationView: UIView {
 				marker.title = "Gasteizko Margolariak"
 				//marker.snippet = "Australia"
 				marker.map = self.map
-				NSLog(":LOCATION:DEBUG: Marker set.")
 			
 				let location = self.controller.getLocation()
 				if location != nil {
 					let d: Int = calculateDistance(lat1: location.latitude, lon1: location.longitude, lat2: lat, lon2: lon)
-					NSLog(":LOCATION:LOG: Distance (m): \(d)")
 				
 					if d <= 1000 {
 						self.lbDistance.text = "A \(d) metros de ti."
@@ -132,9 +130,6 @@ class LocationView: UIView {
 				self.lbNo.isHidden = false
 			}
 		}
-		else{
-			NSLog(":LOCATION:DEBUG: No location saved yet.")
-		}
 	}
 
 

app/PastActivityViewController.swift

@@ -65,7 +65,6 @@ class PastActivityViewController: UIViewController, UIGestureRecognizerDelegate
 	Dismisses the controller.
 	*/
 	func back() {
-		NSLog(":FUTUREACTIVITYCONTROLLER:CONTROLLER:DEBUG: Back")
 		self.dismiss(animated: true, completion: nil)
 	}
 	
@@ -84,8 +83,6 @@ class PastActivityViewController: UIViewController, UIGestureRecognizerDelegate
 	*/
 	public func loadActivity(id: Int){
 		
-		NSLog(":PASTACTIVITYCONTROLLER:DEBUG: Loading past activity \(id)")
-		
 		let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
 		let appDelegate = UIApplication.shared.delegate as! AppDelegate
 		let lang : String = getLanguage()
@@ -131,12 +128,12 @@ class PastActivityViewController: UIViewController, UIGestureRecognizerDelegate
 						self.activityImage.setImage(localPath: path, remotePath: "https://margolariak.com/\(path)")
 					}
 				} catch {
-					NSLog(":PASTACTIVITYCONTROLLER:DEBUG: Error getting image for post \(id): \(error)")
+					NSLog(":PASTACTIVITYCONTROLLER:ERROR: Error getting image for past activity \(id): \(error)")
 				}
 				
 			}
 		} catch {
-			NSLog(":PASTACTIVITYCONTROLLER:DEBUG: Error with request: \(error)")
+			NSLog(":PASTACTIVITYCONTROLLER:ERROR: Error loading past activity: \(error)")
 		}
 	}
 	

app/PhotoViewController.swift

@@ -57,7 +57,6 @@ class PhotoViewController: UIViewController, UIGestureRecognizerDelegate {
 	Run when the app loads.
 	*/
 	override func viewDidLoad() {
-		NSLog(":PHOTO:DEBUG: viewDidLoad")
 		
 		// Populate photo array.
 		let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
@@ -118,7 +117,6 @@ class PhotoViewController: UIViewController, UIGestureRecognizerDelegate {
 	Dismisses the controller.
 	*/
 	func back() {
-		NSLog(":PHOTOCONTROLLER:DEBUG: Back")
 		self.dismiss(animated: true, completion: nil)
 	}
 	

app/PostViewController.swift

@@ -53,12 +53,9 @@ class PostViewController: UIViewController, UIGestureRecognizerDelegate {
 		// Set button action
 		barButton.addTarget(self, action: #selector(self.back), for: .touchUpInside)
 	}
-	
-	//TODO implement all the logic for post loading here, including iboutlts
-	
+		
 	
 	func back() {
-		print("POSTCONTROLLER:DEBUG: Back")
 		self.dismiss(animated: true, completion: nil)
 	}
 	

app/RowAlbum.swift

@@ -73,7 +73,6 @@ Extension of UIView to be formatted as sections.
 	:param: i Custom identifier
 	*/
 	init(s: String, i: Int) {
-		NSLog(":ROWALBUM:DEBUG: Init \(s), \(i)")
 		
 		super.init(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
 		loadViewFromNib()
@@ -99,13 +98,11 @@ Extension of UIView to be formatted as sections.
 	}
 	
 	func openLeftPhoto(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWALBUM:DEBUG: Getting delegate and showing left photo.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.albumController?.showPhoto(album: self.id, photo: self.photoIds[0])
 	}
 	
 	func openRightPhoto(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWALBUM:DEBUG: Getting delegate and showing right photo.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.albumController?.showPhoto(album: self.id, photo: self.photoIds[1])
 	}
@@ -130,14 +127,12 @@ Extension of UIView to be formatted as sections.
 				let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector (RowAlbum.openLeftPhoto(_:)))
 				tapRecognizer.delegate = (UIApplication.shared.delegate as! AppDelegate).controller
 				self.preview[idx].isUserInteractionEnabled = true
-				NSLog(":ROWALBUM:DEBUG: Setting tap recognizer for left photo.")
 				self.preview[idx].addGestureRecognizer(tapRecognizer)
 			}
 			else{
 				let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector (RowAlbum.openRightPhoto(_:)))
 				tapRecognizer.delegate = (UIApplication.shared.delegate as! AppDelegate).controller
 				self.preview[idx].isUserInteractionEnabled = true
-				NSLog(":ROWALBUM:DEBUG: Setting tap recognizer for right photo.")
 				self.preview[idx].addGestureRecognizer(tapRecognizer)
 			}
 		}

app/RowBlog.swift

@@ -127,7 +127,6 @@ Extension of UIView to be formatted as post rows.
 	Opens an activity.
 	*/
 	func openPost(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWBLOG:DEBUG: Getting delegate and showing post \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPost(id: self.id)
 	}

app/RowFutureActivity.swift

@@ -203,7 +203,6 @@ Extension of UIView to be formatted as future activity rows.
 	Opens an activity.
 	*/
 	func openActivity(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWFUTUREACTIVITY:DEBUG: Getting delegate and showing past activity \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPastActivity(id: self.id)
 	}

app/RowGallery.swift

@@ -100,7 +100,6 @@ Extension of UIView to be formatted as sections.
 	Opens an album.
 	*/
 	func openAlbum(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROW_GALLERY:DEBUG: Getting delegate and showing album \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showAlbum(id: self.id)
 	}
@@ -122,7 +121,6 @@ Extension of UIView to be formatted as sections.
 	*/
 	func setImage(idx: Int, filename: String){
 		if (filename == ""){
-			NSLog(":ROWGALLERY:DEBUG: No image for album \(self.id) at index \(idx).")
 			self.preview[idx].isHidden = true
 		}
 		else{

app/RowHomeBlog.swift

@@ -126,7 +126,6 @@ Extension of UIView to be formatted as sections.
 	Opens a post.
 	*/
 	func openPost(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWHOMEBLOG:DEBUG: Getting delegate and showing post \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPost(id: self.id)
 	}

app/RowHomeFutureActivities.swift

@@ -126,7 +126,6 @@ Extension of UIView to be formatted as sections.
 	Opens an activity.
 	*/
 	func openActivity(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWFUTUREACTIVITY:DEBUG: Getting delegate and showing past activity \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showFutureActivity(id: self.id)
 	}

app/RowHomeGallery.swift

@@ -84,7 +84,6 @@ Extension of UIView to be formatted as sections.
 	Open the first photo in the photo viewer.
 	*/
 	func openFirstPhoto(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWHOMEGALLERY:DEBUG: Getting delegate and showing first photo.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPhoto(album: self.albumIds[0], photo: self.photoIds[0])
 	}
@@ -94,7 +93,6 @@ Extension of UIView to be formatted as sections.
 	Open the second photo in the photo viewer.
 	*/
 	func openSecondPhoto(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWHOMEGALLERY:DEBUG: Getting delegate and showing second photo.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPhoto(album: self.albumIds[1], photo: self.photoIds[1])
 	}
@@ -104,7 +102,6 @@ Extension of UIView to be formatted as sections.
 	Open the third photo in the photo viewer.
 	*/
 	func openThirdPhoto(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWHOMEGALLERY:DEBUG: Getting delegate and showing third photo.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPhoto(album: self.albumIds[2], photo: self.photoIds[2])
 	}
@@ -114,7 +111,6 @@ Extension of UIView to be formatted as sections.
 	Open the fourth photo in the photo viewer.
 	*/
 	func openFourthPhoto(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWHOMEGALLERY:DEBUG: Getting delegate and showing fourth photo.")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPhoto(album: self.albumIds[3], photo: self.photoIds[3])
 	}
@@ -143,7 +139,6 @@ Extension of UIView to be formatted as sections.
 			photos[idx].setImage(localPath: path, remotePath: "https://margolariak.com/\(path)")
 			
 			// Set tap recognizer
-			NSLog(":ROWHOMEGALLERY:DEBUG: Setting tap recognizer for index \(idx)")
 			switch idx{
 				case 0:
 					let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector (RowHomeGallery.openFirstPhoto(_:)))

app/RowHomePastActivities.swift

@@ -126,7 +126,6 @@ Extension of UIView to be formatted as past activity rows.
 	Opens an activity.
 	*/
 	func openActivity(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWPASTACTIVITY:DEBUG: Getting delegate and showing past activity \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPastActivity(id: self.id)
 	}

app/RowLablancaOffer.swift

@@ -68,7 +68,6 @@ Extension of UIView to be formatted as sections.
 	:param: i Custom identifier
 	*/
 	init(s: String, i: Int) {
-		NSLog(":ROWLABLANCAOFFER:DEBUG: Init \(s), \(i)")
 		
 		super.init(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
 		loadViewFromNib()

app/RowPastActivity.swift

@@ -124,7 +124,6 @@ Extension of UIView to be formatted as sections.
 	Opens an activity.
 	*/
 	func openActivity(_ sender:UITapGestureRecognizer? = nil){
-		NSLog(":ROWPASTACTIVITY:DEBUG: Getting delegate and showing past activity \(self.id).")
 		let delegate: AppDelegate = UIApplication.shared.delegate as! AppDelegate
 		delegate.controller?.showPastActivity(id: self.id)
 	}

app/RowSchedule.swift

@@ -70,12 +70,6 @@ Extension of UIView to be formatted as sections.
 		
 		container.frame = self.bounds
 		self.addSubview(container)
-		
-		// Set tap recognizer
-		/*print("ROW_BLOG:DEBUG: set tap recognizer")
-		let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector (self.openPost (_:)))
-		tapRecognizer.delegate = (UIApplication.shared.delegate as! AppDelegate).controller
-		addGestureRecognizer(tapRecognizer)*/
 	}
 	
 	
@@ -164,6 +158,6 @@ Extension of UIView to be formatted as sections.
 	*/
 	func openEvent(_ sender:UITapGestureRecognizer? = nil){
 		// TODO implement openEvent.
-		print("ROW_BLOG:DEBUG: Open Event")
+		NSLog(":ROWSCHEDULE:DEBUG: Open Event")
 	}
 }

app/ScheduleViewController.swift

@@ -325,7 +325,6 @@ class ScheduleViewController: UIViewController, UIGestureRecognizerDelegate {
 	:param: increment Days to advance the schedule. Negative values to back it up.
 	*/
 	func changeDay(increment: Int){
-		NSLog(":SCHEDULECONTROLLER:DEBUG: Change day increment: \(increment)")
 		self.selectedDay = self.selectedDay + increment
 		if self.selectedDay <= -1{
 			self.selectedDay = 0

app/ViewController.swift

@@ -60,7 +60,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: coder Coder.
 	*/
 	required init?(coder aDecoder: NSCoder) {
-		NSLog(":CONTROLLER:DEBUG: Init!")
 		super.init(coder: aDecoder)
 		
 	}
@@ -86,7 +85,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: id The post id.
 	*/
 	func showPost(id: Int){
-		NSLog(":CONTROLLER:DEBUG: Showing Post \(id)")
 		self.passId = id
 		performSegue(withIdentifier: "SeguePost", sender: nil)
 	}
@@ -97,7 +95,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: id The activity id.
 	*/
 	func showPastActivity(id: Int){
-		NSLog(":CONTROLLER:DEBUG: Showing past activity \(id)")
 		self.passId = id
 		performSegue(withIdentifier: "SeguePastActivity", sender: nil)
 	}
@@ -108,10 +105,10 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: id The activity id.
 	*/
 	func showFutureActivity(id: Int){
-		NSLog(":CONTROLLER:DEBUG: Showing future activity \(id)")
 		self.passId = id
-		// TODO
+		// TODO set future segue
 		//performSegue(withIdentifier: "SegueFutureActivity", sender: nil)
+		performSegue(withIdentifier: "SeguePastActivity", sender: nil)
 	}
 	
 	
@@ -120,23 +117,19 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: id The album id.
 	*/
 	func showAlbum(id: Int){
-		NSLog(":CONTROLLER:DEBUG: Showing album \(id)")
 		self.passId = id
 		performSegue(withIdentifier: "SegueAlbum", sender: nil)
 	}
 	
 	
-	// TODO: This must go in it AlbumViewController
 	/**
 	Shows a photo.
 	:param: id The album id.
 	*/
 	func showPhoto(album: Int, photo: Int){
-		NSLog(":CONTROLLER:DEBUG: Showing photo \(photo) of album \(album)")
 		self.passAlbum = album
 		self.passId = photo
 		performSegue(withIdentifier: "SeguePhoto", sender: nil)
-		NSLog(":CONTROLLER:DEBUG: PHOTO should be shown")
 	}
 	
 	
@@ -145,7 +138,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: margolari True for the margolari schedule, false for the city one.
 	*/
 	func showSchedule(margolari: Bool){
-		NSLog(":CONTROLLER:DEBUG: Showing schedule. Margolari: \(margolari)")
 		if margolari == true{
 			self.passId = 1
 		}
@@ -163,12 +155,10 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	*/
 	func initialSync(showScreen: Bool){
 		if showScreen == true{
-			NSLog(":CONTROLLER:DEBUG: Showing initial sync screen.")
 			performSegue(withIdentifier: "SegueSync", sender: nil)
 			Sync(synchronous: true)
 		}
 		else{
-			NSLog(":CONTROLLER:DEBUG: Re-populating views and hidding initial sync screen.")
 			NSLog(":CONTROLLER:DEBUG: Re-populating disabled: Throws error.")
 			//self.populate()
 			syncSegue?.destination.dismiss(animated: true, completion: nil)
@@ -182,7 +172,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:sender: The calling view.
 	*/
 	override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-		NSLog(":CONTROLLER:DEBUG: preparing for segue '\(String(describing: segue.identifier))' with id \(self.passId)")
 		if segue.identifier == "SeguePost"{
 			(segue.destination as! PostViewController).id = passId
 		}
@@ -214,7 +203,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	}
 	
 	override func viewWillAppear(_ animated: Bool) {
-		NSLog(":CONTROLLER:DEBUG: Forcing a call to populate")
 		self.populate()
 		super.viewWillAppear(animated)
 	}
@@ -262,6 +250,7 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	As of now, not working.
 	*/
 	func populate(){
+		// TODO Set this up.
 		if (self.containerViewHome != nil){
 			//(self.containerViewHome as HomeView).populate()
 			//let ng = self.containerViewHome.dbgTxt
@@ -371,23 +360,8 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 	:param: selected Index of the selected item.
 	*/
 	@IBAction func showComponent(selected: Int) {
-		NSLog(":CONTROLLER:DEBUG: Selected: \(selected)")
 		//Activate label
 		var i = 0
-
-		
-		/*for cell in sectionCollection.visibleCells as! [MenuCollectionViewCell]{ //TODO: Not only visibles!
-			if i == selected + 1{
-				cell.bar.backgroundColor = UIColor(red: 90/255, green: 180/255, blue: 255/255, alpha: 1)
-				cell.label.font = UIFont.boldSystemFont(ofSize: cell.label.font.pointSize)
-			}
-			else{
-				cell.bar.backgroundColor = UIColor(red: 148/255, green: 209/255, blue: 255/255, alpha: 1)
-				cell.label.font = UIFont.systemFont(ofSize: cell.label.font.pointSize)
-				
-			}
-			i = i + 1
-		}*/
 		
 		//Show the view
 		if selected == 0 {
@@ -450,9 +424,6 @@ class ViewController: UIViewController, UICollectionViewDataSource, UICollection
 				self.containerViewGallery.alpha = 1
 			})
 		}
-		
 	}
-
-
 }