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 a611ca2 commit dcaff5c
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
075FD3D41A34C11700513A3A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 075FD3D31A34C11700513A3A /* Images.xcassets */; };
075FD3D71A34C11700513A3A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 075FD3D51A34C11700513A3A /* LaunchScreen.xib */; };
075FD3E31A34C11700513A3A /* SegueWithpresentViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075FD3E21A34C11700513A3A /* SegueWithpresentViewControllerTests.swift */; };
075FD3EE1A34C14600513A3A /* NuevaClase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075FD3EC1A34C14600513A3A /* NuevaClase.swift */; };
075FD3EF1A34C14600513A3A /* NuevaClase.xib in Resources */ = {isa = PBXBuildFile; fileRef = 075FD3ED1A34C14600513A3A /* NuevaClase.xib */; };
075FD3EF1A34C14600513A3A /* NewClass.xib in Resources */ = {isa = PBXBuildFile; fileRef = 075FD3ED1A34C14600513A3A /* NewClass.xib */; };
077CFA2F1ADB412300D20B9B /* NewClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077CFA2E1ADB412300D20B9B /* NewClass.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -38,8 +38,8 @@
075FD3DC1A34C11700513A3A /* SegueWithpresentViewControllerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SegueWithpresentViewControllerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
075FD3E11A34C11700513A3A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
075FD3E21A34C11700513A3A /* SegueWithpresentViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegueWithpresentViewControllerTests.swift; sourceTree = "<group>"; };
075FD3EC1A34C14600513A3A /* NuevaClase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NuevaClase.swift; sourceTree = "<group>"; };
075FD3ED1A34C14600513A3A /* NuevaClase.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NuevaClase.xib; sourceTree = "<group>"; };
075FD3ED1A34C14600513A3A /* NewClass.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NewClass.xib; sourceTree = "<group>"; };
077CFA2E1ADB412300D20B9B /* NewClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewClass.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -86,8 +86,8 @@
075FD3D01A34C11700513A3A /* Main.storyboard */,
075FD3D31A34C11700513A3A /* Images.xcassets */,
075FD3D51A34C11700513A3A /* LaunchScreen.xib */,
075FD3EC1A34C14600513A3A /* NuevaClase.swift */,
075FD3ED1A34C14600513A3A /* NuevaClase.xib */,
077CFA2E1ADB412300D20B9B /* NewClass.swift */,
075FD3ED1A34C14600513A3A /* NewClass.xib */,
075FD3CA1A34C11700513A3A /* Supporting Files */,
);
path = SegueWithpresentViewController;
Expand Down Expand Up @@ -200,7 +200,7 @@
files = (
075FD3D21A34C11700513A3A /* Main.storyboard in Resources */,
075FD3D71A34C11700513A3A /* LaunchScreen.xib in Resources */,
075FD3EF1A34C14600513A3A /* NuevaClase.xib in Resources */,
075FD3EF1A34C14600513A3A /* NewClass.xib in Resources */,
075FD3D41A34C11700513A3A /* Images.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -220,7 +220,7 @@
buildActionMask = 2147483647;
files = (
075FD3CF1A34C11700513A3A /* ViewController.swift in Sources */,
075FD3EE1A34C14600513A3A /* NuevaClase.swift in Sources */,
077CFA2F1ADB412300D20B9B /* NewClass.swift in Sources */,
075FD3CD1A34C11700513A3A /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -413,6 +413,7 @@
075FD3E81A34C11700513A3A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
075FD3E91A34C11700513A3A /* Build configuration list for PBXNativeTarget "SegueWithpresentViewControllerTests" */ = {
isa = XCConfigurationList;
Expand All @@ -421,6 +422,7 @@
075FD3EB1A34C11700513A3A /* 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>0C46F91C-7CF3-416B-AB6C-1576ADC39CB8</string>
<key>IDESourceControlProjectName</key>
<string>SegueWithpresentViewController</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>9FCBC930A8DBEE5E1E1094396CDFC4C7EE814530</key>
<string>https://github.com/CarlosButron/Swift.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>XIBwithStoryboard/SegueWithpresentViewController.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 @@
// SegueWithpresentViewController
//
// Created by Carlos Butron on 07/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
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!--View Controller-->
<scene sceneID="Bpe-hs-rXY">
<objects>
<viewController storyboardIdentifier="NuevoViewController" id="rzm-VT-hp8" sceneMemberID="viewController">
<viewController storyboardIdentifier="NewViewController" id="rzm-VT-hp8" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="sQ3-I6-eCR"/>
<viewControllerLayoutGuide type="bottom" id="GkZ-hr-sAn"/>
Expand Down
43 changes: 43 additions & 0 deletions XIBwithStoryboard/SegueWithpresentViewController/NewClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//
// NewClass.swift
// SegueWithpresentViewController
//
// Created by Carlos Butron on 13/04/15.
// 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

class NuevaClase: UIViewController {

override func viewDidLoad() {
super.viewDidLoad()

// Do any additional setup after loading the view.
}

override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}


/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
}
*/

}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14B17" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NuevaClase" customModule="T3E3CarlosButron" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NuevaClase" customModule="SegueWithpresentViewController" customModuleProvider="target">
<connections>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
Expand Down
35 changes: 0 additions & 35 deletions XIBwithStoryboard/SegueWithpresentViewController/NuevaClase.swift

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
// SegueWithpresentViewController
//
// Created by Carlos Butron on 07/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 @@ -12,15 +20,15 @@ class ViewController: UIViewController {

@IBAction func buttonAction(sender: UIButton) {
var storyboard = UIStoryboard(name: "Main", bundle: NSBundle.mainBundle())
var viewController:UIViewController = storyboard.instantiateViewControllerWithIdentifier("NuevoViewController") as UIViewController
var viewController:UIViewController = storyboard.instantiateViewControllerWithIdentifier("NewViewController") as UIViewController
self.presentViewController(viewController, animated: true,
completion: nil)
}


@IBAction func buttonAction2(sender: UIButton) {

var newControlador = UIViewController (nibName: "NuevaClase", bundle: nil)
var newControlador = UIViewController (nibName: "NewClass", bundle: nil)
self.presentViewController(newControlador, animated: true,
completion: nil)
}
Expand Down

0 comments on commit dcaff5c

Please sign in to comment.