Skip to content

Commit

Permalink
Added Carthage support, updated demo project, fixed bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Friend-LGA
Friend-LGA committed Nov 11, 2015
1 parent 3a2ee04 commit 667ec92
Show file tree
Hide file tree
Showing 29 changed files with 569 additions and 201 deletions.
104 changes: 26 additions & 78 deletions Demo/LGPlusButtonsViewDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
1946D2D8D0CE8124E0632DEA /* libPods-LGPlusButtonsViewDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4E5C49FE8BEAB57D05B49 /* libPods-LGPlusButtonsViewDemo.a */; };
4A1F8E611BEE098100D0B57E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A1F8E601BEE098100D0B57E /* LaunchScreen.storyboard */; };
4A3F4B5A1AA8BA51006D9DAA /* PlusViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A3F4B591AA8BA51006D9DAA /* PlusViewController.m */; };
4AF13A1F1BF3AD270037B073 /* LGPlusButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */; };
4AF13A201BF3AD270037B073 /* LGPlusButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF13A1E1BF3AD270037B073 /* LGPlusButtonsView.m */; };
847A899A1A9F298B004A8413 /* NavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847A89971A9F298B004A8413 /* NavigationController.m */; };
847A899B1A9F298B004A8413 /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847A89991A9F298B004A8413 /* TableViewController.m */; };
847A899E1A9F2C32004A8413 /* PlusScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847A899D1A9F2C32004A8413 /* PlusScrollViewController.m */; };
Expand All @@ -19,11 +20,13 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
23A4E5C49FE8BEAB57D05B49 /* libPods-LGPlusButtonsViewDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LGPlusButtonsViewDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4A1F8E601BEE098100D0B57E /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
4A3F4B581AA8BA51006D9DAA /* PlusViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlusViewController.h; sourceTree = "<group>"; };
4A3F4B591AA8BA51006D9DAA /* PlusViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlusViewController.m; sourceTree = "<group>"; };
6CA3D88515E7F3B71D89BE22 /* Pods-LGPlusButtonsViewDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LGPlusButtonsViewDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-LGPlusButtonsViewDemo/Pods-LGPlusButtonsViewDemo.release.xcconfig"; sourceTree = "<group>"; };
4AF13A1B1BF3AD270037B073 /* LGPlusButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGPlusButton.h; sourceTree = "<group>"; };
4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGPlusButton.m; sourceTree = "<group>"; };
4AF13A1D1BF3AD270037B073 /* LGPlusButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGPlusButtonsView.h; sourceTree = "<group>"; };
4AF13A1E1BF3AD270037B073 /* LGPlusButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGPlusButtonsView.m; sourceTree = "<group>"; };
847A89961A9F298B004A8413 /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationController.h; sourceTree = "<group>"; };
847A89971A9F298B004A8413 /* NavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavigationController.m; sourceTree = "<group>"; };
847A89981A9F298B004A8413 /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewController.h; sourceTree = "<group>"; };
Expand All @@ -36,30 +39,19 @@
84C5B7CE1A9F22C800EEEB24 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
84C5B7CF1A9F22C800EEEB24 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
84C5B7D71A9F22C800EEEB24 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
FF64EDB1BA04182CD80346D1 /* Pods-LGPlusButtonsViewDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LGPlusButtonsViewDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LGPlusButtonsViewDemo/Pods-LGPlusButtonsViewDemo.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
84C5B7C41A9F22C800EEEB24 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1946D2D8D0CE8124E0632DEA /* libPods-LGPlusButtonsViewDemo.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
4A3F4B5C1AA8BDAD006D9DAA /* Demo View Controllers */ = {
isa = PBXGroup;
children = (
4A3F4B5D1AA8BDBA006D9DAA /* UIView */,
4A3F4B5E1AA8BDBE006D9DAA /* UIScrollView */,
);
name = "Demo View Controllers";
sourceTree = "<group>";
};
4A3F4B5D1AA8BDBA006D9DAA /* UIView */ = {
isa = PBXGroup;
children = (
Expand All @@ -78,29 +70,31 @@
name = UIScrollView;
sourceTree = "<group>";
};
6DC0BC0EF35C3CCDCDDDD0F1 /* Frameworks */ = {
4AF13A1A1BF3AD270037B073 /* LGPlusButtonsView */ = {
isa = PBXGroup;
children = (
23A4E5C49FE8BEAB57D05B49 /* libPods-LGPlusButtonsViewDemo.a */,
4AF13A1B1BF3AD270037B073 /* LGPlusButton.h */,
4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */,
4AF13A1D1BF3AD270037B073 /* LGPlusButtonsView.h */,
4AF13A1E1BF3AD270037B073 /* LGPlusButtonsView.m */,
);
name = Frameworks;
name = LGPlusButtonsView;
path = ../LGPlusButtonsView;
sourceTree = "<group>";
};
83663343D58C23F2EE00B73C /* Pods */ = {
6DC0BC0EF35C3CCDCDDDD0F1 /* Frameworks */ = {
isa = PBXGroup;
children = (
FF64EDB1BA04182CD80346D1 /* Pods-LGPlusButtonsViewDemo.debug.xcconfig */,
6CA3D88515E7F3B71D89BE22 /* Pods-LGPlusButtonsViewDemo.release.xcconfig */,
);
name = Pods;
name = Frameworks;
sourceTree = "<group>";
};
84C5B7BE1A9F22C800EEEB24 = {
isa = PBXGroup;
children = (
4AF13A1A1BF3AD270037B073 /* LGPlusButtonsView */,
84C5B7C91A9F22C800EEEB24 /* LGPlusButtonsViewDemo */,
84C5B7C81A9F22C800EEEB24 /* Products */,
83663343D58C23F2EE00B73C /* Pods */,
6DC0BC0EF35C3CCDCDDDD0F1 /* Frameworks */,
);
sourceTree = "<group>";
Expand All @@ -122,7 +116,8 @@
847A89971A9F298B004A8413 /* NavigationController.m */,
847A89981A9F298B004A8413 /* TableViewController.h */,
847A89991A9F298B004A8413 /* TableViewController.m */,
4A3F4B5C1AA8BDAD006D9DAA /* Demo View Controllers */,
4A3F4B5D1AA8BDBA006D9DAA /* UIView */,
4A3F4B5E1AA8BDBE006D9DAA /* UIScrollView */,
84C5B7D71A9F22C800EEEB24 /* Images.xcassets */,
84C5B7CA1A9F22C800EEEB24 /* Supporting Files */,
4A1F8E601BEE098100D0B57E /* LaunchScreen.storyboard */,
Expand All @@ -146,12 +141,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 84C5B7EA1A9F22C800EEEB24 /* Build configuration list for PBXNativeTarget "LGPlusButtonsViewDemo" */;
buildPhases = (
B1C231C3EE6FF3450126BB97 /* Check Pods Manifest.lock */,
84C5B7C31A9F22C800EEEB24 /* Sources */,
84C5B7C41A9F22C800EEEB24 /* Frameworks */,
84C5B7C51A9F22C800EEEB24 /* Resources */,
92F9790D16709FEEE544F8D3 /* Copy Pods Resources */,
F9E826B8E08EA21BF3C0A16C /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -206,65 +198,19 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
92F9790D16709FEEE544F8D3 /* 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-LGPlusButtonsViewDemo/Pods-LGPlusButtonsViewDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
B1C231C3EE6FF3450126BB97 /* 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;
};
F9E826B8E08EA21BF3C0A16C /* 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-LGPlusButtonsViewDemo/Pods-LGPlusButtonsViewDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
84C5B7C31A9F22C800EEEB24 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4AF13A1F1BF3AD270037B073 /* LGPlusButton.m in Sources */,
4A3F4B5A1AA8BA51006D9DAA /* PlusViewController.m in Sources */,
847A899E1A9F2C32004A8413 /* PlusScrollViewController.m in Sources */,
847A899A1A9F298B004A8413 /* NavigationController.m in Sources */,
84C5B7D01A9F22C800EEEB24 /* AppDelegate.m in Sources */,
847A899B1A9F298B004A8413 /* TableViewController.m in Sources */,
84C5B7CD1A9F22C800EEEB24 /* main.m in Sources */,
4AF13A201BF3AD270037B073 /* LGPlusButtonsView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -352,33 +298,35 @@
};
84C5B7EB1A9F22C800EEEB24 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FF64EDB1BA04182CD80346D1 /* Pods-LGPlusButtonsViewDemo.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LGPlusButtonsViewDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.test.$(PRODUCT_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = com.test.LGPlusButtonsViewDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Debug;
};
84C5B7EC1A9F22C800EEEB24 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6CA3D88515E7F3B71D89BE22 /* Pods-LGPlusButtonsViewDemo.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LGPlusButtonsViewDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.test.$(PRODUCT_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = com.test.LGPlusButtonsViewDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Release;
};
Expand Down
10 changes: 0 additions & 10 deletions Demo/LGPlusButtonsViewDemo.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

30 changes: 0 additions & 30 deletions Demo/LGPlusButtonsViewDemo.xcworkspace/xcshareddata/LGPlusButtonsViewDemo.xcscmblueprint
View file

This file was deleted.

Binary file added ...nsViewDemo/Images.xcassets/Circle_Highlighted.imageset/Circle_Highlighted-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...nsViewDemo/Images.xcassets/Circle_Highlighted.imageset/Circle_Highlighted-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...tonsViewDemo/Images.xcassets/Circle_Highlighted.imageset/Circle_Highlighted.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions Demo/LGPlusButtonsViewDemo/Images.xcassets/Circle_Highlighted.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Circle_Highlighted.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Circle_Highlighted-1.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Circle_Highlighted-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...GPlusButtonsViewDemo/Images.xcassets/Circle_Normal.imageset/Circle_Normal-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...GPlusButtonsViewDemo/Images.xcassets/Circle_Normal.imageset/Circle_Normal-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../LGPlusButtonsViewDemo/Images.xcassets/Circle_Normal.imageset/Circle_Normal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions Demo/LGPlusButtonsViewDemo/Images.xcassets/Circle_Normal.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Circle_Normal.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Circle_Normal-1.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Circle_Normal-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
6 changes: 6 additions & 0 deletions Demo/LGPlusButtonsViewDemo/Images.xcassets/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading

0 comments on commit 667ec92

Please sign in to comment.