Merge pull request #120 from SUPLA/develop

v2.3.18
SUPLA · Aug 24, 2020 · 730c7fa · 730c7fa
2 parents 4cd99ee + 1de7760
commit 730c7fa
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 8 deletions.
diff --git a/SUPLA.xcodeproj/project.pbxproj b/SUPLA.xcodeproj/project.pbxproj
@@ -2752,7 +2752,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 56;
+				CURRENT_PROJECT_VERSION = 58;
 				DEFINES_MODULE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@@ -2767,7 +2767,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SUPLA/lib",
 				);
-				MARKETING_VERSION = 2.3.17;
+				MARKETING_VERSION = 2.3.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsoftware.ios.supla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SUPLA/SUPLA-Bridging-Header.h";
@@ -2784,7 +2784,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 56;
+				CURRENT_PROJECT_VERSION = 58;
 				DEFINES_MODULE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
@@ -2799,7 +2799,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SUPLA/lib",
 				);
-				MARKETING_VERSION = 2.3.17;
+				MARKETING_VERSION = 2.3.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsoftware.ios.supla;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SUPLA/SUPLA-Bridging-Header.h";

diff --git a/SUPLA/RGBWDetailView.m b/SUPLA/RGBWDetailView.m
@@ -228,6 +228,8 @@ -(void)showDimmer {
         [self onPickerTypeTabTouch:_varilight ? self.tabSlider : self.tabWheel];
     }
 
+    self.cbPicker.minBrightness = _varilight ? 1.0 : 0.0;
+
     [self setExtraButtonsHidden:!_varilight];
     [self setWheelSliderTabsHidden:NO];
     self.tabRGB.selected = NO;

diff --git a/SUPLA/SAColorBrightnessPicker.h b/SUPLA/SAColorBrightnessPicker.h
@@ -42,6 +42,7 @@
 @property(nonatomic, copy) UIColor *powerButtonColorOff;
 @property(nonatomic, copy) UIColor *color;
 @property(nonatomic, assign) float brightness;
+@property(nonatomic, assign) float minBrightness;
 @property(nonatomic, readonly) BOOL moving;
 @property(nonatomic, copy) NSArray *brightnessMarkers;
 @property(nonatomic, copy) NSArray *colorMarkers;

diff --git a/SUPLA/SAColorBrightnessPicker.m b/SUPLA/SAColorBrightnessPicker.m
@@ -44,6 +44,7 @@ @implementation SAColorBrightnessPicker {
 
     UIColor *_color;
     float _brightness;
+    float _minBrightness;
     float _colorAngle;
 
     float lastPanPosition;
@@ -817,15 +818,26 @@ -(UIView *) hitTest:(CGPoint)point withEvent:(UIEvent *)event
             } else if ([self touchOverBrightnessWheel:transPoint]) {
                activeTouchPoint = ACTIVE_TOUCHPOINT_BRIGHTNESS_POINTER;
                 angle = [self addAngle:-90 toAngle:angle];
-               [self setBrightness:angle * 100 / 360 raiseEvent:YES];
+
+                float brightness = angle * 100 / 360;
+                if (brightness < _minBrightness) {
+                    brightness = _minBrightness;
+                }
+
+               [self setBrightness:brightness raiseEvent:YES];
             }
         } else if ([self touchOverSlider: transPoint]) {
             activeTouchPoint = ACTIVE_TOUCHPOINT_BRIGHTNESS_POINTER;
             float percent = (transPoint.y - _sliderRect.origin.y
                              - (_sliderRect.size.height-_sliderPointerRange)/2)
                              * 100 / _sliderPointerRange;
 
-            [self setBrightness:100-percent raiseEvent:YES];
+            float brightness = 100-percent;
+               if (brightness < _minBrightness) {
+                   brightness = _minBrightness;
+               }
+
+            [self setBrightness:brightness raiseEvent:YES];
         }
     } else {
         if ( !_colorWheelHidden
@@ -872,7 +884,8 @@ -(void)setBrightness:(float)brightness raiseEvent:(BOOL)raiseEvent {
         _brightness = brightness;
         [self setNeedsDisplay];
 
-        if ( delegate != nil
+        if ( raiseEvent
+            && delegate != nil
             && [delegate respondsToSelector:@selector(cbPickerDataChanged:)] )
             [delegate cbPickerDataChanged: self];
     }
@@ -883,8 +896,26 @@ -(void)setBrightness:(float)brightness {
     [self setBrightness:brightness raiseEvent:NO];
 }
 
+-(void)setMinBrightness:(float)minBrightness {
+    if (minBrightness > 100) {
+        minBrightness = 100;
+    } else if (minBrightness < 0) {
+        minBrightness = 0;
+    }
+
+    _minBrightness = minBrightness;
+}
+
+-(float)minBrightness {
+    return _minBrightness;
+}
+
 - (void)addBrightnessOffset:(float)offset {
-    [self setBrightness:_brightness+offset raiseEvent:YES];
+    float brightness = _brightness+offset;
+    if (brightness < _minBrightness) {
+        brightness = _minBrightness;
+    }
+    [self setBrightness:brightness raiseEvent:YES];
 }
 
 - (void)handleTap:(UITapGestureRecognizer *)gr {

diff --git a/SUPLATests/SAColorBrightnessPickerTests.m b/SUPLATests/SAColorBrightnessPickerTests.m
@@ -124,6 +124,18 @@ - (void)testBrightnessProperty {
     XCTAssertEqual(picker.brightness, 100);
 }
 
+- (void)testMinBrightnessProperty {
+    XCTAssertEqual(picker.minBrightness, 0.0);
+    picker.minBrightness = 55.54;
+    XCTAssertEqualWithAccuracy(picker.minBrightness, 55.54, 0.001);
+    picker.minBrightness = -1;
+    XCTAssertEqual(picker.minBrightness, 0.0);
+    picker.minBrightness = 80.88;
+    XCTAssertEqualWithAccuracy(picker.minBrightness, 80.88, 0.001);
+    picker.minBrightness = 110;
+    XCTAssertEqual(picker.minBrightness, 100);
+}
+
 - (void)testMovingProperty {
     XCTAssertFalse(picker.moving);
 }