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

Fix 'Reply' primary property. #4985

Merged
merged 3 commits into from
Sep 29, 2022
Merged

Fix 'Reply' primary property. #4985

merged 3 commits into from
Sep 29, 2022

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Sep 29, 2022

Fixing what Jan pointed out:

In the case of call notifications, "Call back" would be primary, "Reply" secondary.
For messages, "Reply" should stay primary of course.

Originally posted by @jancborchardt in #4967 (comment)

during call:
call

after missing the call:
call-back

missed called in a chat room:
missed-call-group

chat message:
chat

Camila added 2 commits September 29, 2022 15:17
Signed-off-by: Camila <hello@camila.codes>
Primary is set to true when object type is 'room' or 'chat' and it set to
false when object type is 'call'.

Signed-off-by: Camila <hello@camila.codes>
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks good! :)

There's a bit much space between "View chat" and "Dismiss" (should instead be the same as between the first and second action), but separate issue.

Signed-off-by: Camila <hello@camila.codes>
@camilasan camilasan marked this pull request as ready for review September 29, 2022 15:16
@camilasan
Copy link
Member Author

There's a bit much space between "View chat" and "Dismiss" (should instead be the same as between the first and second action), but separate issue.

what about this?
dismiss

(with recent changes we kinda 'disappeared' with the button... 🙈 )

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@codecov
Copy link

codecov bot commented Sep 29, 2022

Codecov Report

Merging #4985 (1ccc170) into master (5357374) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4985   +/-   ##
=======================================
  Coverage   57.13%   57.13%           
=======================================
  Files         138      138           
  Lines       17221    17221           
=======================================
  Hits         9839     9839           
  Misses       7382     7382           

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4985-1ccc170f91b6acc8b4e4f747c5a952300dec6d47-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@camilasan camilasan merged commit 31478bb into master Sep 29, 2022
@camilasan camilasan deleted the bugfix/primary-buttons branch September 29, 2022 16:34
@mgallien mgallien added this to the 3.7.0 milestone Oct 3, 2022
@camilasan camilasan changed the title Fix 'Reply' primay property. Fix 'Reply' primary property. Oct 4, 2022
@camilasan
Copy link
Member Author

/backport to stable-3.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants