Skip to content

Conversation

@GVodyanov
Copy link
Contributor

@GVodyanov GVodyanov commented Nov 9, 2025

Fix #7558

The only difference from the design spec is the NcSelect not being grey and not having the label "inside" the border, but those require nextcloud vue changes.

Updated screenshots:
Screenshot From 2025-11-14 14-09-43
Screenshot From 2025-11-14 14-09-55
Screenshot From 2025-11-14 14-10-00

@GVodyanov GVodyanov requested a review from kra-mo November 9, 2025 13:10
@GVodyanov GVodyanov self-assigned this Nov 9, 2025
@GVodyanov GVodyanov added the 3. to review Waiting for reviews label Nov 9, 2025
@SebastianKrupinski
Copy link
Contributor

SebastianKrupinski commented Nov 10, 2025

Looks great! Is this ready for testing?

Can you also rebase to the latest calendar version, it will fix some of the CI errors

@kra-mo
Copy link
Member

kra-mo commented Nov 11, 2025

Just a small note before reviewing the whole thing: I updated the mockup in the issue to use the (future) NcFormBoxSelectNative component for the default reminder and density.

@GVodyanov
Copy link
Contributor Author

Looks great! Is this ready for testing?

Can you also rebase to the latest calendar version, it will fix some of the CI errors

Yep, it should work... CI tho...

@SebastianKrupinski
Copy link
Contributor

Looking good so far!

But there are a couple glitches

A, Is everything supposed to be highlighted in dark mode?
B. Switch states are not changing when switched (look at Birthday Calendar and Task Calendar)

image

Copy link
Member

@kra-mo kra-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks really nice :)

A couple of issues:

  • Boxes and groups are not used correctly. "Availability settings" has a low border radius and the CalDAV settings are separated. The discussion here might be useful.
  • Default reminder should be above Simple event editor in Editing unless there was a reason not to put it there.
  • The keyboard shortcuts should use the new component as well. It's fine if it will be in a followup PR, but it should be done too.

@kra-mo
Copy link
Member

kra-mo commented Nov 13, 2025

A, Is everything supposed to be highlighted in dark mode?

This is the styling we went with for the components themselves, but indeed, dark mode was definitely not thought out very much and should probably be adjusted.

@kra-mo
Copy link
Member

kra-mo commented Nov 13, 2025

I opened nextcloud-libraries/nextcloud-vue#7853

@kra-mo
Copy link
Member

kra-mo commented Nov 13, 2025

B. Switch states are not changing when switched (look at Birthday Calendar and Task Calendar)

And I think this one should be fixed by nextcloud-libraries/nextcloud-vue#7851

@GVodyanov
Copy link
Contributor Author

A, Is everything supposed to be highlighted in dark mode?

This should fix it, it's a Nextcloud vue thing

B. Switch states are not changing when switched (look at Birthday Calendar and Task Calendar)

Fixed!, will push in a second

@GVodyanov
Copy link
Contributor Author

@kra-mo

The keyboard shortcuts should use the new component as well. It's fine if it will be in a followup PR, but it should be done too.

These are using NcKbd, isn't that the new component?

@GVodyanov GVodyanov force-pushed the feat/settings-redesign branch from 06d1fec to e9fc7d3 Compare November 13, 2025 16:45
@GVodyanov GVodyanov requested a review from kra-mo November 13, 2025 16:45
@ShGKme
Copy link
Contributor

ShGKme commented Nov 13, 2025

These are using NcKbd, isn't that the new component?

See: https://nextcloud-vue-components.netlify.app/#/Components/App%20containers/NcAppContent/NcAppSettings?id=ncappsettingsshortcutssection

Inside there is <NcKbd>, but new components include complete hotkey list with even a special AppSettings dialog section

@codecov
Copy link

codecov bot commented Nov 13, 2025

Codecov Report

❌ Patch coverage is 0% with 61 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...onents/AppNavigation/Settings/ShortcutOverview.vue 0.00% 31 Missing ⚠️
src/components/AppNavigation/Settings.vue 0.00% 26 Missing ⚠️
...pNavigation/Settings/SettingsAttachmentsFolder.vue 0.00% 4 Missing ⚠️

📢 Thoughts on this report? Let us know!

@GVodyanov GVodyanov force-pushed the feat/settings-redesign branch from a5fc44d to 9074c7e Compare November 14, 2025 11:13
@kra-mo
Copy link
Member

kra-mo commented Nov 14, 2025

@GVodyanov could you please update the screenshots?

@GVodyanov
Copy link
Contributor Author

@GVodyanov could you please update the screenshots?

Updated!

Copy link
Member

@kra-mo kra-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, looks good :)

The only thing now is that keys for keyboard shortcuts should be capital letters, like on a real keyboard.

@GVodyanov GVodyanov force-pushed the feat/settings-redesign branch from 5288a7e to ef13cb6 Compare November 14, 2025 13:36
@GVodyanov
Copy link
Contributor Author

GVodyanov commented Nov 14, 2025

Here ya go:

image

@kra-mo @ShGKme

@GVodyanov GVodyanov requested review from ShGKme and kra-mo November 14, 2025 13:37
Copy link
Contributor

@ShGKme ShGKme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving from the component usage side

@GVodyanov GVodyanov force-pushed the feat/settings-redesign branch from ef13cb6 to 5220466 Compare November 14, 2025 15:52
Signed-off-by: Grigory V <[email protected]>

# Conflicts:
#	package-lock.json
@GVodyanov GVodyanov force-pushed the feat/settings-redesign branch from 5220466 to 4ec261c Compare November 14, 2025 21:05
Copy link
Contributor

@ShGKme ShGKme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still approved

@SebastianKrupinski
Copy link
Contributor

Look good, Merge it when you're ready

@GVodyanov GVodyanov merged commit a35d149 into main Nov 16, 2025
38 checks passed
@GVodyanov GVodyanov deleted the feat/settings-redesign branch November 16, 2025 19:06
@ShGKme
Copy link
Contributor

ShGKme commented Nov 16, 2025

🎉

@GVodyanov
Copy link
Contributor Author

/backport to stable6.0

@ChristophWurst
Copy link
Member

/backport to stable6.0 please

@GVodyanov
Copy link
Contributor Author

/backport to stable6.0

@backportbot backportbot bot added the backport-request A backport was requested for this pull request label Nov 17, 2025
@backportbot
Copy link

backportbot bot commented Nov 17, 2025

The backport to stable6.0 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable6.0
git pull origin stable6.0

# Create the new backport branch
git checkout -b backport/7682/stable6.0

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 4ec261cf

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7682/stable6.0

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

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 backport-request A backport was requested for this pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Calendar settings reorganization

6 participants