Skip to content

Commit f2eb308

Browse files
Friend-LGAFriend-LGA
committed
Added ability to set observer scroll view, cover view, setup every button and more. Fixed bugs.
1 parent 39d5450 commit f2eb308

37 files changed

+2652
-1358
lines changed

‎Demo/LGPlusButtonsViewDemo.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
4A038CBF1BFB908300CA7921 /* LGPlusButtonsViewShared.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A038CBE1BFB908300CA7921 /* LGPlusButtonsViewShared.m */; };
1011
4A1F8E611BEE098100D0B57E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A1F8E601BEE098100D0B57E /* LaunchScreen.storyboard */; };
11-
4A3F4B5A1AA8BA51006D9DAA /* PlusViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A3F4B591AA8BA51006D9DAA /* PlusViewController.m */; };
12+
4A21D59D1BF731560023AE9E /* LGPlusButtonDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A21D59C1BF731560023AE9E /* LGPlusButtonDescription.m */; };
1213
4AF13A1F1BF3AD270037B073 /* LGPlusButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */; };
1314
4AF13A201BF3AD270037B073 /* LGPlusButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF13A1E1BF3AD270037B073 /* LGPlusButtonsView.m */; };
1415
847A899A1A9F298B004A8413 /* NavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847A89971A9F298B004A8413 /* NavigationController.m */; };
15-
847A899B1A9F298B004A8413 /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847A89991A9F298B004A8413 /* TableViewController.m */; };
1616
847A899E1A9F2C32004A8413 /* PlusScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 847A899D1A9F2C32004A8413 /* PlusScrollViewController.m */; };
1717
84C5B7CD1A9F22C800EEEB24 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 84C5B7CC1A9F22C800EEEB24 /* main.m */; };
1818
84C5B7D01A9F22C800EEEB24 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 84C5B7CF1A9F22C800EEEB24 /* AppDelegate.m */; };
1919
84C5B7D81A9F22C800EEEB24 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 84C5B7D71A9F22C800EEEB24 /* Images.xcassets */; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXFileReference section */
23+
4A038CBD1BFB908300CA7921 /* LGPlusButtonsViewShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGPlusButtonsViewShared.h; sourceTree = "<group>"; };
24+
4A038CBE1BFB908300CA7921 /* LGPlusButtonsViewShared.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGPlusButtonsViewShared.m; sourceTree = "<group>"; };
2325
4A1F8E601BEE098100D0B57E /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
24-
4A3F4B581AA8BA51006D9DAA /* PlusViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlusViewController.h; sourceTree = "<group>"; };
25-
4A3F4B591AA8BA51006D9DAA /* PlusViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlusViewController.m; sourceTree = "<group>"; };
26+
4A21D59B1BF731560023AE9E /* LGPlusButtonDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGPlusButtonDescription.h; sourceTree = "<group>"; };
27+
4A21D59C1BF731560023AE9E /* LGPlusButtonDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGPlusButtonDescription.m; sourceTree = "<group>"; };
2628
4AF13A1B1BF3AD270037B073 /* LGPlusButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGPlusButton.h; sourceTree = "<group>"; };
2729
4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGPlusButton.m; sourceTree = "<group>"; };
2830
4AF13A1D1BF3AD270037B073 /* LGPlusButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LGPlusButtonsView.h; sourceTree = "<group>"; };
2931
4AF13A1E1BF3AD270037B073 /* LGPlusButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LGPlusButtonsView.m; sourceTree = "<group>"; };
3032
847A89961A9F298B004A8413 /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationController.h; sourceTree = "<group>"; };
3133
847A89971A9F298B004A8413 /* NavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavigationController.m; sourceTree = "<group>"; };
32-
847A89981A9F298B004A8413 /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewController.h; sourceTree = "<group>"; };
33-
847A89991A9F298B004A8413 /* TableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewController.m; sourceTree = "<group>"; };
3434
847A899C1A9F2C32004A8413 /* PlusScrollViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlusScrollViewController.h; sourceTree = "<group>"; };
3535
847A899D1A9F2C32004A8413 /* PlusScrollViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlusScrollViewController.m; sourceTree = "<group>"; };
3636
84C5B7C71A9F22C800EEEB24 /* LGPlusButtonsViewDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LGPlusButtonsViewDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -52,31 +52,17 @@
5252
/* End PBXFrameworksBuildPhase section */
5353

