Skip to content

Commit 304a07c

Browse files
nicolaschengdevnicolaschengdev
committed
fix issues #11, #12 
1 parent 64dcbbc commit 304a07c

14 files changed

Lines changed: 2608 additions & 273 deletions

‎WYPopoverController/WYPopoverController.m‎

Lines changed: 266 additions & 212 deletions
Large diffs are not rendered by default.

‎demos/DemoSegue/WYPopoverDemoSegue.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,13 @@
4646
97B3CB9917CF595E0005E1A1 /* WYPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 97B3CB9817CF595E0005E1A1 /* WYPlayer.m */; };
4747
97B3CB9C17CF8D700005E1A1 /* WYPlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 97B3CB9B17CF8D700005E1A1 /* WYPlayerCell.m */; };
4848
97B3CBA217CF936A0005E1A1 /* WYPlayerDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97B3CBA117CF936A0005E1A1 /* WYPlayerDetailsViewController.m */; };
49-
97FA5C3717D1A84900F611A0 /* WYPopoverController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97FA5C3417D1A84900F611A0 /* WYPopoverController.m */; };
50-
97FA5C3817D1A84900F611A0 /* WYStoryboardPopoverSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 97FA5C3617D1A84900F611A0 /* WYStoryboardPopoverSegue.m */; };
49+
97C6FF0117D712D3005C6D78 /* WYPopoverController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C6FEFE17D712D3005C6D78 /* WYPopoverController.m */; };
50+
97C6FF0217D712D3005C6D78 /* WYStoryboardPopoverSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C6FF0017D712D3005C6D78 /* WYStoryboardPopoverSegue.m */; };
51+
97D6943B17D4FF170035D292 /* players.plist in Resources */ = {isa = PBXBuildFile; fileRef = 97D6943A17D4FF170035D292 /* players.plist */; };
52+
97D6944017D50F770035D292 /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97D6943F17D50F770035D292 /* MainStoryboard_iPad.storyboard */; };
53+
97D6944417D51E000035D292 /* WYTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97D6944217D51E000035D292 /* WYTestViewController.m */; };
54+
97D6944517D51E000035D292 /* WYTestViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 97D6944317D51E000035D292 /* WYTestViewController.xib */; };
55+
97D6945517D54BC00035D292 /* WYGesturesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97D6945417D54BC00035D292 /* WYGesturesViewController.m */; };
5156
/* End PBXBuildFile section */
5257

5358
/* Begin PBXFileReference section */
@@ -99,10 +104,17 @@
99104
97B3CB9B17CF8D700005E1A1 /* WYPlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYPlayerCell.m; sourceTree = "<group>"; };
100105
97B3CBA017CF936A0005E1A1 /* WYPlayerDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYPlayerDetailsViewController.h; sourceTree = "<group>"; };
101106
97B3CBA117CF936A0005E1A1 /* WYPlayerDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYPlayerDetailsViewController.m; sourceTree = "<group>"; };
102-
97FA5C3317D1A84900F611A0 /* WYPopoverController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYPopoverController.h; sourceTree = "<group>"; };
103-
97FA5C3417D1A84900F611A0 /* WYPopoverController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYPopoverController.m; sourceTree = "<group>"; };
104-
97FA5C3517D1A84900F611A0 /* WYStoryboardPopoverSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYStoryboardPopoverSegue.h; sourceTree = "<group>"; };
105-
97FA5C3617D1A84900F611A0 /* WYStoryboardPopoverSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYStoryboardPopoverSegue.m; sourceTree = "<group>"; };
107+
97C6FEFD17D712D3005C6D78 /* WYPopoverController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYPopoverController.h; sourceTree = "<group>"; };
108+
97C6FEFE17D712D3005C6D78 /* WYPopoverController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYPopoverController.m; sourceTree = "<group>"; };
109+
97C6FEFF17D712D3005C6D78 /* WYStoryboardPopoverSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYStoryboardPopoverSegue.h; sourceTree = "<group>"; };
110+
97C6FF0017D712D3005C6D78 /* WYStoryboardPopoverSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYStoryboardPopoverSegue.m; sourceTree = "<group>"; };
111+
97D6943A17D4FF170035D292 /* players.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = players.plist; sourceTree = "<group>"; };
112+
97D6943F17D50F770035D292 /* MainStoryboard_iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard_iPad.storyboard; sourceTree = "<group>"; };
113+
97D6944117D51E000035D292 /* WYTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYTestViewController.h; sourceTree = "<group>"; };
114+
97D6944217D51E000035D292 /* WYTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYTestViewController.m; sourceTree = "<group>"; };
115+
97D6944317D51E000035D292 /* WYTestViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WYTestViewController.xib; sourceTree = "<group>"; };
116+
97D6945317D54BC00035D292 /* WYGesturesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYGesturesViewController.h; sourceTree = "<group>"; };
117+
97D6945417D54BC00035D292 /* WYGesturesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYGesturesViewController.m; sourceTree = "<group>"; };
106118
/* End PBXFileReference section */
107119

108120
/* Begin PBXFrameworksBuildPhase section */
@@ -149,10 +161,9 @@
149161
97B3CB4317CDE8E50005E1A1 /* WYPopoverDemoSegue */ = {
150162
isa = PBXGroup;
151163
children = (
152-
97FA5C3217D1A84900F611A0 /* WYPopoverController */,
164+
97C6FEFC17D712D3005C6D78 /* WYPopoverController */,
153165
97B3CB4C17CDE8E50005E1A1 /* WYAppDelegate.h */,
154166
97B3CB4D17CDE8E50005E1A1 /* WYAppDelegate.m */,
155-
97B3CB5517CDE8E50005E1A1 /* MainStoryboard.storyboard */,
156167
97B3CB5B17CDE8E50005E1A1 /* WYViewController.h */,
157168
97B3CB5C17CDE8E50005E1A1 /* WYViewController.m */,
158169
97B3CB9417CF58F60005E1A1 /* WYPlayersViewController.h */,
@@ -164,6 +175,13 @@
164175
97B3CB9A17CF8D700005E1A1 /* WYPlayerCell.h */,
165176
97B3CB9B17CF8D700005E1A1 /* WYPlayerCell.m */,
166177
97B3CB4417CDE8E50005E1A1 /* Supporting Files */,
178+
97B3CB5517CDE8E50005E1A1 /* MainStoryboard.storyboard */,
179+
97D6943F17D50F770035D292 /* MainStoryboard_iPad.storyboard */,
180+
97D6944117D51E000035D292 /* WYTestViewController.h */,
181+
97D6944217D51E000035D292 /* WYTestViewController.m */,
182+
97D6944317D51E000035D292 /* WYTestViewController.xib */,
183+
97D6945317D54BC00035D292 /* WYGesturesViewController.h */,
184+
97D6945417D54BC00035D292 /* WYGesturesViewController.m */,
167185
);
168186
path = WYPopoverDemoSegue;
169187
sourceTree = "<group>";
@@ -179,6 +197,7 @@
179197
97B3CB4F17CDE8E50005E1A1 /* Default.png */,
180198
97B3CB5117CDE8E50005E1A1 /* Default@2x.png */,
181199
97B3CB5317CDE8E50005E1A1 /* Default-568h@2x.png */,
200+
97D6943A17D4FF170035D292 /* players.plist */,
182201
);
183202
name = "Supporting Files";
184203
sourceTree = "<group>";
@@ -214,13 +233,13 @@
214233
path = images;
215234
sourceTree = "<group>";
216235
};
217-
97FA5C3217D1A84900F611A0 /* WYPopoverController */ = {
236+
97C6FEFC17D712D3005C6D78 /* WYPopoverController */ = {
218237
isa = PBXGroup;
219238
children = (
220-
97FA5C3317D1A84900F611A0 /* WYPopoverController.h */,
221-
97FA5C3417D1A84900F611A0 /* WYPopoverController.m */,
222-
97FA5C3517D1A84900F611A0 /* WYStoryboardPopoverSegue.h */,
223-
97FA5C3617D1A84900F611A0 /* WYStoryboardPopoverSegue.m */,
239+
97C6FEFD17D712D3005C6D78 /* WYPopoverController.h */,
240+
97C6FEFE17D712D3005C6D78 /* WYPopoverController.m */,
241+
97C6FEFF17D712D3005C6D78 /* WYStoryboardPopoverSegue.h */,
242+
97C6FF0017D712D3005C6D78 /* WYStoryboardPopoverSegue.m */,
224243
);
225244
name = WYPopoverController;
226245
path = ../../../WYPopoverController;
@@ -307,6 +326,9 @@
307326
97B3CB9117CF582D0005E1A1 /* Gestures@2x.png in Resources */,
308327
97B3CB9217CF582D0005E1A1 /* Players.png in Resources */,
309328
97B3CB9317CF582D0005E1A1 /* Players@2x.png in Resources */,
329+
97D6943B17D4FF170035D292 /* players.plist in Resources */,
330+
97D6944017D50F770035D292 /* MainStoryboard_iPad.storyboard in Resources */,
331+
97D6944517D51E000035D292 /* WYTestViewController.xib in Resources */,
310332
);
311333
runOnlyForDeploymentPostprocessing = 0;
312334
};
@@ -324,8 +346,10 @@
324346
97B3CB9917CF595E0005E1A1 /* WYPlayer.m in Sources */,
325347
97B3CB9C17CF8D700005E1A1 /* WYPlayerCell.m in Sources */,
326348
97B3CBA217CF936A0005E1A1 /* WYPlayerDetailsViewController.m in Sources */,
327-
97FA5C3717D1A84900F611A0 /* WYPopoverController.m in Sources */,
328-
97FA5C3817D1A84900F611A0 /* WYStoryboardPopoverSegue.m in Sources */,
349+
97D6944417D51E000035D292 /* WYTestViewController.m in Sources */,
350+
97D6945517D54BC00035D292 /* WYGesturesViewController.m in Sources */,
351+
97C6FF0117D712D3005C6D78 /* WYPopoverController.m in Sources */,
352+
97C6FF0217D712D3005C6D78 /* WYStoryboardPopoverSegue.m in Sources */,
329353
);
330354
runOnlyForDeploymentPostprocessing = 0;
331355
};
@@ -376,7 +400,7 @@
376400
GCC_WARN_ABOUT_RETURN_TYPE = YES;
377401
GCC_WARN_UNINITIALIZED_AUTOS = YES;
378402
GCC_WARN_UNUSED_VARIABLE = YES;
379-
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
403+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
380404
ONLY_ACTIVE_ARCH = YES;
381405
SDKROOT = iphoneos;
382406
TARGETED_DEVICE_FAMILY = "1,2";
@@ -401,7 +425,7 @@
401425
GCC_WARN_ABOUT_RETURN_TYPE = YES;
402426
GCC_WARN_UNINITIALIZED_AUTOS = YES;
403427
GCC_WARN_UNUSED_VARIABLE = YES;
404-
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
428+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
405429
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
406430
SDKROOT = iphoneos;
407431
TARGETED_DEVICE_FAMILY = "1,2";
@@ -415,8 +439,9 @@
415439
GCC_PRECOMPILE_PREFIX_HEADER = YES;
416440
GCC_PREFIX_HEADER = "WYPopoverDemoSegue/WYPopoverDemoSegue-Prefix.pch";
417441
INFOPLIST_FILE = "WYPopoverDemoSegue/WYPopoverDemoSegue-Info.plist";
442+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
418443
PRODUCT_NAME = "$(TARGET_NAME)";
419-
TARGETED_DEVICE_FAMILY = 1;
444+
TARGETED_DEVICE_FAMILY = "1,2";
420445
WRAPPER_EXTENSION = app;
421446
};
422447
name = Debug;
@@ -427,8 +452,9 @@
427452
GCC_PRECOMPILE_PREFIX_HEADER = YES;
428453
GCC_PREFIX_HEADER = "WYPopoverDemoSegue/WYPopoverDemoSegue-Prefix.pch";
429454
INFOPLIST_FILE = "WYPopoverDemoSegue/WYPopoverDemoSegue-Info.plist";
455+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
430456
PRODUCT_NAME = "$(TARGET_NAME)";
431-
TARGETED_DEVICE_FAMILY = 1;
457+
TARGETED_DEVICE_FAMILY = "1,2";
432458
WRAPPER_EXTENSION = app;
433459
};
434460
name = Release;

0 commit comments

Comments
 (0)