[ios] Moved common inclusions into prefix header.

2015-09-18 18:07:41 +03:00 · 2015-09-18 18:07:41 +03:00 · 87e1c2abce
commit 87e1c2abce
parent 6133ec13ac
76 changed files with 14 additions and 78 deletions
--- a/iphone/Maps/Bookmarks/AddSetVC.mm
+++ b/iphone/Maps/Bookmarks/AddSetVC.mm
@ -1,7 +1,6 @@

 #import "AddSetVC.h"
 #import "Framework.h"
-#import "UIKitCategories.h"
 #import "UIViewController+Navigation.h"

 #define TEXT_FIELD_TAG 666
--- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
@ -1,7 +1,6 @@
 #import "BookmarksRootVC.h"
 #import "BookmarksVC.h"
 #import "Common.h"
-#import "UIKitCategories.h"

 #include "Framework.h"
 #include "platform/platform.hpp"
--- a/iphone/Maps/Bookmarks/BookmarksVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksVC.mm
@ -7,7 +7,6 @@
 #import "MapViewController.h"
 #import "MWMMapViewControlsManager.h"
 #import "Statistics.h"
-#import "UIKitCategories.h"
 #import <MessageUI/MFMailComposeViewController.h>

 #include "Framework.h"
--- a/iphone/Maps/Bookmarks/SelectSetVC.mm
+++ b/iphone/Maps/Bookmarks/SelectSetVC.mm
@ -2,7 +2,6 @@
 #import "SelectSetVC.h"
 #import "Framework.h"
 #import "AddSetVC.h"
-#import "UIKitCategories.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMPlacePageEntity.h"
 #import "UIViewController+Navigation.h"
--- a/iphone/Maps/Categories/UIKitCategories.h
+++ b/iphone/Maps/Categories/UIKitCategories.h
@ -1,5 +1,3 @@
-
-#import <Foundation/Foundation.h>
 #import "Macros.h"

 static inline CGPoint SubtractCGPoint(CGPoint p1, CGPoint p2)
--- a/iphone/Maps/Classes/BadgeView.m
+++ b/iphone/Maps/Classes/BadgeView.m
@ -1,6 +1,5 @@

 #import "BadgeView.h"
-#import "UIKitCategories.h"
 #import "UIFont+MapsMeFonts.h"

@implementation BadgeView
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
@ -1,7 +1,6 @@
 #import "Common.h"
 #import "MWMAlertViewController.h"
 #import "MWMDownloadTransitMapAlert.h"
-#import "UIKitCategories.h"

 static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController";

--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
@ -6,7 +6,6 @@
 #import "MWMPlacePageViewManager.h"
 #import "Statistics.h"
 #import "UIButton+RuntimeAttributes.h"
-#import "UIKitCategories.h"
 #import "UILabel+RuntimeAttributes.h"

 #include "Framework.h"
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
@ -6,7 +6,6 @@
 #import "MWMDownloadTransitMapAlert.h"
 #import "Statistics.h"
 #import "UIColor+MapsMeColor.h"
-#import "UIKitCategories.h"
 #import "UILabel+RuntimeAttributes.h"

@interface MWMDownloaderEntity : NSObject 
--- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
@ -3,7 +3,6 @@
 #import "MWMRateAlert.h"
 #import "Statistics.h"
 #import "UIColor+MapsMeColor.h"
-#import "UIKitCategories.h"
 #import <MessageUI/MFMailComposeViewController.h>
 #import <sys/utsname.h>

--- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm
@ -3,7 +3,6 @@
 #import "MWMRoutingDisclaimerAlert.h"
 #import "UIColor+MapsMeColor.h"
 #import "UIFont+MapsMeFonts.h"
-#import "UIKitCategories.h"
 #import "Statistics.h"

 static CGFloat const kMinimumOffset = 20.;
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.m
@ -1,6 +1,5 @@
 #import "MWMCircularProgress.h"
 #import "MWMCircularProgressView.h"
-#import "UIKitCategories.h"

@interface MWMCircularProgress ()

--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m
@ -1,7 +1,6 @@
 #import "MWMCircularProgress.h"
 #import "MWMCircularProgressView.h"
 #import "UIColor+MapsMeColor.h"
