Skip to content

Commit c135346

Browse files
author
RenZhu Macro
committed
Add some new video transitions & fix bug.
1 parent bd7ee08 commit c135346

File tree

59 files changed

+4615
-267
lines changed

Some content is hidden

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

59 files changed

+4615
-267
lines changed

‎Examples/SimpleVideoTransition/SimpleVideoTransition.xcodeproj/project.pbxproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
6ADB07A924ADDE450010A817 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6ADB07A724ADDE450010A817 /* Main.storyboard */; };
1818
6ADB07AB24ADDE460010A817 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6ADB07AA24ADDE460010A817 /* Assets.xcassets */; };
1919
6ADB07AE24ADDE460010A817 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6ADB07AC24ADDE460010A817 /* LaunchScreen.storyboard */; };
20+
AB59B8CC24C5AC8000943BE2 /* NaviViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB59B8CA24C5AC8000943BE2 /* NaviViewController.swift */; };
2021
/* End PBXBuildFile section */
2122

2223
/* Begin PBXContainerItemProxy section */
@@ -55,6 +56,7 @@
5556
6ADB07AA24ADDE460010A817 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5657
6ADB07AD24ADDE460010A817 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5758
6ADB07AF24ADDE460010A817 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
59+
AB59B8CA24C5AC8000943BE2 /* NaviViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NaviViewController.swift; sourceTree = "<group>"; };
5860
/* End PBXFileReference section */
5961

6062
/* Begin PBXFrameworksBuildPhase section */
@@ -107,6 +109,7 @@
107109
children = (
108110
6A3E708C24C067C3009A0AC9 /* 853.mp4 */,
109111
6A3E708E24C067C3009A0AC9 /* cute.mp4 */,
112+
AB59B8CA24C5AC8000943BE2 /* NaviViewController.swift */,
110113
6ADB07A124ADDE450010A817 /* AppDelegate.swift */,
111114
6ADB07A324ADDE450010A817 /* SceneDelegate.swift */,
112115
6ADB07A524ADDE450010A817 /* ViewController.swift */,
@@ -146,7 +149,7 @@
146149
isa = PBXProject;
147150
attributes = {
148151
LastSwiftUpdateCheck = 1150;
149-
LastUpgradeCheck = 1150;
152+
LastUpgradeCheck = 1200;
150153
ORGANIZATIONNAME = "RenZhu Macro";
151154
TargetAttributes = {
152155
6ADB079D24ADDE450010A817 = {
@@ -208,6 +211,7 @@
208211
isa = PBXSourcesBuildPhase;
209212
buildActionMask = 2147483647;
210213
files = (
214+
AB59B8CC24C5AC8000943BE2 /* NaviViewController.swift in Sources */,
211215
6ADB07A624ADDE450010A817 /* ViewController.swift in Sources */,
212216
6ADB07A224ADDE450010A817 /* AppDelegate.swift in Sources */,
213217
6ADB07A424ADDE450010A817 /* SceneDelegate.swift in Sources */,
@@ -262,6 +266,7 @@
262266
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
263267
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
264268
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
269+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
265270
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
266271
CLANG_WARN_STRICT_PROTOTYPES = YES;
267272
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -322,6 +327,7 @@
322327
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
323328
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
324329
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
330+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
325331
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
326332
CLANG_WARN_STRICT_PROTOTYPES = YES;
327333
CLANG_WARN_SUSPICIOUS_MOVE = YES;

‎Examples/SimpleVideoTransition/SimpleVideoTransition.xcodeproj/xcshareddata/xcschemes/SimpleVideoTransition.xcscheme

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1200"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "6ADB079D24ADDE450010A817"
18+
BuildableName = "SimpleVideoTransition.app"
19+
BlueprintName = "SimpleVideoTransition"
20+
ReferencedContainer = "container:SimpleVideoTransition.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<AdditionalOptions>
31+
<AdditionalOption
32+
key = "NSZombieEnabled"
33+
value = "YES"
34+
isEnabled = "YES">
35+
</AdditionalOption>
36+
</AdditionalOptions>
37+
<Testables>
38+
</Testables>
39+
</TestAction>
40+
<LaunchAction
41+
buildConfiguration = "Debug"
42+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
43+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
44+
launchStyle = "0"
45+
useCustomWorkingDirectory = "NO"
46+
ignoresPersistentStateOnLaunch = "NO"
47+
debugDocumentVersioning = "YES"
48+
debugServiceExtension = "internal"
49+
allowLocationSimulation = "YES">
50+
<BuildableProductRunnable
51+
runnableDebuggingMode = "0">
52+
<BuildableReference
53+
BuildableIdentifier = "primary"
54+
BlueprintIdentifier = "6ADB079D24ADDE450010A817"
55+
BuildableName = "SimpleVideoTransition.app"
56+
BlueprintName = "SimpleVideoTransition"
57+
ReferencedContainer = "container:SimpleVideoTransition.xcodeproj">
58+
</BuildableReference>
59+
</BuildableProductRunnable>
60+
</LaunchAction>
61+
<ProfileAction
62+
buildConfiguration = "Release"
63+
shouldUseLaunchSchemeArgsEnv = "YES"
64+
savedToolIdentifier = ""
65+
useCustomWorkingDirectory = "NO"
66+
debugDocumentVersioning = "YES">
67+
<BuildableProductRunnable
68+
runnableDebuggingMode = "0">
69+
<BuildableReference
70+
BuildableIdentifier = "primary"
71+
BlueprintIdentifier = "6ADB079D24ADDE450010A817"
72+
BuildableName = "SimpleVideoTransition.app"
73+
BlueprintName = "SimpleVideoTransition"
74+
ReferencedContainer = "container:SimpleVideoTransition.xcodeproj">
75+
</BuildableReference>
76+
</BuildableProductRunnable>
77+
</ProfileAction>
78+
<AnalyzeAction
79+
buildConfiguration = "Debug">
80+
</AnalyzeAction>
81+
<ArchiveAction
82+
buildConfiguration = "Release"
83+
revealArchiveInOrganizer = "YES">
84+
</ArchiveAction>
85+
</Scheme>

‎Examples/SimpleVideoTransition/SimpleVideoTransition/853.mp4

-404 KB
Binary file not shown.

0 commit comments

Comments
 (0)