From c64937b1042390ececde1409f731b98806fbcc16 Mon Sep 17 00:00:00 2001 From: Vinicius Miana Date: Tue, 10 Mar 2015 09:19:07 -0300 Subject: [PATCH 1/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0dc2a5..8dc96eb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ###2) Adicione no cabeçalho da tabela um campo de texto e um botão para que o usuário escolha o termo a ser procurado. ###3) Use os recursos de internacionalização para permitir que o botão exiba a palavra Buscar, Search e Recherche para os idiomas Português, Inglês e Francês -##Desafio Prata +##Desafio Pratakljdfkldmnldknvddklzmnkz; ###1) Busque outros tipos de mídias (música, podcast, ebook); ###2) Mostre o resultado separado em sessões dentro da UITableView, as quais são identificadas pelo tipo da mídia. From ffd4259d6963cebb5f723d6716e16769725c1532 Mon Sep 17 00:00:00 2001 From: Rafael <41241789@mackenzista.com.br> Date: Tue, 10 Mar 2015 17:49:48 -0300 Subject: [PATCH 2/9] Desafio bronze 1 feito --- iTunesSearch.xcodeproj/project.pbxproj | 6 +++++ iTunesSearch/TableView.xib | 10 +++++-- iTunesSearch/TableViewCell.h | 3 ++- iTunesSearch/TableViewCell.xib | 28 +++++++++++++++---- iTunesSearch/TableViewController.h | 2 +- iTunesSearch/TableViewController.m | 7 ++++- iTunesSearch/ViewController.h | 13 +++++++++ iTunesSearch/ViewController.m | 37 ++++++++++++++++++++++++++ iTunesSearch/iTunesManager.m | 2 +- 9 files changed, 97 insertions(+), 11 deletions(-) create mode 100644 iTunesSearch/ViewController.h create mode 100644 iTunesSearch/ViewController.m diff --git a/iTunesSearch.xcodeproj/project.pbxproj b/iTunesSearch.xcodeproj/project.pbxproj index 79e06d7..9593fca 100644 --- a/iTunesSearch.xcodeproj/project.pbxproj +++ b/iTunesSearch.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 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 */; }; + E3D9526F1AAF9004005A5388 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D9526E1AAF9004005A5388 /* ViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -49,6 +50,8 @@ 92C21CE01AAE76930052ABE6 /* TableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableViewCell.xib; sourceTree = ""; }; 92C21CE61AAE858E0052ABE6 /* Filme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Filme.h; path = Entidades/Filme.h; sourceTree = ""; }; 92C21CE71AAE858E0052ABE6 /* Filme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Filme.m; path = Entidades/Filme.m; sourceTree = ""; }; + E3D9526D1AAF9004005A5388 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + E3D9526E1AAF9004005A5388 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -146,6 +149,8 @@ children = ( 92C21CE61AAE858E0052ABE6 /* Filme.h */, 92C21CE71AAE858E0052ABE6 /* Filme.m */, + E3D9526D1AAF9004005A5388 /* ViewController.h */, + E3D9526E1AAF9004005A5388 /* ViewController.m */, ); name = Entidades; sourceTree = ""; @@ -250,6 +255,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E3D9526F1AAF9004005A5388 /* ViewController.m in Sources */, 92C21CBC1AAE757A0052ABE6 /* TableViewController.m in Sources */, 92C21CDB1AAE75B30052ABE6 /* iTunesManager.m in Sources */, 92C21CB91AAE757A0052ABE6 /* AppDelegate.m in Sources */, diff --git a/iTunesSearch/TableView.xib b/iTunesSearch/TableView.xib index 55f128c..6f271cb 100644 --- a/iTunesSearch/TableView.xib +++ b/iTunesSearch/TableView.xib @@ -1,5 +1,5 @@ - + @@ -19,7 +19,13 @@ - + + + + + + + diff --git a/iTunesSearch/TableViewCell.h b/iTunesSearch/TableViewCell.h index b630349..8bc5f9e 100644 --- a/iTunesSearch/TableViewCell.h +++ b/iTunesSearch/TableViewCell.h @@ -12,6 +12,7 @@ @property (weak, nonatomic) IBOutlet UILabel *nome; @property (weak, nonatomic) IBOutlet UILabel *tipo; - +@property (weak, nonatomic) IBOutlet UILabel *pais; +@property (weak, nonatomic) IBOutlet UILabel *duracao; @end diff --git a/iTunesSearch/TableViewCell.xib b/iTunesSearch/TableViewCell.xib index bf8bd3f..e5b26e1 100644 --- a/iTunesSearch/TableViewCell.xib +++ b/iTunesSearch/TableViewCell.xib @@ -1,5 +1,5 @@ - + @@ -7,15 +7,15 @@ - - + + + + + + + + + + - + diff --git a/iTunesSearch/TableViewController.h b/iTunesSearch/TableViewController.h index 0cbb5c4..177fd9e 100644 --- a/iTunesSearch/TableViewController.h +++ b/iTunesSearch/TableViewController.h @@ -8,7 +8,7 @@ #import -@interface TableViewController : UIViewController +@interface TableViewController : UIViewController @property (strong, nonatomic) IBOutlet UITableView *tableview; diff --git a/iTunesSearch/TableViewController.m b/iTunesSearch/TableViewController.m index f689980..e1cece7 100644 --- a/iTunesSearch/TableViewController.m +++ b/iTunesSearch/TableViewController.m @@ -14,7 +14,7 @@ @interface TableViewController () { NSArray *midias; } - +-(NSString *) timeFormatter; @end @implementation TableViewController @@ -56,7 +56,10 @@ -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NS [celula.nome setText:filme.nome]; [celula.tipo setText:@"Filme"]; + [celula.pais setText: filme.pais]; + [celula.duracao setText:[NSString stringWithFormat:@"%@", filme.duracao]]; + return celula; } @@ -65,4 +68,6 @@ -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPat } + + @end diff --git a/iTunesSearch/ViewController.h b/iTunesSearch/ViewController.h new file mode 100644 index 0000000..385b4cc --- /dev/null +++ b/iTunesSearch/ViewController.h @@ -0,0 +1,13 @@ +// +// ViewController.h +// iTunesSearch +// +// Created by Rafael Hieda on 10/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import + +@interface ViewController : UIViewController + +@end diff --git a/iTunesSearch/ViewController.m b/iTunesSearch/ViewController.m new file mode 100644 index 0000000..d01cdca --- /dev/null +++ b/iTunesSearch/ViewController.m @@ -0,0 +1,37 @@ +// +// ViewController.m +// iTunesSearch +// +// Created by Rafael Hieda on 10/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import "ViewController.h" + +@interface ViewController () + +@end + +@implementation ViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#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 diff --git a/iTunesSearch/iTunesManager.m b/iTunesSearch/iTunesManager.m index e2babda..bfe063b 100644 --- a/iTunesSearch/iTunesManager.m +++ b/iTunesSearch/iTunesManager.m @@ -54,7 +54,7 @@ - (NSArray *)buscarMidias:(NSString *)termo { [filme setNome:[item objectForKey:@"trackName"]]; [filme setTrackId:[item objectForKey:@"trackId"]]; [filme setArtista:[item objectForKey:@"artistName"]]; - [filme setDuracao:[item objectForKey:@"trackTimeMillis"]]; + [filme setDuracao: [item objectForKey:@"trackTimeMillis"]]; [filme setGenero:[item objectForKey:@"primaryGenreName"]]; [filme setPais:[item objectForKey:@"country"]]; [filmes addObject:filme]; From d4388d422f3ef3c31e0af553c878b8938bd6dcec Mon Sep 17 00:00:00 2001 From: Rafael <41241789@mackenzista.com.br> Date: Tue, 10 Mar 2015 17:54:06 -0300 Subject: [PATCH 3/9] Desafio Bronze 1 feito --- iTunesSearch/TableViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iTunesSearch/TableViewController.m b/iTunesSearch/TableViewController.m index e1cece7..b661e2e 100644 --- a/iTunesSearch/TableViewController.m +++ b/iTunesSearch/TableViewController.m @@ -19,7 +19,7 @@ -(NSString *) timeFormatter; @implementation TableViewController - +// - (void)viewDidLoad { [super viewDidLoad]; From fa06e50d8209643867a14e2233cde7d17df51f81 Mon Sep 17 00:00:00 2001 From: Rafael <41241789@mackenzista.com.br> Date: Tue, 10 Mar 2015 19:06:33 -0300 Subject: [PATCH 4/9] Bronze 1 e 2 feitos --- iTunesSearch.xcodeproj/project.pbxproj | 6 -- iTunesSearch/TableView.xib | 86 +++++++++++++++++++++----- iTunesSearch/TableViewCell.xib | 2 +- iTunesSearch/TableViewController.h | 5 +- iTunesSearch/TableViewController.m | 20 +++++- iTunesSearch/ViewController.h | 13 ---- iTunesSearch/ViewController.m | 37 ----------- 7 files changed, 94 insertions(+), 75 deletions(-) delete mode 100644 iTunesSearch/ViewController.h delete mode 100644 iTunesSearch/ViewController.m diff --git a/iTunesSearch.xcodeproj/project.pbxproj b/iTunesSearch.xcodeproj/project.pbxproj index 9593fca..79e06d7 100644 --- a/iTunesSearch.xcodeproj/project.pbxproj +++ b/iTunesSearch.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 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 */; }; - E3D9526F1AAF9004005A5388 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3D9526E1AAF9004005A5388 /* ViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -50,8 +49,6 @@ 92C21CE01AAE76930052ABE6 /* TableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TableViewCell.xib; sourceTree = ""; }; 92C21CE61AAE858E0052ABE6 /* Filme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Filme.h; path = Entidades/Filme.h; sourceTree = ""; }; 92C21CE71AAE858E0052ABE6 /* Filme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Filme.m; path = Entidades/Filme.m; sourceTree = ""; }; - E3D9526D1AAF9004005A5388 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - E3D9526E1AAF9004005A5388 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -149,8 +146,6 @@ children = ( 92C21CE61AAE858E0052ABE6 /* Filme.h */, 92C21CE71AAE858E0052ABE6 /* Filme.m */, - E3D9526D1AAF9004005A5388 /* ViewController.h */, - E3D9526E1AAF9004005A5388 /* ViewController.m */, ); name = Entidades; sourceTree = ""; @@ -255,7 +250,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E3D9526F1AAF9004005A5388 /* ViewController.m in Sources */, 92C21CBC1AAE757A0052ABE6 /* TableViewController.m in Sources */, 92C21CDB1AAE75B30052ABE6 /* iTunesManager.m in Sources */, 92C21CB91AAE757A0052ABE6 /* AppDelegate.m in Sources */, diff --git a/iTunesSearch/TableView.xib b/iTunesSearch/TableView.xib index 6f271cb..2d7bbe4 100644 --- a/iTunesSearch/TableView.xib +++ b/iTunesSearch/TableView.xib @@ -6,26 +6,84 @@ - - + + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iTunesSearch/TableViewCell.xib b/iTunesSearch/TableViewCell.xib index e5b26e1..cddf169 100644 --- a/iTunesSearch/TableViewCell.xib +++ b/iTunesSearch/TableViewCell.xib @@ -15,7 +15,7 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + diff --git a/iTunesSearch/Data.h b/iTunesSearch/Data.h new file mode 100644 index 0000000..982c547 --- /dev/null +++ b/iTunesSearch/Data.h @@ -0,0 +1,19 @@ +// +// Data.h +// iTunesSearch +// +// Created by Rafael Hieda on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import + +@interface Data : NSObject +@property(nonatomic, strong) NSString *name; +@property(nonatomic, strong) NSString *title; +@property(nonatomic, strong) NSString *price; +@property(nonatomic, strong) NSString *mediaType; +@property(nonatomic, strong) NSString *currency; +@property(nonatomic, strong) NSString *country; + +@end diff --git a/iTunesSearch/Data.m b/iTunesSearch/Data.m new file mode 100644 index 0000000..e8b6ba1 --- /dev/null +++ b/iTunesSearch/Data.m @@ -0,0 +1,13 @@ +// +// Data.m +// iTunesSearch +// +// Created by Rafael Hieda on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import "Data.h" + +@implementation Data + +@end diff --git a/iTunesSearch/Entidades/Filme.h b/iTunesSearch/Entidades/Filme.h index eb126dc..0e76198 100644 --- a/iTunesSearch/Entidades/Filme.h +++ b/iTunesSearch/Entidades/Filme.h @@ -16,5 +16,6 @@ @property (nonatomic, strong) NSString *duracao; @property (nonatomic, strong) NSString *genero; @property (nonatomic, strong) NSString *pais; +@property (nonatomic, strong) NSString *preco; @end diff --git a/iTunesSearch/TableViewCell.xib b/iTunesSearch/TableViewCell.xib index cddf169..81ec863 100644 --- a/iTunesSearch/TableViewCell.xib +++ b/iTunesSearch/TableViewCell.xib @@ -26,14 +26,14 @@ -