Skip to content

Commit

Permalink
Added Carthage support, update demo project
Browse files Browse the repository at this point in the history
  • Loading branch information
@Friend-LGA
Friend-LGA committed Nov 11, 2015
1 parent ad3383c commit 6f19f91
Show file tree
Hide file tree
Showing 17 changed files with 629 additions and 143 deletions.
116 changes: 50 additions & 66 deletions Demo/LGAlertViewDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
4ACDE4C21BE10A4000CC8926 /* TableViewControllerActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ACDE4C01BE10A4000CC8926 /* TableViewControllerActionSheet.m */; };
4ACDE4C51BE10F7100CC8926 /* TableViewControllerCustomAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ACDE4C41BE10F7100CC8926 /* TableViewControllerCustomAlert.m */; };
4AEEC7541BE5381300ED5D90 /* TableViewControllerCustomActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AEEC7531BE5381300ED5D90 /* TableViewControllerCustomActionSheet.m */; };
92E830BBF9A0E9733AA1BC7E /* libPods-LGAlertViewDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 623B5C352E52555F577FBF72 /* libPods-LGAlertViewDemo.a */; };
4AF138DD1BF381200037B073 /* LGAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138CF1BF381200037B073 /* LGAlertView.m */; };
4AF138DE1BF381200037B073 /* LGAlertViewButtonProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138D11BF381200037B073 /* LGAlertViewButtonProperties.m */; };
4AF138DF1BF381200037B073 /* LGAlertViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138D31BF381200037B073 /* LGAlertViewCell.m */; };
4AF138E01BF381200037B073 /* LGAlertViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138D51BF381200037B073 /* LGAlertViewController.m */; };
4AF138E11BF381200037B073 /* LGAlertViewTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138D81BF381200037B073 /* LGAlertViewTextField.m */; };
4AF138E21BF381200037B073 /* LGAlertViewWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138DA1BF381200037B073 /* LGAlertViewWindow.m */; };
4AF138E31BF381200037B073 /* UIWindow+LGAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF138DC1BF381200037B073 /* UIWindow+LGAlertView.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -40,17 +46,28 @@
4ACDE4C41BE10F7100CC8926 /* TableViewControllerCustomAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewControllerCustomAlert.m; sourceTree = "<group>"; };
4AEEC7521BE5381300ED5D90 /* TableViewControllerCustomActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewControllerCustomActionSheet.h; sourceTree = "<group>"; };
4AEEC7531BE5381300ED5D90 /* TableViewControllerCustomActionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewControllerCustomActionSheet.m; sourceTree = "<group>"; };
623B5C352E52555F577FBF72 /* libPods-LGAlertViewDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LGAlertViewDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
637E642E08EC55B4AF82AB1E /* Pods-LGAlertViewDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LGAlertViewDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LGAlertViewDemo/Pods-LGAlertViewDemo.debug.xcconfig"; sourceTree = "<group>"; };
75F4867B7B8225C0410A3B3A /* Pods-LGAlertViewDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LGAlertViewDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-LGAlertViewDemo/Pods-LGAlertViewDemo.release.xcconfig"; sourceTree = "<group>"; };
4AF138CE1BF381200037B073 /* LGAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertView.h; sourceTree = "<group>"; };
4AF138CF1BF381200037B073 /* LGAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGAlertView.m; sourceTree = "<group>"; };
4AF138D01BF381200037B073 /* LGAlertViewButtonProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertViewButtonProperties.h; sourceTree = "<group>"; };
4AF138D11BF381200037B073 /* LGAlertViewButtonProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGAlertViewButtonProperties.m; sourceTree = "<group>"; };
4AF138D21BF381200037B073 /* LGAlertViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertViewCell.h; sourceTree = "<group>"; };
4AF138D31BF381200037B073 /* LGAlertViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGAlertViewCell.m; sourceTree = "<group>"; };
4AF138D41BF381200037B073 /* LGAlertViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertViewController.h; sourceTree = "<group>"; };
4AF138D51BF381200037B073 /* LGAlertViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGAlertViewController.m; sourceTree = "<group>"; };
4AF138D61BF381200037B073 /* LGAlertViewShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertViewShared.h; sourceTree = "<group>"; };
4AF138D71BF381200037B073 /* LGAlertViewTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertViewTextField.h; sourceTree = "<group>"; };
4AF138D81BF381200037B073 /* LGAlertViewTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGAlertViewTextField.m; sourceTree = "<group>"; };
4AF138D91BF381200037B073 /* LGAlertViewWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGAlertViewWindow.h; sourceTree = "<group>"; };
4AF138DA1BF381200037B073 /* LGAlertViewWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGAlertViewWindow.m; sourceTree = "<group>"; };
4AF138DB1BF381200037B073 /* UIWindow+LGAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIWindow+LGAlertView.h"; sourceTree = "<group>"; };
4AF138DC1BF381200037B073 /* UIWindow+LGAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIWindow+LGAlertView.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
4A3B785D1AD2A28200DB8642 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
92E830BBF9A0E9733AA1BC7E /* libPods-LGAlertViewDemo.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -60,9 +77,9 @@
4A3B78571AD2A28200DB8642 = {
isa = PBXGroup;
children = (
4AF138CD1BF381200037B073 /* LGAlertView */,
4A3B78621AD2A28200DB8642 /* LGAlertViewDemo */,
4A3B78611AD2A28200DB8642 /* Products */,
A97F0E110AD1D1F440968EB0 /* Pods */,
72646D99469FDAC04E185CBA /* Frameworks */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -108,21 +125,34 @@
name = "Supporting Files";
sourceTree = "<group>";
};
72646D99469FDAC04E185CBA /* Frameworks */ = {
4AF138CD1BF381200037B073 /* LGAlertView */ = {
isa = PBXGroup;
children = (
623B5C352E52555F577FBF72 /* libPods-LGAlertViewDemo.a */,
4AF138CE1BF381200037B073 /* LGAlertView.h */,
4AF138CF1BF381200037B073 /* LGAlertView.m */,
4AF138D01BF381200037B073 /* LGAlertViewButtonProperties.h */,
4AF138D11BF381200037B073 /* LGAlertViewButtonProperties.m */,
4AF138D21BF381200037B073 /* LGAlertViewCell.h */,
4AF138D31BF381200037B073 /* LGAlertViewCell.m */,
4AF138D41BF381200037B073 /* LGAlertViewController.h */,
4AF138D51BF381200037B073 /* LGAlertViewController.m */,
4AF138D61BF381200037B073 /* LGAlertViewShared.h */,
4AF138D71BF381200037B073 /* LGAlertViewTextField.h */,
4AF138D81BF381200037B073 /* LGAlertViewTextField.m */,
4AF138D91BF381200037B073 /* LGAlertViewWindow.h */,
4AF138DA1BF381200037B073 /* LGAlertViewWindow.m */,
4AF138DB1BF381200037B073 /* UIWindow+LGAlertView.h */,
4AF138DC1BF381200037B073 /* UIWindow+LGAlertView.m */,
);
name = Frameworks;
name = LGAlertView;
path = ../LGAlertView;
sourceTree = "<group>";
};
A97F0E110AD1D1F440968EB0 /* Pods */ = {
72646D99469FDAC04E185CBA /* Frameworks */ = {
isa = PBXGroup;
children = (
637E642E08EC55B4AF82AB1E /* Pods-LGAlertViewDemo.debug.xcconfig */,
75F4867B7B8225C0410A3B3A /* Pods-LGAlertViewDemo.release.xcconfig */,
);
name = Pods;
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -132,12 +162,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 4A3B78831AD2A28300DB8642 /* Build configuration list for PBXNativeTarget "LGAlertViewDemo" */;
buildPhases = (
4F6C50315945C908415D4792 /* Check Pods Manifest.lock */,
4A3B785C1AD2A28200DB8642 /* Sources */,
4A3B785D1AD2A28200DB8642 /* Frameworks */,
4A3B785E1AD2A28200DB8642 /* Resources */,
29113AC9920AC8E38789F323 /* Copy Pods Resources */,
B520B4BA66BB51ABABA89F86 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -192,66 +219,25 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
29113AC9920AC8E38789F323 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LGAlertViewDemo/Pods-LGAlertViewDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4F6C50315945C908415D4792 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
B520B4BA66BB51ABABA89F86 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LGAlertViewDemo/Pods-LGAlertViewDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
4A3B785C1AD2A28200DB8642 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4AF138E11BF381200037B073 /* LGAlertViewTextField.m in Sources */,
4AF138E31BF381200037B073 /* UIWindow+LGAlertView.m in Sources */,
4AF138E01BF381200037B073 /* LGAlertViewController.m in Sources */,
4ACDE4C21BE10A4000CC8926 /* TableViewControllerActionSheet.m in Sources */,
4AF138DE1BF381200037B073 /* LGAlertViewButtonProperties.m in Sources */,
4ACDE4C51BE10F7100CC8926 /* TableViewControllerCustomAlert.m in Sources */,
4AEEC7541BE5381300ED5D90 /* TableViewControllerCustomActionSheet.m in Sources */,
4A3B78691AD2A28200DB8642 /* AppDelegate.m in Sources */,
4A3B788E1AD2B29F00DB8642 /* NavigationController.m in Sources */,
4ACDE4C11BE10A4000CC8926 /* TableViewControllerAlert.m in Sources */,
4A3B78661AD2A28200DB8642 /* main.m in Sources */,
4AF138DD1BF381200037B073 /* LGAlertView.m in Sources */,
4AF138DF1BF381200037B073 /* LGAlertViewCell.m in Sources */,
4AF138E21BF381200037B073 /* LGAlertViewWindow.m in Sources */,
4A3B788B1AD2A93D00DB8642 /* TableViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -340,7 +326,6 @@
};
4A3B78841AD2A28300DB8642 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 637E642E08EC55B4AF82AB1E /* Pods-LGAlertViewDemo.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -357,7 +342,6 @@
};
4A3B78851AD2A28300DB8642 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 75F4867B7B8225C0410A3B3A /* Pods-LGAlertViewDemo.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand Down
10 changes: 0 additions & 10 deletions Demo/LGAlertViewDemo.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

16 changes: 8 additions & 8 deletions Demo/LGAlertViewDemo/TableViewControllerActionSheet.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath

dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^(void)
{
[alertView dismissAnimated:YES completionHandler:nil];
if (alertView && alertView.isShowing) [alertView dismissAnimated:YES completionHandler:nil];
});
}
else if (indexPath.row == 11)
Expand All @@ -344,7 +344,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath

dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^(void)
{
[alertView dismissAnimated:YES completionHandler:nil];
if (alertView && alertView.isShowing) [alertView dismissAnimated:YES completionHandler:nil];
});
}
else if (indexPath.row == 12)
Expand Down Expand Up @@ -406,7 +406,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
NSLog(@"destructiveHandler");
}];

[alertView1 transitionToAlertView:alertView2 completionHandler:nil];
if (alertView1 && alertView1.isShowing) [alertView1 transitionToAlertView:alertView2 completionHandler:nil];
});
}
else if (indexPath.row == 15)
Expand Down Expand Up @@ -446,7 +446,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
NSLog(@"destructiveHandler");
}];

[alertView1 transitionToAlertView:alertView2 completionHandler:nil];
if (alertView1 && alertView1.isShowing) [alertView1 transitionToAlertView:alertView2 completionHandler:nil];
});
}
else if (indexPath.row == 16)
Expand Down Expand Up @@ -486,7 +486,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
NSLog(@"destructiveHandler");
}];

[alertView1 transitionToAlertView:alertView2 completionHandler:nil];
if (alertView1 && alertView1.isShowing) [alertView1 transitionToAlertView:alertView2 completionHandler:nil];
});
}
else if (indexPath.row == 17)
Expand Down Expand Up @@ -526,7 +526,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
NSLog(@"destructiveHandler");
}];

[alertView1 transitionToAlertView:alertView2 completionHandler:nil];
if (alertView1 && alertView1.isShowing) [alertView1 transitionToAlertView:alertView2 completionHandler:nil];
});
}
else if (indexPath.row == 18)
Expand Down Expand Up @@ -566,7 +566,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
NSLog(@"destructiveHandler");
}];

[alertView1 transitionToAlertView:alertView2 completionHandler:nil];
if (alertView1 && alertView1.isShowing) [alertView1 transitionToAlertView:alertView2 completionHandler:nil];
});
}
else if (indexPath.row == 19)
Expand Down Expand Up @@ -606,7 +606,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
NSLog(@"destructiveHandler");
}];

[alertView1 transitionToAlertView:alertView2 completionHandler:nil];
if (alertView1 && alertView1.isShowing) [alertView1 transitionToAlertView:alertView2 completionHandler:nil];
});
}

Expand Down
Loading

0 comments on commit 6f19f91

Please sign in to comment.