[MAPSME-4971] Review fixes.

2017-07-25 12:30:57 +03:00 · 2017-07-25 12:30:57 +03:00 · d967f945de
commit d967f945de
parent 7f92f1d568
5 changed files with 137 additions and 128 deletions
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@ -257,33 +257,35 @@ using namespace place_page;
    std::string const currency = self.currencyFormatter.currencyCode.UTF8String;
    std::string const viatorId = [self sponsoredId].UTF8String;

-    api->GetTop5Products(viatorId, currency,
-      [viatorId, self](std::string const & destId, std::vector<viator::Product> const & products)
-      {
-        if (viatorId != destId)
-          return;
-        NSMutableArray<MWMViatorItemModel *> * items = [@[] mutableCopy];
-        for (auto const & p : products)
-        {
-          auto imageURL = [NSURL URLWithString:@(p.m_photoUrl.c_str())];
-          auto pageURL = [NSURL URLWithString:@(p.m_pageUrl.c_str())];
-          if (!imageURL || !pageURL)
-            continue;
-          auto item = [[MWMViatorItemModel alloc] initWithImageURL:imageURL
-                                                           pageURL:pageURL
-                                                             title:@(p.m_title.c_str())
-                                                            rating:p.m_rating
-                                                          duration:@(p.m_duration.c_str())
-                                                             price:@(p.m_priceFormatted.c_str())];
-          [items addObject:item];
-        }
+    __weak auto wSelf = self;
+    api->GetTop5Products(
+        viatorId, currency, [wSelf, viatorId](std::string const & destId,
+                                              std::vector<viator::Product> const & products) {
+          __strong auto self = wSelf;
+          if (!self || viatorId != destId)
+            return;
+          NSMutableArray<MWMViatorItemModel *> * items = [@[] mutableCopy];
+          for (auto const & p : products)
+          {
+            auto imageURL = [NSURL URLWithString:@(p.m_photoUrl.c_str())];
+            auto pageURL = [NSURL URLWithString:@(p.m_pageUrl.c_str())];
+            if (!imageURL || !pageURL)
+              continue;
+            auto item = [[MWMViatorItemModel alloc] initWithImageURL:imageURL
+                                                             pageURL:pageURL
+                                                               title:@(p.m_title.c_str())
+                                                              rating:p.m_rating
+                                                            duration:@(p.m_duration.c_str())
+                                                               price:@(p.m_priceFormatted.c_str())];
+            [items addObject:item];
+          }

-        dispatch_async(dispatch_get_main_queue(), [items, self] {
-          self.viatorItems = items;
+          dispatch_async(dispatch_get_main_queue(), [items, self] {
+            self.viatorItems = items;

-          [self insertSpecialProjectsSectionWithProject:SpecialProject::Viator];
+            [self insertSpecialProjectsSectionWithProject:SpecialProject::Viator];
+          });
        });
-      });
  });
 }

@ -301,42 +303,45 @@ using namespace place_page;
    auto api = GetFramework().GetCianApi(canUseNetwork);
    if (!api)
      return;
