Skip to content

Commit 60839b8

Browse files
committed
Use the UIKit settings for now
Revert this commit after the Account Settings are rewritten in SwiftUI (and are linked to from Settings.swift)
1 parent a425c52 commit 60839b8

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Monal/Classes/ActiveChatsViewController.m

+3-4
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,8 @@ -(void) viewDidLoad
316316
#if !TARGET_OS_MACCATALYST
317317
self.splitViewController.primaryBackgroundStyle = UISplitViewControllerBackgroundStyleSidebar;
318318
#endif
319-
319+
self.settingsButton.image = [UIImage systemImageNamed:@"gearshape.fill"];
320320
[self configureComposeButton];
321-
[self configureSettingsButton];
322321

323322
self.spinnerButton.customView = self.spinner;
324323

@@ -955,8 +954,8 @@ -(void) showGeneralSettings
955954
-(void) showSettings
956955
{
957956
appendToViewQueue((^(PMKResolver resolve) {
958-
UIViewController* settingsView = [[SwiftuiInterface new] makeSettingsView];
959-
[self presentViewController:settingsView animated:YES completion:^{resolve(nil);}];
957+
[self performSegueWithIdentifier:@"showSettings" sender:self];
958+
resolve(nil);
960959
}));
961960
}
962961

0 commit comments

Comments
 (0)