Revamp Settings Section: Complete Migrating to Swift & SwiftUI

[adityagi02]

Overview

This pull request aims to overhaul the existing Settings section of the app, transitioning it from the old Objective-C code with XLForm package usage to modern Swift code utilizing SwiftUI. The revamp covers the Settings screen along with its connected components such as SettingsAdvanced Screen, AutoUpload Screen, ChangeAutoUploadFileName screen, and associated small views.

This significant refactoring enhances maintainability, optimises performance of app, improves user experience, and aligns with modern iOS development standards.

• [x] Navigation between More & Settings Screens
• [ ] Settings Screen
• [ ] Advanced Screen
• [ ] Navigation between More & Advanced Screens
• [ ] AutoUpload Screen
• [ ] Navigation between More & Settings Screens
• [ ] ChangeAutoUploadFileName Screen
• [ ] Navigation between AutoUpload & ChangeAutoUploadFileName Screens
• [ ] Other bugs fixes in Settings Section

P.S.: I'll keep adding screenshots with every particular screen commit.

[adityagi02]

@marinofaggiana please keep on reviewing once you get time, as otherwise this will be a big chunk of code at last. I'll try to be punctual, except if I have university exams in between.

[marinofaggiana]

Hi @adityagi02 welcome !! I absolutely thank you for your great help, for any questions, reviews or anything else we are here for you. Out of curiosity, what university are you attending?

Note.

• please use DCO for signed your push
• compatibility with keychain get/put calls must be maintained
• for everything else you are free to indulge yourself as you wish

Thanks a lot !

ping @mpivchev

[adityagi02]

Thank you for the warm welcome! I love Nextcloud & I'm glad to be contributing here.💙

I'm currently enrolled at the Indian Institute of Information Technology. It's a privilege to be part of an institution that requires passing one of the toughest STEM exams in the world, the JEE Mains & Advanced, for admission.

I'll definitely keep the points you mentioned in mind.

Thanks again !!

[adityagi02]

New Settings Screen

Some queries:

• Firstly, In this Privacy Form, we have vaguely defined toggle text which is confusing. Either we have to change the content text or we have to add some proper footer explanation of what each toggles do.
• When you click "Get Source Code", a browser sheet opens but it's UI is not proper, we have to follow a common and more descriptive view for this.✅

Here user cannot Sign In as cancel button is overlapping. Corrected✅

[marinofaggiana]

Hi @adityagi02 some problem with OpenSSL ?

[adityagi02]

Hi @adityagi02 some problem with OpenSSL ?

yeah, my Xcode which is causing some issue with fetching OpenSSL, so i kept a local dependency you can just add OpenSSL from manager and build with that it'll work fine.

[marinofaggiana]

Hi @adityagi02 some problem with OpenSSL ?

yeah, my Xcode which is causing some issue with fetching OpenSSL, so i kept a local dependency you can just add OpenSSL from manager and build with that it'll work fine.

yes, sure, but is strange, it shouldn't happen

[adityagi02]

Hi @adityagi02 some problem with OpenSSL ?

yeah, my Xcode which is causing some issue with fetching OpenSSL, so i kept a local dependency you can just add OpenSSL from manager and build with that it'll work fine.

yes, sure, but is strange, it shouldn't happen

Yes, it can be an issue otherwise. I have 3 different XCode versions in my desktop for different tasks, maybe that has caused this, but i'll check for exact reason and update if possible.

My machine:

macOS Sonoma Version 14.3
XCode Version 15.0.1 

[adityagi02]

New AutoUpload Screen

Queries:

• We have to rethink the arrangements of these sections, and reconsider these vaguely defined texts on them.

[marinofaggiana]

@adityagi02 thanks again for the work you are doing, remember that user switching also needs to be managed.

For example, you can be in the settings, push "Files" , change user and then push "More", at this point the setting must be reloaded otherwise it shows incorrect data (of the previous user).

[adityagi02]

New Advanced Screen

Changes:

1. All picker menus are now new SwiftUI pickers and constant throughout Settings. Old:- New:-✅

2. No need of any new View❌

3. I have made the trash image red, so that it highlights.(Just my idea)

Queries:

1. We have same texts for two different sections, should we have some changes on these.

@mpivchev

[adityagi02]

We were not having any confirmation alerts, when the user taps on clear log file section.

Added✅

[adityagi02]

Sorry for the DCO, i can't sort this out. I've tried commiting from terminal and XCode both, still It's not working.

[mpivchev]

Hi @adityagi02, thank you for this, it looks great so far :)

[adityagi02]

Hey guys, sorry for that much time, i'm busy as anything with my college assignments along with my current internship. I've committed remaining changes, not tested completely so not pushing right now. Will be back here in second week. @marinofaggiana @mpivchev

