Merge pull request #5 from TimOliver/reversible

Added Reversible Mode

Author: TimOliver

CHANGELOG.md

@@ -1,12 +1,13 @@
 x.y.z Release Notes (yyyy-MM-dd)
 =============================================================
 
-1.0.0 Release Notes (yyyy-MM-dd)
+1.0.0 Release Notes (2019-09-23)
 =============================================================
 
 ### Enhancements
 
 * Added dark mode support for iOS 13 and up.
+* Added optional 'reversible' mode for specific segments.
 
 0.0.1 Release Notes (2019-09-15)
 =============================================================

Design/Arrowhead.pcvd

@@ -36,13 +36,13 @@ NS_ASSUME_NONNULL_BEGIN
  information and state for a single item in the
  segmented control.
  */
-@interface TOSegmentedControlItem : NSObject
+@interface TOSegmentedControlSegment : NSObject
 
 /** When item is a label, the text to display */
-@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy, nullable) NSString *title;
 
 /** When item is an image, the image to display */
-@property (nonatomic, strong) UIImage *image;
+@property (nonatomic, strong, nullable) UIImage *image;
 
 /** Whether the item can be tapped to toggle direction */
 @property (nonatomic, assign) BOOL isReversible;
@@ -53,6 +53,9 @@ NS_ASSUME_NONNULL_BEGIN
 /** Whether this item is enabled or disabled. */
 @property (nonatomic, assign) BOOL isDisabled;
 
+/** Whether the item is selected or not. */
+@property (nonatomic, assign) BOOL isSelected;
+
 /** The view (either image or label) for this item */
 @property (nonatomic, readonly) UIView *itemView;
 
@@ -62,9 +65,12 @@ NS_ASSUME_NONNULL_BEGIN
 /** If the item is an image, the subsequent image view (nil if a string) */
 @property (nonatomic, nullable, readonly) UIImageView *imageView;
 
+/** If the item is reversible, the subsequent arrow image view. */
+@property (nonatomic, nullable, readonly) UIView *arrowView;
+
 // Create an array of objects given an array of strings and images
-+ (NSArray *)itemsWithObjects:(NSArray *)objects
-          forSegmentedControl:(TOSegmentedControl *)segmentedControl;;
++ (NSArray *)segmentsWithObjects:(NSArray *)objects
+             forSegmentedControl:(TOSegmentedControl *)segmentedControl;;
 
 // Create a non-reversible item from this class
 - (nullable instancetype)initWithObject:(id)object
@@ -88,6 +94,9 @@ NS_ASSUME_NONNULL_BEGIN
 // Re-synchronize the item view when the segmented control style changes
 - (void)refreshItemView;
 
+// Rotates the arrow image view to 180 degrees and back again
+- (void)setArrowImageReversed:(BOOL)reversed;
+
 @end
 
 NS_ASSUME_NONNULL_END

…Control/Private/TOSegmentedControlItem.h …trol/Private/TOSegmentedControlSegment.hTOSegmentedControl/Private/TOSegmentedControlItem.h renamed to TOSegmentedControl/Private/TOSegmentedControlSegment.h TOSegmentedControl/Private/TOSegmentedControlItem.h renamed to TOSegmentedControl/Private/TOSegmentedControlSegment.h

@@ -20,7 +20,7 @@
 //  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.
 
-#import "TOSegmentedControlItem.h"
+#import "TOSegmentedControlSegment.h"
 #import "TOSegmentedControl.h"
 #import <UIKit/UIKit.h>
 
@@ -35,20 +35,23 @@ @interface TOSegmentedControl ()
 // -------------------------------------------------
 // Private Interface
 
-@interface TOSegmentedControlItem ()
+@interface TOSegmentedControlSegment ()
 
 // Weak reference to our parent segmented control
 @property (nonatomic, weak) TOSegmentedControl *segmentedControl;
 
 // Read-write access to the item view
 @property (nonatomic, strong, readwrite) UIView *itemView;
 
+// When made reversible, the container for arrow image view to show
+@property (nonatomic, strong, readwrite) UIView *arrowView;
+
 // When made reversible, the arrow image view to show
 @property (nonatomic, strong) UIImageView *arrowImageView;
 
 @end
 
-@implementation TOSegmentedControlItem
+@implementation TOSegmentedControlSegment
 
 #pragma mark - Object Lifecyle -
 
@@ -132,20 +135,20 @@ - (void)dealloc
 
 #pragma mark - Comnvenience Initializers -
 
-+ (NSArray *)itemsWithObjects:(NSArray *)objects forSegmentedControl:(nonnull TOSegmentedControl *)segmentedControl
++ (NSArray *)segmentsWithObjects:(NSArray *)objects forSegmentedControl:(nonnull TOSegmentedControl *)segmentedControl
 {
     NSMutableArray *array = [NSMutableArray array];
 
     // Create an object for each item in the array.
     // Skip anything that isn't an image or a label
     for (id object in objects) {
-        TOSegmentedControlItem *item = nil;
+        TOSegmentedControlSegment *item = nil;
         if ([object isKindOfClass:NSString.class]) {
-            item = [[TOSegmentedControlItem alloc] initWithTitle:object
+            item = [[TOSegmentedControlSegment alloc] initWithTitle:object
                                              forSegmentedControl:segmentedControl];
         }
         else if ([object isKindOfClass:UIImage.class]) {
-            item = [[TOSegmentedControlItem alloc] initWithImage:object
+            item = [[TOSegmentedControlSegment alloc] initWithImage:object
                                              forSegmentedControl:segmentedControl];
         }
 
@@ -170,36 +173,30 @@ - (void)commonInit
 
 - (void)refreshReversibleView
 {
-    // Whether it's in memory or not, set the tint color
-    self.arrowImageView.tintColor = self.segmentedControl.itemColor;
-    
     // If we're no longer (Or never were) reversible,
     // hide and exit out
     if (!self.isReversible) {
-        self.arrowImageView.hidden = YES;
+        self.arrowView.hidden = YES;
         return;
     }
 
     // Create the arrow view if we haven't done so yet
-    if (self.arrowImageView == nil) {
+    if (self.arrowView == nil && self.arrowImageView == nil) {
         UIImage *arrow = self.segmentedControl.arrowImage;
+        self.arrowView = [[UIView alloc] initWithFrame:(CGRect){CGPointZero, arrow.size}];
+        self.arrowView.alpha = 0.0f;
+        [self.segmentedControl.trackView addSubview:self.arrowView];
+
         self.arrowImageView = [[UIImageView alloc] initWithImage:arrow];
+        self.arrowImageView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        [self.arrowView addSubview:self.arrowImageView];
     }
-    
-    // Add the arrow to the item view
-    self.itemView.clipsToBounds = NO;
-    [self.itemView addSubview:self.arrowImageView];
-    
-    // Line up the item view vertically centered next to the item view
-    self.arrowImageView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin |
-                                            UIViewAutoresizingFlexibleBottomMargin |
-                                            UIViewAutoresizingFlexibleLeftMargin;
-    
-    CGRect itemFrame = self.itemView.frame;
-    CGRect frame = self.arrowImageView.frame;
-    frame.origin.x = CGRectGetMaxX(itemFrame) + 2.0f;
-    frame.origin.y = (CGRectGetHeight(itemFrame) - CGRectGetHeight(frame)) * 0.5f;
-    self.arrowImageView.frame = frame;
+
+    // Perform these updates, but never animate them
+    [UIView performWithoutAnimation:^{
+        // Set the tint color
+        self.arrowImageView.tintColor = self.segmentedControl.itemColor;
+    }];
 }
 
 #pragma mark - View Management -
@@ -321,4 +318,14 @@ - (UIImageView *)imageView
     return nil;
 }
 
+- (void)setArrowImageReversed:(BOOL)reversed
+{
+    if (reversed) {
+        self.arrowImageView.transform = CGAffineTransformRotate(CGAffineTransformIdentity, M_PI);
+        return;
+    }
+
+    self.arrowImageView.transform = CGAffineTransformIdentity;
+}
+
 @end