Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions app/lib/frontend/templates/views/pkg/liked_package_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,34 +72,13 @@ d.Node renderLikeButtonAndLabel(
return d.div(
classes: ['like-button-and-label'],
children: [
material.iconButton(
classes: ['like-button-and-label--button'],
isOn: isLiked,
onIcon: d.Image(
src: staticUrls.getAssetUrl('/static/img/like-active.svg'),
alt: 'liked status: active',
width: 18,
height: 18,
),
offIcon: d.Image(
src: staticUrls.getAssetUrl('/static/img/like-inactive.svg'),
alt: 'liked status: inactive',
width: 18,
height: 18,
),
title: isLiked ? 'Unlike this package' : 'Like this package',
attributes: {
'data-ga-click-event': 'toggle-like',
'aria-pressed': isLiked ? 'true' : 'false',
},
),
_renderLikeButton(package, isLiked),
d.span(
classes: ['like-button-and-label--count-wrapper'],
child: d.span(
classes: ['like-button-and-label--count'],
text: _formatPackageLikes(likeCount),
attributes: {
'data-package': package,
'data-value': likeCount.toString(),
},
),
Expand All @@ -108,6 +87,31 @@ d.Node renderLikeButtonAndLabel(
);
}

d.Node _renderLikeButton(String package, bool isLiked) {
return material.iconButton(
classes: ['like-button-and-label--button'],
isOn: isLiked,
onIcon: d.Image(
src: staticUrls.getAssetUrl('/static/img/like-active.svg'),
alt: 'liked status: active',
width: 18,
height: 18,
),
offIcon: d.Image(
src: staticUrls.getAssetUrl('/static/img/like-inactive.svg'),
alt: 'liked status: inactive',
width: 18,
height: 18,
),
title: isLiked ? 'Unlike this package' : 'Like this package',
attributes: {
'data-ga-click-event': 'toggle-like',
'aria-pressed': isLiked ? 'true' : 'false',
'data-package': package,
},
);
}

// keep in-sync with pkg/web_app/lib/src/likes.dart
String? _formatPackageLikes(int? likesCount) {
if (likesCount == null) return null;
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_activity_log_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_admin_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_changelog_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_example_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_install_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_score_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_show_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_show_page_discontinued.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="pkg" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="pkg" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_show_page_flutter_plugin.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="flutter_titanium" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="flutter_titanium" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_show_page_publisher.html
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="neon" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="neon" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_show_page_retracted.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
<span class="package-tag retracted" title="This version was retracted.">retracted</span>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="pkg" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="pkg" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="pkg" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="pkg" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/test/frontend/golden/pkg_show_version_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ <h1 class="title pub-monochrome-icon-hoverable">
</div>
</div>
<div class="like-button-and-label">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" title="Like this package">
<button class="mdc-icon-button like-button-and-label--button" data-ga-click-event="toggle-like" aria-pressed="false" data-package="oxygen" title="Like this package">
<img class="mdc-icon-button__icon" src="/static/hash-%%etag%%/img/like-inactive.svg" alt="liked status: inactive" width="18" height="18"/>
<img class="mdc-icon-button__icon mdc-icon-button__icon--on" src="/static/hash-%%etag%%/img/like-active.svg" alt="liked status: active" width="18" height="18"/>
</button>
<span class="like-button-and-label--count-wrapper">
<span class="like-button-and-label--count" data-package="oxygen" data-value="0">0</span>
<span class="like-button-and-label--count" data-value="0">0</span>
</span>
</div>
</div>
Expand Down
Loading