-    m_cianRequestId = api->GetRentNearby([self latLon],
-    [self](std::vector<cian::RentPlace> const & places, uint64_t const requestId)
-    {
-      if (self->m_cianRequestId != requestId)
-        return;
-      NSMutableArray<MWMCianItemModel *> * items = [@[] mutableCopy];
-      for (auto const & p : places)
-      {
-        auto const & offers = p.m_offers;
-        NSCAssert(!offers.empty(), @"Cian misses offers for place.");
-        if (offers.empty())
-          continue;
-        auto const & firstOffer = offers.front();
-        
-        auto pageURL = [NSURL URLWithString:@(firstOffer.m_url.c_str())];
-        if (!pageURL)
-          continue;
-        auto item = [[MWMCianItemModel alloc] initWithRoomsCount:firstOffer.m_roomsCount
-                                                        priceRur:firstOffer.m_priceRur
-                                                        pageURL:pageURL
-                                                        address:@(firstOffer.m_address.c_str())];
-        [items addObject:item];
-      }
+    auto const latLon = [self latLon];

-      dispatch_async(dispatch_get_main_queue(), [items, self] {
-        self.cianIsReadyCallback(items);
-      });
-    },
-    [self](int code, uint64_t const requestId)
-    {
-      if (self->m_cianRequestId != requestId)
-        return;
-      dispatch_async(dispatch_get_main_queue(), [self] {
-        self.cianIsReadyCallback(@[]);
-      });
-    });
+    __weak auto wSuccessSelf = self;
+    __weak auto wErrorSelf = self;
+    m_cianRequestId = api->GetRentNearby(
+        latLon,
+        [wSuccessSelf](std::vector<cian::RentPlace> const & places, uint64_t const requestId) {
+          __strong auto self = wSuccessSelf;
+          if (!self || self->m_cianRequestId != requestId)
+            return;
+          NSMutableArray<MWMCianItemModel *> * items = [@[] mutableCopy];
+          for (auto const & p : places)
+          {
+            auto const & offers = p.m_offers;
+            NSCAssert(!offers.empty(), @"Cian misses offers for place.");
+            if (offers.empty())
+              continue;
+            auto const & firstOffer = offers.front();
+
+            auto pageURL = [NSURL URLWithString:@(firstOffer.m_url.c_str())];
+            if (!pageURL)
+              continue;
+            auto item =
+                [[MWMCianItemModel alloc] initWithRoomsCount:firstOffer.m_roomsCount
+                                                    priceRur:firstOffer.m_priceRur
+                                                     pageURL:pageURL
+                                                     address:@(firstOffer.m_address.c_str())];
+            [items addObject:item];
+          }
+
+          dispatch_async(dispatch_get_main_queue(),
+                         [self, items] { self.cianIsReadyCallback(items); });
+        },
+        [wErrorSelf](int code, uint64_t const requestId) {
+          __strong auto self = wErrorSelf;
+          if (!self || self->m_cianRequestId != requestId)
+            return;
+          dispatch_async(dispatch_get_main_queue(), [self] { self.cianIsReadyCallback(@[]); });
+        });
  });
 }

@ -348,83 +353,84 @@ using namespace place_page;
  if (Platform::ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE)
    return;

