diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5df8b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ + +*.xccheckout + +*.xcuserstate + +*.xcsettings + +*.xcbkptlist + +*.xcscheme + +*.plist diff --git a/VfrPdfReader/Debug-iphonesimulator/libVfrPdfReader.a b/VfrPdfReader/Debug-iphonesimulator/libVfrPdfReader.a new file mode 100644 index 0000000..76b2868 Binary files /dev/null and b/VfrPdfReader/Debug-iphonesimulator/libVfrPdfReader.a differ diff --git a/VfrPdfReader/NativePdfReader/NativePdfReaderHelper.m b/VfrPdfReader/NativePdfReader/NativePdfReaderHelper.m index 1d6d47b..d59effc 100755 --- a/VfrPdfReader/NativePdfReader/NativePdfReaderHelper.m +++ b/VfrPdfReader/NativePdfReader/NativePdfReaderHelper.m @@ -32,7 +32,7 @@ -(void) showPdf:(NSString *)filePath if([[[[[UIApplication sharedApplication] windows] objectAtIndex:0] rootViewController] respondsToSelector:@selector(presentViewController:animated:completion:)]) [[[[[UIApplication sharedApplication] windows] objectAtIndex:0] rootViewController] presentViewController:readerViewController animated:YES completion:^{/* done */}]; else - [[[[[UIApplication sharedApplication] windows] objectAtIndex:0] rootViewController] presentModalViewController:readerViewController animated:YES]; + [[[[[UIApplication sharedApplication] windows] objectAtIndex:0] rootViewController] presentViewController:readerViewController animated:YES completion:nil]; } } @@ -44,7 +44,7 @@ - (void)dismissReaderViewController:(ReaderViewController *)viewController if([[[[UIApplication sharedApplication] keyWindow] rootViewController] respondsToSelector:@selector(dismissViewControllerAnimated:completion:)]) [[[[UIApplication sharedApplication] keyWindow] rootViewController] dismissViewControllerAnimated:(YES) completion:nil]; else if([[[[UIApplication sharedApplication] keyWindow] rootViewController] respondsToSelector:@selector(dismissModalViewControllerAnimated:)]) - [[[[UIApplication sharedApplication] keyWindow] rootViewController] dismissModalViewControllerAnimated:YES]; + [[[[UIApplication sharedApplication] keyWindow] rootViewController] dismissViewControllerAnimated:YES completion:nil]; //[[[[UIApplication sharedApplication] keyWindow] rootViewController] dismissModalViewControllerAnimated:YES]; } diff --git a/VfrPdfReader/Sources/ReaderDocumentOutline.m b/VfrPdfReader/Sources/ReaderDocumentOutline.m index f0ec66c..e96a0e6 100644 --- a/VfrPdfReader/Sources/ReaderDocumentOutline.m +++ b/VfrPdfReader/Sources/ReaderDocumentOutline.m @@ -34,7 +34,7 @@ @implementation ReaderDocumentOutline #pragma mark ReaderDocumentOutline functions -void logDictionaryEntry(const char *key, CGPDFObjectRef object, void *info) +static void logDictionaryEntry(const char *key, CGPDFObjectRef object, void *info) { //CGPDFDictionaryApplyFunction(dictionary, logDictionaryEntry, NULL); diff --git a/VfrPdfReader/Sources/ReaderMainPagebar.m b/VfrPdfReader/Sources/ReaderMainPagebar.m index e640c45..b0b91e8 100644 --- a/VfrPdfReader/Sources/ReaderMainPagebar.m +++ b/VfrPdfReader/Sources/ReaderMainPagebar.m @@ -179,14 +179,14 @@ - (id)initWithFrame:(CGRect)frame document:(ReaderDocument *)object pageNumberLabel.autoresizesSubviews = NO; pageNumberLabel.autoresizingMask = UIViewAutoresizingNone; - pageNumberLabel.textAlignment = UITextAlignmentCenter; + pageNumberLabel.textAlignment = NSTextAlignmentCenter; pageNumberLabel.backgroundColor = [UIColor clearColor]; pageNumberLabel.textColor = [UIColor whiteColor]; pageNumberLabel.font = [UIFont systemFontOfSize:16.0f]; pageNumberLabel.shadowOffset = CGSizeMake(0.0f, 1.0f); pageNumberLabel.shadowColor = [UIColor blackColor]; pageNumberLabel.adjustsFontSizeToFitWidth = YES; - pageNumberLabel.minimumFontSize = 12.0f; + pageNumberLabel.minimumScaleFactor = 12.0f; [pageNumberView addSubview:pageNumberLabel]; // Add label view diff --git a/VfrPdfReader/Sources/ReaderMainToolbar.m b/VfrPdfReader/Sources/ReaderMainToolbar.m index bc18301..cd3e118 100644 --- a/VfrPdfReader/Sources/ReaderMainToolbar.m +++ b/VfrPdfReader/Sources/ReaderMainToolbar.m @@ -202,7 +202,7 @@ - (id)initWithFrame:(CGRect)frame document:(ReaderDocument *)object UILabel *titleLabel = [[UILabel alloc] initWithFrame:titleRect]; - titleLabel.textAlignment = UITextAlignmentCenter; + titleLabel.textAlignment = NSTextAlignmentCenter; titleLabel.font = [UIFont systemFontOfSize:19.0f]; titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth; titleLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters; @@ -211,7 +211,7 @@ - (id)initWithFrame:(CGRect)frame document:(ReaderDocument *)object titleLabel.backgroundColor = [UIColor clearColor]; titleLabel.shadowOffset = CGSizeMake(0.0f, 1.0f); titleLabel.adjustsFontSizeToFitWidth = YES; - titleLabel.minimumFontSize = 14.0f; + titleLabel.minimumScaleFactor = 14.0f; titleLabel.text = [object.fileName stringByDeletingPathExtension]; [self addSubview:titleLabel]; diff --git a/VfrPdfReader/Sources/ThumbsMainToolbar.m b/VfrPdfReader/Sources/ThumbsMainToolbar.m index 910a7d2..6436d23 100644 --- a/VfrPdfReader/Sources/ThumbsMainToolbar.m +++ b/VfrPdfReader/Sources/ThumbsMainToolbar.m @@ -111,7 +111,7 @@ - (id)initWithFrame:(CGRect)frame title:(NSString *)title UILabel *titleLabel = [[UILabel alloc] initWithFrame:titleRect]; - titleLabel.textAlignment = UITextAlignmentCenter; + titleLabel.textAlignment = NSTextAlignmentCenter; titleLabel.font = [UIFont systemFontOfSize:19.0f]; titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth; titleLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters; @@ -120,7 +120,7 @@ - (id)initWithFrame:(CGRect)frame title:(NSString *)title titleLabel.backgroundColor = [UIColor clearColor]; titleLabel.shadowOffset = CGSizeMake(0.0f, 1.0f); titleLabel.adjustsFontSizeToFitWidth = YES; - titleLabel.minimumFontSize = 14.0f; + titleLabel.minimumScaleFactor = 14.0f; titleLabel.text = title; [self addSubview:titleLabel]; diff --git a/VfrPdfReader/VfrPdfReader.xcodeproj/project.pbxproj b/VfrPdfReader/VfrPdfReader.xcodeproj/project.pbxproj index 426e6f4..dc0da23 100755 --- a/VfrPdfReader/VfrPdfReader.xcodeproj/project.pbxproj +++ b/VfrPdfReader/VfrPdfReader.xcodeproj/project.pbxproj @@ -353,7 +353,7 @@ name = VfrPdfReaderTests; productName = VfrPdfReaderTests; productReference = 8CF5E3E51524D1AC00ABAD50 /* VfrPdfReaderTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; /* End PBXNativeTarget section */ @@ -361,7 +361,7 @@ 8CF5E3CC1524D1AB00ABAD50 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0610; }; buildConfigurationList = 8CF5E3CF1524D1AB00ABAD50 /* Build configuration list for PBXProject "VfrPdfReader" */; compatibilityVersion = "Xcode 3.2"; @@ -479,7 +479,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -493,7 +492,7 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -503,14 +502,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/build/VfrPdfReader.ane b/build/VfrPdfReader.ane index 97dce3d..cebbbbc 100644 Binary files a/build/VfrPdfReader.ane and b/build/VfrPdfReader.ane differ diff --git a/build/extension.xml b/build/extension.xml index e729fbb..d05747c 100755 --- a/build/extension.xml +++ b/build/extension.xml @@ -9,9 +9,9 @@ source other than Adobe, then your use, modification, or distribution of it requ written permission of Adobe. --> - + pl.mllr.extensions.vfrPdfReader - 1 + 2 diff --git a/build/ios-platformoptions.xml b/build/ios-platformoptions.xml index aa51557..4e0c5d6 100755 --- a/build/ios-platformoptions.xml +++ b/build/ios-platformoptions.xml @@ -1,5 +1,5 @@ - - 6.0 + + 8.1