[marinofaggiana]

Hey guys, sorry for that much time, i'm busy as anything with my college assignments along with my current internship. I've committed remaining changes, not tested completely so not pushing right now. Will be back here in second week. @marinofaggiana @mpivchev

Don't worry, school always comes first !

[adityagi02]

Hey guys, sorry for that much time, i'm busy as anything with my college assignments along with my current internship. I've committed remaining changes, not tested completely so not pushing right now. Will be back here in second week. @marinofaggiana @mpivchev

Don't worry, school always comes first !

If you have some free time today or tomorrow, could you please address the doubts mentioned in the review comments above?

[marinofaggiana]

Hey guys, sorry for that much time, i'm busy as anything with my college assignments along with my current internship. I've committed remaining changes, not tested completely so not pushing right now. Will be back here in second week. @marinofaggiana @mpivchev

Don't worry, school always comes first !

If you have some free time today or tomorrow, could you please address the doubts mentioned in the review comments above?

mm where can you report the doubts thx

[adityagi02]

Hi, I have completed all the tasks, you can start final review. There is a small merge conflict, will resolve it afterwards.

@marinofaggiana @mpivchev

[adityagi02]

• maybe a font more small (15 pt)

• In Settings: Lock: On (? is off, which passcode)

• In Advanced/Capabilities the view title is absent (look End-to-end encryption view)

More space at bottom fore read the content and also in Advanced

(for now stop)

sure!! Is that all?

[marinofaggiana]

• maybe a font more small (15 pt)
• In Settings: Lock: On (? is off, which passcode)
• In Advanced/Capabilities the view title is absent (look End-to-end encryption view)

More space at bottom fore read the content and also in Advanced (for now stop)

sure!! Is that all?

hope yes :D .. and please fix the packages + conflicts

[adityagi02]

Hey @marinofaggiana, Can you direct me to a right direction regarding Lock On/Off as i'm stuck on it? Whenever I'm working on it, there are some blockers in connecting this old style TOPasscodeController package code with SwiftUI. The earlier NCSettings' code is more compatible with this package due to being written in Objective-C.

[marinofaggiana]

Don't worry, I can make I, It's a little complicated to explain, you can complete the other issue

[marinofaggiana]

Hi ! please Rebase (we have implemented the UIScene)

[adityagi02]

not building currently inside AutoUploadView !!

[marinofaggiana]

not building currently inside AutoUploadView !!

can I fix in your code ?

[adityagi02]

not building currently inside AutoUploadView !!

• Rebase from Develop
• you can get the serverUrl

let serverUrl = NCUtilityFileSystem().getHomeServer(urlBase: appDelegate.urlBase, userId: appDelegate.userId) you can put it where you want.

so your code will be:

SelectView(serverUrl: serverUrl) or viewModel.serverUrl (if you have put the code in viewModel) .onDisappear { viewModel.setAutoUploadDirectory(serverUrl: serverUrl) }

[adityagi02]

Don't worry, I can make I, It's a little complicated to explain, you can complete the other issue

is this done, so that we can proceed to merge.

[marinofaggiana]

Don't worry, I can make I, It's a little complicated to explain, you can complete the other issue

is this done, so that we can proceed to merge.

Hi @adityagi02 thanks for your job, only some consideration:

• private let manageDatabase = NCManageDatabase() Why init a new DB instance and not use the share instance ?

• NCSettings line 130: every time I change something reload NCViewE2EE(account: AppDelegate().account, rootViewController: nil) which in turn tests the GET API https://nextcloud.homelinux.org/ocs/v2.php/apps/end_to_end_encryption/api/v1/public-key , this is not good, network access or API calls should only be used when required (therefore be careful when using the ObservedObject)

• can you use the Lint ?

@mpivchev It would be nice if I could help you too

[adityagi02]

Don't worry, I can make I, It's a little complicated to explain, you can complete the other issue

is this done, so that we can proceed to merge.

Hi @adityagi02 thanks for your job, only some consideration:

• private let manageDatabase = NCManageDatabase() Why init a new DB instance and not use the share instance ?
• NCSettings line 130: every time I change something reload NCViewE2EE(account: AppDelegate().account, rootViewController: nil) which in turn tests the GET API https://nextcloud.homelinux.org/ocs/v2.php/apps/end_to_end_encryption/api/v1/public-key , this is not good, network access or API calls should only be used when required (therefore be careful when using the ObservedObject)
• can you use the Lint ?

@mpivchev It would be nice if I could help you too

Hey, thanks for these points. I got some idea, but still i think i'll need some help, so @mpivchev can we have a small meet around some time tomorrow, so that i can resolve some silly doubts i had. Thank you again @marinofaggiana