5454
/* Begin PBXGroup section */
55-
4A3F4B5D1AA8BDBA006D9DAA /* UIView */ = {
56-
isa = PBXGroup;
57-
children = (
58-
4A3F4B581AA8BA51006D9DAA /* PlusViewController.h */,
59-
4A3F4B591AA8BA51006D9DAA /* PlusViewController.m */,
60-
);
61-
name = UIView;
62-
sourceTree = "<group>";
63-
};
64-
4A3F4B5E1AA8BDBE006D9DAA /* UIScrollView */ = {
65-
isa = PBXGroup;
66-
children = (
67-
847A899C1A9F2C32004A8413 /* PlusScrollViewController.h */,
68-
847A899D1A9F2C32004A8413 /* PlusScrollViewController.m */,
69-
);
70-
name = UIScrollView;
71-
sourceTree = "<group>";
72-
};
7355
4AF13A1A1BF3AD270037B073 /* LGPlusButtonsView */ = {
7456
isa = PBXGroup;
7557
children = (
76-
4AF13A1B1BF3AD270037B073 /* LGPlusButton.h */,
77-
4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */,
7858
4AF13A1D1BF3AD270037B073 /* LGPlusButtonsView.h */,
7959
4AF13A1E1BF3AD270037B073 /* LGPlusButtonsView.m */,
60+
4AF13A1B1BF3AD270037B073 /* LGPlusButton.h */,
61+
4AF13A1C1BF3AD270037B073 /* LGPlusButton.m */,
62+
4A21D59B1BF731560023AE9E /* LGPlusButtonDescription.h */,
63+
4A21D59C1BF731560023AE9E /* LGPlusButtonDescription.m */,
64+
4A038CBD1BFB908300CA7921 /* LGPlusButtonsViewShared.h */,
65+
4A038CBE1BFB908300CA7921 /* LGPlusButtonsViewShared.m */,
8066
);
8167
name = LGPlusButtonsView;
8268
path = ../LGPlusButtonsView;
@@ -114,10 +100,8 @@
114100
84C5B7CF1A9F22C800EEEB24 /* AppDelegate.m */,
115101
847A89961A9F298B004A8413 /* NavigationController.h */,
116102
847A89971A9F298B004A8413 /* NavigationController.m */,
117-
847A89981A9F298B004A8413 /* TableViewController.h */,
118-
847A89991A9F298B004A8413 /* TableViewController.m */,
119-
4A3F4B5D1AA8BDBA006D9DAA /* UIView */,
120-
4A3F4B5E1AA8BDBE006D9DAA /* UIScrollView */,
103+
847A899C1A9F2C32004A8413 /* PlusScrollViewController.h */,
104+
847A899D1A9F2C32004A8413 /* PlusScrollViewController.m */,
121105
84C5B7D71A9F22C800EEEB24 /* Images.xcassets */,
122106
84C5B7CA1A9F22C800EEEB24 /* Supporting Files */,
123107
4A1F8E601BEE098100D0B57E /* LaunchScreen.storyboard */,
@@ -204,11 +188,11 @@
204188
buildActionMask = 2147483647;
205189
files = (
206190
4AF13A1F1BF3AD270037B073 /* LGPlusButton.m in Sources */,
207-
4A3F4B5A1AA8BA51006D9DAA /* PlusViewController.m in Sources */,
191+
4A21D59D1BF731560023AE9E /* LGPlusButtonDescription.m in Sources */,
208192
847A899E1A9F2C32004A8413 /* PlusScrollViewController.m in Sources */,
209193
847A899A1A9F298B004A8413 /* NavigationController.m in Sources */,
210194
84C5B7D01A9F22C800EEEB24 /* AppDelegate.m in Sources */,
211-
847A899B1A9F298B004A8413 /* TableViewController.m in Sources */,
195+
4A038CBF1BFB908300CA7921 /* LGPlusButtonsViewShared.m in Sources */,
212196
84C5B7CD1A9F22C800EEEB24 /* main.m in Sources */,
213197
4AF13A201BF3AD270037B073 /* LGPlusButtonsView.m in Sources */,
214198
);

‎Demo/LGPlusButtonsViewDemo/AppDelegate.h‎

100644100755
File mode changed.

‎Demo/LGPlusButtonsViewDemo/AppDelegate.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
#import "AppDelegate.h"
1010
#import "NavigationController.h"
11-
#import "TableViewController.h"
11+
#import "PlusScrollViewController.h"
1212

1313
@implementation AppDelegate
1414

1515
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
1616
{
17-
TableViewController *tableViewController = [TableViewController new];
18-
NavigationController *navigationController = [[NavigationController alloc] initWithRootViewController:tableViewController];
17+
PlusScrollViewController *viewController = [PlusScrollViewController new];
18+
NavigationController *navigationController = [[NavigationController alloc] initWithRootViewController:viewController];
1919

2020
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
2121
self.window.rootViewController = navigationController;

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Camera.imageset/Camera.png‎

15.1 KB
Loading

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Camera.imageset/Camera@2x.png‎

15.1 KB
Loading

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Camera.imageset/Camera@3x.png‎

15.8 KB
Loading

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Camera.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "Camera.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "Camera@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "Camera@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Message.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "Message.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "Message@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "Message@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Message.imageset/Message.png‎

15 KB
Loading

‎Demo/LGPlusButtonsViewDemo/Images.xcassets/Message.imageset/Message@2x.png‎

15.3 KB
Loading

0 commit comments

Comments
 (0)