Merge branch 'features/ActiivtyIndicatorCompatibility' of https://github.com/Panajev/MMMaterialDesignSpinner into Panajev-features/ActiivtyIndicatorCompatibility

# Conflicts: # Example/MaterialDesignSpinner.xcodeproj/project.pbxproj # Pod/Classes/MMMaterialDesignSpinner.h Also updating Xcode project files due to latest cocoa pods install
2017-07-15 10:07:03 -07:00
parent 8a67f33bb9 7c54fb571d
commit 0848f4d077
28 changed files with 3566 additions and 3148 deletions
@@ -1,16 +1,16 @@
 PODS:
-  - MMMaterialDesignSpinner (0.2.3)
+  - MMMaterialDesignSpinner (0.2.6)

 DEPENDENCIES:
  - MMMaterialDesignSpinner (from `../`)

 EXTERNAL SOURCES:
  MMMaterialDesignSpinner:
-    :path: ../
+    :path: "../"

 SPEC CHECKSUMS:
-  MMMaterialDesignSpinner: 55c80b454f7928d0ed789cc3c456fa06bd6a2f16
+  MMMaterialDesignSpinner: f877769592cc4410c51299a64d6c3934a9fcdab1

 PODFILE CHECKSUM: c0dd544008166879b3152865a647d9ab7cf11291

-COCOAPODS: 1.0.1
+COCOAPODS: 1.2.1
@@ -1,21 +1,21 @@
 {
  "name": "MMMaterialDesignSpinner",
-  "version": "0.2.3",
+  "version": "0.2.6",
  "summary": "An iOS activity spinner modeled after Google's Material Design spinner",
  "description": "I love Google's new indeterminate spinner in the [Material Design guidelines](http://www.google.com/design/spec/components/progress-activity.html#progress-activity-types-of-indicators), and I hadn't found a recreation of it for iOS yet, so I created it using CoreGraphics and CoreAnimation, which makes it super lightweight, smooth, and scalable to large sizes.\n\nSpecial thanks to the following projects and articles that helped me create this:\n* [Google Material Design's Animated Loading Spinner Using HTML, CSS and SVG](http://david.ingledow.co.uk/blog/google-material-designs-animated-loading-spinner-svg-and-css/) for help figuring out exactly what animations were going on.\n* [LLARingSpinnerView](https://github.com/lipka/LLARingSpinnerView) as the base for a custom activity spinner UIView.\n* [center-vfl](https://github.com/evgenyneu/center-vfl) because centering things with Auto Layout's VFL is way harder than it should be to remember.\n* [kylefox / color.m gist](https://gist.github.com/kylefox/1689973) for creating random UIColor values.",
-  "homepage": "https://github.com/misterwell/MMMaterialDesignSpinner",
+  "homepage": "https://github.com/misterwell/MMMaterialDesignSpinner.git",
  "license": "MIT",
  "authors": {
    "Mike Maxwell": "misterwell@gmail.com"
  },
  "social_media_url": "http://twitter.com/themisterwell",
  "platforms": {
-    "ios": "5.0",
+    "ios": "8.0",
    "tvos": "9.0"
  },
  "source": {
    "git": "https://github.com/misterwell/MMMaterialDesignSpinner.git",
-    "tag": "0.2.3"
+    "tag": "0.2.6"
  },
  "source_files": "Pod/Classes",
  "frameworks": [
@@ -1,16 +1,16 @@
 PODS:
-  - MMMaterialDesignSpinner (0.2.3)
+  - MMMaterialDesignSpinner (0.2.6)

 DEPENDENCIES:
  - MMMaterialDesignSpinner (from `../`)

 EXTERNAL SOURCES:
  MMMaterialDesignSpinner:
-    :path: ../
+    :path: "../"

 SPEC CHECKSUMS:
-  MMMaterialDesignSpinner: 55c80b454f7928d0ed789cc3c456fa06bd6a2f16
+  MMMaterialDesignSpinner: f877769592cc4410c51299a64d6c3934a9fcdab1

 PODFILE CHECKSUM: c0dd544008166879b3152865a647d9ab7cf11291

-COCOAPODS: 1.0.1
+COCOAPODS: 1.2.1
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
-  <string>0.2.3</string>
+  <string>0.2.6</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
@@ -1,4 +1,12 @@
 #ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
 #endif

@@ -1,5 +1,16 @@
+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif

+#import "ActivityTracking.h"
 #import "MMMaterialDesignSpinner.h"

 FOUNDATION_EXPORT double MMMaterialDesignSpinnerVersionNumber;
@@ -5,5 +5,6 @@ OTHER_LDFLAGS = -framework "CoreGraphics" -framework "UIKit"
 PODS_BUILD_DIR = $BUILD_DIR
 PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
@@ -34,6 +34,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 </string>
+			<key>License</key>
+			<string>MIT</string>
 			<key>Title</key>
 			<string>MMMaterialDesignSpinner</string>
 			<key>Type</key>
@@ -59,8 +59,13 @@ code_sign_if_enabled() {
  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
-    /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+
+    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
+      code_sign_cmd="$code_sign_cmd &"
+    fi
+    echo "$code_sign_cmd"
+    eval "$code_sign_cmd"
  fi
 }

@@ -89,3 +94,6 @@ fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
  install_framework "$BUILT_PRODUCTS_DIR/MMMaterialDesignSpinner/MMMaterialDesignSpinner.framework"
 fi
+if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
+  wait
+fi
@@ -18,17 +18,17 @@ case "${TARGETED_DEVICE_FAMILY}" in
  2)
    TARGET_DEVICE_ARGS="--target-device ipad"
    ;;
+  3)
+    TARGET_DEVICE_ARGS="--target-device tv"
+    ;;
+  4)
+    TARGET_DEVICE_ARGS="--target-device watch"
+    ;;
  *)
    TARGET_DEVICE_ARGS="--target-device mac"
    ;;
 esac

