Merge pull request #3929 from igrechuhin/MAPSME-1051

[ios] Fixed rigthtoleft orientation support to search tabs.

iphone/Maps/Classes/Common.h

@@ -66,6 +66,12 @@ static inline BOOL isIOSVersionLessThan(NSUInteger version)
 static BOOL const isIOS7 = isIOSVersionLessThan(8);
 static BOOL const isIOS8 = !isIOS7 && isIOSVersionLessThan(9);
 
+static inline BOOL isInterfaceRightToLeft()
+{
+  return [UIApplication sharedApplication].userInterfaceLayoutDirection ==
+         UIUserInterfaceLayoutDirectionRightToLeft;
+}
+
 static uint64_t const KB = 1024;
 static uint64_t const MB = 1024 * 1024;
 

iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm

@@ -1,4 +1,5 @@
 #import "MWMSearchTabbedViewController.h"
+#import "Common.h"
 #import "MWMSearchCategoriesManager.h"
 #import "MWMSearchHistoryManager.h"
 #import "MWMSearchTabbedCollectionViewCell.h"
@@ -71,12 +72,19 @@ BOOL isOffsetInButton(CGFloat offset, MWMSearchTabButtonsView * button)
 
 - (void)viewWillAppear:(BOOL)animated
 {
+  self.scrollIndicator.hidden = YES;
   [self.tablesCollectionView reloadData];
   [self resetSelectedTab];
   [self refreshScrollPosition];
   [super viewWillAppear:animated];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+  self.scrollIndicator.hidden = NO;
+  [super viewDidAppear:animated];
+}
+
 #pragma mark - Layout
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
@@ -124,7 +132,7 @@ BOOL isOffsetInButton(CGFloat offset, MWMSearchTabButtonsView * button)
 
 - (void)tabButtonPressed:(MWMSearchTabButtonsView *)sender
 {
-  dispatch_async(dispatch_get_main_queue(), ^{
+  runAsyncOnMainQueue(^{
     [self.tablesCollectionView
         scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:sender.tag inSection:0]
                atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally
@@ -134,8 +142,12 @@ BOOL isOffsetInButton(CGFloat offset, MWMSearchTabButtonsView * button)
 
 - (void)updateScrollPosition:(CGFloat)position
 {
-  self.scrollIndicatorOffset.constant = nearbyint(position);
   CGFloat const btnMid = position + 0.5 * self.scrollIndicator.width;
+  if (isInterfaceRightToLeft())
+    position = self.scrollIndicator.width - position;
+  runAsyncOnMainQueue(^{
+    self.scrollIndicatorOffset.constant = nearbyint(position);
+  });
   if (self.selectedButton && isOffsetInButton(btnMid, self.selectedButton))
     return;
   [self.tabButtons

iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewLayout.mm

@@ -1,4 +1,5 @@
 #import "MWMSearchTabbedViewLayout.h"
+#import "Common.h"
 
 @implementation MWMSearchTabbedViewLayout
 
@@ -10,10 +11,14 @@
 
 - (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-  UICollectionViewLayoutAttributes * attr = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
+  UICollectionViewLayoutAttributes * attr =
+      [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
   CGSize const size = self.collectionView.frame.size;
   attr.size = size;
-  attr.center = CGPointMake((indexPath.item + 0.5) * size.width, 0.5 * size.height);
+  CGFloat x = (indexPath.item + 0.5) * size.width;
+  if (isInterfaceRightToLeft())
+    x = self.collectionViewContentSize.width - x;
+  attr.center = CGPointMake(x, 0.5 * size.height);
   return attr;
 }
 
@@ -28,9 +33,5 @@
   return attrs;
 }
 
-- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds
-{
-  return YES;
-}
-
+- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds { return YES; }
 @end