Added image states for TabItems used in TabBar and

CosmicMind · Apr 27, 2018 · 9b69558 · 9b69558
1 parent 6cb7919
commit 9b69558
Show file tree

Hide file tree

Showing 7 changed files with 557 additions and 483 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.15.0
+
+* [issue-1057](https://github.com/CosmicMind/Material/issues/1057): Added image states for TabItems used in TabBar and TabsController
+
 ## 2.14.0
 
 * [issue-995](https://github.com/CosmicMind/Material/issues/995): Updated iOS 11 layout margins for NavigationBar.

diff --git a/Material.podspec b/Material.podspec
@@ -1,6 +1,7 @@
 Pod::Spec.new do |s|
 	s.name = 'Material'
-	s.version = '2.14.0'
+	s.version = '2.15.0'
+	s.swift_version = '4.0'
 	s.license = 'BSD-3-Clause'
 	s.summary = 'A UI/UX framework for creating beautiful applications.'
 	s.homepage = 'http://cosmicmind.com'

diff --git a/Material.xcodeproj/project.pbxproj b/Material.xcodeproj/project.pbxproj
@@ -267,7 +267,7 @@
 		96BCB7971CB40DC500C806FE /* NavigationDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationDrawerController.swift; sourceTree = "<group>"; };
 		96BCB7981CB40DC500C806FE /* Bar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bar.swift; sourceTree = "<group>"; };
 		96BCB7991CB40DC500C806FE /* TransitionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionController.swift; sourceTree = "<group>"; };
-		96BCB79A1CB40DC500C806FE /* TabBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = TabBar.swift; sourceTree = "<group>"; tabWidth = 4; };
+		96BCB79A1CB40DC500C806FE /* TabBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = TabBar.swift; sourceTree = "<group>"; tabWidth = 2; };
 		96BCB79C1CB40DC500C806FE /* TextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = "<group>"; };
 		96BCB79D1CB40DC500C806FE /* TextStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextStorage.swift; sourceTree = "<group>"; };
 		96BCB79E1CB40DC500C806FE /* TextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = "<group>"; };
@@ -852,7 +852,7 @@
 			attributes = {
 				LastSwiftMigration = 0710;
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "CosmicMind, Inc.";
 				TargetAttributes = {
 					963832351B88DFD80015F710 = {
@@ -1024,12 +1024,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1085,12 +1087,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme b/Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Sources/Frameworks/Motion b/Sources/Frameworks/Motion
diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.13.7</string>
+	<string>2.15.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
+4 −0		CHANGELOG.md
+2 −1		Motion.podspec
+5 −1		Motion.xcodeproj/project.pbxproj
+1 −3		Motion.xcodeproj/xcshareddata/xcschemes/Motion iOS.xcscheme
+43 −43		Sources/Animator/MotionAnimator.swift
+90 −90		Sources/Animator/MotionAnimatorViewContext.swift
+466 −466		Sources/Animator/MotionCoreAnimationViewContext.swift
+110 −110		Sources/Animator/MotionCoreAnimator.swift
+66 −66		Sources/Animator/MotionViewPropertyViewContext.swift
+10 −10		Sources/Extensions/Motion+Array.swift
+282 −282		Sources/Extensions/Motion+CALayer.swift
+14 −14		Sources/Extensions/Motion+CAMediaTimingFunction.swift
+123 −123		Sources/Extensions/Motion+CG.swift
+25 −25		Sources/Extensions/Motion+Obj-C.swift
+19 −19		Sources/Extensions/Motion+UIKit.swift
+264 −264		Sources/Extensions/Motion+UIView.swift
+262 −262		Sources/Extensions/Motion+UIViewController.swift
+14 −14		Sources/Extensions/MotionAnimationFillMode.swift
+1 −1		Sources/Info.plist
+389 −389		Sources/MotionAnimation.swift
+109 −109		Sources/MotionAnimationState.swift
+273 −273		Sources/MotionCAAnimation.swift
+434 −434		Sources/MotionContext.swift
+2 −2		Sources/MotionCoordinateSpace.swift
+613 −613		Sources/MotionModifier.swift
+63 −63		Sources/MotionPlugin.swift
+20 −20		Sources/MotionSnapshotType.swift
+153 −153		Sources/MotionTargetState.swift
+6 −6		Sources/MotionTransitionObserver.swift
+3 −3		Sources/MotionViewOrderStrategy.swift
+88 −88		Sources/Preprocessors/CascadePreprocessor.swift
+71 −71		Sources/Preprocessors/ConditionalPreprocessor.swift
+44 −44		Sources/Preprocessors/IgnoreSubviewModifiersPreprocessor.swift
+60 −60		Sources/Preprocessors/MatchPreprocessor.swift
+8 −8		Sources/Preprocessors/MotionCorePreprocessor.swift
+9 −9		Sources/Preprocessors/MotionPreprocessor.swift
+79 −79		Sources/Preprocessors/SourcePreprocessor.swift
+348 −348		Sources/Preprocessors/TransitionPreprocessor.swift
+42 −42		Sources/Transition/MotionProgressRunner.swift
+73 −73		Sources/Transition/MotionTransition+Animate.swift
+110 −110		Sources/Transition/MotionTransition+Complete.swift
+29 −29		Sources/Transition/MotionTransition+CustomTransition.swift
+89 −89		Sources/Transition/MotionTransition+Interactive.swift
+190 −190		Sources/Transition/MotionTransition+Start.swift
+15 −15		Sources/Transition/MotionTransition+UINavigationControllerDelegate.swift
+25 −25		Sources/Transition/MotionTransition+UITabBarControllerDelegate.swift
+62 −62		Sources/Transition/MotionTransition+UIViewControllerTransitioningDelegate.swift
+586 −586		Sources/Transition/MotionTransition.swift