[iOS] Booking improvements stats

https://jira.mail.ru/browse/MAPSME-14207
2020-08-04 20:16:15 +03:00 · 2020-08-04 20:16:15 +03:00 · 33a9b3c3b3
commit 33a9b3c3b3
parent bd3af571d9
16 changed files with 144 additions and 10 deletions
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
@ -18,6 +18,7 @@
 - (void)presentLocationServiceNotSupportedAlert;
 - (void)presentLocationNotFoundAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock;
 - (void)presentNoConnectionAlert;
+- (void)presentSearchQuickFilterNoConnectionAlert;
 - (void)presentDeleteMapProhibitedAlert;
 - (void)presentUnsavedEditsAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock;
 - (void)presentNoWiFiAlertWithOkBlock:(nullable MWMVoidBlock)okBlock andCancelBlock:(nullable MWMVoidBlock)cancelBlock;
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
@ -71,6 +71,9 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
 }

 - (void)presentNoConnectionAlert { [self displayAlert:[MWMAlert noConnectionAlert]]; }
+- (void)presentSearchQuickFilterNoConnectionAlert {
+  [self displayAlert:[MWMAlert searchQuickFilterNoConnectionAlert]];
+}
 - (void)presentDeleteMapProhibitedAlert { [self displayAlert:[MWMAlert deleteMapProhibitedAlert]]; }
 - (void)presentUnsavedEditsAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock
 {
@ -273,7 +276,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
  if (!isOwnerLoaded) {
    return;
  }
-  
+
  // TODO(igrechuhin): Remove this check on location manager refactoring.
  // Workaround for current location manager duplicate error alerts.
  if ([alert isKindOfClass:[MWMLocationAlert class]])
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
@ -9,6 +9,7 @@
 + (MWMAlert *)disabledLocationAlert;
 + (MWMAlert *)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock;
 + (MWMAlert *)noConnectionAlert;
+ (MWMAlert *)searchQuickFilterNoConnectionAlert;
 + (MWMAlert *)deleteMapProhibitedAlert;
 + (MWMAlert *)unsavedEditsAlertWithOkBlock:(MWMVoidBlock)okBlock;
 + (MWMAlert *)locationServiceNotSupportedAlert;
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
@ -35,6 +35,13 @@
 }

 + (MWMAlert *)noConnectionAlert { return [MWMDefaultAlert noConnectionAlert]; }
+ (MWMAlert *)searchQuickFilterNoConnectionAlert {
+  return [MWMDefaultAlert searchQuickFilterNoConnectionAlertWithOkBlock:^{
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
+                                       options:@{}
+                             completionHandler:NULL];
+  }];
+}
 + (MWMAlert *)deleteMapProhibitedAlert { return [MWMDefaultAlert deleteMapProhibitedAlert]; }
 + (MWMAlert *)unsavedEditsAlertWithOkBlock:(MWMVoidBlock)okBlock
 {
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
@ -19,6 +19,7 @@
 + (instancetype)disabledLocationAlert;
 + (instancetype)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock;
 + (instancetype)noConnectionAlert;
+ (instancetype)searchQuickFilterNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock;
 + (instancetype)deleteMapProhibitedAlert;
 + (instancetype)unsavedEditsAlertWithOkBlock:(MWMVoidBlock)okBlock;
 + (instancetype)locationServiceNotSupportedAlert;
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
@ -88,6 +88,17 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
  return alert;
 }

