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

[cleanup] [ios] Project structure cleanup.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-12-19 16:44:37 +03:00
parent a9a2a97033
commit 29e65d3ccd
142 changed files with 636 additions and 761 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Bookmarks/BookmarksRootVC.mm
View file

@ -1,6 +1,6 @@
#import "BookmarksRootVC.h"
#import "BookmarksVC.h"
#import "Common.h"
#import "MWMCommon.h"
#import "Statistics.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"

2
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -1,7 +1,7 @@
#import "BookmarksVC.h"
#import "CircleView.h"
#import "ColorPickerView.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMBookmarkNameCell.h"
#import "MWMLocationHelpers.h"
#import "MWMLocationManager.h"

2
iphone/Maps/Categories/UIButton+Orientation.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "UIButton+Orientation.h"
@implementation UIButton (Orientation)

1
iphone/Maps/Categories/UIButton+RuntimeAttributes.mm
View file

@ -1,5 +1,4 @@
#import <objc/runtime.h>
#import "Macros.h"
#import "UIButton+RuntimeAttributes.h"
#import "UIColor+MapsMeColor.h"
#import "UIFont+MapsMeFonts.h"

2
iphone/Maps/Categories/UIFont+MapsMeFonts.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "UIFont+MapsMeFonts.h"
NSString * const kMediumFontName = @"HelveticaNeue-Medium";

2
iphone/Maps/Categories/UIImageView+Coloring.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"

2
iphone/Maps/Categories/UIKitCategories.h
View file