-#import "UIKitCategories.h"

 static CGFloat const kLineWidth = 2.0;
 static NSString * const kAnimationKey = @"CircleAnimation";
--- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm
+++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm
@ -4,7 +4,6 @@
 #import "MWMCircularProgress.h"
 #import "MWMDownloadMapRequest.h"
 #import "MWMDownloadMapRequestView.h"
-#import "UIKitCategories.h"

 #include "Framework.h"
 #include "storage/index.hpp"
--- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.h
+++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.h
@ -1,5 +1,4 @@
 #import "MWMDownloadMapRequest.h"
-#import "UIKitCategories.h"

@interface MWMDownloadMapRequestView : SolidTouchView

--- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.m
+++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequestView.m
@ -1,7 +1,6 @@
 #import "MWMDownloadMapRequestView.h"
 #import "UIButton+RuntimeAttributes.h"
 #import "UIColor+MapsMeColor.h"
-#import "UIKitCategories.h"

@interface MWMDownloadMapRequestView ()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm
@ -1,7 +1,6 @@
 #import "Common.h"
 #import "MWMAPIBar.h"
 #import "MWMAPIBarView.h"
-#import "UIKitCategories.h"

 #include "Framework.h"

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm
@ -1,6 +1,5 @@
 #import "MWMLocationButtonView.h"
 #import "MWMMapViewControlsCommon.h"
-#import "UIKitCategories.h"

@interface MWMLocationButtonView()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadView.mm
@ -1,6 +1,5 @@
 #import "Common.h"
 #import "MWMSearchDownloadView.h"
-#import "UIKitCategories.h"

@interface MWMSearchDownloadView ()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.h
@ -1,4 +1,3 @@
-#import "UIKitCategories.h"

@class MWMSearchTabButtonsView;

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm
@ -1,7 +1,6 @@
 #import "Common.h"
 #import "MWMSearchTabButtonsView.h"
 #import "MWMSearchView.h"
-#import "UIKitCategories.h"

 static CGFloat const kWidthForiPad = 320.0;

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm
@ -1,7 +1,6 @@
 #import "MWMSearchManager.h"
 #import "MWMSearchTabButtonsView.h"
 #import "UIColor+MapsMeColor.h"
-#import "UIKitCategories.h"

 static CGFloat const kIconToLabelSpacing = 4.0;

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm
@ -1,5 +1,4 @@
 #import "MWMSearchTabbedCollectionViewCell.h"
-#import "UIKitCategories.h"

@interface MWMSearchTabbedCollectionViewCell ()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
@ -4,7 +4,6 @@
 #import "MWMSearchTabbedViewController.h"
 #import "MWMSearchTabbedViewLayout.h"
 #import "MWMSearchTabbedViewProtocol.h"
-#import "UIKitCategories.h"

 #include "Framework.h"

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm
@ -4,7 +4,6 @@
 #import "MWMSearchCommonCell.h"
 #import "UIColor+MapsMeColor.h"
 #import "UIFont+MapsMeFonts.h"
-#import "UIKitCategories.h"

 #include "indexer/mercator.hpp"
 #include "platform/measurement_utils.hpp"
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableView.mm
@ -1,5 +1,4 @@
 #import "MWMSearchTableView.h"
-#import "UIKitCategories.h"

@interface MWMSearchTableView ()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
@ -7,7 +7,6 @@
 #import "MWMSearchTableView.h"
 #import "MWMSearchTableViewController.h"
 #import "ToastView.h"
-#import "UIKitCategories.h"

 #include "std/vector.hpp"

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.mm
@ -1,6 +1,5 @@
 #import "MWMMapViewControlsCommon.h"
 #import "MWMSideMenuButton.h"
-#import "UIKitCategories.h"

@interface MWMSideMenuButton()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuDownloadBadge.m
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuDownloadBadge.m
@ -1,6 +1,5 @@
 #import "MWMMapViewControlsCommon.h"
 #import "MWMSideMenuDownloadBadge.h"
-#import "UIKitCategories.h"

@interface MWMSideMenuDownloadBadge ()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h
@ -1,7 +1,5 @@
 #import "MWMSideMenuDelegate.h"
 #import "MWMSideMenuDownloadBadge.h"
