diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm index 6c2c4a41a2..2817f85955 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm @@ -1,4 +1,5 @@ #import "MWMPlacePageOpeningHoursCell.h" +#import "Common.h" #import "MWMOpeningHoursCommon.h" #import "MWMPlacePageOpeningHoursDayView.h" #import "Statistics.h" @@ -73,6 +74,8 @@ WeekDayView getWeekDayView() self.expandImage.hidden = !delegate.forcedButton; self.expandImage.image = [UIImage imageNamed:@"ic_arrow_gray_right"]; self.expandImage.mwm_coloring = MWMImageColoringGray; + if (isInterfaceRightToLeft()) + self.expandImage.transform = CGAffineTransformMakeScale(-1, 1); NSAssert(info, @"Schedule can not be empty"); osmoh::OpeningHours oh(info.UTF8String); if (MakeTimeTableSet(oh, timeTableSet)) @@ -132,6 +135,9 @@ WeekDayView getWeekDayView() self.expandImage.image = [UIImage imageNamed:@"ic_arrow_gray_down"]; self.expandImage.mwm_coloring = MWMImageColoringGray; + if (isInterfaceRightToLeft()) + self.expandImage.transform = CGAffineTransformMakeScale(-1, 1); + if (self.isExpanded) [self addClosedDays]; } diff --git a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm index 4456e54988..2acebac520 100644 --- a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm +++ b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm @@ -1,15 +1,17 @@ #import "MWMEditorSelectTableViewCell.h" +#import "Common.h" #import "UIColor+MapsMeColor.h" #import "UIImageView+Coloring.h" @interface MWMEditorSelectTableViewCell () -@property (weak, nonatomic) IBOutlet UIImageView * icon; -@property (weak, nonatomic) IBOutlet UILabel * label; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * labelLeadingOffset; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * labelTrailingOffset; +@property(weak, nonatomic) IBOutlet UIImageView * icon; +@property(weak, nonatomic) IBOutlet UILabel * label; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * labelLeadingOffset; +@property(weak, nonatomic) IBOutlet NSLayoutConstraint * labelTrailingOffset; +@property(weak, nonatomic) IBOutlet UIImageView * grayArrow; -@property (weak, nonatomic) id delegate; +@property(weak, nonatomic) id delegate; @end @@ -34,12 +36,12 @@ self.label.text = placeholder; self.label.textColor = [UIColor blackHintText]; } - self.label.preferredMaxLayoutWidth = self.width - self.labelLeadingOffset.constant - self.labelTrailingOffset.constant; -} - -- (IBAction)selectAction -{ - [self.delegate cellSelect:self]; + self.label.preferredMaxLayoutWidth = + self.width - self.labelLeadingOffset.constant - self.labelTrailingOffset.constant; + + if (isInterfaceRightToLeft()) + self.grayArrow.transform = CGAffineTransformMakeScale(-1, 1); } +- (IBAction)selectAction { [self.delegate cellSelect:self]; } @end diff --git a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib index 07861de724..719f0ea545 100644 --- a/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib +++ b/iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib @@ -1,8 +1,8 @@ - + - + @@ -77,6 +77,7 @@ +