@ -1,5 +1,3 @@
#import "Macros.h"
static inline CGPoint SubtractCGPoint(CGPoint p1, CGPoint p2)
{
return CGPointMake(p1.x - p2.x, p1.y - p2.y);

2
iphone/Maps/Categories/UIKitCategories.mm
View file

@ -1,5 +1,5 @@
#import "UIKitCategories.h"
#import "Common.h"
#import "MWMCommon.h"
#import "UIButton+RuntimeAttributes.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"

2
iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAddPlaceNavigationBar.h"
#include "Framework.h"

2
iphone/Maps/Classes/Components/MWMButton.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMButton.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/Components/MWMDropDown.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMDropDown.h"
namespace

2
iphone/Maps/Classes/Components/MWMMultilineLabel.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMMultilineLabel.h"
@implementation MWMMultilineLabel

2
iphone/Maps/Classes/Components/MWMViewController.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "MWMAlertViewController.h"

2
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -1,5 +1,5 @@
#import "MWMAlertViewController.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMController.h"
#import "MWMDownloadTransitMapAlert.h"
#import "MWMLocationAlert.h"

2
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -1,5 +1,5 @@
#import "MWMAlert.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "MWMDefaultAlert.h"
#import "MWMDownloadTransitMapAlert.h"

2
iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "MWMCircularProgress.h"
#import "MWMDownloaderDialogCell.h"

2
iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMDownloaderDialogHeader.h"
#import "MWMDownloadTransitMapAlert.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMLocationAlert.h"
#import "MWMAlertViewController.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMActivityViewController.h"
#import "MWMAlertViewController.h"
#import "MWMAuthorizationCommon.h"

2
iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm
View file

@ -1,5 +1,5 @@
#import "MWMRoutingDisclaimerAlert.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "Statistics.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm
View file

@ -1,5 +1,5 @@
#import "MWMSearchNoResultsAlert.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearch.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm
View file

@ -1,5 +1,5 @@
#import "MWMToast.h"
#import "Common.h"
#import "MWMCommon.h"
#import "UIColor+MapsMeColor.h"
namespace

2
iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
View file

@ -1,5 +1,5 @@
#import "MWMCircularProgressView.h"
#import "Common.h"
#import "MWMCommon.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"

2
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAuthorizationCommon.h"
#import "UIButton+RuntimeAttributes.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MapsAppDelegate.h"
#import "MWMAlertViewController.h"
#import "MWMAuthorizationCommon.h"

2
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
View file

@ -1,5 +1,5 @@
#import "MWMAuthorizationWebViewLoginViewController.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "MWMAuthorizationCommon.h"
#import "MWMCircularProgress.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAPIBar.h"
#import "MWMAPIBarView.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMBottomMenuCollectionViewCell.h"
#import "UIFont+MapsMeFonts.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
View file

@ -1,5 +1,5 @@
#import "MWMBottomMenuView.h"
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "MWMBottomMenuViewController.h"
#import "MWMButton.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -1,6 +1,6 @@
#import "MWMBottomMenuViewController.h"
#import <Pushwoosh/PushNotificationManager.h>
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "MWMActivityViewController.h"
#import "MWMBottomMenuCollectionViewCell.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapViewControlsManager.h"
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "MWMAPIBar.h"
#import "MWMAddPlaceNavigationBar.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMPlacePageOpeningHoursCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMOpeningHoursCommon.h"
#import "MWMPlacePageOpeningHoursDayView.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager+Layout.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearchManager+Layout.h"
namespace

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
View file

@ -1,5 +1,5 @@
#import "MWMSearchManager.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMConsole.h"
#import "MWMFrameworkListener.h"
#import "MWMLocationManager.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearchManager.h"
#import "MWMSearchTabButtonsView.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm
View file

@ -1,5 +1,5 @@
#import "BookmarksVC.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearchBookmarksCell.h"
#import "UIColor+MapsMeColor.h"
#import "UIFont+MapsMeFonts.h"

1
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/BookmarksTab/MWMSearchBookmarksManager.mm
View file

@ -1,7 +1,6 @@
#import "MWMSearchBookmarksManager.h"
#import "MWMSearchBookmarksCell.h"
#import "MWMSearchNoResults.h"
#import "Macros.h"
#include "Framework.h"

1
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm
View file

@ -1,7 +1,6 @@
#import "MWMSearchCategoriesManager.h"
#import "AppInfo.h"
#import "MWMSearchCategoryCell.h"
#import "Macros.h"
#import "Statistics.h"
#include "search/displayed_categories.hpp"

3
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm
View file

@ -1,6 +1,5 @@
#import "MWMSearchCategoryCell.h"
#import "Common.h"
#import "Macros.h"
#import "MWMCommon.h"
#import "UIColor+MapsMeColor.h"
#import "UIFont+MapsMeFonts.h"
#import "UIImageView+Coloring.h"

3
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm
View file

@ -1,11 +1,10 @@
#import "MWMSearchHistoryManager.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMLocationManager.h"
#import "MWMSearchHistoryClearCell.h"
#import "MWMSearchHistoryMyPositionCell.h"
#import "MWMSearchHistoryRequestCell.h"
#import "MWMSearchNoResults.h"
#import "Macros.h"
#import "MapsAppDelegate.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearchHistoryRequestCell.h"
#import "UIColor+MapsMeColor.h"
#import "UIFont+MapsMeFonts.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
View file

@ -1,5 +1,5 @@
#import "MWMSearchTabbedViewController.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearchCategoriesManager.h"
#import "MWMSearchHistoryManager.h"
#import "MWMSearchTabbedCollectionViewCell.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewLayout.mm
View file

@ -1,5 +1,5 @@
#import "MWMSearchTabbedViewLayout.h"
#import "Common.h"
#import "MWMCommon.h"
@implementation MWMSearchTabbedViewLayout

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCell.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSearchCell.h"
#import "Statistics.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchCommonCell.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMLocationManager.h"
#import "MWMSearchCommonCell.h"
#import "MapsAppDelegate.h"

1
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
View file

@ -4,7 +4,6 @@
#import "MWMSearchCommonCell.h"
#import "MWMSearchSuggestionCell.h"
#import "MWMSearchTableView.h"
#import "Macros.h"
#import "MapsAppDelegate.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
View file

@ -1,5 +1,5 @@
#import "MWMSideButtons.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMButton.h"
#import "MWMMapViewControlsManager.h"
#import "MWMSettings.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm
View file

@ -1,5 +1,5 @@
#import "MWMSideButtonsView.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMBottomMenuViewController.h"
#import "MWMButton.h"
#import "MWMMapViewControlsCommon.h"

2
iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
View file

@ -1,5 +1,5 @@
#import "MWMTrafficButtonViewController.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "MWMButton.h"
#import "MWMMapViewControlsCommon.h"

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
View file

@ -1,5 +1,5 @@
#import "MWMNavigationDashboardEntity.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMLocationManager.h"
#import "MWMSettings.h"
#import "MapsAppDelegate.h"

3
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -1,6 +1,6 @@
#import "MWMNavigationDashboardManager.h"
#import <AudioToolbox/AudioServices.h>
#import "Common.h"
#import "MWMCommon.h"
#import "MWMLocationHelpers.h"
#import "MWMMapViewControlsManager.h"
#import "MWMNavigationInfoView.h"
@ -8,7 +8,6 @@
#import "MWMRouter.h"
#import "MWMTaxiPreviewDataSource.h"
#import "MWMTextToSpeech.h"
#import "Macros.h"
#import "MapViewController.h"
#import "MapsAppDelegate.h"
#import "Statistics.h"

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
View file

@ -1,6 +1,6 @@
#import "MWMNavigationInfoView.h"
#import "AppInfo.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMButton.h"
#import "MWMLocationHelpers.h"
#import "MWMLocationManager.h"

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
View file

@ -1,6 +1,6 @@
#import "MWMTextToSpeech.h"
#import <AVFoundation/AVFoundation.h>
#import "Common.h"
#import "MWMCommon.h"
#import "Statistics.h"
#include "LocaleTranslator.h"

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm
View file

@ -1,5 +1,5 @@
#import "MWMNavigationView.h"
#import "Common.h"
#import "MWMCommon.h"
@interface MWMNavigationView ()

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
View file

@ -1,5 +1,5 @@
#import "MWMRoutePreview.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMCircularProgress.h"
#import "MWMNavigationDashboardManager.h"
#import "MWMRoutePointCell.h"

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
View file

@ -1,5 +1,5 @@
#import "MWMTaxiPreviewDataSource.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMNetworkPolicy.h"
#import "MWMRoutePoint.h"
#import "MWMTaxiPreviewCell.h"

4
iphone/Maps/Classes/EAGLView.mm
View file

@ -1,9 +1,9 @@
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "MapsAppDelegate.h"
#import "MWMDirectionView.h"
#import "../Platform/opengl/iosOGLContextFactory.h"
#import "iosOGLContextFactory.h"
#import "3party/Alohalytics/src/alohalytics_objc.h"

2
iphone/Maps/Classes/Editor/MWMEditorSelectTableViewCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMEditorSelectTableViewCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "UIColor+MapsMeColor.h"
#import "UIImageView+Coloring.h"

2
iphone/Maps/Classes/LocalNotificationManager.mm
View file

@ -1,6 +1,6 @@
#import "LocalNotificationManager.h"
#import "CLLocation+Mercator.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMStorage.h"
#import "MapViewController.h"
#import "MapsAppDelegate.h"

2
iphone/Maps/Classes/MWMActionBarButton.mm
View file

@ -1,5 +1,5 @@
#import "MWMActionBarButton.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMButton.h"
#import "MWMCircularProgress.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/MWMEditBookmarkController.mm
View file

@ -1,5 +1,5 @@
#import "MWMEditBookmarkController.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMBookmarkColorViewController.h"
#import "MWMBookmarkTitleCell.h"
#import "MWMButtonCell.h"

2
iphone/Maps/Classes/MWMOpeningHoursLayoutHelper.mm
View file

@ -1,5 +1,5 @@
#import "MWMOpeningHoursLayoutHelper.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMOpeningHours.h"
#import "MWMPlacePageData.h"
#import "MWMTableViewCell.h"

2
iphone/Maps/Classes/MWMPPPreviewBannerCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMPPPreviewBannerCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MapViewController.h"
#import "MWMPlacePageData.h"
#import "MWMPlacePageLayoutImpl.h"

2
iphone/Maps/Classes/MWMPPPreviewLayoutHelper.mm
View file

@ -1,5 +1,5 @@
#import "MWMPPPreviewLayoutHelper.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMDirectionView.h"
#import "MWMPlacePageData.h"
#import "MWMPPPreviewBannerCell.h"

2
iphone/Maps/Classes/MWMPPView.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMPPView.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/MWMPlacePageActionBar.mm
View file

@ -1,5 +1,5 @@
#import "MWMPlacePageActionBar.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMActionBarButton.h"
#import "MWMPlacePageProtocol.h"
#import "MapViewController.h"

2
iphone/Maps/Classes/MWMPlacePageButtonCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMPlacePageButtonCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMPlacePageProtocol.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/MWMPlacePageInfoCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMPlacePageInfoCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MapViewController.h"
#import "MapsAppDelegate.h"
#import "Statistics.h"

2
iphone/Maps/Classes/MWMSegue.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMSegue.h"
@implementation MWMSegue

2
iphone/Maps/Classes/MWMTextView.mm
View file

@ -1,5 +1,5 @@
#import "MWMTextView.h"
#import "Common.h"
#import "MWMCommon.h"
@interface MWMTextView ()

2
iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMMapDownloaderLargeCountryTableViewCell.h"
@interface MWMMapDownloaderLargeCountryTableViewCell ()

2
iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapDownloaderPlaceTableViewCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "UIFont+MapsMeFonts.h"
#include "Framework.h"

2
iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapDownloaderSubplaceTableViewCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "UIFont+MapsMeFonts.h"
@interface MWMMapDownloaderTableViewCell ()

2
iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapDownloaderTableViewCell.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMCircularProgress.h"
#import "MWMMapDownloaderLargeCountryTableViewCell.h"
#import "NSString+Categories.h"

2
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDataSource.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMMapDownloaderDataSource.h"
#import "MWMMapDownloaderLargeCountryTableViewCell.h"
#import "MWMMapDownloaderPlaceTableViewCell.h"

2
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDefaultDataSource.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMMapDownloaderButtonTableViewCell.h"
#import "MWMMapDownloaderDefaultDataSource.h"
#import "MWMStorage.h"

2
iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "MWMButton.h"
#import "MWMFrameworkListener.h"

2
iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapDownloaderViewController.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMMapDownloaderExtendedDataSourceWithAds.h"
#import "MWMMapDownloaderSearchDataSource.h"
#import "MWMNoMapsViewController.h"

2
iphone/Maps/Classes/MapDownloader/NoMaps/MWMNoMapsView.mm
View file

@ -1,5 +1,5 @@
#import "MWMNoMapsView.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMKeyboard.h"
@interface MWMNoMapsView ()<MWMKeyboardObserver>

4
iphone/Maps/Classes/MapViewController.mm
View file

@ -1,7 +1,7 @@
#import "MapViewController.h"
#import "BookmarksRootVC.h"
#import "BookmarksVC.h"
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "MWMAPIBar.h"
#import "MWMAlertViewController.h"
@ -38,8 +38,6 @@
#include "Framework.h"
#include "../Statistics/Statistics.h"
#include "map/user_mark.hpp"
#include "drape_frontend/user_event_stream.hpp"

2
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -4,7 +4,7 @@
#import <FBSDKCoreKit/FBSDKCoreKit.h>
#import <Pushwoosh/PushNotificationManager.h>
#import "AppInfo.h"
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "LocalNotificationManager.h"
#import "MWMAlertViewController.h"

2
iphone/Maps/Classes/Migration/MWMMigrationView.mm
View file

@ -1,4 +1,4 @@
#import "Common.h"
#import "MWMCommon.h"
#import "MWMMigrationView.h"
#import "UIColor+MapsMeColor.h"

2
iphone/Maps/Classes/Search/Filters/MWMSearchFilterTransitioning.mm
View file

@ -1,5 +1,5 @@
#import "MWMSearchFilterTransitioning.h"
#import "Common.h"
#import "MWMCommon.h"
@implementation MWMSearchFilterTransitioning

1
iphone/Maps/Classes/Share/MWMShareActivityItem.mm
View file

@ -1,5 +1,4 @@
#import "MWMShareActivityItem.h"
#import "Macros.h"
#import "Statistics.h"
#import "3party/Alohalytics/src/alohalytics_objc.h"

2
iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapDownloadDialog.h"
#import "Common.h"
#import "MWMCommon.h"
#import "MWMAlertViewController.h"
#import "MWMCircularProgress.h"
#import "MWMFrameworkListener.h"

2
iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
View file

@ -1,5 +1,5 @@
#import "MWMMapWidgets.h"
#import "Common.h"
#import "MWMCommon.h"
#import "EAGLView.h"
#import "MWMNavigationDashboardManager.h"
#import "MapViewController.h"

0
iphone/Maps/Platform/opengl/iosOGLContext.h → iphone/Maps/Classes/iosOGLContext.h
View file

0
iphone/Maps/Platform/opengl/iosOGLContext.mm → iphone/Maps/Classes/iosOGLContext.mm
View file

3
iphone/Maps/Platform/opengl/iosOGLContextFactory.h → iphone/Maps/Classes/iosOGLContextFactory.h
View file

@ -1,7 +1,8 @@
#pragma once
#import "iosOGLContext.h"
#import "../../../../drape/oglcontextfactory.hpp"
#include "drape/oglcontextfactory.hpp"
#include "std/condition_variable.hpp"
#include "std/mutex.hpp"

0
iphone/Maps/Platform/opengl/iosOGLContextFactory.mm → iphone/Maps/Classes/iosOGLContextFactory.mm
View file

0
iphone/Maps/Statistics/AppInfo.h → iphone/Maps/Common/AppInfo.h
View file

0
iphone/Maps/Statistics/AppInfo.mm → iphone/Maps/Common/AppInfo.mm
View file

19
iphone/Maps/Common/DiskFreeSpace.h
View file

@ -1,19 +0,0 @@
#pragma once
uint64_t FreeDiskSpaceInBytes()
{
NSError * error = nil;
NSArray * paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSDictionary * dictionary = [[NSFileManager defaultManager] attributesOfFileSystemForPath:[paths lastObject] error: &error];
if (dictionary)
{
NSNumber * freeFileSystemSizeInBytes = [dictionary objectForKey: NSFileSystemFreeSize];
return [freeFileSystemSizeInBytes longLongValue];
}
else
{
NSLog(@"Error Obtaining Free File System Info: Domain = %@, Code = %ld", [error domain], (long)[error code]);
return 0;
}
}

0
iphone/Maps/Classes/Keyboard/MWMKeyboard.h → iphone/Maps/Common/Keyboard/MWMKeyboard.h
View file

0
iphone/Maps/Classes/Keyboard/MWMKeyboard.mm → iphone/Maps/Common/Keyboard/MWMKeyboard.mm
View file

0
iphone/Maps/Classes/Keyboard/MWMKeyboardObserver.h → iphone/Maps/Common/Keyboard/MWMKeyboardObserver.h
View file

27
iphone/Maps/Classes/Common.h → iphone/Maps/Common/MWMCommon.h
View file

@ -1,40 +1,13 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
static NSString * const MAPSWITHME_PREMIUM_LOCAL_URL = @"mapswithmepro://";
static NSString * const BOOKMARK_CATEGORY_DELETED_NOTIFICATION =
@"BookmarkCategoryDeletedNotification";
static NSString * const METRICS_CHANGED_NOTIFICATION = @"MetricsChangedNotification";
static NSString * const BOOKMARK_DELETED_NOTIFICATION = @"BookmarkDeletedNotification";
static NSString * const LOCATION_MANAGER_STARTED_NOTIFICATION =
@"LocationManagerStartedNotification";
static NSString * const kDownloadingProgressUpdateNotificationId =
@"DownloadingProgressUpdateNotificationId";
static NSString * const kHaveAppleWatch = @"HaveAppleWatch";
static CGFloat const kDefaultAnimationDuration = .2;
static inline NSString * kApplicationGroupIdentifier()
{
static NSString * const productionGroupIdentifier = @"group.mapsme.watchkit.production";
static NSString * const developerGroupIdentifier = @"group.mapsme.watchkit";
static NSString * const productionAppBundleIdentifier = @"com.mapswithme.full";
static NSString * const productionExtBundleIdentifier = @"com.mapswithme.full.watchkitextension";
NSString * bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
if ([bundleIdentifier isEqualToString:productionAppBundleIdentifier] ||
[bundleIdentifier isEqualToString:productionExtBundleIdentifier])
return productionGroupIdentifier;
return developerGroupIdentifier;
}
static inline BOOL firstVersionIsLessThanSecond(NSString * first, NSString * second)
{
NSArray const * const f = [first componentsSeparatedByString:@"."];

3
iphone/Maps/Common/MWMMacros.h Normal file
View file

@ -0,0 +1,3 @@
#define IPAD (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
#define L(str) NSLocalizedString(str, nil)

0
iphone/Maps/Classes/MWMTypes.h → iphone/Maps/Common/MWMTypes.h
View file

1
iphone/Maps/Common/README.txt
View file

@ -1 +0,0 @@
Contains reusable code snippets for all iOS projects

Some files were not shown because too many files have changed in this diff Show more