Skip to content

Commit 1466db5

Browse files
0x0c0x0c
committed
Use page data model to generate each pages.
1 parent 6d6030d commit 1466db5

File tree

18 files changed

+635
-383
lines changed

18 files changed

+635
-383
lines changed

‎Example/RDImageViewerController.xcodeproj/project.pbxproj

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
2424
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
2525
E3A3A445DE0F421C9D66D081 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ADF8DB7BCBB4D47A97E8F2C /* libPods-Tests.a */; };
26+
E90C11501D8E022000630F12 /* RDViewPageContentData.m in Sources */ = {isa = PBXBuildFile; fileRef = E90C114F1D8E022000630F12 /* RDViewPageContentData.m */; };
27+
E90C11531D8E022800630F12 /* RDScrollViewPageContentData.m in Sources */ = {isa = PBXBuildFile; fileRef = E90C11521D8E022800630F12 /* RDScrollViewPageContentData.m */; };
2628
E90E268A1A34981000F1F54A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = E90E26881A34981000F1F54A /* LaunchScreen.xib */; };
2729
E919D29119D8005C003F4BD0 /* RDImageScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = E919D29019D8005C003F4BD0 /* RDImageScrollView.m */; };
2830
E919D29619D80683003F4BD0 /* RDPagingView.m in Sources */ = {isa = PBXBuildFile; fileRef = E919D29519D80683003F4BD0 /* RDPagingView.m */; };
@@ -37,6 +39,9 @@
3739
E919D2AA19D82F8E003F4BD0 /* 8.JPG in Resources */ = {isa = PBXBuildFile; fileRef = E919D2A019D82F8E003F4BD0 /* 8.JPG */; };
3840
E919D2AB19D82F8E003F4BD0 /* 9.JPG in Resources */ = {isa = PBXBuildFile; fileRef = E919D2A119D82F8E003F4BD0 /* 9.JPG */; };
3941
E928DBE01AB2011C00594AAD /* rd_M2DURLConnectionOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = E928DBDF1AB2011C00594AAD /* rd_M2DURLConnectionOperation.m */; };
42+
E9437D751D8DF4BC003DC413 /* RDPageContentData.m in Sources */ = {isa = PBXBuildFile; fileRef = E9437D741D8DF4BC003DC413 /* RDPageContentData.m */; };
43+
E9437D781D8DF59A003DC413 /* RDRemoteImageContentData.m in Sources */ = {isa = PBXBuildFile; fileRef = E9437D771D8DF59A003DC413 /* RDRemoteImageContentData.m */; };
44+
E9437D7B1D8DF5A4003DC413 /* RDImageContentData.m in Sources */ = {isa = PBXBuildFile; fileRef = E9437D7A1D8DF5A4003DC413 /* RDImageContentData.m */; };
4045
E96FFD8419CE7970008ADEDF /* RDImageViewerController.m in Sources */ = {isa = PBXBuildFile; fileRef = E96FFD8119CE7970008ADEDF /* RDImageViewerController.m */; };
4146
E9B106601AB760DA000DEEE4 /* 11.JPG in Resources */ = {isa = PBXBuildFile; fileRef = E9B1065F1AB760DA000DEEE4 /* 11.JPG */; };
4247
E9B106621AB76127000DEEE4 /* 12.JPG in Resources */ = {isa = PBXBuildFile; fileRef = E9B106611AB76127000DEEE4 /* 12.JPG */; };
@@ -80,6 +85,10 @@
8085
89025E39FA3270FE8EDDEEB7 /* RDImageViewerController.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RDImageViewerController.podspec; path = ../RDImageViewerController.podspec; sourceTree = "<group>"; };
8186
8908584DC4E04959ABA607A8 /* libPods-RDImageViewerController.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RDImageViewerController.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8287
E6BEC608C2E338A1EFB29850 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
88+
E90C114E1D8E022000630F12 /* RDViewPageContentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDViewPageContentData.h; sourceTree = "<group>"; };
89+
E90C114F1D8E022000630F12 /* RDViewPageContentData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDViewPageContentData.m; sourceTree = "<group>"; };
90+
E90C11511D8E022800630F12 /* RDScrollViewPageContentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDScrollViewPageContentData.h; sourceTree = "<group>"; };
91+
E90C11521D8E022800630F12 /* RDScrollViewPageContentData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDScrollViewPageContentData.m; sourceTree = "<group>"; };
8392
E90E26891A34981000F1F54A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
8493
E919D28F19D8005C003F4BD0 /* RDImageScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDImageScrollView.h; sourceTree = "<group>"; };
8594
E919D29019D8005C003F4BD0 /* RDImageScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDImageScrollView.m; sourceTree = "<group>"; };
@@ -97,6 +106,12 @@
97106
E919D2A119D82F8E003F4BD0 /* 9.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 9.JPG; sourceTree = "<group>"; };
98107
E928DBDE1AB2011C00594AAD /* rd_M2DURLConnectionOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rd_M2DURLConnectionOperation.h; sourceTree = "<group>"; };
99108
E928DBDF1AB2011C00594AAD /* rd_M2DURLConnectionOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = rd_M2DURLConnectionOperation.m; sourceTree = "<group>"; };
109+
E9437D731D8DF4BC003DC413 /* RDPageContentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDPageContentData.h; sourceTree = "<group>"; };
110+
E9437D741D8DF4BC003DC413 /* RDPageContentData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDPageContentData.m; sourceTree = "<group>"; };
111+
E9437D761D8DF59A003DC413 /* RDRemoteImageContentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDRemoteImageContentData.h; sourceTree = "<group>"; };
112+
E9437D771D8DF59A003DC413 /* RDRemoteImageContentData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDRemoteImageContentData.m; sourceTree = "<group>"; };
113+
E9437D791D8DF5A4003DC413 /* RDImageContentData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDImageContentData.h; sourceTree = "<group>"; };
114+
E9437D7A1D8DF5A4003DC413 /* RDImageContentData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDImageContentData.m; sourceTree = "<group>"; };
100115
E96FFD8019CE7970008ADEDF /* RDImageViewerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RDImageViewerController.h; sourceTree = "<group>"; };
101116
E96FFD8119CE7970008ADEDF /* RDImageViewerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RDImageViewerController.m; sourceTree = "<group>"; };
102117
E9B1065F1AB760DA000DEEE4 /* 11.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 11.JPG; sourceTree = "<group>"; };
@@ -174,6 +189,7 @@
174189
6003F59D195388D20070C39A /* RDAppDelegate.m */,
175190
6003F5A5195388D20070C39A /* RDViewController.h */,
176191
6003F5A6195388D20070C39A /* RDViewController.m */,
192+
E90C114D1D8E020D00630F12 /* SampleDataClass */,
177193
6003F5A8195388D20070C39A /* Images.xcassets */,
178194
6003F594195388D20070C39A /* Supporting Files */,
179195
);
@@ -222,6 +238,17 @@
222238
name = "Podspec Metadata";
223239
sourceTree = "<group>";
224240
};
241+
E90C114D1D8E020D00630F12 /* SampleDataClass */ = {
242+
isa = PBXGroup;
243+
children = (
244+
E90C114E1D8E022000630F12 /* RDViewPageContentData.h */,
245+
E90C114F1D8E022000630F12 /* RDViewPageContentData.m */,
246+
E90C11511D8E022800630F12 /* RDScrollViewPageContentData.h */,
247+
E90C11521D8E022800630F12 /* RDScrollViewPageContentData.m */,
248+
);
249+
path = SampleDataClass;
250+
sourceTree = "<group>";
251+
};
225252
E919D28E19D80053003F4BD0 /* RDImageScrollView */ = {
226253
isa = PBXGroup;
227254
children = (
@@ -268,9 +295,39 @@
268295
path = M2DURLConnectionOperation;
269296
sourceTree = "<group>";
270297
};
298+
E9437D701D8DF414003DC413 /* RDPageContentData */ = {
299+
isa = PBXGroup;
300+
children = (
301+
E9437D711D8DF414003DC413 /* RDImageContentData */,
302+
E9437D721D8DF414003DC413 /* RDRemoteImageContentData */,
303+
E9437D731D8DF4BC003DC413 /* RDPageContentData.h */,
304+
E9437D741D8DF4BC003DC413 /* RDPageContentData.m */,
305+
);
306+
path = RDPageContentData;
307+
sourceTree = "<group>";
308+
};
309+
E9437D711D8DF414003DC413 /* RDImageContentData */ = {
310+
isa = PBXGroup;
311+
children = (
312+
E9437D791D8DF5A4003DC413 /* RDImageContentData.h */,
313+
E9437D7A1D8DF5A4003DC413 /* RDImageContentData.m */,
314+
);
315+
path = RDImageContentData;
316+
sourceTree = "<group>";
317+
};
318+
E9437D721D8DF414003DC413 /* RDRemoteImageContentData */ = {
319+
isa = PBXGroup;
320+
children = (
321+
E9437D761D8DF59A003DC413 /* RDRemoteImageContentData.h */,
322+
E9437D771D8DF59A003DC413 /* RDRemoteImageContentData.m */,
323+
);
324+
path = RDRemoteImageContentData;
325+
sourceTree = "<group>";
326+
};
271327
E96FFD7A19CE7970008ADEDF /* Classes */ = {
272328
isa = PBXGroup;
273329
children = (
330+
E9437D701D8DF414003DC413 /* RDPageContentData */,
274331
E928DBDD1AB2011C00594AAD /* M2DURLConnectionOperation */,
275332
E919D29319D80679003F4BD0 /* RDPagingView */,
276333
E919D28E19D80053003F4BD0 /* RDImageScrollView */,
@@ -346,7 +403,7 @@
346403
isa = PBXProject;
347404
attributes = {
348405
CLASSPREFIX = RD;
349-
LastUpgradeCheck = 0700;
406+
LastUpgradeCheck = 0800;
350407
ORGANIZATIONNAME = "Akira Matsuda";
351408
TargetAttributes = {
352409
6003F589195388D20070C39A = {
@@ -480,10 +537,15 @@
480537
files = (
481538
E96FFD8419CE7970008ADEDF /* RDImageViewerController.m in Sources */,
482539
6003F59E195388D20070C39A /* RDAppDelegate.m in Sources */,
540+
E9437D781D8DF59A003DC413 /* RDRemoteImageContentData.m in Sources */,
541+
E9437D7B1D8DF5A4003DC413 /* RDImageContentData.m in Sources */,
483542
E919D29119D8005C003F4BD0 /* RDImageScrollView.m in Sources */,
484543
6003F5A7195388D20070C39A /* RDViewController.m in Sources */,
544+
E90C11531D8E022800630F12 /* RDScrollViewPageContentData.m in Sources */,
545+
E90C11501D8E022000630F12 /* RDViewPageContentData.m in Sources */,
485546
6003F59A195388D20070C39A /* main.m in Sources */,
486547
E919D29619D80683003F4BD0 /* RDPagingView.m in Sources */,
548+
E9437D751D8DF4BC003DC413 /* RDPageContentData.m in Sources */,
487549
E928DBE01AB2011C00594AAD /* rd_M2DURLConnectionOperation.m in Sources */,
488550
);
489551
runOnlyForDeploymentPostprocessing = 0;
@@ -555,14 +617,19 @@
555617
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
556618
CLANG_WARN_EMPTY_BODY = YES;
557619
CLANG_WARN_ENUM_CONVERSION = YES;
620+
CLANG_WARN_INFINITE_RECURSION = YES;
558621
CLANG_WARN_INT_CONVERSION = YES;
559622
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
623+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
624+
CLANG_WARN_UNREACHABLE_CODE = YES;
560625
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
561626
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
562627
COPY_PHASE_STRIP = NO;
628+
ENABLE_STRICT_OBJC_MSGSEND = YES;
563629
ENABLE_TESTABILITY = YES;
564630
GCC_C_LANGUAGE_STANDARD = gnu99;
565631
GCC_DYNAMIC_NO_PIC = NO;
632+
GCC_NO_COMMON_BLOCKS = YES;
566633
GCC_OPTIMIZATION_LEVEL = 0;
567634
GCC_PREPROCESSOR_DEFINITIONS = (
568635
"DEBUG=1",
@@ -575,7 +642,7 @@
575642
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
576643
GCC_WARN_UNUSED_FUNCTION = YES;
577644
GCC_WARN_UNUSED_VARIABLE = YES;
578-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
645+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
579646
ONLY_ACTIVE_ARCH = YES;
580647
SDKROOT = iphoneos;
581648
TARGETED_DEVICE_FAMILY = "1,2";
@@ -595,20 +662,25 @@
595662
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
596663
CLANG_WARN_EMPTY_BODY = YES;
597664
CLANG_WARN_ENUM_CONVERSION = YES;
665+
CLANG_WARN_INFINITE_RECURSION = YES;
598666
CLANG_WARN_INT_CONVERSION = YES;
599667
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
668+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
669+
CLANG_WARN_UNREACHABLE_CODE = YES;
600670
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
601671
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
602672
COPY_PHASE_STRIP = YES;
603673
ENABLE_NS_ASSERTIONS = NO;
674+
ENABLE_STRICT_OBJC_MSGSEND = YES;
604675
GCC_C_LANGUAGE_STANDARD = gnu99;
676+
GCC_NO_COMMON_BLOCKS = YES;
605677
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
606678
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
607679
GCC_WARN_UNDECLARED_SELECTOR = YES;
608680
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
609681
GCC_WARN_UNUSED_FUNCTION = YES;
610682
GCC_WARN_UNUSED_VARIABLE = YES;
611-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
683+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
612684
SDKROOT = iphoneos;
613685
TARGETED_DEVICE_FAMILY = "1,2";
614686
VALIDATE_PRODUCT = YES;
@@ -626,7 +698,7 @@
626698
GCC_PRECOMPILE_PREFIX_HEADER = YES;
627699
GCC_PREFIX_HEADER = "RDImageViewerController/RDImageViewerController-Prefix.pch";
628700
INFOPLIST_FILE = "RDImageViewerController/RDImageViewerController-Info.plist";
629-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
701+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
630702
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
631703
PRODUCT_NAME = "$(TARGET_NAME)";
632704
PROVISIONING_PROFILE = "";
@@ -646,7 +718,7 @@
646718
GCC_PRECOMPILE_PREFIX_HEADER = YES;
647719
GCC_PREFIX_HEADER = "RDImageViewerController/RDImageViewerController-Prefix.pch";
648720
INFOPLIST_FILE = "RDImageViewerController/RDImageViewerController-Info.plist";
649-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
721+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
650722
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
651723
PRODUCT_NAME = "$(TARGET_NAME)";
652724
PROVISIONING_PROFILE = "";

‎Example/RDImageViewerController.xcodeproj/xcshareddata/xcschemes/RDImageViewerController.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0700"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)