From 83ff465be5e6b16cae45d74775e04fd783034a6c Mon Sep 17 00:00:00 2001 From: Patricia Machado de Abreu <41316177@mackenzista.com.br> Date: Tue, 10 Mar 2015 15:45:21 -0300 Subject: [PATCH 1/5] Desafio Bronze 1 OK --- iTunesSearch/TableViewCell.h | 1 + iTunesSearch/TableViewCell.xib | 24 ++++++++++++++++++------ iTunesSearch/TableViewController.m | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/iTunesSearch/TableViewCell.h b/iTunesSearch/TableViewCell.h index b630349..0858731 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 *artista; @end diff --git a/iTunesSearch/TableViewCell.xib b/iTunesSearch/TableViewCell.xib index bf8bd3f..0cdbd99 100644 --- a/iTunesSearch/TableViewCell.xib +++ b/iTunesSearch/TableViewCell.xib @@ -1,5 +1,5 @@ - + @@ -7,17 +7,17 @@ - - + + + + + + - + diff --git a/iTunesSearch/TableViewController.m b/iTunesSearch/TableViewController.m index f689980..b76423c 100644 --- a/iTunesSearch/TableViewController.m +++ b/iTunesSearch/TableViewController.m @@ -56,6 +56,7 @@ -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NS [celula.nome setText:filme.nome]; [celula.tipo setText:@"Filme"]; + [celula.artista setText:filme.artista]; return celula; } From e7968055dff84abd88ede513f4afcdcc8e26434c Mon Sep 17 00:00:00 2001 From: Patricia Machado de Abreu <41316177@mackenzista.com.br> Date: Tue, 10 Mar 2015 17:19:07 -0300 Subject: [PATCH 2/5] Desafio Bronze 2 OK! --- iTunesSearch/TableView.xib | 4 ++-- iTunesSearch/TableViewController.h | 4 +++- iTunesSearch/TableViewController.m | 32 ++++++++++++++++++++++++++---- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/iTunesSearch/TableView.xib b/iTunesSearch/TableView.xib index 55f128c..728b274 100644 --- a/iTunesSearch/TableView.xib +++ b/iTunesSearch/TableView.xib @@ -1,5 +1,5 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/iTunesSearch/TableViewController.h b/iTunesSearch/TableViewController.h index 0cbb5c4..72c8161 100644 --- a/iTunesSearch/TableViewController.h +++ b/iTunesSearch/TableViewController.h @@ -12,6 +12,8 @@ @property (strong, nonatomic) IBOutlet UITableView *tableview; - +@property (nonatomic) UITextField *textBuscador; +@property (nonatomic) UIButton *buttonBuscador; +@property (nonatomic) NSString *text; @end diff --git a/iTunesSearch/TableViewController.m b/iTunesSearch/TableViewController.m index b76423c..4dd32c9 100644 --- a/iTunesSearch/TableViewController.m +++ b/iTunesSearch/TableViewController.m @@ -19,6 +19,7 @@ @interface TableViewController () { @implementation TableViewController +@synthesize textBuscador, buttonBuscador; - (void)viewDidLoad { @@ -27,11 +28,26 @@ - (void)viewDidLoad { UINib *nib = [UINib nibWithNibName:@"TableViewCell" bundle:nil]; [self.tableview registerNib:nib forCellReuseIdentifier:@"celulaPadrao"]; - 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)]; + self.tableview.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, self.tableview.bounds.size.width, 45.f)]; + + textBuscador = [[UITextField alloc] initWithFrame:CGRectMake(5.0f, 20.0f, 230.0f, 25.0f)]; + [textBuscador setBorderStyle:UITextBorderStyleRoundedRect]; + + buttonBuscador = [[UIButton alloc] initWithFrame:CGRectMake(240.0f, 20.0f, 60.0f, 25.0f)]; + + [buttonBuscador addTarget:self action:@selector(buttonBuscador:) forControlEvents:UIControlEventTouchUpInside]; + + [buttonBuscador setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; + [buttonBuscador setTitle:@"Buscar"forState: UIControlStateNormal]; + [buttonBuscador setFont:[UIFont boldSystemFontOfSize:15.0f]]; + + [self.tableview.tableHeaderView addSubview:textBuscador]; + [self.tableview.tableHeaderView addSubview:buttonBuscador]; + + } - (void)didReceiveMemoryWarning { @@ -65,5 +81,13 @@ -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPat return 70; } - +-(IBAction)buttonBuscador:(id)sender{ + iTunesManager *itunes = [iTunesManager sharedInstance]; + _text = textBuscador.text; + _text = [_text stringByReplacingOccurrencesOfString:@" " withString:@"+"]; + midias = [itunes buscarMidias:_text]; + + [_tableview reloadData]; + +} @end From 5e82341e3cbae7a8916b6874b269054ae920debe Mon Sep 17 00:00:00 2001 From: Patricia Machado de Abreu <41316177@mackenzista.com.br> Date: Wed, 11 Mar 2015 17:29:33 -0300 Subject: [PATCH 3/5] Desafio Prata 1 e 2 OK! --- iTunesSearch.xcodeproj/project.pbxproj | 18 ++++ iTunesSearch/Entidades/Ebook.h | 20 +++++ iTunesSearch/Entidades/Ebook.m | 14 ++++ iTunesSearch/Entidades/Musica.h | 20 +++++ iTunesSearch/Entidades/Musica.m | 13 +++ iTunesSearch/Entidades/Podcast.h | 20 +++++ iTunesSearch/Entidades/Podcast.m | 13 +++ iTunesSearch/TableViewCell.h | 1 + iTunesSearch/TableViewCell.m | 1 + iTunesSearch/TableViewCell.xib | 4 +- iTunesSearch/TableViewController.h | 1 + iTunesSearch/TableViewController.m | 109 ++++++++++++++++++++++--- iTunesSearch/iTunesManager.h | 3 + iTunesSearch/iTunesManager.m | 73 ++++++++++++++--- 14 files changed, 287 insertions(+), 23 deletions(-) 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 diff --git a/iTunesSearch.xcodeproj/project.pbxproj b/iTunesSearch.xcodeproj/project.pbxproj index 79e06d7..605ec2c 100644 --- a/iTunesSearch.xcodeproj/project.pbxproj +++ b/iTunesSearch.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 4D951D611AB0C077002A41D8 /* Musica.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D951D601AB0C077002A41D8 /* Musica.m */; }; + 4D951D641AB0C11C002A41D8 /* Podcast.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D951D631AB0C11C002A41D8 /* Podcast.m */; }; + 4D951D671AB0C151002A41D8 /* Ebook.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D951D661AB0C151002A41D8 /* Ebook.m */; }; 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 */; }; @@ -30,6 +33,12 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 4D951D5F1AB0C077002A41D8 /* Musica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Musica.h; path = Entidades/Musica.h; sourceTree = ""; }; + 4D951D601AB0C077002A41D8 /* Musica.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Musica.m; path = Entidades/Musica.m; sourceTree = ""; }; + 4D951D621AB0C11C002A41D8 /* Podcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Podcast.h; path = Entidades/Podcast.h; sourceTree = ""; }; + 4D951D631AB0C11C002A41D8 /* Podcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Podcast.m; path = Entidades/Podcast.m; sourceTree = ""; }; + 4D951D651AB0C151002A41D8 /* Ebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ebook.h; path = Entidades/Ebook.h; sourceTree = ""; }; + 4D951D661AB0C151002A41D8 /* Ebook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Ebook.m; path = Entidades/Ebook.m; 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 = ""; }; @@ -146,6 +155,12 @@ children = ( 92C21CE61AAE858E0052ABE6 /* Filme.h */, 92C21CE71AAE858E0052ABE6 /* Filme.m */, + 4D951D5F1AB0C077002A41D8 /* Musica.h */, + 4D951D601AB0C077002A41D8 /* Musica.m */, + 4D951D621AB0C11C002A41D8 /* Podcast.h */, + 4D951D631AB0C11C002A41D8 /* Podcast.m */, + 4D951D651AB0C151002A41D8 /* Ebook.h */, + 4D951D661AB0C151002A41D8 /* Ebook.m */, ); name = Entidades; sourceTree = ""; @@ -250,7 +265,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 4D951D671AB0C151002A41D8 /* Ebook.m in Sources */, 92C21CBC1AAE757A0052ABE6 /* TableViewController.m in Sources */, + 4D951D611AB0C077002A41D8 /* Musica.m in Sources */, + 4D951D641AB0C11C002A41D8 /* Podcast.m in Sources */, 92C21CDB1AAE75B30052ABE6 /* iTunesManager.m in Sources */, 92C21CB91AAE757A0052ABE6 /* AppDelegate.m in Sources */, 92C21CE81AAE858E0052ABE6 /* Filme.m in Sources */, diff --git a/iTunesSearch/Entidades/Ebook.h b/iTunesSearch/Entidades/Ebook.h new file mode 100644 index 0000000..c2e6b87 --- /dev/null +++ b/iTunesSearch/Entidades/Ebook.h @@ -0,0 +1,20 @@ +// +// Ebook.h +// iTunesSearch +// +// Created by Patricia Machado de Abreu on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import + +@interface Ebook : NSObject + +@property (nonatomic, strong) NSString *nome; +@property (nonatomic, strong) NSString *trackId; +@property (nonatomic, strong) NSString *autor; +@property (nonatomic, strong) NSString *numPaginas; +@property (nonatomic, strong) NSString *genero; +@property (nonatomic, strong) NSString *pais; + +@end diff --git a/iTunesSearch/Entidades/Ebook.m b/iTunesSearch/Entidades/Ebook.m new file mode 100644 index 0000000..0c70513 --- /dev/null +++ b/iTunesSearch/Entidades/Ebook.m @@ -0,0 +1,14 @@ +// +// Ebook.m +// iTunesSearch +// +// Created by Patricia Machado de Abreu on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import "Ebook.h" + +@implementation Ebook + + +@end diff --git a/iTunesSearch/Entidades/Musica.h b/iTunesSearch/Entidades/Musica.h new file mode 100644 index 0000000..3f724d6 --- /dev/null +++ b/iTunesSearch/Entidades/Musica.h @@ -0,0 +1,20 @@ +// +// Musica.h +// iTunesSearch +// +// Created by Patricia Machado de Abreu on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import + +@interface Musica : NSObject + +@property (nonatomic, strong) NSString *nome; +@property (nonatomic, strong) NSString *trackId; +@property (nonatomic, strong) NSString *artista; +@property (nonatomic, strong) NSString *duracao; +@property (nonatomic, strong) NSString *genero; +@property (nonatomic, strong) NSString *pais; + +@end diff --git a/iTunesSearch/Entidades/Musica.m b/iTunesSearch/Entidades/Musica.m new file mode 100644 index 0000000..32d6f12 --- /dev/null +++ b/iTunesSearch/Entidades/Musica.m @@ -0,0 +1,13 @@ +// +// Musica.m +// iTunesSearch +// +// Created by Patricia Machado de Abreu on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import "Musica.h" + +@implementation Musica + +@end diff --git a/iTunesSearch/Entidades/Podcast.h b/iTunesSearch/Entidades/Podcast.h new file mode 100644 index 0000000..440e0ac --- /dev/null +++ b/iTunesSearch/Entidades/Podcast.h @@ -0,0 +1,20 @@ +// +// Podcast.h +// iTunesSearch +// +// Created by Patricia Machado de Abreu on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import + +@interface Podcast : NSObject + +@property (nonatomic, strong) NSString *nome; +@property (nonatomic, strong) NSString *trackId; +@property (nonatomic, strong) NSString *artista; +@property (nonatomic, strong) NSString *duracao; +@property (nonatomic, strong) NSString *genero; +@property (nonatomic, strong) NSString *pais; + +@end diff --git a/iTunesSearch/Entidades/Podcast.m b/iTunesSearch/Entidades/Podcast.m new file mode 100644 index 0000000..42d7704 --- /dev/null +++ b/iTunesSearch/Entidades/Podcast.m @@ -0,0 +1,13 @@ +// +// Podcast.m +// iTunesSearch +// +// Created by Patricia Machado de Abreu on 11/03/15. +// Copyright (c) 2015 joaquim. All rights reserved. +// + +#import "Podcast.h" + +@implementation Podcast + +@end diff --git a/iTunesSearch/TableViewCell.h b/iTunesSearch/TableViewCell.h index 0858731..5d8f0bf 100644 --- a/iTunesSearch/TableViewCell.h +++ b/iTunesSearch/TableViewCell.h @@ -15,4 +15,5 @@ @property (weak, nonatomic) IBOutlet UILabel *artista; + @end diff --git a/iTunesSearch/TableViewCell.m b/iTunesSearch/TableViewCell.m index ffac89c..7b8af41 100644 --- a/iTunesSearch/TableViewCell.m +++ b/iTunesSearch/TableViewCell.m @@ -20,4 +20,5 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated { // Configure the view for the selected state } + @end diff --git a/iTunesSearch/TableViewCell.xib b/iTunesSearch/TableViewCell.xib index 0cdbd99..0fa8fd4 100644 --- a/iTunesSearch/TableViewCell.xib +++ b/iTunesSearch/TableViewCell.xib @@ -15,7 +15,7 @@