Skip to content

Commit

Permalink
Updated to Swift 1.2. Translated to English. Added new license GPL v3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Butron committed Apr 13, 2015
1 parent b4244fa commit 7c4f96c
Show file tree
Hide file tree
Showing 20 changed files with 283 additions and 104 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>0A51D057-2623-44B0-BBE8-0BE144013CA0</string>
<key>IDESourceControlProjectName</key>
<string>TabBarController</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>https://github.com/CarlosButron/Swift.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>TabBarController/TabBarController.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/CarlosButron/Swift.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</string>
<key>IDESourceControlWCCName</key>
<string>Swift</string>
</dict>
</array>
</dict>
</plist>
Binary file not shown.
10 changes: 9 additions & 1 deletion TabBarController/TabBarController/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
// TabBarController
//
// Created by Carlos Butron on 02/12/14.
// Copyright (c) 2014 Carlos Butron. All rights reserved.
// Copyright (c) 2014 Carlos Butron.
//
// This program 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.
// This program 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 this program. If not, see
// http:/www.gnu.org/licenses/.
//

import UIKit
Expand Down
4 changes: 2 additions & 2 deletions TabBarController/TabBarController/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="8Bs-7t-2dj">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="8Bs-7t-2dj">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
Expand Down Expand Up @@ -119,7 +119,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" id="cAU-as-MFR">
<barButtonItem key="rightBarButtonItem" title="Abrir" id="V7d-2o-zya">
<barButtonItem key="rightBarButtonItem" title="Open" id="V7d-2o-zya">
<connections>
<segue destination="o47-M2-tPP" kind="show" id="9NR-UD-gmb"/>
</connections>
Expand Down
10 changes: 9 additions & 1 deletion TabBarController/TabBarController/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
// TabBarController
//
// Created by Carlos Butron on 02/12/14.
// Copyright (c) 2014 Carlos Butron. All rights reserved.
// Copyright (c) 2014 Carlos Butron.
//
// This program 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.
// This program 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 this program. If not, see
// http:/www.gnu.org/licenses/.
//