-  network_policy::CallPartnersApi([self](platform::NetworkPolicy const & canUseNetwork)
-  {
+  network_policy::CallPartnersApi([self](platform::NetworkPolicy const & canUseNetwork) {
    auto api = GetFramework().GetBookingApi(canUseNetwork);
    if (!api)
      return;

    std::string const hotelId = self.sponsoredId.UTF8String;
-    api->GetHotelInfo(hotelId, [[AppInfo sharedInfo] twoLetterLanguageId].UTF8String,
-                      [hotelId, self](booking::HotelInfo const & hotelInfo)
-    {
-      if (hotelId != hotelInfo.m_hotelId)
-        return;
+    __weak auto wSelf = self;
+    api->GetHotelInfo(
+        hotelId, [[AppInfo sharedInfo] twoLetterLanguageId].UTF8String,
+        [wSelf, hotelId](booking::HotelInfo const & hotelInfo) {
+          __strong auto self = wSelf;
+          if (!self || hotelId != hotelInfo.m_hotelId)
+            return;

-      dispatch_async(dispatch_get_main_queue(), [hotelInfo, self]
-      {
-        m_hotelInfo = hotelInfo;
+          dispatch_async(dispatch_get_main_queue(), [self, hotelInfo] {
+            m_hotelInfo = hotelInfo;

-        auto & sections = self->m_sections;
-        auto const begin = sections.begin();
-        auto const end = sections.end();
+            auto & sections = self->m_sections;
+            auto const begin = sections.begin();
+            auto const end = sections.end();

-        NSUInteger const position = find(begin, end, Sections::Bookmark) != end ? 2 : 1;
-        NSUInteger length = 0;
-        auto it = m_sections.begin() + position;
+            NSUInteger const position = find(begin, end, Sections::Bookmark) != end ? 2 : 1;
+            NSUInteger length = 0;
+            auto it = m_sections.begin() + position;

-        if (!hotelInfo.m_photos.empty())
-        {
-          it = sections.insert(it, Sections::HotelPhotos) + 1;
-          m_hotelPhotosRows.emplace_back(HotelPhotosRow::Regular);
-          length++;
-        }
+            if (!hotelInfo.m_photos.empty())
+            {
+              it = sections.insert(it, Sections::HotelPhotos) + 1;
+              m_hotelPhotosRows.emplace_back(HotelPhotosRow::Regular);
+              length++;
+            }

-        if (!hotelInfo.m_description.empty())
-        {
-          it = sections.insert(it, Sections::HotelDescription) + 1;
-          m_hotelDescriptionRows.emplace_back(HotelDescriptionRow::Regular);
-          m_hotelDescriptionRows.emplace_back(HotelDescriptionRow::ShowMore);
-          length++;
-        }
+            if (!hotelInfo.m_description.empty())
+            {
+              it = sections.insert(it, Sections::HotelDescription) + 1;
+              m_hotelDescriptionRows.emplace_back(HotelDescriptionRow::Regular);
+              m_hotelDescriptionRows.emplace_back(HotelDescriptionRow::ShowMore);
+              length++;
+            }

-        auto const & facilities = hotelInfo.m_facilities;
-        if (!facilities.empty())
-        {
-          it = sections.insert(it, Sections::HotelFacilities) + 1;
-          auto & facilitiesRows = self->m_hotelFacilitiesRows;
-          auto const size = facilities.size();
-          auto constexpr maxNumberOfHotelCellsInPlacePage = 3UL;
+            auto const & facilities = hotelInfo.m_facilities;
+            if (!facilities.empty())
+            {
+              it = sections.insert(it, Sections::HotelFacilities) + 1;
+              auto & facilitiesRows = self->m_hotelFacilitiesRows;
+              auto const size = facilities.size();
+              auto constexpr maxNumberOfHotelCellsInPlacePage = 3UL;

-          if (size > maxNumberOfHotelCellsInPlacePage)
-          {
-            facilitiesRows.insert(facilitiesRows.begin(), maxNumberOfHotelCellsInPlacePage, HotelFacilitiesRow::Regular);
-            facilitiesRows.emplace_back(HotelFacilitiesRow::ShowMore);
-          }
-          else
-          {
-            facilitiesRows.insert(facilitiesRows.begin(), size, HotelFacilitiesRow::Regular);
-          }
+              if (size > maxNumberOfHotelCellsInPlacePage)
+              {
+                facilitiesRows.insert(facilitiesRows.begin(), maxNumberOfHotelCellsInPlacePage,
+                                      HotelFacilitiesRow::Regular);
+                facilitiesRows.emplace_back(HotelFacilitiesRow::ShowMore);
+              }
+              else
+              {
+                facilitiesRows.insert(facilitiesRows.begin(), size, HotelFacilitiesRow::Regular);
+              }

-          length++;
-        }
+              length++;
+            }

-        auto const & reviews = hotelInfo.m_reviews;
-        if (!reviews.empty())
-        {
-          sections.insert(it, Sections::HotelReviews);
-          auto const size = reviews.size();
-          auto & reviewsRows = self->m_hotelReviewsRows;
+            auto const & reviews = hotelInfo.m_reviews;
+            if (!reviews.empty())
+            {
+              sections.insert(it, Sections::HotelReviews);
+              auto const size = reviews.size();
+              auto & reviewsRows = self->m_hotelReviewsRows;

-          reviewsRows.emplace_back(HotelReviewsRow::Header);
-          reviewsRows.insert(reviewsRows.end(), size, HotelReviewsRow::Regular);
-          reviewsRows.emplace_back(HotelReviewsRow::ShowMore);
-          length++;
-        }
+              reviewsRows.emplace_back(HotelReviewsRow::Header);
+              reviewsRows.insert(reviewsRows.end(), size, HotelReviewsRow::Regular);
+              reviewsRows.emplace_back(HotelReviewsRow::ShowMore);
+              length++;
+            }

-        self.sectionsAreReadyCallback({position, length}, self, YES /* It's a section */);
-      });
-    });
+            self.sectionsAreReadyCallback({position, length}, self, YES /* It's a section */);
+          });
+        });
  });
 }

@ -624,7 +630,7 @@ using namespace place_page;
        auto const api = GetFramework().GetBookingApi(canUseNetwork);
        if (api)
          api->GetMinPrice(self.sponsoredId.UTF8String, currency, func);
-  });
+      });
 }

 - (NSNumberFormatter *)currencyFormatter
