Skip to content

Patricia #36

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
PatriciaAbreu wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Patricia #36

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
83ff465
Desafio Bronze 1 OK
PatriciaAbreu Mar 10, 2015
e796805
Desafio Bronze 2 OK!
PatriciaAbreu Mar 10, 2015
5e82341
Desafio Prata 1 e 2 OK!
PatriciaAbreu Mar 11, 2015
2c5e1d8
Desafio prata 1 e prata 2 completos
PatriciaAbreu Mar 12, 2015
9938b86
Implementado herança de classes e Desafio Ouro 2!
PatriciaAbreu 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
36 changes: 30 additions & 6 deletions iTunesSearch.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
4D4694431AB2E71200AD029E /* Entidade.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4694421AB2E71200AD029E /* Entidade.m */; };
4D4694461AB2E87300AD029E /* Filme.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4694451AB2E87300AD029E /* Filme.m */; };
4D4694491AB2E8A000AD029E /* Musica.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4694481AB2E8A000AD029E /* Musica.m */; };
4D46944C1AB2E8C100AD029E /* Podcast.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D46944B1AB2E8C100AD029E /* Podcast.m */; };
4D46944F1AB2E8E500AD029E /* Ebook.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D46944E1AB2E8E500AD029E /* 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 */; };
Expand All @@ -16,7 +21,6 @@
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 */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -30,6 +34,16 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
4D4694411AB2E71200AD029E /* Entidade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Entidade.h; path = Entidades/Entidade.h; sourceTree = "<group>"; };
4D4694421AB2E71200AD029E /* Entidade.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Entidade.m; path = Entidades/Entidade.m; sourceTree = "<group>"; };
4D4694441AB2E87300AD029E /* Filme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Filme.h; path = Entidades/Filme.h; sourceTree = "<group>"; };
4D4694451AB2E87300AD029E /* Filme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Filme.m; path = Entidades/Filme.m; sourceTree = "<group>"; };
4D4694471AB2E8A000AD029E /* Musica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Musica.h; path = Entidades/Musica.h; sourceTree = "<group>"; };
4D4694481AB2E8A000AD029E /* Musica.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Musica.m; path = Entidades/Musica.m; sourceTree = "<group>"; };
4D46944A1AB2E8C100AD029E /* Podcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Podcast.h; path = Entidades/Podcast.h; sourceTree = "<group>"; };
4D46944B1AB2E8C100AD029E /* Podcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Podcast.m; path = Entidades/Podcast.m; sourceTree = "<group>"; };
4D46944D1AB2E8E500AD029E /* Ebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ebook.h; path = Entidades/Ebook.h; sourceTree = "<group>"; };
4D46944E1AB2E8E500AD029E /* Ebook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Ebook.m; path = Entidades/Ebook.m; 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 @@ -47,8 +61,6 @@
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>"; };
92C21CE61AAE858E0052ABE6 /* Filme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Filme.h; path = Entidades/Filme.h; sourceTree = "<group>"; };
92C21CE71AAE858E0052ABE6 /* Filme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Filme.m; path = Entidades/Filme.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -144,8 +156,16 @@
92C21CE91AAE859A0052ABE6 /* Entidades */ = {
isa = PBXGroup;
children = (
92C21CE61AAE858E0052ABE6 /* Filme.h */,
92C21CE71AAE858E0052ABE6 /* Filme.m */,
4D4694411AB2E71200AD029E /* Entidade.h */,
4D4694421AB2E71200AD029E /* Entidade.m */,
4D4694441AB2E87300AD029E /* Filme.h */,
4D4694451AB2E87300AD029E /* Filme.m */,
4D4694471AB2E8A000AD029E /* Musica.h */,
4D4694481AB2E8A000AD029E /* Musica.m */,
4D46944A1AB2E8C100AD029E /* Podcast.h */,
4D46944B1AB2E8C100AD029E /* Podcast.m */,
4D46944D1AB2E8E500AD029E /* Ebook.h */,
4D46944E1AB2E8E500AD029E /* Ebook.m */,
);
name = Entidades;
sourceTree = "<group>";
Expand Down Expand Up @@ -250,10 +270,14 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4D46944F1AB2E8E500AD029E /* Ebook.m in Sources */,
4D46944C1AB2E8C100AD029E /* Podcast.m in Sources */,
4D4694491AB2E8A000AD029E /* Musica.m in Sources */,
92C21CBC1AAE757A0052ABE6 /* TableViewController.m in Sources */,
4D4694431AB2E71200AD029E /* Entidade.m in Sources */,
4D4694461AB2E87300AD029E /* Filme.m in Sources */,
92C21CDB1AAE75B30052ABE6 /* iTunesManager.m in Sources */,
92C21CB91AAE757A0052ABE6 /* AppDelegate.m in Sources */,
92C21CE81AAE858E0052ABE6 /* Filme.m in Sources */,
92C21CE11AAE76930052ABE6 /* TableViewCell.m in Sources */,
92C21CB61AAE757A0052ABE6 /* main.m in Sources */,
);
Expand Down
13 changes: 13 additions & 0 deletions iTunesSearch/Entidades/Ebook.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Ebook.h
// iTunesSearch
//
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import "Entidade.h"