-#import "UIKitCategories.h"
-#import <UIKit/UIKit.h>

@interface MWMSideMenuView : SolidTouchView <MWMSideMenuDownloadBadgeOwner>

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm
@ -1,7 +1,6 @@
 #import "MWMMapViewControlsCommon.h"
 #import "MWMSideMenuDownloadBadge.h"
 #import "MWMSideMenuView.h"
-#import "UIKitCategories.h"

@interface MWMSideMenuView()

--- a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m
@ -1,6 +1,5 @@
 #import "MWMZoomButtonsView.h"
 #import "MWMMapViewControlsCommon.h"
-#import "UIKitCategories.h"

 static CGFloat const kZoomViewOffsetToTopBound = 12.0;
 static CGFloat const kZoomViewOffsetToBottomBound = 40.0;
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@ -9,7 +9,6 @@
 #import "MWMRouteHelperPanelsDrawer.h"
 #import "MWMRoutePreview.h"
 #import "MWMTextToSpeech.h"
-#import "UIKitCategories.h"

@interface MWMNavigationDashboardManager ()

--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/Dashboard/MWMNavigationDashboard.mm
@ -2,7 +2,6 @@
 #import "MWMNavigationDashboard.h"
 #import "MWMNavigationDashboardEntity.h"
 #import "TimeUtils.h"
-#import "UIKitCategories.h"
 #import "UIColor+MapsMeColor.h"

@interface MWMImageView : UIImageView
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMLanesPanel.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMLanesPanel.mm
@ -1,5 +1,4 @@
 #import "MWMLanesPanel.h"
-#import "UIKitCategories.h"
 #import "UIColor+MapsMeColor.h"

 static CGFloat const kOffset = 16.;
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm
@ -1,6 +1,5 @@
 #import "Common.h"
 #import "MWMNavigationView.h"
-#import "UIKitCategories.h"

 static CGFloat const kStatusbarHeight = 20.0;

--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNextTurnPanel.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNextTurnPanel.mm
@ -1,5 +1,4 @@
 #import "MWMNextTurnPanel.h"
-#import "UIKitCategories.h"

@interface MWMNextTurnPanel ()

--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanel.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanel.mm
@ -1,6 +1,5 @@
 #import "Common.h"
 #import "MWMRouteHelperPanel.h"
-#import "UIKitCategories.h"

 static CGFloat const kHeight = 40.;

--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanelsDrawer.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMRouteHelperPanelsDrawer.mm
@ -1,7 +1,6 @@
 #import "MWMLanesPanel.h"
 #import "MWMNextTurnPanel.h"
 #import "MWMRouteHelperPanelsDrawer.h"
-#import "UIKitCategories.h"
 #import "UIColor+MapsMeColor.h"

 static CGFloat const kOffsetBetweenPanels = 8.;
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
@ -4,7 +4,6 @@
 #import "MWMRoutePreview.h"
 #import "TimeUtils.h"
 #import "UIColor+MapsMeColor.h"
-#import "UIKitCategories.h"

@interface MWMRoutePreview () <MWMCircularProgressDelegate>

--- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m
+++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequest.m
@ -1,7 +1,6 @@
 #import "MWMDownloadMapRequest.h"
 #import "MWMSearchDownloadMapRequest.h"
 #import "MWMSearchDownloadMapRequestView.h"
-#import "UIKitCategories.h"

@interface MWMSearchDownloadMapRequest () <MWMDownloadMapRequestDelegate>

--- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.h
+++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.h
@ -1,4 +1,3 @@
-#import "UIKitCategories.h"

 NS_ENUM(NSUInteger, MWMSearchDownloadMapRequestViewState)
 {
--- a/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.mm
+++ b/iphone/Maps/Classes/CustomViews/SearchDownloadMapRequest/MWMSearchDownloadMapRequestView.mm
@ -1,7 +1,6 @@
 #import "Common.h"
 #import "MWMSearchDownloadMapRequest.h"
 #import "MWMSearchDownloadMapRequestView.h"
-#import "UIKitCategories.h"

@interface MWMSearchDownloadMapRequestView ()

--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@ -3,8 +3,6 @@
 #import "Common.h"
 #import "EAGLView.h"

-#import "../Categories/UIKitCategories.h"
-
 #include "Framework.h"

 #ifndef USE_DRAPE
--- a/iphone/Maps/Classes/LocalNotificationManager.mm
+++ b/iphone/Maps/Classes/LocalNotificationManager.mm
@ -6,7 +6,6 @@
 #import "MapViewController.h"
 #import "Statistics.h"
 #import "TimeUtils.h"
-#import "UIKitCategories.h"

 #import "3party/Alohalytics/src/alohalytics_objc.h"

--- a/iphone/Maps/Classes/MWMBasePlacePageView.mm
+++ b/iphone/Maps/Classes/MWMBasePlacePageView.mm
@ -1,5 +1,4 @@
 #import "MWMBasePlacePageView.h"
-#import "UIKitCategories.h"
 #import "MWMPlacePageInfoCell.h"
 #import "MWMPlacePageBookmarkCell.h"
 #import "MWMPlacePageEntity.h"
--- a/iphone/Maps/Classes/MWMBookmarkColorCell.mm
+++ b/iphone/Maps/Classes/MWMBookmarkColorCell.mm
@ -1,5 +1,4 @@
 #import "MWMBookmarkColorCell.h"
-#import "UIKitCategories.h"

 extern NSArray * const kBookmarkColorsVariant;

--- a/iphone/Maps/Classes/MWMBookmarkColorViewController.mm
+++ b/iphone/Maps/Classes/MWMBookmarkColorViewController.mm
@ -1,5 +1,4 @@
 #import "MWMBookmarkColorViewController.h"
-#import "UIKitCategories.h"
 #import "MWMBookmarkColorCell.h"
 #import "MWMPlacePageEntity.h"
 #import "MWMPlacePageViewManager.h"
--- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
+++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
@ -3,7 +3,6 @@
 #import "MWMPlacePageViewManager.h"
 #import "MWMPlacePage.h"
 #import "MWMPlacePageEntity.h"
-#import "UIKitCategories.h"
 #import "UIViewController+Navigation.h"

 static NSString * const kBookmarkDescriptionViewControllerNibName = @"MWMBookmarkDescriptionViewController";
--- a/iphone/Maps/Classes/MWMDirectionView.mm
+++ b/iphone/Maps/Classes/MWMDirectionView.mm
@ -1,7 +1,6 @@
 #import "MWMDirectionView.h"
 #import "MWMPlacePageViewManager.h"
 #import "UIFont+MapsMeFonts.h"
-#import "UIKitCategories.h"

 static NSString * const kDirectionViewNibName = @"MWMDirectionView";
 static CGFloat const kDirectionArrowSide = IPAD ? 260. : 160.;
--- a/iphone/Maps/Classes/MWMPlacePage.mm
+++ b/iphone/Maps/Classes/MWMPlacePage.mm
@ -6,7 +6,6 @@
 #import "MWMDirectionView.h"
 #import "MWMBookmarkColorViewController.h"
 #import "SelectSetVC.h"
-#import "UIKitCategories.h"
 #import "MWMBookmarkDescriptionViewController.h"

 #import "../../3party/Alohalytics/src/alohalytics_objc.h"
--- a/iphone/Maps/Classes/MWMPlacePageActionBar.mm
+++ b/iphone/Maps/Classes/MWMPlacePageActionBar.mm
@ -4,7 +4,6 @@
 #import "MWMPlacePageActionBar.h"
 #import "MWMPlacePageEntity.h"
 #import "MWMPlacePageViewManager.h"
-#import "UIKitCategories.h"

 #include "Framework.h"

--- a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
@ -1,6 +1,5 @@
 #import "MWMPlacePageBookmarkCell.h"
 #import "MWMPlacePageEntity.h"
-#import "UIKitCategories.h"
 #import "MWMPlacePage.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMBasePlacePageView.h"
--- a/iphone/Maps/Classes/MWMPlacePageEntity.mm
+++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm
@ -1,8 +1,6 @@
 #import "MWMPlacePageEntity.h"
-#import "UIKitCategories.h"
 #import "MWMPlacePageViewManager.h"
 #import "MapViewController.h"
-#import "UIKitCategories.h"
 #include "platform/measurement_utils.hpp"

 extern NSArray * const kBookmarkColorsVariant = @[@"placemark-red", @"placemark-yellow", @"placemark-blue", @"placemark-green", @"placemark-purple", @"placemark-orange", @"placemark-brown", @"placemark-pink"];
--- a/iphone/Maps/Classes/MWMPlacePageInfoCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageInfoCell.mm
@ -1,7 +1,6 @@
 #import "MWMPlacePageEntity.h"
 #import "MWMPlacePageInfoCell.h"
 #import "UIFont+MapsMeFonts.h"
-#import "UIKitCategories.h"

 #include "platform/settings.hpp"
 #include "platform/measurement_utils.hpp"
--- a/iphone/Maps/Classes/MWMPlacePageNavigationBar.mm
+++ b/iphone/Maps/Classes/MWMPlacePageNavigationBar.mm
@ -3,7 +3,6 @@
 #import "MWMiPhonePortraitPlacePage.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMBasePlacePageView.h"
-#import "UIKitCategories.h"
 #import "MWMPlacePageEntity.h"
 #import <objc/runtime.h>

--- a/iphone/Maps/Classes/MWMPlacePageTypeDescription.mm
+++ b/iphone/Maps/Classes/MWMPlacePageTypeDescription.mm
@ -1,5 +1,4 @@
 #import "MWMPlacePageTypeDescription.h"
-#import "UIKitCategories.h"

 static NSString * const kPlacePageDescriptionViewNibName = @"MWMPlacePageDescriptionView";

--- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm
+++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
@ -14,7 +14,6 @@
 #import "MWMPlacePageNavigationBar.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMPlacePageViewManagerDelegate.h"
-#import "UIKitCategories.h"

 #include "Framework.h"

--- a/iphone/Maps/Classes/MWMSpringAnimation.mm
+++ b/iphone/Maps/Classes/MWMSpringAnimation.mm
@ -1,5 +1,4 @@
 #import "MWMSpringAnimation.h"
-#import "UIKitCategories.h"

@interface MWMSpringAnimation ()

--- a/iphone/Maps/Classes/MWMiPadPlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm
@ -2,7 +2,6 @@
 #import "MWMiPadPlacePage.h"
 #import "MWMPlacePageViewManager.h"
 #import "MWMPlacePageActionBar.h"
-#import "UIKitCategories.h"
 #import "MWMBasePlacePageView.h"
 #import "MWMBookmarkColorViewController.h"
 #import "SelectSetVC.h"
--- a/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm
@ -3,7 +3,6 @@
 #import "MWMBasePlacePageView.h"
 #import "MWMPlacePageActionBar.h"
 #import "MWMPlacePageViewManager.h"
-#import "UIKitCategories.h"
 #import "MWMSpringAnimation.h"
 #import "MWMPlacePage+Animation.h"

--- a/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm
+++ b/iphone/Maps/Classes/MWMiPhonePortraitPlacePage.mm
@ -1,7 +1,6 @@
 #import "Common.h"
 #import "MWMiPhonePortraitPlacePage.h"
 #import "MWMSpringAnimation.h"
-#import "UIKitCategories.h"
 #import "MWMPlacePageActionBar.h"
 #import "MWMPlacePageNavigationBar.h"
 #import "MWMPlacePageViewManager.h"
--- a/iphone/Maps/Classes/MapCell.mm
+++ b/iphone/Maps/Classes/MapCell.mm
@ -1,6 +1,5 @@
 #import "Common.h"
 #import "MapCell.h"
-#import "UIKitCategories.h"
 #import "UIColor+MapsMeColor.h"
 #import "UIFont+MapsMeFonts.h"

--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@ -7,7 +7,6 @@
 #import "MWMMapViewControlsManager.h"
 #import "RouteState.h"
 #import "UIFont+MapsMeFonts.h"
-#import "UIKitCategories.h"
 #import "UIViewController+Navigation.h"

 #import "3party/Alohalytics/src/alohalytics_objc.h"
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@ -9,7 +9,6 @@
 #import "Preferences.h"
 #import "RouteState.h"
 #import "Statistics.h"
-#import "UIKitCategories.h"
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <Parse/Parse.h>
 #import <ParseFacebookUtilsV4/PFFacebookUtils.h>
--- a/iphone/Maps/Classes/ProgressView.m
+++ b/iphone/Maps/Classes/ProgressView.m
@ -1,6 +1,5 @@

 #import "ProgressView.h"
-#import "UIKitCategories.h"

@interface ProgressView ()

--- a/iphone/Maps/Classes/ToastView.m
+++ b/iphone/Maps/Classes/ToastView.m
@ -1,6 +1,5 @@

 #import "ToastView.h"
-#import "UIKitCategories.h"

@interface ToastView ()

--- a/iphone/Maps/Classes/UIViewController+Navigation.mm
+++ b/iphone/Maps/Classes/UIViewController+Navigation.mm
@ -1,5 +1,4 @@
 #import "Common.h"
-#import "UIKitCategories.h"
 #import "UIViewController+Navigation.h"

@implementation UIViewController (Navigation)
--- a/iphone/Maps/CommunityVC.m
+++ b/iphone/Maps/CommunityVC.m
@ -1,7 +1,6 @@

 #import "CommunityVC.h"
 #import "UIViewController+Navigation.h"
-#import "UIKitCategories.h"
 #import <MessageUI/MFMailComposeViewController.h>
 #import "../../3party/Alohalytics/src/alohalytics_objc.h"

--- a/iphone/Maps/DownloaderParentVC.h
+++ b/iphone/Maps/DownloaderParentVC.h
@ -2,7 +2,6 @@
 #import <UIKit/UIKit.h>
 #import "MapsObservers.h"
 #import "MapCell.h"
-#import "UIKitCategories.h"
 #import "ViewController.h"

 #include "storage/storage_defines.hpp"
--- a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
@ -19,6 +19,17 @@
                  </ActionContent>
               </BreakpointActionProxy>
            </Actions>
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "objc_exception_throw"
+                  moduleName = "libobjc.A.dylib"
+                  usesParentBreakpointCondition = "Yes"
+                  offsetFromSymbolStart = "0">
+               </Location>
+            </Locations>
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
--- a/iphone/Maps/Maps_Prefix.pch
+++ b/iphone/Maps/Maps_Prefix.pch
@ -6,4 +6,7 @@
    #import <Foundation/Foundation.h>
    #import <UIKit/UIKit.h>
    #import <CoreLocation/CoreLocation.h>
+    #import <CoreGraphics/CoreGraphics.h>
+
+    #import "UIKitCategories.h"
 #endif
--- a/iphone/Maps/Settings/SettingsViewController.mm
+++ b/iphone/Maps/Settings/SettingsViewController.mm
@ -4,7 +4,6 @@
 #import "SelectableCell.h"
 #import "LinkCell.h"
 #import "WebViewController.h"
-#import "UIKitCategories.h"
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
 #import "Framework.h"
--- a/iphone/Maps/SettingsAndMoreVC.mm
+++ b/iphone/Maps/SettingsAndMoreVC.mm
@ -1,6 +1,5 @@

 #import "SettingsAndMoreVC.h"
-#import "UIKitCategories.h"
 #import <MessageUI/MFMailComposeViewController.h>
 #import <sys/utsname.h>
 #import "SettingsViewController.h"
--- a/iphone/Maps/UIButton+RuntimeAttributes.m
+++ b/iphone/Maps/UIButton+RuntimeAttributes.m
@ -2,7 +2,6 @@
 #import "UIButton+RuntimeAttributes.h"
 #import "UIColor+MapsMeColor.h"
 #import "UIFont+MapsMeFonts.h"
-#import "UIKitCategories.h"

@implementation UIButton (RuntimeAttributes)

--- a/iphone/Maps/UILabel+RuntimeAttributes.mm
+++ b/iphone/Maps/UILabel+RuntimeAttributes.mm
@ -1,5 +1,4 @@
 #import "UILabel+RuntimeAttributes.h"
-#import "UIKitCategories.h"
 #import "UIFont+MapsMeFonts.h"
 #import "UIColor+MapsMeColor.h"