Iñigo Valentin пре 9 година
родитељ
комит
eef874e358
3 измењених фајлова са 0 додато и 112 уклоњено
  1. 0 8
      app.xcodeproj/project.pbxproj
  2. 0 88
      app/RowHomeLocation.swift
  3. 0 16
      app/RowHomeLocation.xib

+ 0 - 8
app.xcodeproj/project.pbxproj

@@ -85,8 +85,6 @@
 		93E0C5F21EBE264F00905811 /* RowLabel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93E0C5F11EBE264F00905811 /* RowLabel.xib */; };
 		93E0C5F21EBE264F00905811 /* RowLabel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93E0C5F11EBE264F00905811 /* RowLabel.xib */; };
 		93E0C5F41EBE306900905811 /* ScheduleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E0C5F31EBE306900905811 /* ScheduleViewController.swift */; };
 		93E0C5F41EBE306900905811 /* ScheduleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E0C5F31EBE306900905811 /* ScheduleViewController.swift */; };
 		93E5058F1EEB0DCC00560B4A /* PhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E5058E1EEB0DCC00560B4A /* PhotoViewController.swift */; };
 		93E5058F1EEB0DCC00560B4A /* PhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E5058E1EEB0DCC00560B4A /* PhotoViewController.swift */; };
-		93E505911EEB41F900560B4A /* RowHomeLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E505901EEB41F900560B4A /* RowHomeLocation.swift */; };
-		93E505931EEB42D400560B4A /* RowHomeLocation.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93E505921EEB42D400560B4A /* RowHomeLocation.xib */; };
 		93EB2F0C1EBF5AEB00F64186 /* RowSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EB2F0B1EBF5AEB00F64186 /* RowSchedule.swift */; };
 		93EB2F0C1EBF5AEB00F64186 /* RowSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EB2F0B1EBF5AEB00F64186 /* RowSchedule.swift */; };
 		93EB2F0E1EBF5BF500F64186 /* RowSchedule.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93EB2F0D1EBF5BF500F64186 /* RowSchedule.xib */; };
 		93EB2F0E1EBF5BF500F64186 /* RowSchedule.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93EB2F0D1EBF5BF500F64186 /* RowSchedule.xib */; };
 		93EE9ECB1EE9B87100288F6E /* PastActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EE9ECA1EE9B87100288F6E /* PastActivityViewController.swift */; };
 		93EE9ECB1EE9B87100288F6E /* PastActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EE9ECA1EE9B87100288F6E /* PastActivityViewController.swift */; };
@@ -174,8 +172,6 @@
 		93E0C5F11EBE264F00905811 /* RowLabel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RowLabel.xib; sourceTree = "<group>"; };
 		93E0C5F11EBE264F00905811 /* RowLabel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RowLabel.xib; sourceTree = "<group>"; };
 		93E0C5F31EBE306900905811 /* ScheduleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduleViewController.swift; sourceTree = "<group>"; };
 		93E0C5F31EBE306900905811 /* ScheduleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduleViewController.swift; sourceTree = "<group>"; };
 		93E5058E1EEB0DCC00560B4A /* PhotoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoViewController.swift; sourceTree = "<group>"; };
 		93E5058E1EEB0DCC00560B4A /* PhotoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoViewController.swift; sourceTree = "<group>"; };
-		93E505901EEB41F900560B4A /* RowHomeLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RowHomeLocation.swift; sourceTree = "<group>"; };
-		93E505921EEB42D400560B4A /* RowHomeLocation.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RowHomeLocation.xib; sourceTree = "<group>"; };
 		93EB2F0B1EBF5AEB00F64186 /* RowSchedule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RowSchedule.swift; sourceTree = "<group>"; };
 		93EB2F0B1EBF5AEB00F64186 /* RowSchedule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RowSchedule.swift; sourceTree = "<group>"; };
 		93EB2F0D1EBF5BF500F64186 /* RowSchedule.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RowSchedule.xib; sourceTree = "<group>"; };
 		93EB2F0D1EBF5BF500F64186 /* RowSchedule.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RowSchedule.xib; sourceTree = "<group>"; };
 		93EE9ECA1EE9B87100288F6E /* PastActivityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PastActivityViewController.swift; sourceTree = "<group>"; };
 		93EE9ECA1EE9B87100288F6E /* PastActivityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PastActivityViewController.swift; sourceTree = "<group>"; };
@@ -294,8 +290,6 @@
 				93B9115E1ED765510061BA71 /* app-Bridging-Header.h */,
 				93B9115E1ED765510061BA71 /* app-Bridging-Header.h */,
 				93EE9ECA1EE9B87100288F6E /* PastActivityViewController.swift */,
 				93EE9ECA1EE9B87100288F6E /* PastActivityViewController.swift */,
 				93E5058E1EEB0DCC00560B4A /* PhotoViewController.swift */,
 				93E5058E1EEB0DCC00560B4A /* PhotoViewController.swift */,
