drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Switched OSM profile to SwiftUI and redesigned it

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-07-04 21:20:43 +02:00
committed by Yannik Bloscheck
parent db1ef9b148
commit 15c7e71866
127 changed files with 1753 additions and 2503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
iphone/Maps/Classes/MapViewController.mm
View File

@@ -1,7 +1,6 @@
#import "MapViewController.h"
#import <CoreApi/MWMBookmarksManager.h>
#import "EAGLView.h"
#import "MWMAuthorizationCommon.h"
#import "MWMAutoupdateController.h"
#import "MWMEditorViewController.h"
#import "MWMFrameworkListener.h"
@@ -425,10 +424,6 @@ NSString *const kSettingsSegue = @"Map2Settings";
if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden)
self.controlsManager.menuState = self.controlsManager.menuRestoreState;
// Added in https://github.com/organicmaps/organicmaps/pull/7333
// After all users migrate to OAuth2 we can remove next code
[self migrateOAuthCredentials];
if (self.trackRecordingManager.isActive)
[self showTrackRecordingPlacePage];
@@ -499,8 +494,7 @@ NSString *const kSettingsSegue = @"Map2Settings";
- (void)showViralAlertIfNeeded {
NSUserDefaults *ud = NSUserDefaults.standardUserDefaults;
using namespace osm_auth_ios;
if (!AuthorizationIsNeedCheck() || [ud objectForKey:kUDViralAlertWasShown] || !AuthorizationHaveCredentials())
if (!Profile.needsReauthorization || [ud objectForKey:kUDViralAlertWasShown] || Profile.isExisting)
return;
if (osm::Editor::Instance().GetStats().m_edits.size() < 2)
@@ -536,14 +530,6 @@ NSString *const kSettingsSegue = @"Map2Settings";
[self setNeedsStatusBarAppearanceUpdate];
}
- (void)migrateOAuthCredentials {
if (osm_auth_ios::AuthorizationHaveOAuth1Credentials())
{
osm_auth_ios::AuthorizationClearOAuth1Credentials();
[self.alertController presentOsmReauthAlert];
}
}
- (id)initWithCoder:(NSCoder *)coder {
NSLog(@"MapViewController initWithCoder Started");
self = [super initWithCoder:coder];
@@ -661,13 +647,12 @@ NSString *const kSettingsSegue = @"Map2Settings";
#pragma mark - Authorization
- (void)checkAuthorization {
using namespace osm_auth_ios;
BOOL const isAfterEditing = AuthorizationIsNeedCheck() && !AuthorizationHaveCredentials();
BOOL const isAfterEditing = Profile.needsReauthorization && !Profile.isExisting;
if (isAfterEditing) {
AuthorizationSetNeedCheck(NO);
[Profile requestReauthorizationWithShouldReauthorize:NO];
if (!Platform::IsConnected())
return;
[self.alertController presentOsmAuthAlert];
[self presentViewController:BridgeControllers.profileAsAlert animated:YES completion:nil];
}
}