import UIKit
Expand Down
10 changes: 6 additions & 4 deletions TableView/TableView.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
07E35DC41A2E49F500CA606C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 07E35DC31A2E49F500CA606C /* Images.xcassets */; };
07E35DC71A2E49F500CA606C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07E35DC51A2E49F500CA606C /* LaunchScreen.xib */; };
07E35DD31A2E49F500CA606C /* TableViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E35DD21A2E49F500CA606C /* TableViewTests.swift */; };
07E35DDD1A2E4A0900CA606C /* imagen1.png in Resources */ = {isa = PBXBuildFile; fileRef = 07E35DDC1A2E4A0900CA606C /* imagen1.png */; };
07E35DDD1A2E4A0900CA606C /* image1.png in Resources */ = {isa = PBXBuildFile; fileRef = 07E35DDC1A2E4A0900CA606C /* image1.png */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -37,7 +37,7 @@
07E35DCC1A2E49F500CA606C /* TableViewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TableViewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
07E35DD11A2E49F500CA606C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
07E35DD21A2E49F500CA606C /* TableViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewTests.swift; sourceTree = "<group>"; };
07E35DDC1A2E4A0900CA606C /* imagen1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = imagen1.png; sourceTree = "<group>"; };
07E35DDC1A2E4A0900CA606C /* image1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = image1.png; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -79,7 +79,7 @@
07E35DB91A2E49F500CA606C /* TableView */ = {
isa = PBXGroup;
children = (
07E35DDC1A2E4A0900CA606C /* imagen1.png */,
07E35DDC1A2E4A0900CA606C /* image1.png */,
07E35DBC1A2E49F500CA606C /* AppDelegate.swift */,
07E35DBE1A2E49F500CA606C /* ViewController.swift */,
07E35DC01A2E49F500CA606C /* Main.storyboard */,
Expand Down Expand Up @@ -195,7 +195,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
07E35DDD1A2E4A0900CA606C /* imagen1.png in Resources */,
07E35DDD1A2E4A0900CA606C /* image1.png in Resources */,
07E35DC21A2E49F500CA606C /* Main.storyboard in Resources */,
07E35DC71A2E49F500CA606C /* LaunchScreen.xib in Resources */,
07E35DC41A2E49F500CA606C /* Images.xcassets in Resources */,
Expand Down Expand Up @@ -409,6 +409,7 @@
07E35DD81A2E49F500CA606C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
07E35DD91A2E49F500CA606C /* Build configuration list for PBXNativeTarget "TableViewTests" */ = {
isa = XCConfigurationList;
Expand All @@ -417,6 +418,7 @@
07E35DDB1A2E49F500CA606C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>8017C6A5-FAC8-47DC-853E-EA6BD1170AB7</string>
<key>IDESourceControlProjectName</key>
<string>TableView</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>https://github.com/CarlosButron/Swift.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>TableView/TableView.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/CarlosButron/Swift.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</string>
<key>IDESourceControlWCCName</key>
<string>Swift</string>
</dict>
</array>
</dict>
</plist>
Binary file not shown.
10 changes: 9 additions & 1 deletion TableView/TableView/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
// TableView
//
// Created by Carlos Butron on 02/12/14.
// Copyright (c) 2014 Carlos Butron. All rights reserved.
// Copyright (c) 2014 Carlos Butron.
//
// This program 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.
// This program 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 this program. If not, see
// http:/www.gnu.org/licenses/.
//

import UIKit
Expand Down
28 changes: 18 additions & 10 deletions TableView/TableView/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
// TableView
//
// Created by Carlos Butron on 02/12/14.
// Copyright (c) 2014 Carlos Butron. All rights reserved.
// Copyright (c) 2014 Carlos Butron.
//
// This program 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.
// This program 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 this program. If not, see
// http:/www.gnu.org/licenses/.
//

import UIKit
Expand All @@ -22,29 +30,29 @@ class ViewController: UIViewController, UITableViewDataSource, UITableViewDelega
}


//Número de Filas
//Number of rows
func tableView(tableView: UITableView, numberOfRowsInSection section:
Int) -> Int{
return 4 }
//Contenido de las celdas
//DetailCells
func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath:
NSIndexPath) -> UITableViewCell{
var cell:UITableViewCell = UITableViewCell(style:
UITableViewCellStyle.Subtitle, reuseIdentifier: nil)
cell.textLabel.text = "Texto de la Celda"
cell.detailTextLabel?.text = "Subtitulo de la Celda"
cell.imageView.image = UIImage(named:"imagen1.png")
cell.textLabel.text = "Cell text"
cell.detailTextLabel?.text = "Cell Subtitle"
cell.imageView.image = UIImage(named:"image1.png")
return cell
}
//Título de la Cabecera
//Title
func tableView(tableView: UITableView, titleForHeaderInSection section:
Int) -> String{
return "Cabecera"
return "Head"
}
//Subtítulo del Pie de Tabla
//Foot Subtitle
func tableView(tableView: UITableView, titleForFooterInSection section:
Int) -> String{
return "Pie de Tabla"
return "Foot"
}

}
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
077CFA2B1ADB31E800D20B9B /* CustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077CFA2A1ADB31E800D20B9B /* CustomCell.swift */; };
07E35D6A1A2E470A00CA606C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E35D691A2E470A00CA606C /* AppDelegate.swift */; };
07E35D6C1A2E470A00CA606C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E35D6B1A2E470A00CA606C /* ViewController.swift */; };
07E35D6F1A2E470A00CA606C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D6D1A2E470A00CA606C /* Main.storyboard */; };
07E35D711A2E470A00CA606C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D701A2E470A00CA606C /* Images.xcassets */; };
07E35D741A2E470A00CA606C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D721A2E470A00CA606C /* LaunchScreen.xib */; };
07E35D801A2E470A00CA606C /* TableViewWithPropertyListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E35D7F1A2E470A00CA606C /* TableViewWithPropertyListTests.swift */; };
07E35D9A1A2E475200CA606C /* Property List.plist in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D991A2E475200CA606C /* Property List.plist */; };
07E35D9C1A2E475900CA606C /* CeldaPersonalizada.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E35D9B1A2E475900CA606C /* CeldaPersonalizada.swift */; };
07E35DA51A2E47C800CA606C /* djTux.png in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D9D1A2E47C800CA606C /* djTux.png */; };
07E35DA61A2E47C800CA606C /* einsteinTux.png in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D9E1A2E47C800CA606C /* einsteinTux.png */; };
07E35DA71A2E47C800CA606C /* indianaTux.png in Resources */ = {isa = PBXBuildFile; fileRef = 07E35D9F1A2E47C800CA606C /* indianaTux.png */; };
Expand All @@ -36,6 +36,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
077CFA2A1ADB31E800D20B9B /* CustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomCell.swift; sourceTree = "<group>"; };
07E35D641A2E470A00CA606C /* TableViewWithPropertyList.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TableViewWithPropertyList.app; sourceTree = BUILT_PRODUCTS_DIR; };
07E35D681A2E470A00CA606C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
07E35D691A2E470A00CA606C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -47,7 +48,6 @@
07E35D7E1A2E470A00CA606C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
07E35D7F1A2E470A00CA606C /* TableViewWithPropertyListTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewWithPropertyListTests.swift; sourceTree = "<group>"; };
07E35D991A2E475200CA606C /* Property List.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Property List.plist"; sourceTree = "<group>"; };
07E35D9B1A2E475900CA606C /* CeldaPersonalizada.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CeldaPersonalizada.swift; sourceTree = "<group>"; };
07E35D9D1A2E47C800CA606C /* djTux.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = djTux.png; sourceTree = "<group>"; };
07E35D9E1A2E47C800CA606C /* einsteinTux.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = einsteinTux.png; sourceTree = "<group>"; };
07E35D9F1A2E47C800CA606C /* indianaTux.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = indianaTux.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -101,7 +101,7 @@
07E35D691A2E470A00CA606C /* AppDelegate.swift */,
07E35D6B1A2E470A00CA606C /* ViewController.swift */,
07E35D991A2E475200CA606C /* Property List.plist */,
07E35D9B1A2E475900CA606C /* CeldaPersonalizada.swift */,
077CFA2A1ADB31E800D20B9B /* CustomCell.swift */,
07E35D6D1A2E470A00CA606C /* Main.storyboard */,
07E35D701A2E470A00CA606C /* Images.xcassets */,
07E35D721A2E470A00CA606C /* LaunchScreen.xib */,
Expand Down Expand Up @@ -260,7 +260,7 @@
buildActionMask = 2147483647;
files = (
07E35D6C1A2E470A00CA606C /* ViewController.swift in Sources */,
07E35D9C1A2E475900CA606C /* CeldaPersonalizada.swift in Sources */,
077CFA2B1ADB31E800D20B9B /* CustomCell.swift in Sources */,
07E35D6A1A2E470A00CA606C /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -453,6 +453,7 @@
07E35D851A2E470A00CA606C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
07E35D861A2E470A00CA606C /* Build configuration list for PBXNativeTarget "TableViewWithPropertyListTests" */ = {
isa = XCConfigurationList;
Expand All @@ -461,6 +462,7 @@
07E35D881A2E470A00CA606C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>DFA24D54-0219-47A8-B028-6C5D1BDC3163</string>
<key>IDESourceControlProjectName</key>
<string>TableViewWithPropertyList</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>https://github.com/CarlosButron/Swift.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>TableViewWithPropertyList/TableViewWithPropertyList.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/CarlosButron/Swift.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</string>
<key>IDESourceControlWCCName</key>
<string>Swift</string>
</dict>
</array>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
// TableViewWithPropertyList
//
// Created by Carlos Butron on 02/12/14.
// Copyright (c) 2014 Carlos Butron. All rights reserved.
// Copyright (c) 2014 Carlos Butron.
//
// This program 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.
// This program 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 this program. If not, see
// http:/www.gnu.org/licenses/.
//

import UIKit
Expand Down
Loading

0 comments on commit 7c4f96c

Please sign in to comment.