From 8e461376c4840c06debb5410746c9d821b27917c Mon Sep 17 00:00:00 2001 From: mmedeiro <31313132@mackezista.com.br> Date: Tue, 10 Mar 2015 16:51:55 -0300 Subject: [PATCH 1/5] bronze 1 (ok) --- iTunesSearch/Entidades/Filme.h | 2 ++ iTunesSearch/TableViewCell.h | 3 ++ iTunesSearch/TableViewCell.xib | 54 +++++++++++++++++++++++++----- iTunesSearch/TableViewController.m | 3 ++ iTunesSearch/iTunesManager.m | 1 + 5 files changed, 55 insertions(+), 8 deletions(-) diff --git a/iTunesSearch/Entidades/Filme.h b/iTunesSearch/Entidades/Filme.h index eb126dc..91dfbcc 100644 --- a/iTunesSearch/Entidades/Filme.h +++ b/iTunesSearch/Entidades/Filme.h @@ -16,5 +16,7 @@ @property (nonatomic, strong) NSString *duracao; @property (nonatomic, strong) NSString *genero; @property (nonatomic, strong) NSString *pais; +@property (nonatomic, strong) NSString *price; + @end diff --git a/iTunesSearch/TableViewCell.h b/iTunesSearch/TableViewCell.h index b630349..b218f26 100644 --- a/iTunesSearch/TableViewCell.h +++ b/iTunesSearch/TableViewCell.h @@ -13,5 +13,8 @@ @property (weak, nonatomic) IBOutlet UILabel *nome; @property (weak, nonatomic) IBOutlet UILabel *tipo; +@property (weak, nonatomic) IBOutlet UILabel *genero; +@property (weak, nonatomic) IBOutlet UILabel *pais; +@property (weak, nonatomic) IBOutlet UILabel *price; @end diff --git a/iTunesSearch/TableViewCell.xib b/iTunesSearch/TableViewCell.xib index bf8bd3f..5ed4776 100644 --- a/iTunesSearch/TableViewCell.xib +++ b/iTunesSearch/TableViewCell.xib @@ -1,5 +1,5 @@ - + @@ -7,40 +7,78 @@ - - + + - + + + + + + + + + + + + + + + + + + + + - + diff --git a/iTunesSearch/TableViewController.m b/iTunesSearch/TableViewController.m index f689980..c15b0dc 100644 --- a/iTunesSearch/TableViewController.m +++ b/iTunesSearch/TableViewController.m @@ -56,6 +56,9 @@ -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NS [celula.nome setText:filme.nome]; [celula.tipo setText:@"Filme"]; + [celula.genero setText:filme.genero]; + [celula.pais setText:filme.pais]; + [celula.price setText:[NSString stringWithFormat:@"U$$ %@", filme.price]]; return celula; } diff --git a/iTunesSearch/iTunesManager.m b/iTunesSearch/iTunesManager.m index e2babda..bde8925 100644 --- a/iTunesSearch/iTunesManager.m +++ b/iTunesSearch/iTunesManager.m @@ -57,6 +57,7 @@ - (NSArray *)buscarMidias:(NSString *)termo { [filme setDuracao:[item objectForKey:@"trackTimeMillis"]]; [filme setGenero:[item objectForKey:@"primaryGenreName"]]; [filme setPais:[item objectForKey:@"country"]]; + [filme setPrice:[item objectForKey:@"trackPrice"]]; [filmes addObject:filme]; } From 350032b9655940933fbf2df50304048fa00b081b Mon Sep 17 00:00:00 2001 From: mmedeiro <31313132@mackezista.com.br> Date: Tue, 10 Mar 2015 17:38:24 -0300 Subject: [PATCH 2/5] bronze 2 --- iTunesSearch/TableView.xib | 64 +++++++++++++++++++++++++----- iTunesSearch/TableViewController.h | 4 ++ iTunesSearch/TableViewController.m | 17 +++++--- 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/iTunesSearch/TableView.xib b/iTunesSearch/TableView.xib index 55f128c..3c0dcdc 100644 --- a/iTunesSearch/TableView.xib +++ b/iTunesSearch/TableView.xib @@ -1,25 +1,69 @@ - + + - - + + + - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iTunesSearch/TableViewController.h b/iTunesSearch/TableViewController.h index 0cbb5c4..e02ebc4 100644 --- a/iTunesSearch/TableViewController.h +++ b/iTunesSearch/TableViewController.h @@ -11,7 +11,11 @@ @interface TableViewController : UIViewController +@property (strong, nonatomic) IBOutlet UIView *view; @property (strong, nonatomic) IBOutlet UITableView *tableview; +@property (weak, nonatomic) IBOutlet UITextField *textBusca; + +- (IBAction)buttonSearch:(id)sender; @end diff --git a/iTunesSearch/TableViewController.m b/iTunesSearch/TableViewController.m index c15b0dc..61d340a 100644 --- a/iTunesSearch/TableViewController.m +++ b/iTunesSearch/TableViewController.m @@ -20,18 +20,20 @@ @interface TableViewController () { @implementation TableViewController - - (void)viewDidLoad { [super viewDidLoad]; + _tableview.delegate=self; + _tableview.dataSource=self; + UINib *nib = [UINib nibWithNibName:@"TableViewCell" bundle:nil]; [self.tableview registerNib:nib forCellReuseIdentifier:@"celulaPadrao"]; - iTunesManager *itunes = [iTunesManager sharedInstance]; - midias = [itunes buscarMidias:@"Apple"]; +// iTunesManager *itunes = [iTunesManager sharedInstance]; +// midias = [itunes buscarMidias:@"Apple"]; -#warning Necessario para que a table view tenha um espaco em relacao ao topo, pois caso contrario o texto ficara atras da barra superior - self.tableview.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, self.tableview.bounds.size.width, 15.f)]; +//#warning Necessario para que a table view tenha um espaco em relacao ao topo, pois caso contrario o texto ficara atras da barra superior + //self.tableview.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, self.tableview.bounds.size.width, 15.f)]; } - (void)didReceiveMemoryWarning { @@ -68,4 +70,9 @@ -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPat } +- (IBAction)buttonSearch:(id)sender { + iTunesManager *itunes =[iTunesManager sharedInstance]; + midias = [itunes buscarMidias:_textBusca.text]; + [self.tableview reloadData]; +} @end From 839979578917ec7b5741e6541ae87ad2966971f5 Mon Sep 17 00:00:00 2001 From: mmedeiro <31313132@mackezista.com.br> Date: Wed, 11 Mar 2015 17:28:20 -0300 Subject: [PATCH 3/5] Bronze 3 + Prata 1 + Prata 2 --- iTunesSearch.xcodeproj/project.pbxproj | 43 +++++++++- iTunesSearch/{ => Base.lproj}/TableView.xib | 4 +- iTunesSearch/Entidades/Ebook.h | 19 +++++ iTunesSearch/Entidades/Ebook.m | 13 +++ iTunesSearch/Entidades/Musica.h | 21 +++++ iTunesSearch/Entidades/Musica.m | 13 +++ iTunesSearch/Entidades/Podcast.h | 19 +++++ iTunesSearch/Entidades/Podcast.m | 16 ++++ iTunesSearch/TableViewController.m | 93 ++++++++++++++++++--- iTunesSearch/en.lproj/TableView.strings | 3 + iTunesSearch/fr.lproj/TableView.strings | 3 + iTunesSearch/iTunesManager.h | 3 + iTunesSearch/iTunesManager.m | 56 ++++++++++++- iTunesSearch/pt.lproj/TableView.strings | 3 + 14 files changed, 289 insertions(+), 20 deletions(-) rename iTunesSearch/{ => Base.lproj}/TableView.xib (93%) create mode 100644 iTunesSearch/Entidades/Ebook.h create mode 100644 iTunesSearch/Entidades/Ebook.m create mode 100644 iTunesSearch/Entidades/Musica.h create mode 100644 iTunesSearch/Entidades/Musica.m create mode 100644 iTunesSearch/Entidades/Podcast.h create mode 100644 iTunesSearch/Entidades/Podcast.m create mode 100644 iTunesSearch/en.lproj/TableView.strings create mode 100644 iTunesSearch/fr.lproj/TableView.strings create mode 100644 iTunesSearch/pt.lproj/TableView.strings diff --git a/iTunesSearch.xcodeproj/project.pbxproj b/iTunesSearch.xcodeproj/project.pbxproj index 79e06d7..22b96d2 100644 --- a/iTunesSearch.xcodeproj/project.pbxproj +++ b/iTunesSearch.xcodeproj/project.pbxproj @@ -7,13 +7,16 @@ 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 */; }; 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 */; }; @@ -30,6 +33,16 @@ /* 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 = ""; }; + 4B87DC241AB0C0F800062A4B /* Musica.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Musica.m; path = Entidades/Musica.m; sourceTree = ""; }; + 4B87DC261AB0C6CD00062A4B /* Podcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Podcast.h; path = Entidades/Podcast.h; sourceTree = ""; }; + 4B87DC271AB0C6CD00062A4B /* Podcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Podcast.m; path = Entidades/Podcast.m; sourceTree = ""; }; + 4B87DC291AB0C90F00062A4B /* Ebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ebook.h; path = Entidades/Ebook.h; sourceTree = ""; }; + 4B87DC2A1AB0C90F00062A4B /* Ebook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Ebook.m; path = Entidades/Ebook.m; sourceTree = ""; }; + 4B87DC2D1AB0D39E00062A4B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TableView.xib; sourceTree = ""; }; + 4B87DC301AB0D3A100062A4B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/TableView.strings; sourceTree = ""; }; + 4B87DC311AB0D3BE00062A4B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/TableView.strings; sourceTree = ""; }; + 4B87DC321AB0D3DA00062A4B /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/TableView.strings; sourceTree = ""; }; 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 = ""; }; 92C21CB51AAE757A0052ABE6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -43,7 +56,6 @@ 92C21CCF1AAE757A0052ABE6 /* iTunesSearchTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iTunesSearchTests.m; sourceTree = ""; }; 92C21CD91AAE75B30052ABE6 /* iTunesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTunesManager.h; sourceTree = ""; }; 92C21CDA1AAE75B30052ABE6 /* iTunesManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTunesManager.m; sourceTree = ""; }; - 92C21CDC1AAE75DC0052ABE6 /* TableView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableView.xib; sourceTree = ""; }; 92C21CDE1AAE76930052ABE6 /* TableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewCell.h; sourceTree = ""; }; 92C21CDF1AAE76930052ABE6 /* TableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewCell.m; sourceTree = ""; }; 92C21CE01AAE76930052ABE6 /* TableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableViewCell.xib; sourceTree = ""; }; @@ -96,7 +108,7 @@ 92C21CB81AAE757A0052ABE6 /* AppDelegate.m */, 92C21CBA1AAE757A0052ABE6 /* TableViewController.h */, 92C21CBB1AAE757A0052ABE6 /* TableViewController.m */, - 92C21CDC1AAE75DC0052ABE6 /* TableView.xib */, + 4B87DC2E1AB0D39E00062A4B /* TableView.xib */, 92C21CD91AAE75B30052ABE6 /* iTunesManager.h */, 92C21CDA1AAE75B30052ABE6 /* iTunesManager.m */, 92C21CC01AAE757A0052ABE6 /* Images.xcassets */, @@ -146,6 +158,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 = ""; @@ -232,7 +250,7 @@ files = ( 92C21CC11AAE757A0052ABE6 /* Images.xcassets in Resources */, 92C21CE21AAE76930052ABE6 /* TableViewCell.xib in Resources */, - 92C21CDD1AAE75DC0052ABE6 /* TableView.xib in Resources */, + 4B87DC2C1AB0D39E00062A4B /* TableView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -250,7 +268,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 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 */, @@ -277,6 +298,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 = ""; + }; +/* End PBXVariantGroup section */ + /* Begin XCBuildConfiguration section */ 92C21CD11AAE757A0052ABE6 /* Debug */ = { isa = XCBuildConfiguration; diff --git a/iTunesSearch/TableView.xib b/iTunesSearch/Base.lproj/TableView.xib similarity index 93% rename from iTunesSearch/TableView.xib rename to iTunesSearch/Base.lproj/TableView.xib index 3c0dcdc..76d3620 100644 --- a/iTunesSearch/TableView.xib +++ b/iTunesSearch/Base.lproj/TableView.xib @@ -26,8 +26,8 @@ -