forked from organicmaps/organicmaps-tmp
[ios] Fixed iOS warnings.
This commit is contained in:
parent
87f2a281df
commit
b925d2ae38
11 changed files with 26 additions and 17 deletions
|
@ -22,6 +22,6 @@
|
|||
|
||||
- (void)updatePath:(CGFloat)progress;
|
||||
|
||||
- (UIView *)buttonView;
|
||||
- (UIView * _Nullable)buttonView;
|
||||
|
||||
@end
|
||||
|
|
|
@ -209,7 +209,7 @@ CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_P
|
|||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (UIView *)buttonView
|
||||
- (UIView * _Nullable)buttonView
|
||||
{
|
||||
return self.button;
|
||||
}
|
||||
|
|
|
@ -133,6 +133,9 @@ using namespace taxi;
|
|||
self.type = MWMRoutePreviewTaxiCellTypeMaxim;
|
||||
providerName = kStatMaxim;
|
||||
break;
|
||||
case taxi::Provider::Type::Count:
|
||||
LOG(LERROR, ("Incorrect taxi provider"));
|
||||
break;
|
||||
}
|
||||
[Statistics logEvent:kStatRoutingBuildTaxi withParameters:@{@"provider": providerName}];
|
||||
auto cv = self.collectionView;
|
||||
|
@ -164,6 +167,7 @@ using namespace taxi;
|
|||
case taxi::Provider::Type::Uber: provider = kStatUber; break;
|
||||
case taxi::Provider::Type::Yandex: provider = kStatYandex; break;
|
||||
case taxi::Provider::Type::Maxim: provider = kStatMaxim; break;
|
||||
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
|
||||
}
|
||||
NSString * errorValue = nil;
|
||||
switch (errorCode)
|
||||
|
|
|
@ -253,7 +253,7 @@ using namespace osm_auth_ios;
|
|||
auto const & request = f.GetParsedSearchRequest();
|
||||
auto manager = [MWMMapViewControlsManager manager];
|
||||
|
||||
auto query = [@((request.m_query + " ").c_str()) stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
||||
auto query = [@((request.m_query + " ").c_str()) stringByRemovingPercentEncoding];
|
||||
auto locale = @(request.m_locale.c_str());
|
||||
|
||||
if (request.m_isSearchOnMap)
|
||||
|
|
|
@ -92,7 +92,7 @@ final class AuthorizationViewController: MWMViewController {
|
|||
|
||||
@IBAction private func phoneSignIn() {
|
||||
dismiss(animated: true) {
|
||||
let url = ViewModel.phoneAuthURL()
|
||||
let url = ViewModel.phoneAuthURL()!
|
||||
let wv = WebViewController(authURL: url, onSuccessAuth: { (token: String?) in
|
||||
self.process(token: token!, type: .phone)
|
||||
}, onFailure: {
|
||||
|
|
|
@ -18,7 +18,7 @@ typedef void (^MWMAuthorizationCompleteBlock)(BOOL);
|
|||
|
||||
@interface MWMAuthorizationViewModel : NSObject
|
||||
|
||||
+ (NSURL *)phoneAuthURL;
|
||||
+ (NSURL * _Nullable)phoneAuthURL;
|
||||
+ (void)checkAuthenticationWithSource:(MWMAuthorizationSource)source
|
||||
onComplete:(MWMAuthorizationCompleteBlock _Nonnull)onComplete;
|
||||
+ (BOOL)hasSocialToken;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
@implementation MWMAuthorizationViewModel
|
||||
|
||||
+ (NSURL *)phoneAuthURL
|
||||
+ (NSURL * _Nullable)phoneAuthURL
|
||||
{
|
||||
return [NSURL URLWithString:@(GetFramework().GetUser().GetPhoneAuthUrl("http://localhost").c_str())];
|
||||
}
|
||||
|
|
|
@ -101,6 +101,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
|
|||
case taxi::Provider::Uber: provider = kStatUber; break;
|
||||
case taxi::Provider::Yandex: provider = kStatYandex; break;
|
||||
case taxi::Provider::Maxim: provider = kStatMaxim; break;
|
||||
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
|
||||
}
|
||||
[Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{ @"provider" : provider }];
|
||||
}
|
||||
|
|
|
@ -121,6 +121,8 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
|
|||
|
||||
#pragma mark - MWMBookmarksObserver
|
||||
|
||||
- (void)onConversionFinish:(BOOL)success {}
|
||||
|
||||
- (void)onBookmarkDeleted:(MWMMarkID)bookmarkId
|
||||
{
|
||||
auto data = self.data;
|
||||
|
|
|
@ -385,6 +385,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
|
|||
case taxi::Provider::Uber: type = MWMPlacePageTaxiProviderUber; break;
|
||||
case taxi::Provider::Yandex: type = MWMPlacePageTaxiProviderYandex; break;
|
||||
case taxi::Provider::Maxim: type = MWMPlacePageTaxiProviderMaxim; break;
|
||||
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
|
||||
}
|
||||
[c configWithType:type delegate:delegate];
|
||||
self.taxiCell = c;
|
||||
|
@ -626,6 +627,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
|
|||
case taxi::Provider::Uber: provider = kStatUber; break;
|
||||
case taxi::Provider::Yandex: provider = kStatYandex; break;
|
||||
case taxi::Provider::Maxim: provider = kStatMaxim; break;
|
||||
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
|
||||
}
|
||||
[Statistics logEvent:kStatPlacepageTaxiShow
|
||||
withParameters:@{kStatProvider: provider, kStatPlacement: kStatPlacePage}];
|
||||
|
|
|
@ -3,20 +3,20 @@ protocol WelcomeProtocolBase: AnyObject {
|
|||
|
||||
var pageIndex: Int! { get set }
|
||||
|
||||
weak var pageController: WelcomePageController! { get set }
|
||||
var pageController: WelcomePageController! { get set }
|
||||
|
||||
func updateSize()
|
||||
|
||||
weak var image: UIImageView! { get set }
|
||||
weak var alertTitle: UILabel! { get set }
|
||||
weak var alertText: UILabel! { get set }
|
||||
weak var nextPageButton: UIButton! { get set }
|
||||
weak var containerWidth: NSLayoutConstraint! { get set }
|
||||
weak var containerHeight: NSLayoutConstraint! { get set }
|
||||
weak var imageMinHeight: NSLayoutConstraint! { get set }
|
||||
weak var imageHeight: NSLayoutConstraint! { get set }
|
||||
weak var titleTopOffset: NSLayoutConstraint! { get set }
|
||||
weak var titleImageOffset: NSLayoutConstraint! { get set }
|
||||
var image: UIImageView! { get set }
|
||||
var alertTitle: UILabel! { get set }
|
||||
var alertText: UILabel! { get set }
|
||||
var nextPageButton: UIButton! { get set }
|
||||
var containerWidth: NSLayoutConstraint! { get set }
|
||||
var containerHeight: NSLayoutConstraint! { get set }
|
||||
var imageMinHeight: NSLayoutConstraint! { get set }
|
||||
var imageHeight: NSLayoutConstraint! { get set }
|
||||
var titleTopOffset: NSLayoutConstraint! { get set }
|
||||
var titleImageOffset: NSLayoutConstraint! { get set }
|
||||
}
|
||||
|
||||
extension WelcomeProtocolBase {
|
||||
|
|
Loading…
Add table
Reference in a new issue