Skip to content

Commit 05cfb01

Browse files
authored
Merge pull request #20 from iWECon/bugfix2
*LayerWrapperView bugfix
2 parents c670682 + 6e7f906 commit 05cfb01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1351
-1144
lines changed

Demo/Demo.xcodeproj/project.pbxproj

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
08020CCC28A838DC00255795 /* TableTestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08020CCB28A838DC00255795 /* TableTestController.swift */; };
10+
080677C628BE7D8B00000E16 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 080677C528BE7D8B00000E16 /* ViewController.swift */; };
11+
080677C828BE7DA400000E16 /* WrapStackDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 080677C728BE7DA400000E16 /* WrapStackDemoViewController.swift */; };
12+
08A24B8428E49A9600CDD7E2 /* LookinServer in Frameworks */ = {isa = PBXBuildFile; productRef = 08A24B8328E49A9600CDD7E2 /* LookinServer */; };
13+
08A24B8628E49C7A00CDD7E2 /* HVStackWrapperViewDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A24B8528E49C7A00CDD7E2 /* HVStackWrapperViewDemoViewController.swift */; };
1114
08E16CD9289ABA1C0019D7CB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E16CD8289ABA1C0019D7CB /* AppDelegate.swift */; };
1215
08E16CDB289ABA1C0019D7CB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E16CDA289ABA1C0019D7CB /* SceneDelegate.swift */; };
13-
08E16CDD289ABA1C0019D7CB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E16CDC289ABA1C0019D7CB /* ViewController.swift */; };
16+
08E16CDD289ABA1C0019D7CB /* HVStackDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E16CDC289ABA1C0019D7CB /* HVStackDemoViewController.swift */; };
1417
08E16CE0289ABA1C0019D7CB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 08E16CDE289ABA1C0019D7CB /* Main.storyboard */; };
1518
08E16CE2289ABA1D0019D7CB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 08E16CE1289ABA1D0019D7CB /* Assets.xcassets */; };
1619
08E16CE5289ABA1D0019D7CB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 08E16CE3289ABA1D0019D7CB /* LaunchScreen.storyboard */; };
@@ -19,11 +22,13 @@
1922
/* End PBXBuildFile section */
2023

