Skip to content

[stable12] Use PNG icons for activity emails and ios client #5648

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.

Sign up for GitHub

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

Merged
MorrisJobke merged 3 commits into from
Jul 7, 2017
Merged

[stable12] Use PNG icons for activity emails and ios client #5648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43964d9
Add a flag to allow checking if SVGs are okay
nickvergessen Jun 20, 2017
87e69b5
Use PNG version of the icons for shipped activities
nickvergessen Jun 20, 2017
a6bae8a
Fix tests
nickvergessen Jun 20, 2017
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
1 change: 1 addition & 0 deletions apps/comments/img/comments-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion apps/comments/lib/Activity/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {

if ($event->getSubject() === 'add_comment_subject') {
$this->parseMessage($event);
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
}

if ($this->activityManager->isFormattingFilteredObject()) {
try {
Expand Down
6 changes: 5 additions & 1 deletion apps/dav/lib/CalDAV/Activity/Provider/Calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {

$this->l = $this->languageFactory->get('dav', $language);

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
}

if ($event->getSubject() === self::SUBJECT_ADD) {
$subject = $this->l->t('{actor} created calendar {calendar}');
Expand Down
6 changes: 5 additions & 1 deletion apps/dav/lib/CalDAV/Activity/Provider/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {

$this->l = $this->languageFactory->get('dav', $language);

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
}

if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
Expand Down
6 changes: 5 additions & 1 deletion apps/dav/lib/CalDAV/Activity/Provider/Todo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {

$this->l = $this->languageFactory->get('dav', $language);

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
}

if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
Expand Down
Binary file added apps/files/img/add-color.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/files/img/change.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/files/img/delete-color.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 22 additions & 6 deletions apps/files/lib/Activity/FavoriteProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,19 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
public function parseShortVersion(IEvent $event) {

if ($event->getSubject() === self::SUBJECT_ADDED) {
$event->setParsedSubject($this->l->t('Added to favorites'))
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
$event->setParsedSubject($this->l->t('Added to favorites'));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
}
} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
$event->setParsedSubject($this->l->t('Removed from favorites'))
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
$event->setParsedSubject($this->l->t('Removed from favorites'));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
}
} else {
throw new \InvalidArgumentException();
}
Expand All @@ -120,10 +128,18 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {

if ($event->getSubject() === self::SUBJECT_ADDED) {
$subject = $this->l->t('You added {file} to your favorites');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
}
} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
$subject = $this->l->t('You removed {file} from your favorites');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
}
} else {
throw new \InvalidArgumentException();
}
Expand Down
96 changes: 80 additions & 16 deletions apps/files/lib/Activity/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,41 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {

if ($event->getSubject() === 'created_by') {
$subject = $this->l->t('Created by {user}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
}
} else if ($event->getSubject() === 'changed_by') {
$subject = $this->l->t('Changed by {user}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'deleted_by') {
$subject = $this->l->t('Deleted by {user}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
}
} else if ($event->getSubject() === 'restored_by') {
$subject = $this->l->t('Restored by {user}');
} else if ($event->getSubject() === 'renamed_by') {
$subject = $this->l->t('Renamed by {user}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'moved_by') {
$subject = $this->l->t('Moved by {user}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else {
throw new \InvalidArgumentException();
}
Expand All @@ -151,41 +171,85 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {

if ($event->getSubject() === 'created_self') {
$subject = $this->l->t('You created {file}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
}
} else if ($event->getSubject() === 'created_by') {
$subject = $this->l->t('{user} created {file}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
}
} else if ($event->getSubject() === 'created_public') {
$subject = $this->l->t('{file} was created in a public folder');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
}
} else if ($event->getSubject() === 'changed_self') {
$subject = $this->l->t('You changed {file}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'changed_by') {
$subject = $this->l->t('{user} changed {file}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'deleted_self') {
$subject = $this->l->t('You deleted {file}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
}
} else if ($event->getSubject() === 'deleted_by') {
$subject = $this->l->t('{user} deleted {file}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
}
} else if ($event->getSubject() === 'restored_self') {
$subject = $this->l->t('You restored {file}');
} else if ($event->getSubject() === 'restored_by') {
$subject = $this->l->t('{user} restored {file}');
} else if ($event->getSubject() === 'renamed_self') {
$subject = $this->l->t('You renamed {oldfile} to {newfile}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'renamed_by') {
$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'moved_self') {
$subject = $this->l->t('You moved {oldfile} to {newfile}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else if ($event->getSubject() === 'moved_by') {
$subject = $this->l->t('{user} moved {oldfile} to {newfile}');
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
}
} else {
throw new \InvalidArgumentException();
}
Expand Down
12 changes: 10 additions & 2 deletions apps/files_sharing/lib/Activity/Providers/Downloads.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ public function parseShortVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand All @@ -76,7 +80,11 @@ public function parseLongVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down
12 changes: 10 additions & 2 deletions apps/files_sharing/lib/Activity/Providers/Groups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ public function parseShortVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand All @@ -78,7 +82,11 @@ public function parseLongVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down
12 changes: 10 additions & 2 deletions apps/files_sharing/lib/Activity/Providers/PublicLinks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ public function parseShortVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down Expand Up @@ -90,7 +94,11 @@ public function parseLongVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down
12 changes: 10 additions & 2 deletions apps/files_sharing/lib/Activity/Providers/RemoteShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ public function parseShortVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand All @@ -100,7 +104,11 @@ public function parseLongVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down
12 changes: 10 additions & 2 deletions apps/files_sharing/lib/Activity/Providers/Users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ public function parseShortVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down Expand Up @@ -92,7 +96,11 @@ public function parseLongVersion(IEvent $event) {
throw new \InvalidArgumentException();
}

$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
$this->setSubjects($event, $subject, $parsedParameters);

return $event;
Expand Down
Loading