@interface Ebook : Entidade

@end
14 changes: 14 additions & 0 deletions iTunesSearch/Entidades/Ebook.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// Ebook.m
// iTunesSearch
//
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import "Ebook.h"

@implementation Ebook


@end
20 changes: 20 additions & 0 deletions iTunesSearch/Entidades/Entidade.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// Entidade.h
// iTunesSearch
//
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface Entidade : 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;
@property (nonatomic, strong) NSString *imagem;

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

#import "Entidade.h"

@implementation Entidade

@end
13 changes: 3 additions & 10 deletions iTunesSearch/Entidades/Filme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@
// Filme.h
// iTunesSearch
//
// Created by joaquim on 09/03/15.
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "Entidade.h"

@interface Filme : 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;
@interface Filme : Entidade

@end
2 changes: 1 addition & 1 deletion iTunesSearch/Entidades/Filme.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Filme.m
// iTunesSearch
//
// Created by joaquim on 09/03/15.
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

Expand Down
13 changes: 13 additions & 0 deletions iTunesSearch/Entidades/Musica.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Musica.h
// iTunesSearch
//
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import "Entidade.h"

@interface Musica : Entidade

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

#import "Musica.h"

@implementation Musica

@end
13 changes: 13 additions & 0 deletions iTunesSearch/Entidades/Podcast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// Podcast.h
// iTunesSearch
//
// Created by Patricia Machado de Abreu on 13/03/15.
// Copyright (c) 2015 joaquim. All rights reserved.
//

#import "Entidade.h"

@interface Podcast : Entidade

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

#import "Podcast.h"

@implementation Podcast

@end
4 changes: 2 additions & 2 deletions iTunesSearch/TableView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14D72i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
</dependencies>
Expand All @@ -19,7 +19,7 @@
<outlet property="dataSource" destination="-1" id="grn-Rq-4Ux"/>
<outlet property="delegate" destination="-1" id="M2x-yu-OMO"/>
</connections>
<point key="canvasLocation" x="-135" y="440"/>
<point key="canvasLocation" x="-316" y="279"/>
</tableView>
</objects>
</document>
3 changes: 3 additions & 0 deletions iTunesSearch/TableViewCell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

@property (weak, nonatomic) IBOutlet UILabel *nome;
@property (weak, nonatomic) IBOutlet UILabel *tipo;
@property (weak, nonatomic) IBOutlet UILabel *artista;
@property (weak, nonatomic) IBOutlet UIImageView *imagem;



@end
1 change: 1 addition & 0 deletions iTunesSearch/TableViewCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
// Configure the view for the selected state
}


@end
Loading