Skip to content

M
Material
Commit 0dd67e7b by Daniel Dahan
Options

preparing for TabsController release

parent 05c17716
Showing with 23 additions and 8 deletions
Material.xcodeproj/project.pbxproj
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
96DE3CDB1F269BF00035F7AF /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CB41F269BF00035F7AF /* Motion+UIView.swift */; }; 96DE3CDB1F269BF00035F7AF /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CB41F269BF00035F7AF /* Motion+UIView.swift */; };
96DE3CDC1F269BF00035F7AF /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CB51F269BF00035F7AF /* Motion+UIViewController.swift */; }; 96DE3CDC1F269BF00035F7AF /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CB51F269BF00035F7AF /* Motion+UIViewController.swift */; };
96DE3CDD1F269BF00035F7AF /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CB61F269BF00035F7AF /* MotionAnimationFillMode.swift */; }; 96DE3CDD1F269BF00035F7AF /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CB61F269BF00035F7AF /* MotionAnimationFillMode.swift */; };
96DE3CE01F269BF00035F7AF /* Motion.h in Headers */ = {isa = PBXBuildFile; fileRef = 96DE3CB91F269BF00035F7AF /* Motion.h */; };
96DE3CE11F269BF00035F7AF /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CBA1F269BF00035F7AF /* Motion.swift */; }; 96DE3CE11F269BF00035F7AF /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CBA1F269BF00035F7AF /* Motion.swift */; };
96DE3CE21F269BF00035F7AF /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CBB1F269BF00035F7AF /* MotionAnimation.swift */; }; 96DE3CE21F269BF00035F7AF /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CBB1F269BF00035F7AF /* MotionAnimation.swift */; };
96DE3CE31F269BF00035F7AF /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CBC1F269BF00035F7AF /* MotionAnimationState.swift */; }; 96DE3CE31F269BF00035F7AF /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE3CBC1F269BF00035F7AF /* MotionAnimationState.swift */; };
...@@ -308,7 +307,6 @@ ...@@ -308,7 +307,6 @@
96DE3CB61F269BF00035F7AF /* MotionAnimationFillMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationFillMode.swift; sourceTree = "<group>"; }; 96DE3CB61F269BF00035F7AF /* MotionAnimationFillMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationFillMode.swift; sourceTree = "<group>"; };
96DE3CB71F269BF00035F7AF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 96DE3CB71F269BF00035F7AF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96DE3CB81F269BF00035F7AF /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; 96DE3CB81F269BF00035F7AF /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
96DE3CB91F269BF00035F7AF /* Motion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Motion.h; sourceTree = "<group>"; };
96DE3CBA1F269BF00035F7AF /* Motion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Motion.swift; sourceTree = "<group>"; }; 96DE3CBA1F269BF00035F7AF /* Motion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Motion.swift; sourceTree = "<group>"; };
96DE3CBB1F269BF00035F7AF /* MotionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimation.swift; sourceTree = "<group>"; }; 96DE3CBB1F269BF00035F7AF /* MotionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimation.swift; sourceTree = "<group>"; };
96DE3CBC1F269BF00035F7AF /* MotionAnimationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationState.swift; sourceTree = "<group>"; }; 96DE3CBC1F269BF00035F7AF /* MotionAnimationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationState.swift; sourceTree = "<group>"; };
...@@ -430,6 +428,14 @@ ...@@ -430,6 +428,14 @@
name = BottomTabBar; name = BottomTabBar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
9630AC351F29997800B4217D /* Motion */ = {
isa = PBXGroup;
children = (
96DE3CA51F269BF00035F7AF /* Sources */,
);
name = Motion;
sourceTree = "<group>";
};
96328B9A1E05C135009A4C90 /* Data */ = { 96328B9A1E05C135009A4C90 /* Data */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -745,7 +751,7 @@ ...@@ -745,7 +751,7 @@
96DE3BA21F2519B90035F7AF /* Frameworks */ = { 96DE3BA21F2519B90035F7AF /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96DE3CA51F269BF00035F7AF /* Sources */, 9630AC351F29997800B4217D /* Motion */,
); );
path = Frameworks; path = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -757,7 +763,6 @@ ...@@ -757,7 +763,6 @@
96DE3CAD1F269BF00035F7AF /* Extensions */, 96DE3CAD1F269BF00035F7AF /* Extensions */,
96DE3CB71F269BF00035F7AF /* Info.plist */, 96DE3CB71F269BF00035F7AF /* Info.plist */,
96DE3CB81F269BF00035F7AF /* LICENSE */, 96DE3CB81F269BF00035F7AF /* LICENSE */,
96DE3CB91F269BF00035F7AF /* Motion.h */,
96DE3CBA1F269BF00035F7AF /* Motion.swift */, 96DE3CBA1F269BF00035F7AF /* Motion.swift */,
96DE3CBB1F269BF00035F7AF /* MotionAnimation.swift */, 96DE3CBB1F269BF00035F7AF /* MotionAnimation.swift */,
96DE3CBC1F269BF00035F7AF /* MotionAnimationState.swift */, 96DE3CBC1F269BF00035F7AF /* MotionAnimationState.swift */,
...@@ -906,7 +911,6 @@ ...@@ -906,7 +911,6 @@
9617B0911DFCA8CF00410F8F /* ToolbarController.swift in Headers */, 9617B0911DFCA8CF00410F8F /* ToolbarController.swift in Headers */,
96328B9B1E05C24E009A4C90 /* CollectionViewController.swift in Headers */, 96328B9B1E05C24E009A4C90 /* CollectionViewController.swift in Headers */,
96328B9E1E05C24E009A4C90 /* TableView.swift in Headers */, 96328B9E1E05C24E009A4C90 /* TableView.swift in Headers */,
96DE3CE01F269BF00035F7AF /* Motion.h in Headers */,
96328B9F1E05C24E009A4C90 /* TableViewController.swift in Headers */, 96328B9F1E05C24E009A4C90 /* TableViewController.swift in Headers */,
961409B11E43D15C00E7BA99 /* FABMenu.swift in Headers */, 961409B11E43D15C00E7BA99 /* FABMenu.swift in Headers */,
961409B21E43D15C00E7BA99 /* FABMenuController.swift in Headers */, 961409B21E43D15C00E7BA99 /* FABMenuController.swift in Headers */,
......
Sources/iOS/TabsController.swift
...@@ -331,8 +331,19 @@ fileprivate extension TabsController { ...@@ -331,8 +331,19 @@ fileprivate extension TabsController {
tvc.view.frame.size = container.bounds.size tvc.view.frame.size = container.bounds.size
tvc.motionModalTransitionType = motionTransitionType tvc.motionModalTransitionType = motionTransitionType
Motion.shared.transition(from: fvc, to: tvc, in: container) view.isUserInteractionEnabled = false
Motion.shared.transition(from: fvc, to: tvc, in: container) { [weak self] (isFinished) in
selectedIndex = i guard let s = self else {
return
}
s.view.isUserInteractionEnabled = true
guard isFinished else {
return
}
s.selectedIndex = i
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment