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

[ios] Fixed arrows direction for Arabic language.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-08-03 14:05:11 +03:00
parent 1c1c63a1c1
commit 9f13fa1056
3 changed files with 14 additions and 2 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

@ -3,6 +3,7 @@
#import "MWMPlacePageOpeningHoursDayView.h"
#import "Statistics.h"
#import "UIImageView+Coloring.h"
#import "Common.h"
#include "3party/opening_hours/opening_hours.hpp"
#include "editor/opening_hours_ui.hpp"
@ -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];
}

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

@ -1,3 +1,4 @@
#import "Common.h"
#import "MWMEditorSelectTableViewCell.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"
@ -8,6 +9,7 @@
@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;
@ -35,6 +37,9 @@
self.label.textColor = [UIColor blackHintText];
}
self.label.preferredMaxLayoutWidth = self.width - self.labelLeadingOffset.constant - self.labelTrailingOffset.constant;
if (isInterfaceRightToLeft())
self.grayArrow.transform = CGAffineTransformMakeScale(-1, 1);
}
- (IBAction)selectAction

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"/>