Skip to content

Commit

Permalink
le quite las barras a las otras pantallas que faltaban close #3
Browse files Browse the repository at this point in the history
  • Loading branch information
rockarloz committed Dec 8, 2014
1 parent 7cf1a34 commit 1426880
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 96 deletions.
4 changes: 4 additions & 0 deletions DejateCaer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
F30A68901A3259D700F3DA61 /* Lato-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F30A687D1A3259D700F3DA61 /* Lato-Thin.ttf */; };
F30A68911A3259D700F3DA61 /* Lato-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F30A687E1A3259D700F3DA61 /* Lato-ThinItalic.ttf */; };
F30A68921A3259D700F3DA61 /* SIL Open Font License.txt in Resources */ = {isa = PBXBuildFile; fileRef = F30A687F1A3259D700F3DA61 /* SIL Open Font License.txt */; };
F30A68941A33634900F3DA61 /* share.png in Resources */ = {isa = PBXBuildFile; fileRef = F30A68931A33634900F3DA61 /* share.png */; };
F312730A192ABEBB002E4119 /* ResenaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3127309192ABEBB002E4119 /* ResenaViewController.m */; };
F324E8241947CA390002A6FB /* Teatro.png in Resources */ = {isa = PBXBuildFile; fileRef = F324E8231947CA390002A6FB /* Teatro.png */; };
F32CF00618F5A9220098A5CF /* flechas.xib in Resources */ = {isa = PBXBuildFile; fileRef = F32CF00518F5A9220098A5CF /* flechas.xib */; };
Expand Down Expand Up @@ -160,6 +161,7 @@
F30A687D1A3259D700F3DA61 /* Lato-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Lato-Thin.ttf"; sourceTree = "<group>"; };
F30A687E1A3259D700F3DA61 /* Lato-ThinItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Lato-ThinItalic.ttf"; sourceTree = "<group>"; };
F30A687F1A3259D700F3DA61 /* SIL Open Font License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SIL Open Font License.txt"; sourceTree = "<group>"; };
F30A68931A33634900F3DA61 /* share.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = share.png; sourceTree = "<group>"; };
F3127308192ABEBB002E4119 /* ResenaViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResenaViewController.h; sourceTree = "<group>"; };
F3127309192ABEBB002E4119 /* ResenaViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResenaViewController.m; sourceTree = "<group>"; };
F324E8231947CA390002A6FB /* Teatro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Teatro.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -368,6 +370,7 @@
children = (
F3CF5DF61A15BCB700092E07 /* FututroViewController.h */,
F3CF5DF71A15BCB700092E07 /* FututroViewController.m */,
F30A68931A33634900F3DA61 /* share.png */,
F332E83A18D161BA00DF538D /* DejateCaer */,
F332E85C18D161BA00DF538D /* DejateCaerTests */,
F332E83318D161BA00DF538D /* Frameworks */,
Expand Down Expand Up @@ -824,6 +827,7 @@
F342E0D1193E663B00A4FF4E /* tools.png in Resources */,
F36521471A0FECB000DFD69B /* aquiTab.png in Resources */,
F3C680B518FCA9520092D6D8 /* icono58.png in Resources */,
F30A68941A33634900F3DA61 /* share.png in Resources */,
F30A68901A3259D700F3DA61 /* Lato-Thin.ttf in Resources */,
F30A68921A3259D700F3DA61 /* SIL Open Font License.txt in Resources */,
F32CF01818F5F5AF0098A5CF /* flechas_cierran.xib in Resources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/DescripcionViewController.m"
timestampString = "439515944.141347"
timestampString = "439575659.155891"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "465"
endingLineNumber = "465"
startingLineNumber = "444"
endingLineNumber = "444"
landmarkName = "-web:"
landmarkType = "5">
</BreakpointContent>
Expand Down Expand Up @@ -584,11 +584,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "439517508.84077"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1213"
endingLineNumber = "1213"
startingLineNumber = "1212"
endingLineNumber = "1212"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -600,11 +600,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "439517508.84077"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1209"
endingLineNumber = "1209"
startingLineNumber = "1208"
endingLineNumber = "1208"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -616,11 +616,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "439517508.84077"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1207"
endingLineNumber = "1207"
startingLineNumber = "1206"
endingLineNumber = "1206"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand Down Expand Up @@ -664,11 +664,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "439517508.84077"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1190"
endingLineNumber = "1190"
startingLineNumber = "1189"
endingLineNumber = "1189"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -680,11 +680,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "439517508.84077"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1351"
endingLineNumber = "1351"
startingLineNumber = "1350"
endingLineNumber = "1350"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand Down Expand Up @@ -712,11 +712,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "439517508.84077"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1363"
endingLineNumber = "1363"
startingLineNumber = "1362"
endingLineNumber = "1362"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand All @@ -728,11 +728,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "DejateCaer/NuevoInicioViewController.m"
timestampString = "438284292.877217"
timestampString = "439573377.059305"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1048"
endingLineNumber = "1048"
startingLineNumber = "1047"
endingLineNumber = "1047"
landmarkName = "-filtrar:"
landmarkType = "5">
</BreakpointContent>
Expand Down
46 changes: 14 additions & 32 deletions DejateCaer/Base.lproj/Main_iPhone.storyboard
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="ZVH-mO-vRS">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
</dependencies>
<customFonts key="customFonts">
Expand Down Expand Up @@ -65,31 +66,21 @@
<action selector="regresar:" destination="TNA-jl-Jhe" eventType="touchDown" id="Jh4-uf-G17"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JMo-fT-r7s">
<rect key="frame" x="279" y="29" width="25" height="25"/>
<state key="normal" image="twitter1.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="twittear:" destination="TNA-jl-Jhe" eventType="touchDown" id="wgQ-xw-c8g"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9HE-3g-vCg">
<rect key="frame" x="234" y="29" width="25" height="25"/>
<state key="normal" title="FB" image="facebook1.png">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="postToFacebook:" destination="TNA-jl-Jhe" eventType="touchDown" id="u6G-GT-UPd"/>
</connections>
</button>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Evento" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1lu-xB-Ldn">
<rect key="frame" x="122" y="30" width="76" height="24"/>
<fontDescription key="fontDescription" name="Lato-Bold" family="Lato" pointSize="24"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GMI-0l-74h">
<rect key="frame" x="276" y="29" width="22" height="26"/>
<state key="normal" image="share.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="compartir:" destination="TNA-jl-Jhe" eventType="touchDown" id="juP-EE-5ki"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.027450980392156862" green="0.40784313725490196" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
Expand Down Expand Up @@ -441,12 +432,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c1z-PJ-uQo">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="eventario.png" translatesAutoresizingMaskIntoConstraints="NO" id="T8Z-Tk-445">
<rect key="frame" x="92" y="37" width="136" height="19"/>
</imageView>
</subviews>
<rect key="frame" x="0.0" y="0.0" width="320" height="20"/>
<color key="backgroundColor" red="0.027450980390000001" green="0.40784313729999999" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</subviews>
Expand All @@ -456,7 +442,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="phL-K3-TMj" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-830" y="2345"/>
<point key="canvasLocation" x="-722" y="2681"/>
</scene>
<!--Nuevo Opciones View Controller-->
<scene sceneID="1eQ-lR-bnO">
Expand All @@ -471,12 +457,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1OC-ov-qgL">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="eventario.png" translatesAutoresizingMaskIntoConstraints="NO" id="Sdp-H9-vql">
<rect key="frame" x="92" y="37" width="136" height="19"/>
</imageView>
</subviews>
<rect key="frame" x="0.0" y="0.0" width="320" height="20"/>
<color key="backgroundColor" red="0.027450980390000001" green="0.40784313729999999" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7cb-mH-tnE">
Expand Down Expand Up @@ -930,6 +911,7 @@
<image name="hora.png" width="195" height="191"/>
<image name="informacion1.png" width="195" height="191"/>
<image name="nombre.png" width="195" height="191"/>
<image name="share.png" width="38" height="53"/>
<image name="telefono1.png" width="195" height="191"/>
<image name="titulo.png" width="195" height="191"/>
<image name="toolBar.png" width="32" height="32"/>
Expand Down
4 changes: 4 additions & 0 deletions DejateCaer/CalendarioViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ @interface CalendarioViewController ()
@end

@implementation CalendarioViewController
- (UIStatusBarStyle)preferredStatusBarStyle
{
return UIStatusBarStyleLightContent;
}

- (void)viewDidLoad {

Expand Down
3 changes: 1 addition & 2 deletions DejateCaer/DescripcionViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@


-(IBAction)regresar:(id)sender;
-(IBAction)twittear:(id)sender;
- (IBAction)postToFacebook:(id)sender;

@property (weak, nonatomic) IBOutlet UIScrollView *scrollView;

@end
39 changes: 9 additions & 30 deletions DejateCaer/DescripcionViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ - (void)viewDidLoad

{

self.screenName = @"Descripción de Evento";
self.screenName = [_evento objectForKey:@"nombre"];



Expand Down Expand Up @@ -338,40 +338,19 @@ - (void)didReceiveMemoryWarning
// Dispose of any resources that can be recreated.
}

-(IBAction)twittear:(id)sender
{
if ([SLComposeViewController isAvailableForServiceType:SLServiceTypeTwitter])
{
SLComposeViewController *tweetSheet = [SLComposeViewController
composeViewControllerForServiceType:SLServiceTypeTwitter];
NSString *cuerpo=[NSString stringWithFormat:@"Me gusta el evento:%@ @EventarioCDMX #EventarioApp %@",[_evento objectForKey:@"nombre"],[_evento objectForKey:@"url"]];
[tweetSheet setInitialText:cuerpo];
[self presentViewController:tweetSheet animated:YES completion:nil];
}
-(IBAction)compartir:(id)sender{

NSString *url=[NSString stringWithFormat:@"Me gusta el evento:%@ @EventarioCDMX %@",[_evento objectForKey:@"nombre"],[_evento objectForKey:@"url"]];

NSArray *objectsToShare = [NSArray arrayWithObjects:url, nil];

UIActivityViewController *compatir=[[UIActivityViewController alloc]initWithActivityItems:objectsToShare applicationActivities:nil];
[self presentViewController:compatir animated:YES completion:nil];

else{

UIAlertView *alert=[[UIAlertView alloc]initWithTitle:@"Mensaje" message:@"No tiene una cuenta de Twitter configurada. Configurala en Ajustes -> Twitter -> Añadir Cuenta" delegate:nil cancelButtonTitle:@"Aceptar" otherButtonTitles:nil, nil];
[alert show];

}
}
- (IBAction)postToFacebook:(id)sender {
if([SLComposeViewController isAvailableForServiceType:SLServiceTypeFacebook]) {
SLComposeViewController *controller = [SLComposeViewController composeViewControllerForServiceType:SLServiceTypeFacebook];

[controller setInitialText:[NSString stringWithFormat:@"Me gusta el evento:%@. #EventarioApp #EventarioCDMX %@",[_evento objectForKey:@"nombre"],[_evento objectForKey:@"url"]]];
[self presentViewController:controller animated:YES completion:Nil];
}

else{

UIAlertView *alert=[[UIAlertView alloc]initWithTitle:@"Mensaje" message:@"No tiene una cuenta de Facebook configurada. Configurala en Ajustes -> Facebook -> Añadir Cuenta" delegate:nil cancelButtonTitle:@"Aceptar" otherButtonTitles:nil, nil];
[alert show];

}
}

#pragma mark - MapView Delegate

- (MKAnnotationView *) mapView: (MKMapView *) mapView viewForAnnotation: (id<MKAnnotation>) annotation {
Expand Down
3 changes: 1 addition & 2 deletions DejateCaer/NuevoInicioViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -1041,8 +1041,7 @@ - (void)mapView:(MKMapView *)mapView regionDidChangeAnimated:(BOOL)animated
}
-(void)viewDidAppear:(BOOL)animated{

[self viewDidLoad];
}
}

-(IBAction)filtrar:(id)sender{
UIButton *a=(UIButton *)sender;
Expand Down
5 changes: 5 additions & 0 deletions DejateCaer/NuevoOpcionesViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ @implementation NuevoOpcionesViewController
AppDelegate *delegate;
double radio;
}
- (UIStatusBarStyle)preferredStatusBarStyle
{
return UIStatusBarStyleLightContent;
}

- (void)viewDidLoad {


Expand Down
Loading

0 comments on commit 1426880

Please sign in to comment.