Skip to content

Revert using display name in shared albums' name - #1786

Merged
artonge merged 1 commit into
masterfrom
artonge/fix/revert_display_name_in_shared_album
May 16, 2023
Merged

Revert using display name in shared albums' name#1786
artonge merged 1 commit into
masterfrom
artonge/fix/revert_display_name_in_shared_album

Conversation

@artonge

@artongeartonge commented May 11, 2023

Copy link
Copy Markdown
Collaborator

Revert part of #1781 to keep unique album names, and improve rendering of cover and header of shared albums

Based on concerns expressed here: #1781 (comment)

BeforeAfter
Screenshot from 2023-05-11 14-39-46Screenshot from 2023-05-11 14-34-08
Screenshot from 2023-05-11 14-39-32Screenshot from 2023-05-11 14-34-15

@artonge
artonge enabled auto-merge May 11, 2023 09:19
@artongeartonge self-assigned this May 11, 2023
@artongeartonge added enhancement New feature or request 3. to review Waiting for reviews php PHP related ticket javascript Javascript related ticket labels May 11, 2023
@artongeartonge added this to the Nextcloud 27 milestone May 11, 2023
@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from b4827ad to 3a36fd4CompareMay 11, 2023 09:26
@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable26

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable25

@backportbot-nextcloudbackportbot-nextcloudBot added the backport-request Pending backport by the backport-bot label May 11, 2023
@nimishavijay

nimishavijay commented May 11, 2023

Copy link
Copy Markdown
Member

This looks great! Since this PR purpose is to make it clear who shared the item with you, I would suggest showing the full name along with the avatar, using a user bubble (without the primary color), screenshots attached. What do you think? cc @szaimen :)

@szaimen

Copy link
Copy Markdown
Contributor

Yes, using a userbubble including the display name is a good idea. The mockup looks good to me! :)

@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from 3a36fd4 to c6bcc03CompareMay 11, 2023 12:38
@artonge

Copy link
Copy Markdown
CollaboratorAuthor

Thanks, screenshots updated. Good to review :)

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Screenshots look good to me :)

@nimishavijaynimishavijay left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🚀 :)

@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from c6bcc03 to 1c095eaCompareMay 11, 2023 14:27

@pulsejetpulsejet left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Love that bubble 💯

@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from 1c095ea to 2144dd2CompareMay 12, 2023 10:50
@blizzzblizzz mentioned this pull request May 12, 2023

@jancborchardtjancborchardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Awesome, looks much better with the userbubble.

Detail: In the grid list, the "Shared by" could go on the same line as date and "X items" as that's not so long @artonge? Then there is less of a vertical change between shared and non-shared albums.

@artonge

Copy link
Copy Markdown
CollaboratorAuthor

Detail: In the grid list, the "Shared by" could go on the same line as date and "X items" as that's not so long @artonge? Then there is less of a vertical change between shared and non-shared albums.

I am worried that this would overflow in most cases, so keeping it as is.

@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from 2144dd2 to 67c9374CompareMay 15, 2023 15:13

@jancborchardtjancborchardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Right, didn’t take into account the names itself. Approving then :)

@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from 67c9374 to 5e420e9CompareMay 15, 2023 20:42
+ Improve rendering of cover and header of shared albums
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
artongeforce-pushed the artonge/fix/revert_display_name_in_shared_album branch from 5e420e9 to 8c71a53CompareMay 16, 2023 07:54
@artonge
artonge merged commit 4f7e63e into masterMay 16, 2023
@artonge
artonge deleted the artonge/fix/revert_display_name_in_shared_album branch May 16, 2023 08:04
@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbackport-requestPending backport by the backport-botenhancementNew feature or requestjavascriptJavascript related ticketphpPHP related ticket

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@artonge@nimishavijay@szaimen@jancborchardt@pulsejet