-realpath() {
-  DIRECTORY="$(cd "${1%/*}" && pwd)"
-  FILENAME="${1##*/}"
-  echo "$DIRECTORY/$FILENAME"
-}
-
 install_resource()
 {
  if [[ "$1" = /* ]] ; then
@@ -70,7 +70,7 @@ EOM
      xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
      ;;
    *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
+      ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
      ;;
    *)
@@ -93,7 +93,7 @@ then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
  while read line; do
-    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+    if [[ $line != "${PODS_ROOT}*" ]]; then
      XCASSET_FILES+=("$line")
    fi
  done <<<"$OTHER_XCASSETS"
@@ -1,4 +1,14 @@
+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif


 FOUNDATION_EXPORT double Pods_MaterialDesignSpinnerVersionNumber;
@@ -5,4 +5,5 @@ OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MMMaterialDes
 OTHER_LDFLAGS = $(inherited) -framework "MMMaterialDesignSpinner"
 PODS_BUILD_DIR = $BUILD_DIR
 PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
@@ -5,4 +5,5 @@ OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MMMaterialDes
 OTHER_LDFLAGS = $(inherited) -framework "MMMaterialDesignSpinner"
 PODS_BUILD_DIR = $BUILD_DIR
 PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
@@ -34,6 +34,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 </string>
+			<key>License</key>
+			<string>MIT</string>
 			<key>Title</key>
 			<string>MMMaterialDesignSpinner</string>
 			<key>Type</key>
@@ -59,8 +59,13 @@ code_sign_if_enabled() {
  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
-    /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+
+    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
+      code_sign_cmd="$code_sign_cmd &"
+    fi
+    echo "$code_sign_cmd"
+    eval "$code_sign_cmd"
  fi
 }

@@ -89,3 +94,6 @@ fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
  install_framework "$BUILT_PRODUCTS_DIR/MMMaterialDesignSpinner/MMMaterialDesignSpinner.framework"
 fi
+if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
+  wait
+fi
@@ -18,17 +18,17 @@ case "${TARGETED_DEVICE_FAMILY}" in
  2)
    TARGET_DEVICE_ARGS="--target-device ipad"
    ;;
+  3)
+    TARGET_DEVICE_ARGS="--target-device tv"
+    ;;
+  4)
+    TARGET_DEVICE_ARGS="--target-device watch"
+    ;;
  *)
    TARGET_DEVICE_ARGS="--target-device mac"
    ;;
 esac

-realpath() {
-  DIRECTORY="$(cd "${1%/*}" && pwd)"
-  FILENAME="${1##*/}"
-  echo "$DIRECTORY/$FILENAME"
-}
-
 install_resource()
 {
  if [[ "$1" = /* ]] ; then
@@ -70,7 +70,7 @@ EOM
      xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
      ;;
    *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
+      ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
      XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
      ;;
    *)
@@ -93,7 +93,7 @@ then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
  while read line; do
-    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+    if [[ $line != "${PODS_ROOT}*" ]]; then
      XCASSET_FILES+=("$line")
    fi
  done <<<"$OTHER_XCASSETS"
@@ -1,4 +1,14 @@
+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif


 FOUNDATION_EXPORT double Pods_TestsVersionNumber;
@@ -5,4 +5,5 @@ OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MMMaterialDes
 OTHER_LDFLAGS = $(inherited) -framework "MMMaterialDesignSpinner"
 PODS_BUILD_DIR = $BUILD_DIR
 PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
@@ -5,4 +5,5 @@ OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/MMMaterialDes
 OTHER_LDFLAGS = $(inherited) -framework "MMMaterialDesignSpinner"
 PODS_BUILD_DIR = $BUILD_DIR
 PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
  #

  s.name         = "MMMaterialDesignSpinner"
-  s.version      = "0.2.3"
+  s.version      = "0.2.6"
  s.summary      = "An iOS activity spinner modeled after Google's Material Design spinner"

  # This description is used to generate tags and improve search results.
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
                        * [kylefox / color.m gist](https://gist.github.com/kylefox/1689973) for creating random UIColor values.
                       DESC

-  s.homepage       = "https://github.com/misterwell/MMMaterialDesignSpinner"
+  s.homepage       = "https://github.com/misterwell/MMMaterialDesignSpinner.git"
  # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"


@@ -72,7 +72,7 @@ Pod::Spec.new do |s|
  # s.platform     = :ios, "5.0"

  #  When using multiple platforms
-  s.ios.deployment_target = "5.0"
+  s.ios.deployment_target = "8.0"
  # s.osx.deployment_target = "10.7"
  # s.watchos.deployment_target = "2.0"
  s.tvos.deployment_target = "9.0"
@@ -84,7 +84,7 @@ Pod::Spec.new do |s|
  #  Supports git, hg, bzr, svn and HTTP.
  #

-  s.source       = { :git => "https://github.com/misterwell/MMMaterialDesignSpinner.git", :tag => "0.2.3" }
+  s.source       = { :git => "https://github.com/misterwell/MMMaterialDesignSpinner.git", :tag => "0.2.6" }


  # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -7,12 +7,14 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		75A8F60A1E6C2F8E00C7FF55 /* ActivityTracking.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8F6091E6C2F8E00C7FF55 /* ActivityTracking.h */; };
 		9295C9501B253D8900C388EB /* MMMaterialDesignSpinner.h in Headers */ = {isa = PBXBuildFile; fileRef = 9295C94E1B253D8900C388EB /* MMMaterialDesignSpinner.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9295C9511B253D8900C388EB /* MMMaterialDesignSpinner.m in Sources */ = {isa = PBXBuildFile; fileRef = 9295C94F1B253D8900C388EB /* MMMaterialDesignSpinner.m */; };
 		9295C9531B253D9F00C388EB /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9295C9521B253D9F00C388EB /* Info.plist */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
+		75A8F6091E6C2F8E00C7FF55 /* ActivityTracking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActivityTracking.h; path = Pod/Classes/ActivityTracking.h; sourceTree = SOURCE_ROOT; };
 		9295C9321B253D2D00C388EB /* MMMaterialDesignSpinner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MMMaterialDesignSpinner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9295C94E1B253D8900C388EB /* MMMaterialDesignSpinner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MMMaterialDesignSpinner.h; path = Pod/Classes/MMMaterialDesignSpinner.h; sourceTree = SOURCE_ROOT; };
 		9295C94F1B253D8900C388EB /* MMMaterialDesignSpinner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MMMaterialDesignSpinner.m; path = Pod/Classes/MMMaterialDesignSpinner.m; sourceTree = SOURCE_ROOT; };
@@ -51,6 +53,7 @@
 			children = (
 				9295C94E1B253D8900C388EB /* MMMaterialDesignSpinner.h */,
 				9295C94F1B253D8900C388EB /* MMMaterialDesignSpinner.m */,
+				75A8F6091E6C2F8E00C7FF55 /* ActivityTracking.h */,
 				9295C9351B253D2D00C388EB /* Supporting Files */,
 			);
 			path = MMMaterialDesignSpinner;
@@ -71,6 +74,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				75A8F60A1E6C2F8E00C7FF55 /* ActivityTracking.h in Headers */,
 				9295C9501B253D8900C388EB /* MMMaterialDesignSpinner.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -0,0 +1,56 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+@protocol ActivityTracking
+
+// default is UIActivityIndicatorViewStyleWhite
+@property(nonatomic) UIActivityIndicatorViewStyle activityIndicatorViewStyle;
+
+// default is YES. calls -setHidden when animating gets set to NO
+@property(nonatomic) BOOL hidesWhenStopped;
+
+@property (nullable, readwrite, nonatomic, strong) UIColor *color NS_AVAILABLE_IOS(5_0) UI_APPEARANCE_SELECTOR;
+
+/** Sets the line width of the spinner's circle. */
+@property (nonatomic) CGFloat lineWidth;
+
+/** Sets the line cap of the spinner's circle. */
+@property (nonatomic, strong) NSString *lineCap;
+
+/** Specifies the timing function to use for the control's animation. Defaults to kCAMediaTimingFunctionEaseInEaseOut */
+@property (nullable, nonatomic, strong) CAMediaTimingFunction *timingFunction;
+
+/** Property indicating the duration of the animation, default is 1.5s. Should be set prior to -[startAnimating] */
+@property (nonatomic, readwrite) NSTimeInterval duration;
+
+/**
+ *  Convenience function for starting & stopping animation with a boolean variable instead of explicit
+ *  method calls.
+ *
+ *  @param animate true to start animating, false to stop animating.
+ @note This method simply calls the startAnimating or stopAnimating methods based on the value of the animate parameter.
+ */
+- (void)setAnimating:(BOOL)animate;
+- (void)startAnimating;
+- (void)stopAnimating;
+- (BOOL)isAnimating;
+
+@end
@@ -7,6 +7,7 @@
 //

 #import <UIKit/UIKit.h>
+#import "ActivityTracking.h"

 //! Project version number for MMMaterialDesignSpinner.
 FOUNDATION_EXPORT double MMMaterialDesignSpinnerVersionNumber;
@@ -19,43 +20,6 @@ FOUNDATION_EXPORT const unsigned char MMMaterialDesignSpinnerVersionString[];
 /**
 *  A control similar to iOS' UIActivityIndicatorView modeled after Google's Material Design Activity spinner.
 */
-@interface MMMaterialDesignSpinner : UIView
-
-/** Sets the line width of the spinner's circle. */
-@property (nonatomic) CGFloat lineWidth;
-
-/** Sets the line cap of the spinner's circle. */
-@property (nonatomic, strong) NSString *lineCap;
-
-/** Sets whether the view is hidden when not animating. */
-@property (nonatomic) BOOL hidesWhenStopped;
-
-/** Specifies the timing function to use for the control's animation. Defaults to kCAMediaTimingFunctionEaseInEaseOut */
-@property (nonatomic, strong) CAMediaTimingFunction *timingFunction;
-
-/** Property indicating whether the view is currently animating. */
-@property (nonatomic, readonly) BOOL isAnimating;
-
-/** Property indicating the duration of the animation, default is 1.5s. Should be set prior to -[startAnimating] */
-@property (nonatomic, readwrite) NSTimeInterval duration;
-
-/**
- *  Convenience function for starting & stopping animation with a boolean variable instead of explicit
- *  method calls.
- *
- *  @param animate true to start animating, false to stop animating.
-    @note This method simply calls the startAnimating or stopAnimating methods based on the value of the animate parameter.
- */
- (void)setAnimating:(BOOL)animate;
-
-/**
- *  Starts animation of the spinner.
- */
- (void)startAnimating;
-
-/**
- *  Stops animation of the spinnner.
- */
- (void)stopAnimating;
+@interface MMMaterialDesignSpinner : UIView <ActivityTracking>

@end
@@ -19,6 +19,11 @@ static NSString *kMMRingRotationAnimationKey = @"mmmaterialdesignspinner.rotatio
@implementation MMMaterialDesignSpinner

@synthesize progressLayer=_progressLayer;
+@synthesize hidesWhenStopped=_hidesWhenStopped;
+@synthesize activityIndicatorViewStyle=_activityIndicatorViewStyle;
+@synthesize color=_color;
+@synthesize timingFunction=_timingFunction;
+@synthesize duration=_duration;

 - (instancetype)initWithFrame:(CGRect)frame {
    if (self = [super initWithFrame:frame]) {
@@ -36,6 +41,7 @@ static NSString *kMMRingRotationAnimationKey = @"mmmaterialdesignspinner.rotatio

 - (void)awakeFromNib
 {
+    [super awakeFromNib];
    [self initialize];
 }

@@ -47,6 +53,7 @@ static NSString *kMMRingRotationAnimationKey = @"mmmaterialdesignspinner.rotatio
    
    // See comment in resetAnimations on why this notification is used.
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resetAnimations) name:UIApplicationDidBecomeActiveNotification object:nil];
+    [self invalidateIntrinsicContentSize];
 }

 - (void)dealloc
@@ -58,9 +65,15 @@ static NSString *kMMRingRotationAnimationKey = @"mmmaterialdesignspinner.rotatio
    [super layoutSubviews];
    
    self.progressLayer.frame = CGRectMake(0, 0, CGRectGetWidth(self.bounds), CGRectGetHeight(self.bounds));
+    [self invalidateIntrinsicContentSize];
    [self updatePath];
 }

+- (CGSize)intrinsicContentSize
+{
+    return CGSizeMake(self.bounds.size.width, self.bounds.size.height);
+}
+
 - (void)tintColorDidChange {
    [super tintColorDidChange];
    
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.1</string>
+	<string>0.2.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>