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

[MAPSME-3445] [ios] Fixed bottom menu layout direction for RightToLeft languages.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-01-17 14:19:28 +03:00
parent 8e6b6d9128
commit 0346475170
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -253,7 +253,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
{
MWMBottomMenuLayout * cvLayout =
(MWMBottomMenuLayout *)self.buttonsCollectionView.collectionViewLayout;
cvLayout.buttonsCount = MWMBottomMenuViewCellCount;
cvLayout.buttonsCount = [self collectionView:self.additionalButtons numberOfItemsInSection:0];
[self.additionalButtons reloadData];
[(MWMBottomMenuView *)self.view refreshLayout];
}
@ -303,7 +303,10 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
[collectionView dequeueReusableCellWithReuseIdentifier:isWideMenu ? kCollectionCelllandscape
: kCollectionCellPortrait
forIndexPath:indexPath];
switch (indexPath.item)
NSInteger item = indexPath.item;
if (isInterfaceRightToLeft())
item = [self collectionView:collectionView numberOfItemsInSection:indexPath.section] - item - 1;
switch (item)
{
case MWMBottomMenuViewCellAddPlace:
{
@ -339,7 +342,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
badgeCount:0
isEnabled:YES];
break;
case MWMBottomMenuViewCellCount: break;
}
return cell;
}
@ -359,7 +361,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
case MWMBottomMenuViewCellDownload: [self menuActionDownloadMaps]; break;
case MWMBottomMenuViewCellSettings: [self menuActionOpenSettings]; break;
case MWMBottomMenuViewCellShare: [self menuActionShareLocation]; break;
case MWMBottomMenuViewCellCount: break;
}
}