Skip to content

M
Material
Commit 366df6a0 by Daniel Dahan
Options

fixed linking for .md files and alike

parent ceca2641
Showing with 7 additions and 33 deletions
Material.xcodeproj/project.pbxproj
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
961154CC1F32A7B100A78D74 /* ChipBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961154CB1F32A7B100A78D74 /* ChipBar.swift */; }; 961154CC1F32A7B100A78D74 /* ChipBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961154CB1F32A7B100A78D74 /* ChipBar.swift */; };
961409B11E43D15C00E7BA99 /* FABMenu.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183621E0C6CE200083C30 /* FABMenu.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 961409B11E43D15C00E7BA99 /* FABMenu.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183621E0C6CE200083C30 /* FABMenu.swift */; settings = {ATTRIBUTES = (Public, ); }; };
961409B21E43D15C00E7BA99 /* FABMenuController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183641E0C6DD400083C30 /* FABMenuController.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 961409B21E43D15C00E7BA99 /* FABMenuController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 96A183641E0C6DD400083C30 /* FABMenuController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
9615277E1F393C0E00E8B2AC /* LICENSE.md in Sources */ = {isa = PBXBuildFile; fileRef = 961527541F393C0E00E8B2AC /* LICENSE.md */; };
9615277F1F393C0E00E8B2AC /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 961527551F393C0E00E8B2AC /* README.md */; };
961527801F393C0E00E8B2AC /* MotionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527581F393C0E00E8B2AC /* MotionAnimator.swift */; }; 961527801F393C0E00E8B2AC /* MotionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527581F393C0E00E8B2AC /* MotionAnimator.swift */; };
961527811F393C0E00E8B2AC /* MotionAnimatorViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527591F393C0E00E8B2AC /* MotionAnimatorViewContext.swift */; }; 961527811F393C0E00E8B2AC /* MotionAnimatorViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527591F393C0E00E8B2AC /* MotionAnimatorViewContext.swift */; };
961527821F393C0E00E8B2AC /* MotionCoreAnimationViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615275A1F393C0E00E8B2AC /* MotionCoreAnimationViewContext.swift */; }; 961527821F393C0E00E8B2AC /* MotionCoreAnimationViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615275A1F393C0E00E8B2AC /* MotionCoreAnimationViewContext.swift */; };
...@@ -27,7 +25,6 @@ ...@@ -27,7 +25,6 @@
9615278C1F393C0E00E8B2AC /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527651F393C0E00E8B2AC /* Motion+UIView.swift */; }; 9615278C1F393C0E00E8B2AC /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527651F393C0E00E8B2AC /* Motion+UIView.swift */; };
9615278D1F393C0E00E8B2AC /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527661F393C0E00E8B2AC /* Motion+UIViewController.swift */; }; 9615278D1F393C0E00E8B2AC /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527661F393C0E00E8B2AC /* Motion+UIViewController.swift */; };
9615278E1F393C0E00E8B2AC /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527671F393C0E00E8B2AC /* MotionAnimationFillMode.swift */; }; 9615278E1F393C0E00E8B2AC /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527671F393C0E00E8B2AC /* MotionAnimationFillMode.swift */; };
9615278F1F393C0E00E8B2AC /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 961527681F393C0E00E8B2AC /* LICENSE */; };
961527901F393C0E00E8B2AC /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527691F393C0E00E8B2AC /* Motion.swift */; }; 961527901F393C0E00E8B2AC /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 961527691F393C0E00E8B2AC /* Motion.swift */; };
961527911F393C0E00E8B2AC /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615276A1F393C0E00E8B2AC /* MotionAnimation.swift */; }; 961527911F393C0E00E8B2AC /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615276A1F393C0E00E8B2AC /* MotionAnimation.swift */; };
961527921F393C0E00E8B2AC /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615276B1F393C0E00E8B2AC /* MotionAnimationState.swift */; }; 961527921F393C0E00E8B2AC /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9615276B1F393C0E00E8B2AC /* MotionAnimationState.swift */; };
...@@ -995,7 +992,6 @@ ...@@ -995,7 +992,6 @@
96334EF61C8B84660083986B /* Assets.xcassets in Resources */, 96334EF61C8B84660083986B /* Assets.xcassets in Resources */,
96BCB7F71CB40DE900C806FE /* Roboto-Medium.ttf in Resources */, 96BCB7F71CB40DE900C806FE /* Roboto-Medium.ttf in Resources */,
96BCB7F31CB40DE900C806FE /* Roboto-Bold.ttf in Resources */, 96BCB7F31CB40DE900C806FE /* Roboto-Bold.ttf in Resources */,
9615278F1F393C0E00E8B2AC /* LICENSE in Resources */,
96BCB7FB1CB40DE900C806FE /* Roboto-Thin.ttf in Resources */, 96BCB7FB1CB40DE900C806FE /* Roboto-Thin.ttf in Resources */,
96BCB7F91CB40DE900C806FE /* Roboto-Regular.ttf in Resources */, 96BCB7F91CB40DE900C806FE /* Roboto-Regular.ttf in Resources */,
96BCB7F51CB40DE900C806FE /* Roboto-Light.ttf in Resources */, 96BCB7F51CB40DE900C806FE /* Roboto-Light.ttf in Resources */,
...@@ -1040,7 +1036,6 @@ ...@@ -1040,7 +1036,6 @@
965E81191DD4D5C800D61E4B /* SnackbarController.swift in Sources */, 965E81191DD4D5C800D61E4B /* SnackbarController.swift in Sources */,
961527811F393C0E00E8B2AC /* MotionAnimatorViewContext.swift in Sources */, 961527811F393C0E00E8B2AC /* MotionAnimatorViewContext.swift in Sources */,
965E811A1DD4D5C800D61E4B /* StatusBarController.swift in Sources */, 965E811A1DD4D5C800D61E4B /* StatusBarController.swift in Sources */,
9615277F1F393C0E00E8B2AC /* README.md in Sources */,
961527871F393C0E00E8B2AC /* Motion+CALayer.swift in Sources */, 961527871F393C0E00E8B2AC /* Motion+CALayer.swift in Sources */,
965E811B1DD4D5C800D61E4B /* Switch.swift in Sources */, 965E811B1DD4D5C800D61E4B /* Switch.swift in Sources */,
965E811C1DD4D5C800D61E4B /* TabBar.swift in Sources */, 965E811C1DD4D5C800D61E4B /* TabBar.swift in Sources */,
...@@ -1121,7 +1116,6 @@ ...@@ -1121,7 +1116,6 @@
961527801F393C0E00E8B2AC /* MotionAnimator.swift in Sources */, 961527801F393C0E00E8B2AC /* MotionAnimator.swift in Sources */,
965E80E21DD4C50600D61E4B /* View.swift in Sources */, 965E80E21DD4C50600D61E4B /* View.swift in Sources */,
961527911F393C0E00E8B2AC /* MotionAnimation.swift in Sources */, 961527911F393C0E00E8B2AC /* MotionAnimation.swift in Sources */,
9615277E1F393C0E00E8B2AC /* LICENSE.md in Sources */,
9615279A1F393C0E00E8B2AC /* MotionTransition.swift in Sources */, 9615279A1F393C0E00E8B2AC /* MotionTransition.swift in Sources */,
9615279F1F393C0E00E8B2AC /* IgnoreSubviewModifiersPreprocessor.swift in Sources */, 9615279F1F393C0E00E8B2AC /* IgnoreSubviewModifiersPreprocessor.swift in Sources */,
96328B7A1E020A41009A4C90 /* CollectionViewController.swift in Sources */, 96328B7A1E020A41009A4C90 /* CollectionViewController.swift in Sources */,
......
Sources/iOS/ChipBar.swift
...@@ -319,6 +319,7 @@ extension ChipBar { ...@@ -319,6 +319,7 @@ extension ChipBar {
guard -1 < index, index < chipItems.count else { guard -1 < index, index < chipItems.count else {
return return
} }
animate(to: chipItems[index], isTriggeredByUserInteraction: false, completion: completion) animate(to: chipItems[index], isTriggeredByUserInteraction: false, completion: completion)
} }
......
Sources/iOS/TabBar.swift
...@@ -110,7 +110,7 @@ open class TabBar: Bar { ...@@ -110,7 +110,7 @@ open class TabBar: Bar {
open weak var delegate: TabBarDelegate? open weak var delegate: TabBarDelegate?
/// The currently selected tabItem. /// The currently selected tabItem.
open fileprivate(set) var selected: TabItem? open fileprivate(set) var selectedTabItem: TabItem?
/// A preset wrapper around tabItems contentEdgeInsets. /// A preset wrapper around tabItems contentEdgeInsets.
open var tabItemsContentEdgeInsetsPreset: EdgeInsetsPreset { open var tabItemsContentEdgeInsetsPreset: EdgeInsetsPreset {
...@@ -166,20 +166,6 @@ open class TabBar: Bar { ...@@ -166,20 +166,6 @@ open class TabBar: Bar {
} }
} }
/// A boolean to animate the line when touched.
@IBInspectable
open var isLineAnimated = true {
didSet {
for b in tabItems {
if isLineAnimated {
prepareLineAnimationHandler(tabItem: b)
} else {
removeLineAnimationHandler(tabItem: b)
}
}
}
}
/// A reference to the line UIView. /// A reference to the line UIView.
open let line = UIView() open let line = UIView()
...@@ -254,10 +240,10 @@ fileprivate extension TabBar { ...@@ -254,10 +240,10 @@ fileprivate extension TabBar {
v.cornerRadius = 0 v.cornerRadius = 0
v.contentEdgeInsets = .zero v.contentEdgeInsets = .zero
if isLineAnimated {
prepareLineAnimationHandler(tabItem: v) prepareLineAnimationHandler(tabItem: v)
} }
}
selectedTabItem = tabItems.first
} }
/** /**
...@@ -323,15 +309,7 @@ fileprivate extension TabBar { ...@@ -323,15 +309,7 @@ fileprivate extension TabBar {
/// Layout the line view. /// Layout the line view.
func layoutLine() { func layoutLine() {
guard 0 < tabItems.count else { guard let v = selectedTabItem else {
return
}
if nil == selected {
selected = tabItems.first
}
guard let v = selected else {
return return
} }
...@@ -367,6 +345,7 @@ extension TabBar { ...@@ -367,6 +345,7 @@ extension TabBar {
guard -1 < index, index < tabItems.count else { guard -1 < index, index < tabItems.count else {
return return
} }
animate(to: tabItems[index], isTriggeredByUserInteraction: false, completion: completion) animate(to: tabItems[index], isTriggeredByUserInteraction: false, completion: completion)
} }
...@@ -393,7 +372,7 @@ fileprivate extension TabBar { ...@@ -393,7 +372,7 @@ fileprivate extension TabBar {
delegate?.tabBar?(tabBar: self, willSelect: tabItem) delegate?.tabBar?(tabBar: self, willSelect: tabItem)
} }
selected = tabItem selectedTabItem = tabItem
isAnimating = true isAnimating = true
line.animate(.duration(0.25), line.animate(.duration(0.25),
......
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