2124
/* Begin PBXFileReference section */
22-
08020CCB28A838DC00255795 /* TableTestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableTestController.swift; sourceTree = "<group>"; };
25+
080677C528BE7D8B00000E16 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
26+
080677C728BE7DA400000E16 /* WrapStackDemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrapStackDemoViewController.swift; sourceTree = "<group>"; };
27+
08A24B8528E49C7A00CDD7E2 /* HVStackWrapperViewDemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HVStackWrapperViewDemoViewController.swift; sourceTree = "<group>"; };
2328
08E16CD5289ABA1C0019D7CB /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
2429
08E16CD8289ABA1C0019D7CB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2530
08E16CDA289ABA1C0019D7CB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
26-
08E16CDC289ABA1C0019D7CB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
31+
08E16CDC289ABA1C0019D7CB /* HVStackDemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HVStackDemoViewController.swift; sourceTree = "<group>"; };
2732
08E16CDF289ABA1C0019D7CB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
2833
08E16CE1289ABA1D0019D7CB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2934
08E16CE4289ABA1D0019D7CB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -37,6 +42,7 @@
3742
buildActionMask = 2147483647;
3843
files = (
3944
08F2594E28BD06150098174B /* PinLayout in Frameworks */,
45+
08A24B8428E49A9600CDD7E2 /* LookinServer in Frameworks */,
4046
08F2594C28BD060D0098174B /* StackKit in Frameworks */,
4147
);
4248
runOnlyForDeploymentPostprocessing = 0;
@@ -67,12 +73,14 @@
6773
children = (
6874
08E16CD8289ABA1C0019D7CB /* AppDelegate.swift */,
6975
08E16CDA289ABA1C0019D7CB /* SceneDelegate.swift */,
70-
08E16CDC289ABA1C0019D7CB /* ViewController.swift */,
76+
080677C528BE7D8B00000E16 /* ViewController.swift */,
77+
08E16CDC289ABA1C0019D7CB /* HVStackDemoViewController.swift */,
78+
08A24B8528E49C7A00CDD7E2 /* HVStackWrapperViewDemoViewController.swift */,
79+
080677C728BE7DA400000E16 /* WrapStackDemoViewController.swift */,
7180
08E16CDE289ABA1C0019D7CB /* Main.storyboard */,
7281
08E16CE1289ABA1D0019D7CB /* Assets.xcassets */,
7382
08E16CE3289ABA1D0019D7CB /* LaunchScreen.storyboard */,
7483
08E16CE6289ABA1D0019D7CB /* Info.plist */,
75-
08020CCB28A838DC00255795 /* TableTestController.swift */,
7684
);
7785
path = Demo;
7886
sourceTree = "<group>";
@@ -111,6 +119,7 @@
111119
packageProductDependencies = (
112120
08F2594B28BD060D0098174B /* StackKit */,
113121
08F2594D28BD06150098174B /* PinLayout */,
122+
08A24B8328E49A9600CDD7E2 /* LookinServer */,
114123
);
115124
productName = TestStackKit;
116125
productReference = 08E16CD5289ABA1C0019D7CB /* Demo.app */;
@@ -142,6 +151,7 @@
142151
mainGroup = 08E16CCC289ABA1C0019D7CB;
143152
packageReferences = (
144153
085CA41F28BD0521000E74CD /* XCRemoteSwiftPackageReference "pinlayout" */,
154+
08A24B8228E49A9600CDD7E2 /* XCRemoteSwiftPackageReference "LookinServer" */,
145155
);
146156
productRefGroup = 08E16CD6289ABA1C0019D7CB /* Products */;
147157
projectDirPath = "";
@@ -170,10 +180,12 @@
170180
isa = PBXSourcesBuildPhase;
171181
buildActionMask = 2147483647;
172182
files = (
173-
08E16CDD289ABA1C0019D7CB /* ViewController.swift in Sources */,
183+
080677C628BE7D8B00000E16 /* ViewController.swift in Sources */,
184+
08E16CDD289ABA1C0019D7CB /* HVStackDemoViewController.swift in Sources */,
185+
080677C828BE7DA400000E16 /* WrapStackDemoViewController.swift in Sources */,
186+
08A24B8628E49C7A00CDD7E2 /* HVStackWrapperViewDemoViewController.swift in Sources */,
174187
08E16CD9289ABA1C0019D7CB /* AppDelegate.swift in Sources */,
175188
08E16CDB289ABA1C0019D7CB /* SceneDelegate.swift in Sources */,
176-
08020CCC28A838DC00255795 /* TableTestController.swift in Sources */,
177189
);
178190
runOnlyForDeploymentPostprocessing = 0;
179191
};
@@ -401,9 +413,22 @@
401413
minimumVersion = 1.0.0;
402414
};
403415
};
416+
08A24B8228E49A9600CDD7E2 /* XCRemoteSwiftPackageReference "LookinServer" */ = {
417+
isa = XCRemoteSwiftPackageReference;
418+
repositoryURL = "https://github.com/QMUI/LookinServer/";
419+
requirement = {
420+
branch = develop;
421+
kind = branch;
422+
};
423+
};
404424
/* End XCRemoteSwiftPackageReference section */
405425

406426
/* Begin XCSwiftPackageProductDependency section */
427+
08A24B8328E49A9600CDD7E2 /* LookinServer */ = {
428+
isa = XCSwiftPackageProductDependency;
429+
package = 08A24B8228E49A9600CDD7E2 /* XCRemoteSwiftPackageReference "LookinServer" */;
430+
productName = LookinServer;
431+
};
407432
08F2594B28BD060D0098174B /* StackKit */ = {
408433
isa = XCSwiftPackageProductDependency;
409434
productName = StackKit;

Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)