From 5c19d91b83cd8a391730d8ac8bf163d125684155 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Wed, 27 Jan 2016 16:14:41 +0300 Subject: [PATCH] [ios] Fixed buttons behavior. --- iphone/Maps/Categories/UIKitCategories.mm | 2 - iphone/Maps/Classes/Components/MWMButton.h | 14 ++ iphone/Maps/Classes/Components/MWMButton.mm | 144 ++++++++++++++++ .../CircularProgress/MWMCircularProgress.xib | 9 +- .../MWMCircularProgressView.mm | 14 +- .../BottomMenu/MWMBottomMenuView.mm | 22 +-- .../BottomMenu/MWMBottomMenuViewController.h | 4 +- .../BottomMenu/MWMBottomMenuViewController.mm | 16 +- .../MWMBottomMenuViewController.xib | 18 +- .../MWMMapViewControlsManager.mm | 4 +- .../BookmarksTab/MWMSearchBookmarksCell.xib | 4 +- .../ZoomButtons/MWMZoomButtonsView.xib | 8 +- .../MWMNavigationDashboardManager.mm | 1 - .../MWMLandscapeNavigationDashboard.xib | 8 +- .../Dashboard/MWMNiPadNavigationDashboard.xib | 8 +- .../MWMPortraitNavigationDashboard.xib | 10 +- ...MWMOpeningHoursClosedSpanTableViewCell.xib | 4 +- iphone/Maps/Classes/PlacePageActionBar.xib | 16 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 16 +- iphone/Maps/Mapsme.storyboard | 50 +++--- iphone/Maps/UIButton+Coloring.h | 16 -- iphone/Maps/UIButton+Coloring.mm | 160 ------------------ 22 files changed, 263 insertions(+), 285 deletions(-) create mode 100644 iphone/Maps/Classes/Components/MWMButton.h create mode 100644 iphone/Maps/Classes/Components/MWMButton.mm delete mode 100644 iphone/Maps/UIButton+Coloring.h delete mode 100644 iphone/Maps/UIButton+Coloring.mm diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index 22e81aaaa5..ea3734d70f 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -1,5 +1,4 @@ #import "Common.h" -#import "UIButton+Coloring.h" #import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" #import "UIKitCategories.h" @@ -246,7 +245,6 @@ - (void)refresh { - [self changeColoringToOpposite]; UIColor * oppositeNormal = [self titleColorForState:UIControlStateNormal].opposite; UIColor * oppositeSelected = [self titleColorForState:UIControlStateSelected].opposite; UIColor * oppositeHightlighted = [self titleColorForState:UIControlStateHighlighted].opposite; diff --git a/iphone/Maps/Classes/Components/MWMButton.h b/iphone/Maps/Classes/Components/MWMButton.h new file mode 100644 index 0000000000..28bb431540 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMButton.h @@ -0,0 +1,14 @@ +typedef NS_ENUM(NSUInteger, MWMButtonColoring) +{ + MWMButtonColoringOther, + MWMButtonColoringBlue, + MWMButtonColoringBlack, + MWMButtonColoringGray +}; + +@interface MWMButton : UIButton + +@property (copy, nonatomic) NSString * imageName; +@property (nonatomic) MWMButtonColoring coloring; + +@end diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.mm new file mode 100644 index 0000000000..c71e65d396 --- /dev/null +++ b/iphone/Maps/Classes/Components/MWMButton.mm @@ -0,0 +1,144 @@ +#import "MWMButton.h" +#import "UIColor+MapsMeColor.h" + +namespace +{ + NSString * const kDefaultPattern = @"%@_%@"; + NSString * const kHighlightedPattern = @"%@_highlighted_%@"; + NSString * const kSelectedPattern = @"%@_selected_%@"; +} // namespace + +@implementation MWMButton + +- (void)setImageName:(NSString *)imageName +{ + _imageName = imageName; + [self setDefaultImages]; +} + +- (void)refresh +{ + [self changeColoringToOpposite]; + [super refresh]; +} + +- (void)setColoring:(MWMButtonColoring)coloring +{ + _coloring = coloring; + [self.imageView makeImageAlwaysTemplate]; + [self setDefaultTintColor]; +} + +- (void)changeColoringToOpposite +{ + if (self.coloring == MWMButtonColoringOther) + { + if (self.imageName) + { + [self setDefaultImages]; + self.imageView.image = [self imageForState:self.state]; + } + return; + } + if (self.state == UIControlStateNormal) + [self setDefaultTintColor]; + else if (self.state == UIControlStateHighlighted) + [self setHighlighted:YES]; + else if (self.state == UIControlStateSelected) + [self setSelected:YES]; +} + +- (void)setDefaultImages +{ + NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light"; + [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kDefaultPattern, self.imageName, postfix]] forState:UIControlStateNormal]; + [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kHighlightedPattern, self.imageName, postfix]] forState:UIControlStateHighlighted]; + [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kSelectedPattern, self.imageName, postfix]] forState:UIControlStateSelected]; +} + +- (void)setHighlighted:(BOOL)highlighted +{ + [super setHighlighted:highlighted]; + [self.imageView makeImageAlwaysTemplate]; + if (highlighted) + { + switch (self.coloring) + { + case MWMButtonColoringBlue: + self.tintColor = [UIColor linkBlueDark]; + break; + case MWMButtonColoringBlack: + self.tintColor = [UIColor blackHintText]; + break; + case MWMButtonColoringGray: + self.tintColor = [UIColor blackDividers]; + break; + case MWMButtonColoringOther: + break; + } + } + else + { + if (self.selected) + return; + [self setDefaultTintColor]; + } +} + +- (void)setSelected:(BOOL)selected +{ + [super setSelected:selected]; + [self.imageView makeImageAlwaysTemplate]; + if (selected) + { + switch (self.coloring) + { + case MWMButtonColoringBlack: + self.tintColor = [UIColor linkBlue]; + break; + case MWMButtonColoringBlue: + case MWMButtonColoringOther: + case MWMButtonColoringGray: + break; + } + } + else + { + [self setDefaultTintColor]; + } +} + +- (void)setDefaultTintColor +{ + switch (self.coloring) + { + case MWMButtonColoringBlack: + self.tintColor = [UIColor blackSecondaryText]; + break; + case MWMButtonColoringBlue: + self.tintColor = [UIColor linkBlue]; + break; + case MWMButtonColoringGray: + self.tintColor = [UIColor blackHintText]; + break; + case MWMButtonColoringOther: + self.imageView.image = [self imageForState:UIControlStateNormal]; + break; + } +} + +- (void)setColoringName:(NSString *)coloring +{ + if ([coloring isEqualToString:@"MWMBlue"]) + self.coloring = MWMButtonColoringBlue; + else if ([coloring isEqualToString:@"MWMBlack"]) + self.coloring = MWMButtonColoringBlack; + else if ([coloring isEqualToString:@"MWMOther"]) + self.coloring = MWMButtonColoringOther; + else if ([coloring isEqualToString:@"MWMGray"]) + self.coloring = MWMButtonColoringGray; + else + NSAssert(false, @"Invalid UIButton's coloring!"); +} + +@end diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib index 69b25df7b5..48db570a18 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib @@ -1,8 +1,8 @@ - + - + @@ -15,9 +15,8 @@ - - diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm index bb5335760e..911edf07ac 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm @@ -1,7 +1,7 @@ #import "Common.h" +#import "MWMButton.h" #import "MWMCircularProgress.h" #import "MWMCircularProgressView.h" -#import "UIButton+Coloring.h" #import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" @@ -26,7 +26,7 @@ static inline CGFloat angleWithProgress(CGFloat progress) @property (weak, nonatomic) IBOutlet MWMCircularProgress * owner; @property (weak, nonatomic) IBOutlet UIImageView * spinner; -@property (weak, nonatomic) IBOutlet UIButton * button; +@property (weak, nonatomic) IBOutlet MWMButton * button; @end @@ -102,23 +102,23 @@ static inline CGFloat angleWithProgress(CGFloat progress) { case MWMCircularProgressStateNormal: normalImage = self.images[@(MWMCircularProgressStateNormal)]; - self.button.mwm_coloring = MWMButtonColoringBlack; + self.button.coloring = MWMButtonColoringBlack; break; case MWMCircularProgressStateSelected: normalImage = self.images[@(MWMCircularProgressStateSelected)]; - self.button.mwm_coloring = MWMButtonColoringBlue; + self.button.coloring = MWMButtonColoringBlue; break; case MWMCircularProgressStateProgress: normalImage = self.images[@(MWMCircularProgressStateProgress)]; - self.button.mwm_coloring = MWMButtonColoringBlue; + self.button.coloring = MWMButtonColoringBlue; break; case MWMCircularProgressStateFailed: normalImage = self.images[@(MWMCircularProgressStateFailed)]; - self.button.mwm_coloring = MWMButtonColoringBlue; + self.button.coloring = MWMButtonColoringBlue; break; case MWMCircularProgressStateCompleted: normalImage = self.images[@(MWMCircularProgressStateCompleted)]; - self.button.mwm_coloring = MWMButtonColoringBlue; + self.button.coloring = MWMButtonColoringBlue; break; } [self.button setImage:normalImage forState:UIControlStateNormal]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm index b1a6c64ca9..9f94889b96 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm @@ -2,8 +2,8 @@ #import "EAGLView.h" #import "MWMBottomMenuView.h" #import "MWMBottomMenuViewController.h" +#import "MWMButton.h" #import "MapsAppDelegate.h" -#import "UIButton+Coloring.h" #import "UIButton+RuntimeAttributes.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" @@ -24,11 +24,11 @@ @property(weak, nonatomic) IBOutlet UIView * downloadBadge; -@property(weak, nonatomic) IBOutlet UIButton * locationButton; -@property(weak, nonatomic) IBOutlet UIButton * p2pButton; -@property(weak, nonatomic) IBOutlet UIButton * searchButton; -@property(weak, nonatomic) IBOutlet UIButton * bookmarksButton; -@property(weak, nonatomic) IBOutlet UIButton * menuButton; +@property(weak, nonatomic) IBOutlet MWMButton * locationButton; +@property(weak, nonatomic) IBOutlet MWMButton * p2pButton; +@property(weak, nonatomic) IBOutlet MWMButton * searchButton; +@property(weak, nonatomic) IBOutlet MWMButton * bookmarksButton; +@property(weak, nonatomic) IBOutlet MWMButton * menuButton; @property(weak, nonatomic) IBOutlet UIButton * goButton; @@ -298,11 +298,11 @@ { if (!isIOSVersionLessThan(8)) return; - auto const coloring = self.p2pButton.mwm_coloring; - self.p2pButton.mwm_coloring = coloring; - self.bookmarksButton.mwm_coloring = coloring; - self.locationButton.mwm_coloring = self.locationButton.mwm_coloring; - self.searchButton.mwm_coloring = self.searchButton.mwm_coloring; + auto const coloring = self.p2pButton.coloring; + self.p2pButton.coloring = coloring; + self.bookmarksButton.coloring = coloring; + self.locationButton.coloring = self.locationButton.coloring; + self.searchButton.coloring = self.searchButton.coloring; } #pragma mark - Properties diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h index e2b3415319..29cb3356b9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h @@ -3,7 +3,7 @@ #include "platform/location.hpp" -@class MapViewController; +@class MapViewController, MWMButton; @protocol MWMBottomMenuControllerProtocol @@ -15,7 +15,7 @@ @interface MWMBottomMenuViewController : ViewController @property(nonatomic) MWMBottomMenuState state; -@property(weak, nonatomic) IBOutlet UIButton * p2pButton; +@property(weak, nonatomic) IBOutlet MWMButton * p2pButton; @property(nonatomic) CGFloat leftBound; - (instancetype)initWithParentController:(MapViewController *)controller diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm index d60dacba14..c2bf9add83 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm @@ -7,11 +7,11 @@ #import "MWMBottomMenuLayout.h" #import "MWMBottomMenuView.h" #import "MWMBottomMenuViewController.h" +#import "MWMButton.h" #import "MWMMapViewControlsManager.h" #import "MWMSearchManager.h" #import "SettingsAndMoreVC.h" #import "Statistics.h" -#import "UIButton+Coloring.h" #import "UIImageView+Coloring.h" #import "UIColor+MapsMeColor.h" #import "UIKitCategories.h" @@ -43,7 +43,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) @property (weak, nonatomic) MapViewController * controller; @property (weak, nonatomic) IBOutlet UICollectionView * buttonsCollectionView; -@property (weak, nonatomic) IBOutlet UIButton * locationButton; +@property (weak, nonatomic) IBOutlet MWMButton * locationButton; @property (weak, nonatomic) IBOutlet UICollectionView * additionalButtons; @property (weak, nonatomic) IBOutlet UILabel * streetLabel; @@ -219,27 +219,27 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) } else { - UIButton * locBtn = self.locationButton; + MWMButton * locBtn = self.locationButton; switch (state) { case location::MODE_PENDING_POSITION: - locBtn.mwm_coloring = MWMButtonColoringBlue; + locBtn.coloring = MWMButtonColoringBlue; break; case location::MODE_UNKNOWN_POSITION: [locBtn setImage:[UIImage imageNamed:@"ic_menu_location_follow"] forState:UIControlStateNormal]; - locBtn.mwm_coloring = MWMButtonColoringGray; + locBtn.coloring = MWMButtonColoringGray; break; case location::MODE_NOT_FOLLOW: [locBtn setImage:[UIImage imageNamed:@"ic_menu_location_get_position"] forState:UIControlStateNormal]; - locBtn.mwm_coloring = MWMButtonColoringBlack; + locBtn.coloring = MWMButtonColoringBlack; break; case location::MODE_FOLLOW: [locBtn setImage:[UIImage imageNamed:@"ic_menu_location_follow"] forState:UIControlStateNormal]; - locBtn.mwm_coloring = MWMButtonColoringBlue; + locBtn.coloring = MWMButtonColoringBlue; break; case location::MODE_ROTATE_AND_FOLLOW: [locBtn setImage:[UIImage imageNamed:@"ic_menu_location_follow_and_rotate"] forState:UIControlStateNormal]; - locBtn.mwm_coloring = MWMButtonColoringBlue; + locBtn.coloring = MWMButtonColoringBlue; break; } } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib index 5e902078b3..29bdb4f7b5 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib @@ -28,7 +28,7 @@ - - - - - - @@ -1900,27 +1923,6 @@ the world. Join us! - @@ -2551,7 +2553,7 @@ the world. Join us! - + diff --git a/iphone/Maps/UIButton+Coloring.h b/iphone/Maps/UIButton+Coloring.h deleted file mode 100644 index dbdaa1d0bc..0000000000 --- a/iphone/Maps/UIButton+Coloring.h +++ /dev/null @@ -1,16 +0,0 @@ -typedef NS_ENUM(NSUInteger, MWMButtonColoring) -{ - MWMButtonColoringOther, - MWMButtonColoringBlue, - MWMButtonColoringBlack, - MWMButtonColoringGray -}; - -@interface UIButton (Coloring) - -@property (nonatomic) MWMButtonColoring mwm_coloring; -@property (copy, nonatomic) NSString * mwm_name; - -- (void)changeColoringToOpposite; - -@end diff --git a/iphone/Maps/UIButton+Coloring.mm b/iphone/Maps/UIButton+Coloring.mm deleted file mode 100644 index 13698f21ac..0000000000 --- a/iphone/Maps/UIButton+Coloring.mm +++ /dev/null @@ -1,160 +0,0 @@ -#import "UIButton+Coloring.h" -#import "UIColor+MapsMeColor.h" - -#import - -namespace -{ - -NSString * const kDefaultPattern = @"%@_%@"; -NSString * const kHighlightedPattern = @"%@_highlighted_%@"; -NSString * const kSelectedPattern = @"%@_selected_%@"; - -} // namespace - -@implementation UIButton (Coloring) - -- (void)setMwm_name:(NSString *)mwm_name -{ - objc_setAssociatedObject(self, @selector(mwm_name), mwm_name, OBJC_ASSOCIATION_COPY_NONATOMIC); - [self setDefaultImages]; -} - -- (NSString *)mwm_name -{ - return objc_getAssociatedObject(self, @selector(mwm_name)); -} - -- (void)setMwm_coloring:(MWMButtonColoring)mwm_coloring -{ - objc_setAssociatedObject(self, @selector(mwm_coloring), @(mwm_coloring), OBJC_ASSOCIATION_RETAIN_NONATOMIC); - [self.imageView makeImageAlwaysTemplate]; - [self setDefaultTintColor]; -} - -- (void)changeColoringToOpposite -{ - if (self.mwm_coloring == MWMButtonColoringOther) - { - if (self.mwm_name) - { - [self setDefaultImages]; - self.imageView.image = [self imageForState:self.state]; - } - return; - } - if (self.state == UIControlStateNormal) - [self setDefaultTintColor]; - else if (self.state == UIControlStateHighlighted) - [self setHighlighted:YES]; - else if (self.state == UIControlStateSelected) - [self setSelected:YES]; -} - -- (void)setDefaultImages -{ - NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light"; - [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kDefaultPattern, self.mwm_name, postfix]] forState:UIControlStateNormal]; - [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kHighlightedPattern, self.mwm_name, postfix]] forState:UIControlStateHighlighted]; - [self setImage:[UIImage imageNamed:[NSString stringWithFormat:kSelectedPattern, self.mwm_name, postfix]] forState:UIControlStateSelected]; -} - -- (void)setHighlighted:(BOOL)highlighted -{ - [super setHighlighted:highlighted]; - UIImage * image = [self imageForState:highlighted ? UIControlStateHighlighted : UIControlStateNormal]; - if (highlighted) - { - self.imageView.image = image; - [self.imageView makeImageAlwaysTemplate]; - switch (self.mwm_coloring) - { - case MWMButtonColoringBlue: - self.tintColor = [UIColor linkBlueDark]; - break; - case MWMButtonColoringBlack: - self.tintColor = [UIColor blackHintText]; - break; - case MWMButtonColoringGray: - self.tintColor = [UIColor blackDividers]; - break; - case MWMButtonColoringOther: - break; - } - } - else - { - if (self.selected) - return; - self.imageView.image = image; - [self.imageView makeImageAlwaysTemplate]; - [self setDefaultTintColor]; - } -} - -- (void)setSelected:(BOOL)selected -{ - [super setSelected:selected]; - if (UIImage * image = [self imageForState:selected ? UIControlStateSelected : UIControlStateNormal]) - { - self.imageView.image = image; - [self.imageView makeImageAlwaysTemplate]; - } - if (selected) - { - switch (self.mwm_coloring) - { - case MWMButtonColoringBlack: - self.tintColor = [UIColor linkBlue]; - break; - case MWMButtonColoringBlue: - case MWMButtonColoringOther: - case MWMButtonColoringGray: - break; - } - } - else - { - [self setDefaultTintColor]; - } -} - -- (void)setDefaultTintColor -{ - switch (self.mwm_coloring) - { - case MWMButtonColoringBlack: - self.tintColor = [UIColor blackSecondaryText]; - break; - case MWMButtonColoringBlue: - self.tintColor = [UIColor linkBlue]; - break; - case MWMButtonColoringGray: - self.tintColor = [UIColor blackHintText]; - break; - case MWMButtonColoringOther: - self.imageView.image = [self imageForState:UIControlStateNormal]; - break; - } -} - -- (MWMButtonColoring)mwm_coloring -{ - return static_cast([objc_getAssociatedObject(self, @selector(mwm_coloring)) integerValue]); -} - -- (void)setColoring:(NSString *)coloring -{ - if ([coloring isEqualToString:@"MWMBlue"]) - self.mwm_coloring = MWMButtonColoringBlue; - else if ([coloring isEqualToString:@"MWMBlack"]) - self.mwm_coloring = MWMButtonColoringBlack; - else if ([coloring isEqualToString:@"MWMOther"]) - self.mwm_coloring = MWMButtonColoringOther; - else if ([coloring isEqualToString:@"MWMGray"]) - self.mwm_coloring = MWMButtonColoringGray; - else - NSAssert(false, @"Invalid UIButton's coloring!"); -} - -@end