Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Migrating from the MaterialPreferences library to native #3063

Merged
merged 6 commits into from
Jun 27, 2023

Conversation

rapterjet2004
Copy link
Contributor

@rapterjet2004 rapterjet2004 commented May 31, 2023

MaterialPreferences is unmaintained and the UI looks dated. This PR is to migrate to a native solution, and adhere to the modern material 3 design. #3050 (comment) This way the app becomes more maintainable in the long run and reduces the use of 3rd party dependencies.

Signed-off-by: Julius Linus julius.linus@nextcloud.com

🖼️ Themed Screenshots

image

Conversation Info Activity

🏡 After
image

image

Settings Activity

🏡 After
image
image

🚧 TODO

UI

  • Migrate Notification Settings Item XML
  • Migrate Guest Access Settings Item XML
  • Migrate Webinar Info Item XML
  • Migrate Conversation Info XML
  • Migrate Settings Activity XML

Back end

  • Migrate Conversation Info Activity
  • Migrate Guest Access Helper
  • Migrate Settings Activity
  • Migrate from UserInputModule in Settings Activity
  • Migrate from StorageModule / Conversation Info Activity
  • Remove it from the build gradle
  • Get it reviewed

🏁 Checklist

  • ⛑️ Tests (unit and/or integration) are included or not needed
  • 🔖 Capability is checked or not needed
  • 🔙 Backport requests are created or not needed: /backport to stable-xx.x
  • 📅 Milestone is set
  • 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

@rapterjet2004 rapterjet2004 added the 2. developing Work in progress label May 31, 2023
@mahibi

This comment was marked as resolved.

@rapterjet2004

This comment was marked as resolved.

@mahibi

This comment was marked as resolved.

@AndyScherzinger

This comment was marked as resolved.

@AndyScherzinger
Copy link
Member

For reference, my design changes are based on https://m3.material.io/components/lists

@rapterjet2004 rapterjet2004 added the low Low priority label Jun 12, 2023
@AndyXheli
Copy link

Looks really nice 👌

@rapterjet2004 rapterjet2004 marked this pull request as ready for review June 19, 2023 18:28
@rapterjet2004 rapterjet2004 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 19, 2023
@AndyScherzinger
Copy link
Member

@rapterjet2004 can you rebase to latest master, else I would have to re-install and loose all accounts? Thanks in advance 💙

@AndyXheli
Copy link

AndyXheli commented Jun 20, 2023

I noticed that the proxy type box was empty on this version but the default is no proxy

@rapterjet2004

This comment was marked as resolved.

@AndyXheli

This comment was marked as resolved.

@rapterjet2004
Copy link
Contributor Author

Ok I just fixed it, I had to reset the app data first. I added this line of code before setting up my drop down
if (appPreferences.proxyType == null) { appPreferences.proxyType = resources.getString(R.string.nc_no_proxy) }

@AndyXheli
Copy link

Perfect! Thank you so much.

@mahibi
Copy link
Collaborator

mahibi commented Jun 26, 2023

it looks like we have some fun work ahead of us here with merge conflicts. we can do this together if you want @rapterjet2004

@rapterjet2004 rapterjet2004 force-pushed the replace-material-preferences branch 4 times, most recently from aab762d to 9ecf66f Compare June 26, 2023 21:38
@rapterjet2004 rapterjet2004 requested review from AndyScherzinger and removed request for AndyScherzinger June 26, 2023 22:11
rapterjet2004 and others added 2 commits June 27, 2023 07:43
Signed-off-by: Julius Linus julius.linus@nextcloud.com
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
rapterjet2004 and others added 2 commits June 27, 2023 07:43
Signed-off-by: Julius Linus julius.linus@nextcloud.com
Signed-off-by: github-actions <github-actions@github.com>
nextcloud-bot and others added 2 commits June 27, 2023 07:44
This reverts commit dc7b421b2bdfedc9a71a1b55b87fda4670cfc35e.

Revert "rebasing"

This reverts commit ad5a4110052ce56ae90d3d9183c393ec59f6d6db.

Revert "rebasing"

This reverts commit 12b36133948dea1e7529fa7b31f1bd63bf68ca34.

Revert "WIP migrating from material preferences to native, working on migrating DatabaseStorageModule"

This reverts commit 8fd8e4070816724f3dc55f994ee054c931b49782.

Revert "rebasing"

This reverts commit 0397c6fbf2c8b84530fa2806ec269680cf01deab.

rebasing
Signed-off-by: Julius Linus julius.linus@nextcloud.com

WIP migrating from material preferences to native, working on migrating DatabaseStorageModule
Signed-off-by: Julius Linus julius.linus@nextcloud.com

rebasing
Signed-off-by: Julius Linus julius.linus@nextcloud.com

rebasing
Signed-off-by: Julius Linus julius.linus@nextcloud.com

rebasing
Signed-off-by: Julius Linus julius.linus@nextcloud.com
@mahibi mahibi merged commit 8543b94 into master Jun 27, 2023
12 of 13 checks passed
@delete-merged-branch delete-merged-branch bot deleted the replace-material-preferences branch June 27, 2023 12:53
@github-actions
Copy link
Contributor

Codacy

Lint

TypemasterPR
Warnings9696
Errors00

SpotBugs

CategoryBaseNew
Correctness99
Dodgy code165163
Internationalization55
Malicious code vulnerability33
Performance119
Security22
Total195191

@github-actions
Copy link
Contributor

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/3063-talk.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

@AndyScherzinger AndyScherzinger added this to the 17.1.0 milestone Jun 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews dependencies low Low priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants