diff --git a/SemanaPuc.xcodeproj/project.pbxproj b/SemanaPuc.xcodeproj/project.pbxproj index 8531f82..3b0243e 100644 --- a/SemanaPuc.xcodeproj/project.pbxproj +++ b/SemanaPuc.xcodeproj/project.pbxproj @@ -9,6 +9,9 @@ /* Begin PBXBuildFile section */ 7F305C681D36B8C3004A6963 /* EventsDAO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F305C671D36B8C3004A6963 /* EventsDAO.swift */; }; 7F6EF7FD1D3557A000998356 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F6EF7FC1D3557A000998356 /* Events.swift */; }; + 7FDA58F31D39526800B83EEA /* InformationTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FDA58F21D39526800B83EEA /* InformationTabViewController.swift */; }; + 7FDA58F91D39530800B83EEA /* InformationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FDA58F81D39530800B83EEA /* InformationViewController.swift */; }; + 7FDA58FA1D395C7B00B83EEA /* Information.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7FDA58FC1D395C7B00B83EEA /* Information.storyboard */; }; B24D803B1D34065E00889E49 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B24D803A1D34065E00889E49 /* AppDelegate.swift */; }; B24D803D1D34065E00889E49 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B24D803C1D34065E00889E49 /* ViewController.swift */; }; B24D80401D34065E00889E49 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B24D803E1D34065E00889E49 /* Main.storyboard */; }; @@ -26,6 +29,9 @@ /* Begin PBXFileReference section */ 7F305C671D36B8C3004A6963 /* EventsDAO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventsDAO.swift; sourceTree = ""; }; 7F6EF7FC1D3557A000998356 /* Events.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Events.swift; sourceTree = ""; }; + 7FDA58F21D39526800B83EEA /* InformationTabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InformationTabViewController.swift; sourceTree = ""; }; + 7FDA58F81D39530800B83EEA /* InformationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InformationViewController.swift; sourceTree = ""; }; + 7FDA58FE1D395DCF00B83EEA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Information.storyboard; sourceTree = ""; }; B24D80371D34065E00889E49 /* SemanaPuc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SemanaPuc.app; sourceTree = BUILT_PRODUCTS_DIR; }; B24D803A1D34065E00889E49 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; B24D803C1D34065E00889E49 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -85,7 +91,6 @@ B24D80531D340E5200889E49 /* controllers */, B24D80521D340E3400889E49 /* views */, B24D803A1D34065E00889E49 /* AppDelegate.swift */, - B24D80411D34065E00889E49 /* Assets.xcassets */, B24D80461D34065E00889E49 /* Info.plist */, ); path = SemanaPuc; @@ -98,6 +103,8 @@ B24D80431D34065E00889E49 /* LaunchScreen.storyboard */, B24D80501D340E2200889E49 /* Activity.storyboard */, B24D80581D34118300889E49 /* Favorites.storyboard */, + 7FDA58FC1D395C7B00B83EEA /* Information.storyboard */, + B24D80411D34065E00889E49 /* Assets.xcassets */, ); name = views; sourceTree = ""; @@ -108,9 +115,11 @@ B24D803C1D34065E00889E49 /* ViewController.swift */, B24D804C1D340B3B00889E49 /* ActivityViewController.swift */, B24D804E1D340CF400889E49 /* ActivityTabViewController.swift */, + B24D80561D34115F00889E49 /* FavoritesViewController.swift */, B24D80541D34113100889E49 /* FavoritesTabViewController.swift */, + 7FDA58F21D39526800B83EEA /* InformationTabViewController.swift */, + 7FDA58F81D39530800B83EEA /* InformationViewController.swift */, B24D80601D3557D200889E49 /* EventsFake.swift */, - B24D80561D34115F00889E49 /* FavoritesViewController.swift */, ); name = controllers; sourceTree = ""; @@ -176,6 +185,7 @@ B24D80451D34065E00889E49 /* LaunchScreen.storyboard in Resources */, B24D80421D34065E00889E49 /* Assets.xcassets in Resources */, B24D80401D34065E00889E49 /* Main.storyboard in Resources */, + 7FDA58FA1D395C7B00B83EEA /* Information.storyboard in Resources */, B24D80511D340E2200889E49 /* Activity.storyboard in Resources */, B24D80591D34118300889E49 /* Favorites.storyboard in Resources */, ); @@ -193,16 +203,26 @@ B24D80551D34113100889E49 /* FavoritesTabViewController.swift in Sources */, B24D804F1D340CF400889E49 /* ActivityTabViewController.swift in Sources */, B24D804D1D340B3B00889E49 /* ActivityViewController.swift in Sources */, + 7FDA58F31D39526800B83EEA /* InformationTabViewController.swift in Sources */, 7F6EF7FD1D3557A000998356 /* Events.swift in Sources */, B24D80571D34115F00889E49 /* FavoritesViewController.swift in Sources */, B24D803B1D34065E00889E49 /* AppDelegate.swift in Sources */, B24D80611D3557D200889E49 /* EventsFake.swift in Sources */, + 7FDA58F91D39530800B83EEA /* InformationViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ + 7FDA58FC1D395C7B00B83EEA /* Information.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 7FDA58FE1D395DCF00B83EEA /* Base */, + ); + name = Information.storyboard; + sourceTree = ""; + }; B24D803E1D34065E00889E49 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( diff --git a/SemanaPuc/Activity.storyboard b/SemanaPuc/Activity.storyboard index c848729..dec0198 100644 --- a/SemanaPuc/Activity.storyboard +++ b/SemanaPuc/Activity.storyboard @@ -22,8 +22,10 @@ + + @@ -52,12 +54,15 @@ + + + diff --git a/SemanaPuc/Assets.xcassets/Contents.json b/SemanaPuc/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/SemanaPuc/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/SemanaPuc/Assets.xcassets/V de Venturus.imageset/Contents.json b/SemanaPuc/Assets.xcassets/V de Venturus.imageset/Contents.json new file mode 100644 index 0000000..def1ea0 --- /dev/null +++ b/SemanaPuc/Assets.xcassets/V de Venturus.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "V de Venturus.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/SemanaPuc/Assets.xcassets/V de Venturus.imageset/V de Venturus.png b/SemanaPuc/Assets.xcassets/V de Venturus.imageset/V de Venturus.png new file mode 100644 index 0000000..2d9c486 Binary files /dev/null and b/SemanaPuc/Assets.xcassets/V de Venturus.imageset/V de Venturus.png differ diff --git a/SemanaPuc/Base.lproj/Information.storyboard b/SemanaPuc/Base.lproj/Information.storyboard new file mode 100644 index 0000000..e2b8b38 --- /dev/null +++ b/SemanaPuc/Base.lproj/Information.storyboard @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Puc Campinas - Campus I Rodovia D.Pedro I,km 136 Parque das Universidades Campinas - SP CEP: 13086-900 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SemanaPuc/Base.lproj/Main.storyboard b/SemanaPuc/Base.lproj/Main.storyboard index fa65ad5..893da07 100644 --- a/SemanaPuc/Base.lproj/Main.storyboard +++ b/SemanaPuc/Base.lproj/Main.storyboard @@ -43,10 +43,10 @@ - + - + @@ -56,13 +56,13 @@ - + - + @@ -75,7 +75,7 @@ - + diff --git a/SemanaPuc/Favorites.storyboard b/SemanaPuc/Favorites.storyboard index c28f877..e83e22b 100644 --- a/SemanaPuc/Favorites.storyboard +++ b/SemanaPuc/Favorites.storyboard @@ -1,14 +1,14 @@ - + - + - + - + diff --git a/SemanaPuc/Info.plist b/SemanaPuc/Info.plist index 6905cc6..cd511f9 100644 --- a/SemanaPuc/Info.plist +++ b/SemanaPuc/Info.plist @@ -36,5 +36,9 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + LSApplicationQueriesSchemes + + tel + diff --git a/SemanaPuc/Information.swift b/SemanaPuc/Information.swift new file mode 100644 index 0000000..b098120 --- /dev/null +++ b/SemanaPuc/Information.swift @@ -0,0 +1,9 @@ +// +// Information.swift +// SemanaPuc +// +// Created by vntlab on 7/15/16. +// Copyright © 2016 munhra. All rights reserved. +// + +import Foundation diff --git a/SemanaPuc/InformationTabViewController.swift b/SemanaPuc/InformationTabViewController.swift new file mode 100644 index 0000000..74f20b5 --- /dev/null +++ b/SemanaPuc/InformationTabViewController.swift @@ -0,0 +1,22 @@ +// +// InformationTabViewController.swift +// SemanaPuc +// +// Created by vntlab on 7/15/16. +// Copyright © 2016 munhra. All rights reserved. +// + +import UIKit + +class InformationTabViewController: UIViewController { + + override func viewDidLoad() { + let storyboard = UIStoryboard(name: "Information", bundle: nil) + let controller = storyboard.instantiateInitialViewController() + addChildViewController(controller!) + view.addSubview(controller!.view) + controller!.didMoveToParentViewController(self) + } + +} + diff --git a/SemanaPuc/InformationViewController.swift b/SemanaPuc/InformationViewController.swift new file mode 100644 index 0000000..e126259 --- /dev/null +++ b/SemanaPuc/InformationViewController.swift @@ -0,0 +1,36 @@ +// +// InformationViewController.swift +// SemanaPuc +// +// Created by vntlab on 7/15/16. +// Copyright © 2016 munhra. All rights reserved. +// +import UIKit + +class InformationViewController:UITableViewController +{ + + let phoneNumber = "08007287822" + + @IBAction func PhoneButtom(sender: UIButton) { + if let phoneCallURL:NSURL = NSURL(string:"tel://\(phoneNumber)") { + let application:UIApplication = UIApplication.sharedApplication() + if (application.canOpenURL(phoneCallURL)) { + application.openURL(phoneCallURL); + + } + } + } + + + @IBAction func siteButtom(sender: UIButton) { + + let url = NSURL(string: "https://google.com")! + UIApplication.sharedApplication().openURL(url) + } + + @IBAction func VenturusButtom(sender: UIButton) { + let url = NSURL(string: "http://www.venturus.org.br/site/")! + UIApplication.sharedApplication().openURL(url) + } +} diff --git a/SemanaPuc/en.lproj/Information.storyboard b/SemanaPuc/en.lproj/Information.storyboard new file mode 100644 index 0000000..97d2d27 --- /dev/null +++ b/SemanaPuc/en.lproj/Information.storyboard @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +