Skip to content

Mariana Medeiro #39

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.

Sign up for GitHub

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

Open
mmedeiro wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Mariana Medeiro #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e46137
bronze 1 (ok)
mmedeiro Mar 10, 2015
350032b
bronze 2
mmedeiro Mar 10, 2015
8399795
Bronze 3 + Prata 1 + Prata 2
mmedeiro Mar 11, 2015
0648e00
correções
mmedeiro Mar 12, 2015
aa2ecdf
prata 3 - faltando back
mmedeiro Mar 13, 2015
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
53 changes: 49 additions & 4 deletions iTunesSearch.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@
objects = {

/* Begin PBXBuildFile section */
4B87DC251AB0C0F800062A4B /* Musica.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B87DC241AB0C0F800062A4B /* Musica.m */; };
4B87DC281AB0C6CD00062A4B /* Podcast.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B87DC271AB0C6CD00062A4B /* Podcast.m */; };
4B87DC2B1AB0C90F00062A4B /* Ebook.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B87DC2A1AB0C90F00062A4B /* Ebook.m */; };
4B87DC2C1AB0D39E00062A4B /* TableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B87DC2E1AB0D39E00062A4B /* TableView.xib */; };
4BC2383F1AB35B39002737DA /* Detalhescel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC2383D1AB35B39002737DA /* Detalhescel.m */; };
4BC238401AB35B39002737DA /* Detalhescel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BC2383E1AB35B39002737DA /* Detalhescel.xib */; };
92C21CB61AAE757A0052ABE6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CB51AAE757A0052ABE6 /* main.m */; };
92C21CB91AAE757A0052ABE6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CB81AAE757A0052ABE6 /* AppDelegate.m */; };
92C21CBC1AAE757A0052ABE6 /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CBB1AAE757A0052ABE6 /* TableViewController.m */; };
92C21CC11AAE757A0052ABE6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 92C21CC01AAE757A0052ABE6 /* Images.xcassets */; };
92C21CD01AAE757A0052ABE6 /* iTunesSearchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CCF1AAE757A0052ABE6 /* iTunesSearchTests.m */; };
92C21CDB1AAE75B30052ABE6 /* iTunesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CDA1AAE75B30052ABE6 /* iTunesManager.m */; };
92C21CDD1AAE75DC0052ABE6 /* TableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 92C21CDC1AAE75DC0052ABE6 /* TableView.xib */; };
92C21CE11AAE76930052ABE6 /* TableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CDF1AAE76930052ABE6 /* TableViewCell.m */; };
92C21CE21AAE76930052ABE6 /* TableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 92C21CE01AAE76930052ABE6 /* TableViewCell.xib */; };
92C21CE81AAE858E0052ABE6 /* Filme.m in Sources */ = {isa = PBXBuildFile; fileRef = 92C21CE71AAE858E0052ABE6 /* Filme.m */; };
Expand All @@ -30,6 +35,19 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
4B87DC231AB0C0F800062A4B /* Musica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Musica.h; path = Entidades/Musica.h; sourceTree = "<group>"; };
4B87DC241AB0C0F800062A4B /* Musica.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Musica.m; path = Entidades/Musica.m; sourceTree = "<group>"; };
4B87DC261AB0C6CD00062A4B /* Podcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Podcast.h; path = Entidades/Podcast.h; sourceTree = "<group>"; };
4B87DC271AB0C6CD00062A4B /* Podcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Podcast.m; path = Entidades/Podcast.m; sourceTree = "<group>"; };
4B87DC291AB0C90F00062A4B /* Ebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ebook.h; path = Entidades/Ebook.h; sourceTree = "<group>"; };
4B87DC2A1AB0C90F00062A4B /* Ebook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Ebook.m; path = Entidades/Ebook.m; sourceTree = "<group>"; };
4B87DC2D1AB0D39E00062A4B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TableView.xib; sourceTree = "<group>"; };
4B87DC301AB0D3A100062A4B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/TableView.strings; sourceTree = "<group>"; };
4B87DC311AB0D3BE00062A4B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/TableView.strings; sourceTree = "<group>"; };
4B87DC321AB0D3DA00062A4B /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/TableView.strings; sourceTree = "<group>"; };
4BC2383C1AB35B39002737DA /* Detalhescel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Detalhescel.h; sourceTree = "<group>"; };
4BC2383D1AB35B39002737DA /* Detalhescel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Detalhescel.m; sourceTree = "<group>"; };
4BC2383E1AB35B39002737DA /* Detalhescel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Detalhescel.xib; sourceTree = "<group>"; };
92C21CB01AAE757A0052ABE6 /* iTunesSearch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iTunesSearch.app; sourceTree = BUILT_PRODUCTS_DIR; };
92C21CB41AAE757A0052ABE6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
92C21CB51AAE757A0052ABE6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand All @@ -43,7 +61,6 @@
92C21CCF1AAE757A0052ABE6 /* iTunesSearchTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iTunesSearchTests.m; sourceTree = "<group>"; };
92C21CD91AAE75B30052ABE6 /* iTunesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTunesManager.h; sourceTree = "<group>"; };
92C21CDA1AAE75B30052ABE6 /* iTunesManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTunesManager.m; sourceTree = "<group>"; };
92C21CDC1AAE75DC0052ABE6 /* TableView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableView.xib; sourceTree = "<group>"; };
92C21CDE1AAE76930052ABE6 /* TableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewCell.h; sourceTree = "<group>"; };
92C21CDF1AAE76930052ABE6 /* TableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewCell.m; sourceTree = "<group>"; };
92C21CE01AAE76930052ABE6 /* TableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableViewCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -96,7 +113,10 @@
92C21CB81AAE757A0052ABE6 /* AppDelegate.m */,
92C21CBA1AAE757A0052ABE6 /* TableViewController.h */,
92C21CBB1AAE757A0052ABE6 /* TableViewController.m */,
92C21CDC1AAE75DC0052ABE6 /* TableView.xib */,
4B87DC2E1AB0D39E00062A4B /* TableView.xib */,
4BC2383C1AB35B39002737DA /* Detalhescel.h */,
4BC2383D1AB35B39002737DA /* Detalhescel.m */,
4BC2383E1AB35B39002737DA /* Detalhescel.xib */,
92C21CD91AAE75B30052ABE6 /* iTunesManager.h */,
92C21CDA1AAE75B30052ABE6 /* iTunesManager.m */,
92C21CC01AAE757A0052ABE6 /* Images.xcassets */,
Expand Down Expand Up @@ -146,6 +166,12 @@
children = (
92C21CE61AAE858E0052ABE6 /* Filme.h */,
92C21CE71AAE858E0052ABE6 /* Filme.m */,
4B87DC231AB0C0F800062A4B /* Musica.h */,
4B87DC241AB0C0F800062A4B /* Musica.m */,
4B87DC261AB0C6CD00062A4B /* Podcast.h */,
4B87DC271AB0C6CD00062A4B /* Podcast.m */,
4B87DC291AB0C90F00062A4B /* Ebook.h */,
4B87DC2A1AB0C90F00062A4B /* Ebook.m */,
);
name = Entidades;
sourceTree = "<group>";
Expand Down Expand Up @@ -232,7 +258,8 @@
files = (
92C21CC11AAE757A0052ABE6 /* Images.xcassets in Resources */,
92C21CE21AAE76930052ABE6 /* TableViewCell.xib in Resources */,
92C21CDD1AAE75DC0052ABE6 /* TableView.xib in Resources */,
4BC238401AB35B39002737DA /* Detalhescel.xib in Resources */,
4B87DC2C1AB0D39E00062A4B /* TableView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -250,7 +277,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4BC2383F1AB35B39002737DA /* Detalhescel.m in Sources */,
4B87DC2B1AB0C90F00062A4B /* Ebook.m in Sources */,
92C21CBC1AAE757A0052ABE6 /* TableViewController.m in Sources */,
4B87DC251AB0C0F800062A4B /* Musica.m in Sources */,
4B87DC281AB0C6CD00062A4B /* Podcast.m in Sources */,
92C21CDB1AAE75B30052ABE6 /* iTunesManager.m in Sources */,
92C21CB91AAE757A0052ABE6 /* AppDelegate.m in Sources */,
92C21CE81AAE858E0052ABE6 /* Filme.m in Sources */,
Expand All @@ -277,6 +308,20 @@
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
4B87DC2E1AB0D39E00062A4B /* TableView.xib */ = {
isa = PBXVariantGroup;
children = (
4B87DC2D1AB0D39E00062A4B /* Base */,
4B87DC301AB0D3A100062A4B /* en */,
4B87DC311AB0D3BE00062A4B /* fr */,
4B87DC321AB0D3DA00062A4B /* pt */,
);
name = TableView.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
92C21CD11AAE757A0052ABE6 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down
8 changes: 7 additions & 1 deletion iTunesSearch/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

#warning Adicionado codigo para iniciar com a interface do TableView
// TableViewController *tvc = [[TableViewController alloc] initWithNibName:@"TableView" bundle:nil];

TableViewController *tvc = [[TableViewController alloc] init];
[self.window setRootViewController:tvc];

UINavigationController *nc = [[UINavigationController alloc]initWithRootViewController:tvc];

[[self window]setRootViewController:nc];
//[self.window setRootViewController:tvc];

[self.window makeKeyAndVisible];
return YES;
}
Expand Down
75 changes: 75 additions & 0 deletions iTunesSearch/Base.lproj/TableView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1510" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TableViewController">
<connections>
<outlet property="tableview" destination="E5w-wc-b61" id="b9z-lB-c47"/>
<outlet property="textBusca" destination="KOW-Cb-mk5" id="uEB-9p-Rhz"/>
<outlet property="view" destination="HfX-dB-CZD" id="E4S-y4-D3b"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="HfX-dB-CZD">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="E5w-wc-b61">
<rect key="frame" x="0.0" y="73" width="600" height="527"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KOW-Cb-mk5">
<rect key="frame" x="8" y="20" width="445" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L81-Yn-Hb9">
<rect key="frame" x="461" y="31" width="131" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="55" id="IeQ-Xh-6Yu"/>
</constraints>
<state key="normal" title="Search">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="buttonSearch:" destination="-1" eventType="touchUpInside" id="n4j-kO-RO6"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="L81-Yn-Hb9" firstAttribute="top" secondItem="HfX-dB-CZD" secondAttribute="top" constant="100" id="19i-mu-hDR"/>
<constraint firstItem="KOW-Cb-mk5" firstAttribute="leading" secondItem="HfX-dB-CZD" secondAttribute="leading" constant="70" id="1Ln-EQ-REF"/>
<constraint firstItem="KOW-Cb-mk5" firstAttribute="leading" secondItem="HfX-dB-CZD" secondAttribute="leading" id="40X-FL-Bxa"/>
<constraint firstItem="L81-Yn-Hb9" firstAttribute="trailing" secondItem="HfX-dB-CZD" secondAttribute="trailingMargin" id="90e-mn-OwC"/>
<constraint firstItem="E5w-wc-b61" firstAttribute="top" secondItem="L81-Yn-Hb9" secondAttribute="bottom" constant="23" id="9mX-ja-Gl5"/>
<constraint firstItem="KOW-Cb-mk5" firstAttribute="top" secondItem="HfX-dB-CZD" secondAttribute="top" constant="100" id="CkP-v4-x9U"/>
<constraint firstItem="L81-Yn-Hb9" firstAttribute="top" relation="greaterThanOrEqual" secondItem="HfX-dB-CZD" secondAttribute="top" constant="100" id="H86-cl-V1T"/>
<constraint firstAttribute="bottom" secondItem="E5w-wc-b61" secondAttribute="bottom" id="Q4D-Ti-x9i"/>
<constraint firstItem="L81-Yn-Hb9" firstAttribute="leading" secondItem="KOW-Cb-mk5" secondAttribute="trailing" constant="10" id="QbH-o7-0O7"/>
<constraint firstItem="E5w-wc-b61" firstAttribute="leading" secondItem="HfX-dB-CZD" secondAttribute="leading" id="RBJ-Y3-D8W"/>
<constraint firstAttribute="centerY" secondItem="L81-Yn-Hb9" secondAttribute="centerY" id="Uf7-O2-woI"/>
<constraint firstItem="L81-Yn-Hb9" firstAttribute="top" secondItem="HfX-dB-CZD" secondAttribute="top" constant="20" symbolic="YES" id="YXf-XS-4KK"/>
<constraint firstItem="KOW-Cb-mk5" firstAttribute="top" secondItem="L81-Yn-Hb9" secondAttribute="top" id="mWw-zJ-DNS"/>
<constraint firstItem="L81-Yn-Hb9" firstAttribute="top" secondItem="HfX-dB-CZD" secondAttribute="top" id="r7E-Hh-ZEm"/>
<constraint firstItem="KOW-Cb-mk5" firstAttribute="leading" secondItem="HfX-dB-CZD" secondAttribute="leadingMargin" id="xEt-Sf-4y5"/>
<constraint firstAttribute="trailing" secondItem="E5w-wc-b61" secondAttribute="trailing" id="ybc-bJ-h2z"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="1Ln-EQ-REF"/>
<exclude reference="40X-FL-Bxa"/>
<exclude reference="mWw-zJ-DNS"/>
<exclude reference="H86-cl-V1T"/>
<exclude reference="Uf7-O2-woI"/>
<exclude reference="YXf-XS-4KK"/>
<exclude reference="r7E-Hh-ZEm"/>
</mask>
</variation>
<point key="canvasLocation" x="-79" y="828"/>
</view>
</objects>
</document>
19 changes: 19 additions & 0 deletions iTunesSearch/Detalhescel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// Detalhescel.h
// iTunesSearch
//
// Created by Mariana Medeiro on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface Detalhescel : UIViewController
@property (weak, nonatomic) IBOutlet UIImageView *imagemdetalhes;
@property (weak, nonatomic) IBOutlet UILabel *nome;
@property (weak, nonatomic) IBOutlet UILabel *pais;
@property (weak, nonatomic) IBOutlet UILabel *price;
@property int row;
@property int section;

@end
102 changes: 102 additions & 0 deletions iTunesSearch/Detalhescel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
//
// Detalhescel.m
// iTunesSearch
//
// Created by Mariana Medeiro on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import "Detalhescel.h"
#import "TableViewCell.h"
#import "iTunesManager.h"
#import "Entidades/Filme.h"
#import "Entidades/Musica.h"
#import "Entidades/Podcast.h"
#import "Entidades/Ebook.h"
#import "Detalhescel.h"

@interface Detalhescel ()

@end

@implementation Detalhescel

@synthesize row, section, nome, pais, price;

- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.


}

- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}


-(void) viewWillAppear:(BOOL)animated {
iTunesManager *im = [iTunesManager sharedInstance];
id objt = [[im.all objectAtIndex:section]objectAtIndex:row];


Filme *filme;
Musica *musica;
Podcast *podcast;
Ebook *ebook;

switch (section) {
case 0:
filme = objt;

[nome setText:filme.nome];
[pais setText:filme.pais];
[price setText:[NSString stringWithFormat:@"U$$ %@", filme.price]];


break;

case 1:
musica = objt;
[nome setText:musica.nome];
[pais setText:musica.pais];
[price setText:[NSString stringWithFormat:@"U$$ %@", musica.price]];

break;

case 2:
podcast = objt;
[nome setText:podcast.nome];
[pais setText:podcast.pais];
[price setText:[NSString stringWithFormat:@"U$$ %@", podcast.price]];

break;

case 3:
ebook = objt;
[nome setText:ebook.nome];
[price setText:[NSString stringWithFormat:@"U$$ %@", ebook.price]];
[nome setText:ebook.nome];



break;

default:
break;
}


}
/*
#pragma mark - Navigation

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

@end
Loading