-				93E505901EEB41F900560B4A /* RowHomeLocation.swift */,
-				93E505921EEB42D400560B4A /* RowHomeLocation.xib */,
 			);
 			);
 			path = app;
 			path = app;
 			sourceTree = "<group>";
 			sourceTree = "<group>";
@@ -409,7 +403,6 @@
 				93B84BA41D9C31AB006C0F67 /* Assets.xcassets in Resources */,
 				93B84BA41D9C31AB006C0F67 /* Assets.xcassets in Resources */,
 				935D6E2D1E8678B700CED3A1 /* GalleryView.xib in Resources */,
 				935D6E2D1E8678B700CED3A1 /* GalleryView.xib in Resources */,
 				93EB2F0E1EBF5BF500F64186 /* RowSchedule.xib in Resources */,
 				93EB2F0E1EBF5BF500F64186 /* RowSchedule.xib in Resources */,
-				93E505931EEB42D400560B4A /* RowHomeLocation.xib in Resources */,
 				935AE18C1ECE162C0055E71F /* RowLablancaOffer.xib in Resources */,
 				935AE18C1ECE162C0055E71F /* RowLablancaOffer.xib in Resources */,
 				93B911471ED763690061BA71 /* GoogleMaps.bundle in Resources */,
 				93B911471ED763690061BA71 /* GoogleMaps.bundle in Resources */,
 				93BAD2EE1E585578009DF853 /* RowHomeBlog.xib in Resources */,
 				93BAD2EE1E585578009DF853 /* RowHomeBlog.xib in Resources */,
@@ -428,7 +421,6 @@
 			isa = PBXSourcesBuildPhase;
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			buildActionMask = 2147483647;
 			files = (
 			files = (
-				93E505911EEB41F900560B4A /* RowHomeLocation.swift in Sources */,
 				93294FF81E336FA000FDAF50 /* Entry.swift in Sources */,
 				93294FF81E336FA000FDAF50 /* Entry.swift in Sources */,
 				937EA02D1E5B8B5300D0893A /* UIApplcation.swift in Sources */,
 				937EA02D1E5B8B5300D0893A /* UIApplcation.swift in Sources */,
 				93E0C5F41EBE306900905811 /* ScheduleViewController.swift in Sources */,
 				93E0C5F41EBE306900905811 /* ScheduleViewController.swift in Sources */,

+ 0 - 88
app/RowHomeLocation.swift

@@ -1,88 +0,0 @@
-// Copyright (C) 2016 Inigo Valentin
-//
-// This file is part of the Gasteizko Margolariak IOS app.
-//
-// The Gasteizko Margolariak IOS app is free software: you can
-// redistribute it and/or modify it under the terms of the
-// GNU General Public License as published by the Free Software
-// Foundation, either version 3 of the License, or (at your
-// option) any later version.
-//
-// The Gasteizko Margolariak IOS app is distributed in the
-// hope that it will be useful, but WITHOUT ANY WARRANTY;
-// without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-// Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with the Gasteizko Margolariak IOS app.
-// If not, see <http://www.gnu.org/licenses/>.
-
-import Foundation
-import UIKit
-
-/**
-Extension of UIView to be formatted as sections.
-*/
-@IBDesignable class RowHomeLocation: UIView {
-	
-	//@IBOutlet weak var container: UIView!
-	
-	
-	/**
-	Default constructor
-	*/
-	required init?(coder aDecoder: NSCoder) {
-		super.init(coder: aDecoder)
-	}
-	
-	
-	/**
-	Loads the view in the xib file with the same name.
-	*/
-	private func loadViewFromNib() {
-		let bundle = Bundle(for: type(of: self))
-		let nib = UINib(nibName: String(describing: type(of: self)), bundle: bundle)
-		nib.instantiate(withOwner: self, options: nil).first as! UIView
-	}
-	
-	
-	/**
-	Default constructor.
-	:param: s Custom identifier
-	:param: i Custom identifier
-	*/
-	init(s: String, i: Int) {
-		super.init(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
-		loadViewFromNib()
-		
-		self.frame = self.bounds
-		self.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-		self.translatesAutoresizingMaskIntoConstraints = true
-		//self.container.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-		//self.container.translatesAutoresizingMaskIntoConstraints = true
-		//self.container.frame = self.bounds
-		//self.addSubview(container)
-		
-		
-		//TODO Set click listeners
-	}
-	
-	
-	/**
-	Default constructor for the interface builder
-	*/
-	override init(frame: CGRect){
-		super.init(frame: frame)
-	}
-	
-	
-	/**
-	Sets the distance to Gasteizko Margolariak.
-	:param: m Distance, in meters.
-	*/
-	func setDistance(m: Int){
-		// TODO set label
-	}
-	
-}

+ 0 - 16
app/RowHomeLocation.xib

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </view>
-    </objects>
-</document>