RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #3935 from igrechuhin/MAPSME-1056

Browse source 
[ios] Fixed arrows direction for Arabic language.
This commit is contained in:
Vlad Mihaylenko 2016-08-03 15:07:19 +04:00 • committed by GitHub
commit b9433f78a1
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm
View file

@ -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];
}

24
iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm
View file

@ -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<MWMEditorCellProtocol> delegate;
@property(weak, nonatomic) id<MWMEditorCellProtocol> 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

5
iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@ -77,6 +77,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="grayArrow" destination="jLw-GA-z3y" id="5NK-K5-4IO"/>
<outlet property="icon" destination="xur-tJ-HA9" id="ObZ-fc-tbA"/>
<outlet property="label" destination="MBe-6r-IsA" id="mvf-Q3-vMz"/>
<outlet property="labelLeadingOffset" destination="RGA-XL-gLq" id="Tb4-Ew-iDe"/>