diff --git a/iphone/Common/RichTextVC.h b/iphone/Common/RichTextVC.h index 8ec7ed0d3f..4ee5048dae 100644 --- a/iphone/Common/RichTextVC.h +++ b/iphone/Common/RichTextVC.h @@ -1,7 +1,8 @@ #import +#import "ViewController.h" -@interface RichTextVC : UIViewController +@interface RichTextVC : ViewController - (instancetype)initWithText:(NSString *)text; diff --git a/iphone/Common/WebViewController.h b/iphone/Common/WebViewController.h index 36ead9e8df..f24f76f0fd 100644 --- a/iphone/Common/WebViewController.h +++ b/iphone/Common/WebViewController.h @@ -1,6 +1,7 @@ #import +#import "ViewController.h" -@interface WebViewController : UIViewController +@interface WebViewController : ViewController @property (nonatomic) NSURL * m_url; @property (nonatomic) NSString * m_htmlText; diff --git a/iphone/Maps/Bookmarks/AddSetVC.h b/iphone/Maps/Bookmarks/AddSetVC.h index 9ce16173d9..658c64ebcf 100644 --- a/iphone/Maps/Bookmarks/AddSetVC.h +++ b/iphone/Maps/Bookmarks/AddSetVC.h @@ -1,4 +1,5 @@ #import +#import "TableViewController.h" @class AddSetVC; @protocol AddSetVCDelegate @@ -7,7 +8,7 @@ @end -@interface AddSetVC : UITableViewController +@interface AddSetVC : TableViewController @property (nonatomic, weak) id delegate; diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.h b/iphone/Maps/Bookmarks/BookmarksRootVC.h index df7bae8a19..5e78707923 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.h +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.h @@ -1,6 +1,7 @@ #import +#import "TableViewController.h" -@interface BookmarksRootVC : UITableViewController +@interface BookmarksRootVC : TableViewController { /// Description for the user: how to create/import bookmarks. /// We store it here to correctly calculate dynamic table footer height depending on the text formatting. diff --git a/iphone/Maps/Bookmarks/BookmarksVC.h b/iphone/Maps/Bookmarks/BookmarksVC.h index ce1445ba0e..5fba73bb9d 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.h +++ b/iphone/Maps/Bookmarks/BookmarksVC.h @@ -1,7 +1,8 @@ #import +#import "TableViewController.h" #import "LocationManager.h" -@interface BookmarksVC : UITableViewController +@interface BookmarksVC : TableViewController { LocationManager * m_locationManager; size_t m_categoryIndex; diff --git a/iphone/Maps/Bookmarks/SelectSetVC.h b/iphone/Maps/Bookmarks/SelectSetVC.h index 4bedcd9c38..e361dc374f 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.h +++ b/iphone/Maps/Bookmarks/SelectSetVC.h @@ -1,5 +1,6 @@ #import +#import "TableViewController.h" #include "../../map/bookmark.hpp" @class SelectSetVC; @@ -9,7 +10,7 @@ @end -@interface SelectSetVC : UITableViewController +@interface SelectSetVC : TableViewController - (id)initWithBookmarkAndCategory:(BookmarkAndCategory const &)bookmarkAndCategory; diff --git a/iphone/Maps/Classes/BookmarkDescriptionVC.h b/iphone/Maps/Classes/BookmarkDescriptionVC.h index 81b50f9990..f3c2785435 100644 --- a/iphone/Maps/Classes/BookmarkDescriptionVC.h +++ b/iphone/Maps/Classes/BookmarkDescriptionVC.h @@ -1,5 +1,6 @@ #import +#import "TableViewController.h" #include "../../map/bookmark.hpp" @class BookmarkDescriptionVC; @@ -9,7 +10,7 @@ @end -@interface BookmarkDescriptionVC : UITableViewController +@interface BookmarkDescriptionVC : TableViewController @property (nonatomic, weak) id delegate; @property (nonatomic) BookmarkAndCategory bookmarkAndCategory; diff --git a/iphone/Maps/Classes/BookmarkNameVC.h b/iphone/Maps/Classes/BookmarkNameVC.h index 69eff1e494..81f67edf0a 100644 --- a/iphone/Maps/Classes/BookmarkNameVC.h +++ b/iphone/Maps/Classes/BookmarkNameVC.h @@ -1,5 +1,6 @@ #import +#import "TableViewController.h" #include "../../map/bookmark.hpp" @class BookmarkNameVC; @@ -9,7 +10,7 @@ @end -@interface BookmarkNameVC : UITableViewController +@interface BookmarkNameVC : TableViewController @property (nonatomic) BookmarkAndCategory bookmarkAndCategory; @property (nonatomic) NSString * temporaryName; diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index e81a9362cf..de8f4cb0d4 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -1,5 +1,6 @@ #import +#import "ViewController.h" #import "LocationManager.h" #import "LocationButton.h" #import "BottomMenu.h" @@ -12,7 +13,7 @@ namespace search { struct AddressInfo; } -@interface MapViewController : UIViewController +@interface MapViewController : ViewController { enum Action { diff --git a/iphone/Maps/Classes/MoreAppsVC.h b/iphone/Maps/Classes/MoreAppsVC.h index 4ddefd67ff..23252a1f79 100644 --- a/iphone/Maps/Classes/MoreAppsVC.h +++ b/iphone/Maps/Classes/MoreAppsVC.h @@ -1,6 +1,7 @@ #import +#import "ViewController.h" -@interface MoreAppsVC : UIViewController +@interface MoreAppsVC : ViewController @end diff --git a/iphone/Maps/CommunityVC.h b/iphone/Maps/CommunityVC.h index 648af6a129..29a7df1f9b 100644 --- a/iphone/Maps/CommunityVC.h +++ b/iphone/Maps/CommunityVC.h @@ -1,6 +1,7 @@ #import +#import "TableViewController.h" -@interface CommunityVC : UITableViewController +@interface CommunityVC : TableViewController @end diff --git a/iphone/Maps/DownloaderParentVC.h b/iphone/Maps/DownloaderParentVC.h index d31caedb3b..94e653fef2 100644 --- a/iphone/Maps/DownloaderParentVC.h +++ b/iphone/Maps/DownloaderParentVC.h @@ -3,6 +3,7 @@ #import "MapsObservers.h" #import "MapCell.h" #import "UIKitCategories.h" +#import "ViewController.h" #include "../../storage/storage_defines.hpp" @@ -23,7 +24,7 @@ typedef NS_ENUM(NSUInteger, DownloaderAction) using namespace storage; -@interface DownloaderParentVC : UIViewController +@interface DownloaderParentVC : ViewController - (NSString *)formattedMapSize:(size_t)size; - (void)openGuideWithInfo:(guides::GuideInfo const &)info; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 89f459670e..6fc897cbb1 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -203,6 +203,10 @@ B0DFE6311A1B78A200B6C35E /* LocalNotifications-Pro.plist in Resources */ = {isa = PBXBuildFile; fileRef = B0DFE62F1A1B78A200B6C35E /* LocalNotifications-Pro.plist */; }; B0E1FCDC1A23399E00A8E08B /* RouteOverallInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = B0E1FCDB1A23399E00A8E08B /* RouteOverallInfoView.m */; }; B0E1FCDF1A2343BC00A8E08B /* NextTurnPhoneView.m in Sources */ = {isa = PBXBuildFile; fileRef = B0E1FCDE1A2343BC00A8E08B /* NextTurnPhoneView.m */; }; + B0FBFA271A515AFD0086819E /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA261A515AFD0086819E /* ViewController.m */; }; + B0FBFA281A515AFD0086819E /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA261A515AFD0086819E /* ViewController.m */; }; + B0FBFA2B1A515B4C0086819E /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA2A1A515B4C0086819E /* TableViewController.m */; }; + B0FBFA2C1A515B4C0086819E /* TableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B0FBFA2A1A515B4C0086819E /* TableViewController.m */; }; CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; }; CB252D7016FF82C9001E41E9 /* Statistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.mm */; }; ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; @@ -1537,6 +1541,10 @@ B0E1FCDB1A23399E00A8E08B /* RouteOverallInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RouteOverallInfoView.m; sourceTree = ""; }; B0E1FCDD1A2343BC00A8E08B /* NextTurnPhoneView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NextTurnPhoneView.h; sourceTree = ""; }; B0E1FCDE1A2343BC00A8E08B /* NextTurnPhoneView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NextTurnPhoneView.m; sourceTree = ""; }; + B0FBFA251A515AFD0086819E /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewController.h; path = ../ViewController.h; sourceTree = ""; }; + B0FBFA261A515AFD0086819E /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ViewController.m; path = ../ViewController.m; sourceTree = ""; }; + B0FBFA291A515B4C0086819E /* TableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableViewController.h; path = ../TableViewController.h; sourceTree = ""; }; + B0FBFA2A1A515B4C0086819E /* TableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableViewController.m; path = ../TableViewController.m; sourceTree = ""; }; CB252D6B16FF82C8001E41E9 /* Statistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Statistics.h; sourceTree = ""; }; CB252D6C16FF82C8001E41E9 /* Statistics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Statistics.mm; sourceTree = ""; }; ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = ""; }; @@ -2280,6 +2288,10 @@ B08AA8CD1A24C7BC00810B1C /* LocalNotificationInfoProvider.m */, B0DFE62F1A1B78A200B6C35E /* LocalNotifications-Pro.plist */, B0DFE62D1A1B75DB00B6C35E /* LocalNotifications-Lite.plist */, + B0FBFA251A515AFD0086819E /* ViewController.h */, + B0FBFA261A515AFD0086819E /* ViewController.m */, + B0FBFA291A515B4C0086819E /* TableViewController.h */, + B0FBFA2A1A515B4C0086819E /* TableViewController.m */, 978F9251183BD530000D6C7C /* NavigationController.h */, 978F9252183BD530000D6C7C /* NavigationController.mm */, EE7F297C1219ECA300EB67A9 /* RenderBuffer.hpp */, @@ -4653,6 +4665,7 @@ FAA614B8155F16950031C345 /* AddSetVC.mm in Sources */, 977E26C619E31BDF00BA2219 /* DownloaderParentVC.mm in Sources */, FAAEA7D5161D8D3100CCD661 /* BookmarksRootVC.mm in Sources */, + B0FBFA2B1A515B4C0086819E /* TableViewController.m in Sources */, F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */, 9789DB56188D5E2A007C6FAE /* InAppMessagesManager.mm in Sources */, 9778E99D191A5B6600AD850A /* BookmarkDescriptionVC.mm in Sources */, @@ -4669,6 +4682,7 @@ 97F61794183E7445009919E2 /* LinkCell.m in Sources */, 976D86EC19C8697700C920EF /* ProgressView.m in Sources */, 97D092B1190A681F00FF645B /* PlacePageInfoCell.mm in Sources */, + B0FBFA271A515AFD0086819E /* ViewController.m in Sources */, 97A8001018B21395000C07A2 /* SearchBar.mm in Sources */, EDC5C543175F2CA600420E92 /* ShareActionSheet.mm in Sources */, 9778E9A1191A663700AD850A /* BookmarkNameVC.mm in Sources */, @@ -4687,6 +4701,7 @@ 978D4A2A1996C17300D72CA7 /* RichTextVC.m in Sources */, FAFB08EA151215EE0041901D /* MapsAppDelegate.mm in Sources */, 97908B31196591FB003DD7C6 /* SearchShowOnMapCell.m in Sources */, + B0FBFA281A515AFD0086819E /* ViewController.m in Sources */, 976D86F219C877E600C920EF /* MapCell.mm in Sources */, 977E26C319E31BCC00BA2219 /* ActiveMapsVC.mm in Sources */, FAFB08EB151215EE0041901D /* EAGLView.mm in Sources */, @@ -4712,6 +4727,7 @@ B08AA8D71A26108F00810B1C /* LocalNotificationInfoProvider.m in Sources */, 9747264418323080006B7CB7 /* UIKitCategories.m in Sources */, FAFB08F5151215EE0041901D /* Preferences.mm in Sources */, + B0FBFA2C1A515B4C0086819E /* TableViewController.m in Sources */, 97F0817F19AF72590098FB0B /* BadgeView.m in Sources */, 97D807BD18A933FB00D416E0 /* MoreAppsCell.m in Sources */, 97908B2D1965876C003DD7C6 /* SearchCategoryCell.m in Sources */, diff --git a/iphone/Maps/Settings/SettingsViewController.h b/iphone/Maps/Settings/SettingsViewController.h index 567fade0ca..7df8283ab0 100644 --- a/iphone/Maps/Settings/SettingsViewController.h +++ b/iphone/Maps/Settings/SettingsViewController.h @@ -1,6 +1,7 @@ #import +#import "TableViewController.h" -@interface SettingsViewController : UITableViewController +@interface SettingsViewController : TableViewController @end diff --git a/iphone/Maps/SettingsAndMoreVC.h b/iphone/Maps/SettingsAndMoreVC.h index f5d37b7131..1833d23ea6 100644 --- a/iphone/Maps/SettingsAndMoreVC.h +++ b/iphone/Maps/SettingsAndMoreVC.h @@ -1,6 +1,7 @@ #import +#import "TableViewController.h" -@interface SettingsAndMoreVC : UITableViewController +@interface SettingsAndMoreVC : TableViewController @end diff --git a/iphone/Maps/TableViewController.h b/iphone/Maps/TableViewController.h new file mode 100644 index 0000000000..ebab17fd68 --- /dev/null +++ b/iphone/Maps/TableViewController.h @@ -0,0 +1,13 @@ +// +// TableViewController.h +// Maps +// +// Created by Timur Bernikowich on 29/12/2014. +// Copyright (c) 2014 MapsWithMe. All rights reserved. +// + +#import + +@interface TableViewController : UITableViewController + +@end diff --git a/iphone/Maps/TableViewController.m b/iphone/Maps/TableViewController.m new file mode 100644 index 0000000000..157215468b --- /dev/null +++ b/iphone/Maps/TableViewController.m @@ -0,0 +1,18 @@ +// +// TableViewController.m +// Maps +// +// Created by Timur Bernikowich on 29/12/2014. +// Copyright (c) 2014 MapsWithMe. All rights reserved. +// + +#import "TableViewController.h" + +@implementation TableViewController + +- (BOOL)prefersStatusBarHidden +{ + return NO; +} + +@end diff --git a/iphone/Maps/ViewController.h b/iphone/Maps/ViewController.h new file mode 100644 index 0000000000..2f5c9e08ec --- /dev/null +++ b/iphone/Maps/ViewController.h @@ -0,0 +1,13 @@ +// +// ViewController.h +// Maps +// +// Created by Timur Bernikowich on 29/12/2014. +// Copyright (c) 2014 MapsWithMe. All rights reserved. +// + +#import + +@interface ViewController : UIViewController + +@end diff --git a/iphone/Maps/ViewController.m b/iphone/Maps/ViewController.m new file mode 100644 index 0000000000..5f05d443d4 --- /dev/null +++ b/iphone/Maps/ViewController.m @@ -0,0 +1,18 @@ +// +// ViewController.m +// Maps +// +// Created by Timur Bernikowich on 29/12/2014. +// Copyright (c) 2014 MapsWithMe. All rights reserved. +// + +#import "ViewController.h" + +@implementation ViewController + +- (BOOL)prefersStatusBarHidden +{ + return NO; +} + +@end \ No newline at end of file