Skip to content

Commit a5182ab

Browse files
MorrisJobkeMorrisJobke
authored
Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
[stable12] Use PNG icons for activity emails and ios client
2 parents 8ad1123 + a6bae8a commit a5182ab

File tree

34 files changed

+313
-82
lines changed

34 files changed

+313
-82
lines changed

‎apps/comments/img/comments-dark.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎apps/comments/lib/Activity/Provider.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
8787

8888
if ($event->getSubject() === 'add_comment_subject') {
8989
$this->parseMessage($event);
90-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
90+
if ($this->activityManager->getRequirePNG()) {
91+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
92+
} else {
93+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
94+
}
9195

9296
if ($this->activityManager->isFormattingFilteredObject()) {
9397
try {

‎apps/dav/lib/CalDAV/Activity/Provider/Calendar.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
8484

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

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

8993
if ($event->getSubject() === self::SUBJECT_ADD) {
9094
$subject = $this->l->t('{actor} created calendar {calendar}');

‎apps/dav/lib/CalDAV/Activity/Provider/Event.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
8080

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

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

8589
if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
8690
$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');

‎apps/dav/lib/CalDAV/Activity/Provider/Todo.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
4040

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

43-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
43+
if ($this->activityManager->getRequirePNG()) {
44+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
45+
} else {
46+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
47+
}
4448

4549
if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
4650
$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');

‎apps/files/img/add-color.png‎

4.12 KB
Loading

‎apps/files/img/change.png‎

4.12 KB
Loading

‎apps/files/img/delete-color.png‎

4.12 KB
Loading

‎apps/files/lib/Activity/FavoriteProvider.php‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,19 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
9797
public function parseShortVersion(IEvent $event) {
9898

9999
if ($event->getSubject() === self::SUBJECT_ADDED) {
100-
$event->setParsedSubject($this->l->t('Added to favorites'))
101-
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
100+
$event->setParsedSubject($this->l->t('Added to favorites'));
101+
if ($this->activityManager->getRequirePNG()) {
102+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
103+
} else {
104+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
105+
}
102106
} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
103-
$event->setParsedSubject($this->l->t('Removed from favorites'))
104-
->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
107+
$event->setParsedSubject($this->l->t('Removed from favorites'));
108+
if ($this->activityManager->getRequirePNG()) {
109+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
110+
} else {
111+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
112+
}
105113
} else {
106114
throw new \InvalidArgumentException();
107115
}
@@ -120,10 +128,18 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
120128

121129
if ($event->getSubject() === self::SUBJECT_ADDED) {
122130
$subject = $this->l->t('You added {file} to your favorites');
123-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
131+
if ($this->activityManager->getRequirePNG()) {
132+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.png')));
133+
} else {
134+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
135+
}
124136
} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
125137
$subject = $this->l->t('You removed {file} from your favorites');
126-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
138+
if ($this->activityManager->getRequirePNG()) {
139+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.png')));
140+
} else {
141+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
142+
}
127143
} else {
128144
throw new \InvalidArgumentException();
129145
}

‎apps/files/lib/Activity/Provider.php‎

Lines changed: 80 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,41 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
110110

111111
if ($event->getSubject() === 'created_by') {
112112
$subject = $this->l->t('Created by {user}');
113-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
113+
if ($this->activityManager->getRequirePNG()) {
114+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
115+
} else {
116+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
117+
}
114118
} else if ($event->getSubject() === 'changed_by') {
115119
$subject = $this->l->t('Changed by {user}');
116-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
120+
if ($this->activityManager->getRequirePNG()) {
121+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
122+
} else {
123+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
124+
}
117125
} else if ($event->getSubject() === 'deleted_by') {
118126
$subject = $this->l->t('Deleted by {user}');
119-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
127+
if ($this->activityManager->getRequirePNG()) {
128+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png')));
129+
} else {
130+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
131+
}
120132
} else if ($event->getSubject() === 'restored_by') {
121133
$subject = $this->l->t('Restored by {user}');
122134
} else if ($event->getSubject() === 'renamed_by') {
123135
$subject = $this->l->t('Renamed by {user}');
124-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
136+
if ($this->activityManager->getRequirePNG()) {
137+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
138+
} else {
139+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
140+
}
125141
} else if ($event->getSubject() === 'moved_by') {
126142
$subject = $this->l->t('Moved by {user}');
127-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
143+
if ($this->activityManager->getRequirePNG()) {
144+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
145+
} else {
146+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
147+
}
128148
} else {
129149
throw new \InvalidArgumentException();
130150
}
@@ -151,41 +171,85 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
151171

152172
if ($event->getSubject() === 'created_self') {
153173
$subject = $this->l->t('You created {file}');
154-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
174+
if ($this->activityManager->getRequirePNG()) {
175+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
176+
} else {
177+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
178+
}
155179
} else if ($event->getSubject() === 'created_by') {
156180
$subject = $this->l->t('{user} created {file}');
157-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
181+
if ($this->activityManager->getRequirePNG()) {
182+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
183+
} else {
184+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
185+
}
158186
} else if ($event->getSubject() === 'created_public') {
159187
$subject = $this->l->t('{file} was created in a public folder');
160-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
188+
if ($this->activityManager->getRequirePNG()) {
189+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png')));
190+
} else {
191+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
192+
}
161193
} else if ($event->getSubject() === 'changed_self') {
162194
$subject = $this->l->t('You changed {file}');
163-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
195+
if ($this->activityManager->getRequirePNG()) {
196+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
197+
} else {
198+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
199+
}
164200
} else if ($event->getSubject() === 'changed_by') {
165201
$subject = $this->l->t('{user} changed {file}');
166-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
202+
if ($this->activityManager->getRequirePNG()) {
203+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
204+
} else {
205+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
206+
}
167207
} else if ($event->getSubject() === 'deleted_self') {
168208
$subject = $this->l->t('You deleted {file}');
169-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
209+
if ($this->activityManager->getRequirePNG()) {
210+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png')));
211+
} else {
212+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
213+
}
170214
} else if ($event->getSubject() === 'deleted_by') {
171215
$subject = $this->l->t('{user} deleted {file}');
172-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
216+
if ($this->activityManager->getRequirePNG()) {
217+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png')));
218+
} else {
219+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
220+
}
173221
} else if ($event->getSubject() === 'restored_self') {
174222
$subject = $this->l->t('You restored {file}');
175223
} else if ($event->getSubject() === 'restored_by') {
176224
$subject = $this->l->t('{user} restored {file}');
177225
} else if ($event->getSubject() === 'renamed_self') {
178226
$subject = $this->l->t('You renamed {oldfile} to {newfile}');
179-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
227+
if ($this->activityManager->getRequirePNG()) {
228+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
229+
} else {
230+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
231+
}
180232
} else if ($event->getSubject() === 'renamed_by') {
181233
$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
182-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
234+
if ($this->activityManager->getRequirePNG()) {
235+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
236+
} else {
237+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
238+
}
183239
} else if ($event->getSubject() === 'moved_self') {
184240
$subject = $this->l->t('You moved {oldfile} to {newfile}');
185-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
241+
if ($this->activityManager->getRequirePNG()) {
242+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
243+
} else {
244+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
245+
}
186246
} else if ($event->getSubject() === 'moved_by') {
187247
$subject = $this->l->t('{user} moved {oldfile} to {newfile}');
188-
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
248+
if ($this->activityManager->getRequirePNG()) {
249+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png')));
250+
} else {
251+
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
252+
}
189253
} else {
190254
throw new \InvalidArgumentException();
191255
}

0 commit comments

Comments
 (0)