Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MergeManualComInformacoes #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions SemanaPuc.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -26,6 +29,9 @@
/* Begin PBXFileReference section */
7F305C671D36B8C3004A6963 /* EventsDAO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventsDAO.swift; sourceTree = "<group>"; };
7F6EF7FC1D3557A000998356 /* Events.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Events.swift; sourceTree = "<group>"; };
7FDA58F21D39526800B83EEA /* InformationTabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InformationTabViewController.swift; sourceTree = "<group>"; };
7FDA58F81D39530800B83EEA /* InformationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InformationViewController.swift; sourceTree = "<group>"; };
7FDA58FE1D395DCF00B83EEA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Information.storyboard; sourceTree = "<group>"; };
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 = "<group>"; };
B24D803C1D34065E00889E49 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -85,7 +91,6 @@
B24D80531D340E5200889E49 /* controllers */,
B24D80521D340E3400889E49 /* views */,
B24D803A1D34065E00889E49 /* AppDelegate.swift */,
B24D80411D34065E00889E49 /* Assets.xcassets */,
B24D80461D34065E00889E49 /* Info.plist */,
);
path = SemanaPuc;
Expand All @@ -98,6 +103,8 @@
B24D80431D34065E00889E49 /* LaunchScreen.storyboard */,
B24D80501D340E2200889E49 /* Activity.storyboard */,
B24D80581D34118300889E49 /* Favorites.storyboard */,
7FDA58FC1D395C7B00B83EEA /* Information.storyboard */,
B24D80411D34065E00889E49 /* Assets.xcassets */,
);
name = views;
sourceTree = "<group>";
Expand All @@ -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 = "<group>";
Expand Down Expand Up @@ -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 */,
);
Expand All @@ -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 = "<group>";
};
B24D803E1D34065E00889E49 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down
5 changes: 5 additions & 0 deletions SemanaPuc/Activity.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="eventCell" id="XhM-E7-88W">
<rect key="frame" x="0.0" y="92" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XhM-E7-88W" id="raE-lt-EJy">
<rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
<connections>
Expand Down Expand Up @@ -52,12 +54,15 @@
<objects>
<tableViewController id="RhP-da-jR9" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="JOx-4G-91L">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="titleSchedule" id="m1z-tT-l3d">
<rect key="frame" x="0.0" y="92" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="m1z-tT-l3d" id="yJ0-J6-0FA">
<rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
Expand Down
6 changes: 6 additions & 0 deletions SemanaPuc/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
21 changes: 21 additions & 0 deletions SemanaPuc/Assets.xcassets/V de Venturus.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading