Skip to content
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

Update to ApacheFlex 4.13 and Air Version 14 #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to ApacheFlex 4.13 and Air Version 14 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bad483
Change air to 14.0 and recompile the lane
jjdelgado Oct 30, 2014
5b72aff
Fixed some warnings
jjdelgado Oct 30, 2014
f6c2e83
edit gitignore
jjdelgado Oct 31, 2014
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
12 changes: 12 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

*.xccheckout

*.xcuserstate

*.xcsettings

*.xcbkptlist

*.xcscheme

*.plist
Binary file added VfrPdfReader/Debug-iphonesimulator/libVfrPdfReader.a
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions VfrPdfReader/NativePdfReader/NativePdfReaderHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

}
}
Expand All @@ -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];

}
Expand Down
2 changes: 1 addition & 1 deletion VfrPdfReader/Sources/ReaderDocumentOutline.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions VfrPdfReader/Sources/ReaderMainPagebar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions VfrPdfReader/Sources/ReaderMainToolbar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions VfrPdfReader/Sources/ThumbsMainToolbar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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];
Expand Down
10 changes: 4 additions & 6 deletions VfrPdfReader/VfrPdfReader.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,15 +353,15 @@
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 */

/* Begin PBXProject section */
8CF5E3CC1524D1AB00ABAD50 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0450;
LastUpgradeCheck = 0610;
};
buildConfigurationList = 8CF5E3CF1524D1AB00ABAD50 /* Build configuration list for PBXProject "VfrPdfReader" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -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;
Expand All @@ -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;
};
Expand All @@ -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;
Expand Down
Binary file modified build/VfrPdfReader.ane
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions build/extension.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ source other than Adobe, then your use, modification, or distribution of it requ
written permission of Adobe.

-->
<extension xmlns="http://ns.adobe.com/air/extension/3.1">
<extension xmlns="http://ns.adobe.com/air/extension/14.0">
<id>pl.mllr.extensions.vfrPdfReader</id>
<versionNumber>1</versionNumber>
<versionNumber>2</versionNumber>
<platforms>
<platform name="iPhone-ARM">
<applicationDeployment>
Expand Down
4 changes: 2 additions & 2 deletions build/ios-platformoptions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<platform xmlns="http://ns.adobe.com/air/extension/3.1">
<sdkVersion>6.0</sdkVersion>
<platform xmlns="http://ns.adobe.com/air/extension/14.0">
<sdkVersion>8.1</sdkVersion>
<linkerOptions>
<option>-framework MessageUI -framework ImageIO</option>
</linkerOptions>
Expand Down