Fix app icon being inverted for app store apps too

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

3 files changed, 20 insertions, 8 deletions

diff --git a/core/img/places/default-app-icon.svg b/core/img/places/default-app-icon.svg
new file mode 100644
index 00000000000..7ef7f086921
--- /dev/null
+++ b/core/img/places/default-app-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1" viewBox="0 0 32 32"><path d="M13.733 0a.915.915 0 0 0-.933.934V3.6c-1.182.304-2.243.794-3.267 1.4L7.6 3.068a.93.93 0 0 0-1.334 0l-3.2 3.2a.93.93 0 0 0 0 1.334L5 9.535c-.607 1.024-1.097 2.085-1.4 3.267H.933a.915.915 0 0 0-.933.934v4.533c0 .53.403.934.933.934H3.6c.303 1.182.793 2.243 1.4 3.267l-1.934 1.935a.93.93 0 0 0 0 1.333l3.2 3.2a.93.93 0 0 0 1.333 0L9.532 27c1.024.61 2.085 1.097 3.266 1.4v2.667c0 .53.402.933.932.933h4.534c.53 0 .933-.403.933-.935V28.4c1.18-.305 2.24-.795 3.265-1.4L24.4 28.93a.93.93 0 0 0 1.332 0l3.2-3.2a.93.93 0 0 0 0-1.333L27 22.465c.607-1.024 1.096-2.085 1.4-3.266h2.665a.915.915 0 0 0 .935-.933v-4.534a.915.915 0 0 0-.934-.933H28.4c-.304-1.182-.792-2.243-1.4-3.267L28.932 7.6a.93.93 0 0 0 0-1.334l-3.2-3.2a.93.93 0 0 0-1.333 0L22.465 5c-1.024-.607-2.084-1.097-3.266-1.4V.933A.915.915 0 0 0 18.267 0zM16 8.87A7.134 7.134 0 0 1 23.13 16 7.134 7.134 0 0 1 16 23.133c-3.936 0-7.13-3.196-7.13-7.132S12.063 8.87 16 8.87z" display="block" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 103dcf26a71..a046148dcc4 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -670,6 +670,7 @@ form.section {
 	position: relative;
 }
 .app-image {
+	position: relative;
 	height: 150px;
 	opacity: 1;
 	overflow: hidden;
@@ -757,18 +758,21 @@ form.section {
 #apps-list.installed .app-image {
 	width: 44px;
 	text-align: right;
-	opacity: .5;
 }
 
 #apps-list.installed .app-image-icon svg {
 	margin-top: 5px;
 	width: 20px;
 	height: 20px;
+	opacity: .5;
 }
 
-#apps-list .app-image-icon svg {
-	opacity: .3;
-	margin-top: 50px;
+#apps-list:not(.installed) .app-image-icon svg {
+	position: absolute;
+	bottom: 43px; /* position halfway vertically */
+	width: 64px;
+	height: 64px;
+	opacity: .1;
 }
 
 .installed .actions {
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 03ae4e2e8c9..6da8c395ecb 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -183,7 +183,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		app.firstExperimental = firstExperimental;
 
 		if (!app.preview) {
-			app.preview = OC.imagePath('core', 'filetypes/image');
+			app.preview = OC.imagePath('core', 'places/default-app-icon');
 			app.previewAsIcon = true;
 		}
 
@@ -235,9 +235,16 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			currentImage.src = app.preview;
 
 			currentImage.onload = function() {
-				page.find('.app-image')
-					.append(OC.Settings.Apps.imageUrl(app.preview, app.fromAppStore))
-					.removeClass('icon-loading');
+				/* Trigger color inversion for placeholder image too */
+				if(app.previewAsIcon) {
+					page.find('.app-image')
+						.append(OC.Settings.Apps.imageUrl(app.preview, false))
+						.removeClass('icon-loading');
+				} else {
+					page.find('.app-image')
+						.append(OC.Settings.Apps.imageUrl(app.preview, app.fromAppStore))
+						.removeClass('icon-loading');
+				}
 			};
 		}