fill contents

refs UrbanApps#21
ykws · Jun 1, 2017 · 06d4fc5 · 06d4fc5
1 parent 3f9d670
commit 06d4fc5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/UAProgressView.h b/UAProgressView.h
@@ -73,6 +73,13 @@
  */
 @property (nonatomic, strong) UIColor *tintColor;
 
+/**
+ * The color of the fill contents
+ *
+ * Defaults to same tintColor
+ */
+@property (nonatomic, strong) UIColor *fillColor;
+
 /**
  *  Gets/sets the progress, from 0.0 to 1.0. Progress < 0 is set to 0.0, progress > 1 is set to 1.0
  */
@@ -94,4 +101,9 @@
  */
 - (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
 
+/**
+ *  Fill contents.
+ */
+- (void)addFill;
+
 @end
diff --git a/UAProgressView.m b/UAProgressView.m
@@ -130,6 +130,14 @@ - (void) setTintColor:(UIColor *)tintColor
     [self tintColorDidChange];
 }
 
+- (UIColor*) fillColor
+{
+    if (_fillColor == nil) {
+        return _tintColor;
+    }
+    return _fillColor;
+}
+
 #pragma mark - Layout
 
 - (void)layoutSubviews {
@@ -225,7 +233,7 @@ - (void)onValueLabelUpdateTimer:(NSTimer *)timer {
 - (void)addFill {
 	if (self.fillOnTouch) {
 		// update the layer model
-		self.progressView.layer.backgroundColor = [self tintColor].CGColor;
+		self.progressView.layer.backgroundColor = [self fillColor].CGColor;
 
 		// call block
 		if (self.fillChangedBlock) {