AmineB/Flikrkr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed previously stacked views.

Browse Source
This commit is contained in:
makowildcat 2014-04-10 12:21:37 +02:00
parent a47da4d9f0
commit 0e89f0d743
10 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
4.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

20
Flikrkr.xcodeproj/project.pbxproj
View File

@ -9,10 +9,11 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
5A066DD718F68EA500A16494 /* PictureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A066DD618F68EA500A16494 /* PictureViewController.m */; }; 5A066DD718F68EA500A16494 /* PictureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A066DD618F68EA500A16494 /* PictureViewController.m */; };
5A066DDA18F68EE900A16494 /* ReaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A066DD918F68EE900A16494 /* ReaderView.m */; }; 5A066DDA18F68EE900A16494 /* ReaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A066DD918F68EE900A16494 /* ReaderView.m */; };
5A066DDF18F6975200A16494 /* 1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DDB18F6975200A16494 /* 1.jpg */; };
5A066DE618F6982000A16494 /* 0.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DE318F6982000A16494 /* 0.jpg */; }; 5A066DE618F6982000A16494 /* 0.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DE318F6982000A16494 /* 0.jpg */; };
5A066DE718F6982000A16494 /* 3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DE418F6982000A16494 /* 3.jpg */; }; 5A066DE718F6982000A16494 /* 3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DE418F6982000A16494 /* 3.jpg */; };
5A066DE818F6982000A16494 /* 2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DE518F6982000A16494 /* 2.jpg */; }; 5A066DEB18F6A7BF00A16494 /* 2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DE918F6A7BF00A16494 /* 2.jpg */; };
5A066DEE18F6A7C800A16494 /* 4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DED18F6A7C800A16494 /* 4.jpg */; };
5A066DF018F6A80500A16494 /* 1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5A066DEF18F6A80500A16494 /* 1.jpg */; };
5A11DCFE18F68644007CE97C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A11DCFD18F68644007CE97C /* Foundation.framework */; }; 5A11DCFE18F68644007CE97C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A11DCFD18F68644007CE97C /* Foundation.framework */; };
5A11DD0018F68644007CE97C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A11DCFF18F68644007CE97C /* CoreGraphics.framework */; }; 5A11DD0018F68644007CE97C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A11DCFF18F68644007CE97C /* CoreGraphics.framework */; };
5A11DD0218F68644007CE97C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A11DD0118F68644007CE97C /* UIKit.framework */; }; 5A11DD0218F68644007CE97C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A11DD0118F68644007CE97C /* UIKit.framework */; };
@ -46,10 +47,11 @@
5A066DD618F68EA500A16494 /* PictureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureViewController.m; sourceTree = "<group>"; }; 5A066DD618F68EA500A16494 /* PictureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureViewController.m; sourceTree = "<group>"; };
5A066DD818F68EE900A16494 /* ReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderView.h; sourceTree = "<group>"; }; 5A066DD818F68EE900A16494 /* ReaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderView.h; sourceTree = "<group>"; };
5A066DD918F68EE900A16494 /* ReaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderView.m; sourceTree = "<group>"; }; 5A066DD918F68EE900A16494 /* ReaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderView.m; sourceTree = "<group>"; };
5A066DDB18F6975200A16494 /* 1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 1.jpg; sourceTree = "<group>"; };
5A066DE318F6982000A16494 /* 0.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 0.jpg; path = ../0.jpg; sourceTree = "<group>"; }; 5A066DE318F6982000A16494 /* 0.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 0.jpg; path = ../0.jpg; sourceTree = "<group>"; };
5A066DE418F6982000A16494 /* 3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 3.jpg; path = ../3.jpg; sourceTree = "<group>"; }; 5A066DE418F6982000A16494 /* 3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 3.jpg; path = ../3.jpg; sourceTree = "<group>"; };
5A066DE518F6982000A16494 /* 2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 2.jpg; path = ../2.jpg; sourceTree = "<group>"; }; 5A066DE918F6A7BF00A16494 /* 2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 2.jpg; sourceTree = "<group>"; };
5A066DED18F6A7C800A16494 /* 4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 4.jpg; sourceTree = "<group>"; };
5A066DEF18F6A80500A16494 /* 1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 1.jpg; path = ../1.jpg; sourceTree = "<group>"; };
5A11DCFA18F68644007CE97C /* Flikrkr.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Flikrkr.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5A11DCFA18F68644007CE97C /* Flikrkr.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Flikrkr.app; sourceTree = BUILT_PRODUCTS_DIR; };
5A11DCFD18F68644007CE97C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 5A11DCFD18F68644007CE97C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
5A11DCFF18F68644007CE97C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 5A11DCFF18F68644007CE97C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@ -132,9 +134,10 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
5A066DE318F6982000A16494 /* 0.jpg */, 5A066DE318F6982000A16494 /* 0.jpg */,
5A066DDB18F6975200A16494 /* 1.jpg */, 5A066DEF18F6A80500A16494 /* 1.jpg */,
5A066DE518F6982000A16494 /* 2.jpg */, 5A066DE918F6A7BF00A16494 /* 2.jpg */,
5A066DE418F6982000A16494 /* 3.jpg */, 5A066DE418F6982000A16494 /* 3.jpg */,
5A066DED18F6A7C800A16494 /* 4.jpg */,
5A11DD0E18F68644007CE97C /* AppDelegate.h */, 5A11DD0E18F68644007CE97C /* AppDelegate.h */,
5A11DD0F18F68644007CE97C /* AppDelegate.m */, 5A11DD0F18F68644007CE97C /* AppDelegate.m */,
5A11DD3218F6871F007CE97C /* Storyboard.storyboard */, 5A11DD3218F6871F007CE97C /* Storyboard.storyboard */,
@ -253,11 +256,12 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
5A066DEE18F6A7C800A16494 /* 4.jpg in Resources */,
5A066DEB18F6A7BF00A16494 /* 2.jpg in Resources */,
5A11DD0A18F68644007CE97C /* InfoPlist.strings in Resources */, 5A11DD0A18F68644007CE97C /* InfoPlist.strings in Resources */,
5A066DDF18F6975200A16494 /* 1.jpg in Resources */,
5A066DE818F6982000A16494 /* 2.jpg in Resources */,
5A11DD1518F68644007CE97C /* Images.xcassets in Resources */, 5A11DD1518F68644007CE97C /* Images.xcassets in Resources */,
5A066DE718F6982000A16494 /* 3.jpg in Resources */, 5A066DE718F6982000A16494 /* 3.jpg in Resources */,
5A066DF018F6A80500A16494 /* 1.jpg in Resources */,
5A066DE618F6982000A16494 /* 0.jpg in Resources */, 5A066DE618F6982000A16494 /* 0.jpg in Resources */,
5A11DD3318F6871F007CE97C /* Storyboard.storyboard in Resources */, 5A11DD3318F6871F007CE97C /* Storyboard.storyboard in Resources */,
); );

BIN
Flikrkr/._1.jpg Normal file
View File

Binary file not shown.

BIN
Flikrkr/._2.jpg Normal file
View File

Binary file not shown.

BIN
Flikrkr/._4.jpg Normal file
View File

Binary file not shown.

BIN
Flikrkr/2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 KiB

BIN
Flikrkr/4.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

2
Flikrkr/PictureViewController.m
View File

@ -39,7 +39,7 @@
} }
- (int) numberOfPages - (int) numberOfPages
{ {
return 4; return 5;
} }
- (UIView *) pageAtIndex:(int)index - (UIView *) pageAtIndex:(int)index
{ {

1
Flikrkr/ReaderView.m
View File

@ -36,6 +36,7 @@
-(void)displayPageAtIndex:(int)index -(void)displayPageAtIndex:(int)index
{ {
if (index >= 0 && index < [self.delegate numberOfPages]) { if (index >= 0 && index < [self.delegate numberOfPages]) {
[self.subviews.lastObject removeFromSuperview];
UIView * view = [self.delegate pageAtIndex:index]; UIView * view = [self.delegate pageAtIndex:index];
[self addSubview:view]; [self addSubview:view];
self.currentIndex = index; self.currentIndex = index;