@ -730,7 +736,10 @@ using namespace place_page;
 - (NSString *)apiURL { return @(m_info.GetApiUrl().c_str()); }
 - (std::vector<Sections> const &)sections { return m_sections; }
 - (std::vector<PreviewRows> const &)previewRows { return m_previewRows; }
- (std::vector<place_page::SpecialProject> const &)specialProjectRows { return m_specialProjectRows; }
+- (std::vector<place_page::SpecialProject> const &)specialProjectRows
+{
+  return m_specialProjectRows;
+}
 - (std::vector<MetainfoRows> const &)metainfoRows { return m_metainfoRows; }
 - (std::vector<MetainfoRows> &)mutableMetainfoRows { return m_metainfoRows; }
 - (std::vector<AdRows> const &)adRows { return m_adRows; }
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@ -264,7 +264,6 @@ void logPointEvent(MWMRoutePoint * pt, NSString * eventType)

 - (void)shouldDestroyLayout { self.layout = nil; }
 - (void)shouldClose { GetFramework().DeactivateMapSelection(true); }
-
 - (BOOL)isExpandedOnShow
 {
  auto data = self.data;
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
@ -414,7 +414,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
    {
      Class cls = [MWMPPViatorCarouselCell class];
      auto c = static_cast<MWMPPViatorCarouselCell *>(
-                                                      [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
+          [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
      [c configWith:data.viatorItems delegate:delegate];
      self.viatorCell = c;
      return c;
@ -423,7 +423,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
    {
      Class cls = [MWMPPCianCarouselCell class];
      auto c = static_cast<MWMPPCianCarouselCell *>(
-                                                      [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
+          [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
      [c configWithDelegate:delegate];
      self.cianCell = c;
      return c;
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm
@ -80,7 +80,8 @@ CGFloat const kMinOffset = 1;
      scrollView.scrollEnabled = YES;
      auto actionBar = self.actionBar;
      actionBar.maxY = actionBar.superview.height;
-      auto const targetOffset = self.state == State::Expanded ? self.expandedContentOffset : self.bottomContentOffset;
+      auto const targetOffset =
+          self.state == State::Expanded ? self.expandedContentOffset : self.bottomContentOffset;
      [scrollView setContentOffset:{ 0, targetOffset } animated:YES];
    });
  });
@ -265,7 +266,7 @@ CGFloat const kMinOffset = 1;
    auto const isDirectionUp = self.direction == ScrollDirection::Up;
    self.state = isDirectionUp ? State::Top : State::Bottom;
    place_page_layout::animate(^{
-      [scrollView setContentOffset:{0, isDirectionUp ? openOffset : self.bottomContentOffset}
+      [scrollView setContentOffset:{ 0, isDirectionUp ? openOffset : self.bottomContentOffset }
                          animated:YES];
    });
  }
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@ -57,6 +57,6 @@ ENABLE_STRICT_OBJC_MSGSEND = YES
 GCC_NO_COMMON_BLOCKS = YES
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 ONLY_ACTIVE_ARCH = YES
-OTHER_SWIFT_FLAGS = -Xfrontend -warn-long-function-bodies=200
+OTHER_SWIFT_FLAGS = -Xfrontend -warn-long-function-bodies=400
 PRODUCT_NAME = $(TARGET_NAME)
 VALID_ARCHS = i386 x86_64 armv7 armv7s arm64