+ (instancetype)searchQuickFilterNoConnectionAlertWithOkBlock:(MWMVoidBlock)okBlock {
+  MWMDefaultAlert *alert = [self defaultAlertWithTitle:L(@"choose_dates_online_only_dialog_message")
+                                               message:nil
+                                      rightButtonTitle:L(@"choose_dates_online_only_dialog_cta")
+                                       leftButtonTitle:L(@"cancel")
+                                     rightButtonAction:okBlock
+                                       statisticsEvent:@"No Connection Alert"];
+  [alert setNeedsCloseAlertAfterEnterBackground];
+  return alert;
+}
+
 + (instancetype)deleteMapProhibitedAlert
 {
  MWMDefaultAlert * alert =
--- a/iphone/Maps/Common/Statistics/StatisticsStrings.h
+++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h
@ -477,6 +477,17 @@ static NSString *const kStatSearchRestaurants = @"Search.Restaurants";
 static NSString *const kStatSearchSponsoredSelect = @"Search_SponsoredCategory_selected";
 static NSString *const kStatSearchSponsoredShow = @"Search_SponsoredCategory_shown";
 static NSString *const kStatSearchTabSelected = @"Search_Tab_selected";
+static NSString *const kStatSearchQuickFilterOpen = @"Search_QuickFilter_Open";
+static NSString *const kStatSearchQuickFilterClick = @"Search_QuickFilter_Click";
+static NSString *const kStatSearchQuickFilterApply = @"Search_QuickFilter_Apply";
+static NSString *const kStatSearchQuickFilterError = @"Search_QuickFilter_Click_error";
+static NSString *const kStatSearchContextAreaClick = @"Search_ContextArea_Click";
+static NSString *const kStatSearchRooms = @"rooms";
+static NSString *const kStatSearchAdults = @"adults";
+static NSString *const kStatSearchChildren = @"children";
+static NSString *const kStatSearchInfants = @"infants";
+static NSString *const kStatList = @"list";
+static NSString *const kStatFilter = @"filter";
 static NSString *const kStatSelectMap = @"Select map";
 static NSString *const kStatSelectResult = @"Select result";
 static NSString *const kStatSelectTab = @"Select tab";
--- a/iphone/Maps/Core/Search/MWMSearch.mm
+++ b/iphone/Maps/Core/Search/MWMSearch.mm
@ -273,6 +273,26 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params &&availabi
 + (void)updateHotelFilterWithParams:(MWMHotelParams *)params {
  [MWMSearch manager].filter = params;
  [[MWMSearch manager] update];
+
+  std::string priceCategory = strings::JoinAny(params.price, ',', [](auto const & item) {
+    return std::to_string(static_cast<int>(item));
+  });
+  std::string types = strings::JoinAny(params.types, ',', [](auto const & item) {
+    return std::to_string(static_cast<int>(item));
+  });
+
+  [Statistics logEvent:kStatSearchFilterApply withParameters:@{kStatCategory: kStatHotel,
+                                                               kStatSearchRooms: @(params.numberOfRooms),
+                                                               kStatSearchAdults: @(params.numberOfAdults),
+                                                               kStatSearchChildren: @(params.numberOfChildren),
+                                                               kStatSearchInfants: @(params.numberOfInfants),
+                                                               kStatDate:
+                                                                 @[params.checkInDate ? params.checkInDate : kStatNone,
+                                                                   params.checkOutDate ? params.checkOutDate : kStatNone],
+                                                               kStatRating: @(static_cast<int>(params.rating)),
+                                                               kStatPriceCategory: @(priceCategory.c_str()),
+                                                               kStatTypes: @(types.c_str())
+  }];
 }

 - (void)reset {
--- a/iphone/Maps/UI/Search/DatePickerViewController.swift
+++ b/iphone/Maps/UI/Search/DatePickerViewController.swift
@ -3,6 +3,7 @@ import DatePicker

@objc protocol DatePickerViewControllerDelegate: AnyObject {
  func datePicker(_ datePicker: DatePickerViewController, didSelectStartDate startDate:Date, endDate:Date)
+  func datePickerDidClick(_ datePicker: DatePickerViewController, didSelectStartDate startDate: Date?, endDate: Date?)
  func datePickerDidCancel(_ datePicker: DatePickerViewController)
 }

@ -17,7 +18,7 @@ import DatePicker
  @IBOutlet var cancelButton: UIButton!
  @IBOutlet var datePickerView: DatePickerView!

-  @objc var delegate: DatePickerViewControllerDelegate?
+  @objc weak var delegate: DatePickerViewControllerDelegate?

  lazy var dateFormatter: DateFormatter = {
    let formatter = DateFormatter()
@ -61,6 +62,7 @@ extension DatePickerViewController: DatePickerViewDelegate {
      } else {
        numberOfDaysLabel.text = nil
      }
+      delegate?.datePickerDidClick(self, didSelectStartDate: view.startDate, endDate: view.endDate)
    }
    
    guard let startDate = view.startDate else {
@ -72,7 +74,10 @@ extension DatePickerViewController: DatePickerViewDelegate {

    if date > startDate && view.endDate == nil {
      guard Calendar.current.dateComponents([.day], from: startDate, to: date).day! <= 30 else {
-        MWMAlertViewController.activeAlert().presentDefaultAlert(withTitle: "TODO: can't select more than 30 days", message: nil, rightButtonTitle: L("ok"), leftButtonTitle: nil, rightButtonAction: nil)
+        MWMAlertViewController.activeAlert().presentDefaultAlert(withTitle: L("30_days_limit_dialog"),
+                                                                 message: nil, rightButtonTitle: L("ok"),
+                                                                 leftButtonTitle: nil,
+                                                                 rightButtonAction: nil)
        return
      }
      view.endDate = date
--- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
@ -157,7 +157,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
 - (void)viewWillAppear:(BOOL)animated
 {
  [super viewWillAppear:animated];
-  [Statistics logEvent:kStatSearchFilterOpen withParameters:@{kStatCategory: kStatHotel}];
+  [Statistics logEvent:kStatSearchFilterOpen withParameters:@{kStatCategory: kStatHotel,
+                                                              kStatNetwork: [Statistics connectionTypeString]}];
  [self.tableView reloadData];
  [self refreshAppearance];
  [self setNeedsStatusBarAppearanceUpdate];
@ -200,7 +201,6 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar

 - (IBAction)applyAction
 {
-  [Statistics logEvent:kStatSearchFilterApply withParameters:@{kStatCategory: kStatHotel}];
  [MWMEye bookingFilterUsed];
  [self.delegate hotelsFilterViewController:self didSelectParams:[self getSelectedHotelParams]];
 }
@ -388,8 +388,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
  case ftypes::IsHotelChecker::Type::Resort: typeString = kStatResort; break;
  case ftypes::IsHotelChecker::Type::Count: break;
  }
-  [Statistics logEvent:kStatSearchFilterClick
-        withParameters:@{kStatCategory: kStatHotel, kStatType: typeString}];
+  [Statistics logEvent:kStatSearchFilterClick withParameters:@{kStatCategory: kStatHotel,
+                                                               kStatType: typeString}];
  m_selectedTypes.emplace(type);
 }

--- a/iphone/Maps/UI/Search/GuestsPickerViewController.swift
+++ b/iphone/Maps/UI/Search/GuestsPickerViewController.swift
@ -4,6 +4,11 @@
                    adults: Int,
                    children: Int,
                    infants: Int)
+  func guestPickerDidClick(_ guestsPicker: GuestsPickerViewController,
+                           didSelectRooms rooms: Int,
+                           adults: Int,
+                           children: Int,
+                           infants: Int)
  func guestsPickerDidCancel(_ guestsPicker: GuestsPickerViewController)
 }

@ -56,4 +61,12 @@
  @IBAction func onCancel(_ sender: UIButton) {
    delegate?.guestsPickerDidCancel(self)
  }
+
+  @IBAction func onStepperValueChanged(_ sender: Any) {
+    delegate?.guestPickerDidClick(self,
+                                  didSelectRooms: roomsStepper.value,
+                                  adults: adultsStepper.value,
+                                  children: childrenStepper.value,
+                                  infants: infantsStepper.value)
+  }
 }
--- a/iphone/Maps/UI/Search/GuestsPickerViewController.xib
+++ b/iphone/Maps/UI/Search/GuestsPickerViewController.xib
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
@ -101,6 +101,9 @@
                                        <constraint firstAttribute="height" constant="38" id="AKR-Yw-d97"/>
                                        <constraint firstAttribute="width" constant="100" id="KqJ-Cs-Aug"/>
                                    </constraints>
+                                    <connections>
+                                        <action selector="onStepperValueChanged:" destination="-1" eventType="valueChanged" id="v6h-4b-t3o"/>
+                                    </connections>
                                </view>
                            </subviews>
                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -159,6 +162,9 @@
                                        <constraint firstAttribute="width" constant="100" id="H6l-kr-84N"/>
                                        <constraint firstAttribute="height" constant="38" id="sap-u6-Aam"/>
                                    </constraints>
+                                    <connections>
+                                        <action selector="onStepperValueChanged:" destination="-1" eventType="valueChanged" id="t6F-CW-gcf"/>
+                                    </connections>
                                </view>
                            </subviews>
                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -217,6 +223,9 @@
                                        <constraint firstAttribute="height" constant="38" id="84Q-Ml-uR6"/>
                                        <constraint firstAttribute="width" constant="100" id="QLu-c2-LGX"/>
                                    </constraints>
+                                    <connections>
+                                        <action selector="onStepperValueChanged:" destination="-1" eventType="valueChanged" id="8WU-RP-hOq"/>
+                                    </connections>
                                </view>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="3 - 16 years old" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5sc-U2-ZDP">
                                    <rect key="frame" x="56" y="33.5" width="234" height="19.5"/>
@ -278,6 +287,9 @@
                                        <constraint firstAttribute="width" constant="100" id="1IX-Nt-R6h"/>
                                        <constraint firstAttribute="height" constant="38" id="ycS-ih-Kec"/>
                                    </constraints>
+                                    <connections>
+                                        <action selector="onStepperValueChanged:" destination="-1" eventType="valueChanged" id="1lY-4P-4fL"/>
+                                    </connections>
                                </view>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="0 - 3 years old" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s1L-9S-yeM">
                                    <rect key="frame" x="56" y="33.5" width="234" height="19.5"/>
--- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
@ -1,6 +1,7 @@
 #import "MWMSearch.h"
 #import "MWMSearchManager+Filter.h"
 #import <objc/runtime.h>
+#import "Statistics.h"

@interface MWMSearchManager ()

@ -43,6 +44,7 @@
 - (IBAction)updateTap
 {
  [self showHotelFilterWithParams:[MWMSearch getFilter] onFinishCallback:nil];
+  [Statistics logEvent:kStatSearchContextAreaClick withParameters:@{kStatValue: kStatFilter}];
 }

 - (IBAction)clearFilter
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@ -128,6 +128,15 @@ using Observers = NSHashTable<Observer>;

 - (IBAction)onBookingDateButtonPressed:(id)sender {
  [self.searchTextField resignFirstResponder];
+
+  if (Platform::ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE) {
+    [MWMAlertViewController.activeAlertController presentSearchQuickFilterNoConnectionAlert];
+    [Statistics logEvent:kStatSearchQuickFilterError withParameters:@{kStatCategory: kStatHotel,
+                                                                      kStatError: @"no internet",
+                                                                      kStatFilter: kStatDate}];
+    return;
+  }
+
  DatePickerViewController *controller = [[DatePickerViewController alloc] init];
  controller.delegate = self;
  controller.popoverPresentationController.sourceView = self.searchBarView;
@ -137,6 +146,15 @@ using Observers = NSHashTable<Observer>;

 - (IBAction)onBookingGuestsButtonPressed:(id)sender {
  [self.searchTextField resignFirstResponder];
+
+  if (Platform::ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE) {
+    [MWMAlertViewController.activeAlertController presentSearchQuickFilterNoConnectionAlert];
+    [Statistics logEvent:kStatSearchQuickFilterError withParameters:@{kStatCategory: kStatHotel,
+                                                                      kStatError: @"no internet",
+                                                                      kStatFilter: kStatSearchRooms}];
+    return;
+  }
+
  GuestsPickerViewController *controller = [[GuestsPickerViewController alloc] init];
  controller.delegate = self;
  controller.popoverPresentationController.sourceView = self.searchBarView;
@ -420,6 +438,14 @@ using Observers = NSHashTable<Observer>;
  [[MapViewController sharedController] dismissViewControllerAnimated:YES completion:nil];
 }

+- (void)datePickerDidClick:(DatePickerViewController *)datePicker
+        didSelectStartDate:(NSDate *)startDate
+                   endDate:(NSDate *)endDate {
+  [Statistics logEvent:kStatSearchQuickFilterClick withParameters:@{ kStatCategory: kStatHotel,
+                                                                     kStatDate: @[startDate ? startDate : kStatNone,
+                                                                                  endDate ? endDate : kStatNone]}];
+}
+
 #pragma mark - GuestsPickerViewControllerDelegate

 - (void)guestsPicker:(GuestsPickerViewController *)guestsPicker
@ -440,6 +466,19 @@ using Observers = NSHashTable<Observer>;
  [[MapViewController sharedController] dismissViewControllerAnimated:YES completion:nil];
 }

+- (void)guestPickerDidClick:(GuestsPickerViewController *)guestsPicker
+             didSelectRooms:(NSInteger)rooms
+                     adults:(NSInteger)adults
+                   children:(NSInteger)children
+                    infants:(NSInteger)infants {
+  [Statistics logEvent:kStatSearchQuickFilterClick withParameters:@{kStatCategory: kStatHotel,
+                                                                    kStatSearchRooms: @(rooms),
+                                                                    kStatSearchAdults: @(adults),
+                                                                    kStatSearchChildren: @(children),
+                                                                    kStatSearchInfants: @(infants)
+  }];
+}
+
 - (void)guestsPickerDidCancel:(GuestsPickerViewController *)guestsPicker {
  [[MapViewController sharedController] dismissViewControllerAnimated:YES completion:nil];
 }
@ -450,9 +489,11 @@ using Observers = NSHashTable<Observer>;
  switch (self.state) {
    case MWMSearchManagerStateTableSearch:
      self.state = MWMSearchManagerStateMapSearch;
+      [Statistics logEvent:kStatSearchContextAreaClick withParameters:@{kStatValue: kStatMap}];
      break;
    case MWMSearchManagerStateMapSearch:
      self.state = MWMSearchManagerStateTableSearch;
+      [Statistics logEvent:kStatSearchContextAreaClick withParameters:@{kStatValue: kStatList}];
      break;
    default:
      break;
--- a/iphone/Maps/UI/Search/SearchBar.swift
+++ b/iphone/Maps/UI/Search/SearchBar.swift
@ -35,6 +35,10 @@ final class SearchBar: SolidTouchView {
  @objc var isBookingSearchViewHidden: Bool = true {
    didSet {
      if oldValue != isBookingSearchViewHidden {
+        if isBookingSearchViewHidden {
+          Statistics.logEvent(kStatSearchQuickFilterOpen, withParameters: [kStatCategory: kStatHotel,
+                                                                           kStatNetwork: Statistics.connectionTypeString()])
+        }
        UIView.animate(withDuration: kDefaultAnimationDuration / 2,
                       delay: 0,
                       options: [.beginFromCurrentState],
--- a/iphone/Maps/UI/Search/ValueStepperView.swift
+++ b/iphone/Maps/UI/Search/ValueStepperView.swift
@ -1,4 +1,4 @@
-final class ValueStepperView: UIView {
+final class ValueStepperView: UIControl {
  var minValue = 0 {
    didSet {
      guard minValue <= maxValue else { fatalError() }
@ -74,9 +74,11 @@ final class ValueStepperView: UIView {

  @objc func onMinus(_ sender: UIButton) {
    value -= 1
+    sendActions(for: .valueChanged)
  }

  @objc func onPlus(_ sender: UIButton) {
    value += 1
+    sendActions(for: .valueChanged)
  }
 }