Merge pull request #3606 from mritzmann/master

add manifest.json for android pwa

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 2499bb887adb87f2b2b99271f47dec83b168f59d..aa388bcbcbd3d5a2e062f8e1f5ab122822435589 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -38,6 +38,8 @@
 
             <link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}">
 
+            <link rel="manifest" href="{{ asset('manifest.json') }}">
+
             {% block css %}
             {% endblock %}
             {% block scripts %}

diff --git a/web/manifest.json b/web/manifest.json
new file mode 100644 (file)
index 0000000..72638ee
--- /dev/null
+++ b/web/manifest.json
@@ -0,0 +1,48 @@
+{
+  "short_name": "wallabag",
+  "name": "Save and classify articles. Read them later. Freely.",
+  "icons": [
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-57.png",
+      "type": "image/png",
+      "sizes": "57x57"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-72.png",
+      "type": "image/png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-76.png",
+      "type": "image/png",
+      "sizes": "76x76"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-114.png",
+      "type": "image/png",
+      "sizes": "114x114"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-120.png",
+      "type": "image/png",
+      "sizes": "120x120"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-144.png",
+      "type": "image/png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-152.png",
+      "type": "image/png",
+      "sizes": "152x152"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "display": "standalone",
+  "background_color": "#FFFFFF"
+}

diff --git a/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png b/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png
new file mode 100644 (file)
index 0000000..7385c25
Binary files /dev/null and b/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png differ