From d31dd61b1bf31af028127eb59eb4788010624800 Mon Sep 17 00:00:00 2001
From: AJ Jordan <alex@strugee.net>
Date: Wed, 1 Apr 2020 19:54:48 -0400
Subject: [PATCH 1/3] Ignore CHANGELOG.md while generating changelogs

I heard you liked changelogs, so I put a changelog in your changelog...
or something. How meta.

Signed-off-by: AJ Jordan <alex@strugee.net>
---
 scripts/buildDev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/buildDev b/scripts/buildDev
index 78ec7b557db7..8a4d8f673b9f 100755
--- a/scripts/buildDev
+++ b/scripts/buildDev
@@ -44,7 +44,7 @@ lastBuildTag=$(git tag | grep dev | tail -n1)
 #  * Commits touching only non-user-facing stuff like tests
 #  * Version bump commits
 #  * Anything reachable from the previous dev edition tag
-changelog=$(git log --no-merges --invert-grep --author=dependabot --pretty='format:%s' HEAD "^$lastBuildTag" -- ':!src/androidTest' ':!.*' ':!scripts/' ':!screenshots' | grep -vE '^daily dev [[:digit:]]{8}$')
+changelog=$(git log --no-merges --invert-grep --author=dependabot --pretty='format:%s' HEAD "^$lastBuildTag" -- ':!src/androidTest' ':!.*' ':!scripts/' ':!screenshots' ':!CHANGELOG.md' | grep -vE '^daily dev [[:digit:]]{8}$')
 # Make Transifex updates have a nicer description
 if echo "$changelog" | grep -q 'tx-robot'; then
 	changelog=$(echo "$changelog" | grep -v 'tx-robot')

From 0259a331343616320a752d069adf16816fcfc759 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 2 Apr 2020 08:32:41 +0200
Subject: [PATCH 2/3] Change pdf icon

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 drawable_resources/application-pdf.svg | 12 ++++++-
 scripts/analysis/lint-results.txt      |  2 +-
 src/main/res/drawable/file_pdf.xml     | 43 ++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/drawable_resources/application-pdf.svg b/drawable_resources/application-pdf.svg
index cb54edd93396..cd5bad4b70de 100644
--- a/drawable_resources/application-pdf.svg
+++ b/drawable_resources/application-pdf.svg
@@ -1 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" width="16" version="1.1"><path fill="#dc5047" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3zm5.8 3.9s0.07 0.95-0.15 2.3c0.715 2.053 1.5 2.33 1.85 2.5 0.74-0.06 1.565-0.1 2.3 0.3 0.5 0.286 0.894 1.5-0.3 1.5-0.54-0.034-1.537-0.346-2.25-0.7-1.066 0.12-2.39 0.32-3.5 0.8-1.25 2.1-1.81 2.4-2.25 2.4-1.215-0.32-0.56-1.93-0.1-2.2 0.55-0.47 1.195-0.74 1.4-0.8 0.09-0.15 1.384-2.69 1.7-3.75-0.3-1.024-0.37-2.106-0.2-2.75 0.78-1.018 1.5-0.35 1.5 0.4zm-0.7 3.1c-0.27 1.057-1.348 3.084-1.3 3 1.105-0.485 2.1-0.63 3.2-0.8-0.526-0.235-1.146-0.25-1.9-2.2z"/></svg>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <path d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3z"
+        fill="#dc5047" />
+    <g fill="#fff" aria-label="PDF">
+        <path
+            d="m4.9093 8.443v1.057h-0.61813v-3h1.1703q0.33791 0 0.59341 0.12363 0.25755 0.12363 0.3956 0.35234 0.13805 0.22665 0.13805 0.51717 0 0.44093-0.30288 0.69643-0.30082 0.25343-0.83448 0.25343zm0-0.50069h0.5522q0.24519 0 0.37294-0.11538 0.12981-0.11538 0.12981-0.32967 0-0.22047-0.12981-0.35646t-0.35852-0.14011h-0.56662z" />
+        <path
+            d="m7.011 9.5v-3h0.92308q0.3956 0 0.70673 0.17926 0.31319 0.1772 0.48832 0.50687 0.17514 0.32761 0.17514 0.74588v0.13805q0 0.41827-0.17308 0.74382-0.17102 0.32555-0.4842 0.50481-0.31319 0.17926-0.70673 0.18132zm0.61813-2.4993v2.0027h0.29876q0.36264 0 0.55426-0.23695 0.19162-0.23695 0.19574-0.67788v-0.15865q0-0.45742-0.18956-0.69231-0.18956-0.23695-0.55426-0.23695z" />
+        <path d="m11.56 8.274h-1.1868v1.226h-0.61813v-3h1.9533v0.50069h-1.3352v0.77473h1.1868z" />
+    </g>
+</svg>
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 9612bc22b562..5d6b4fa29027 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 94 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 95 warnings</span>
diff --git a/src/main/res/drawable/file_pdf.xml b/src/main/res/drawable/file_pdf.xml
index 9d2ff48f6f27..7ee633ead66c 100644
--- a/src/main/res/drawable/file_pdf.xml
+++ b/src/main/res/drawable/file_pdf.xml
@@ -1,4 +1,41 @@
-<vector android:height="72dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#dc5047" android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3zM8.3,4.9s0.07,0.95 -0.15,2.3c0.715,2.053 1.5,2.33 1.85,2.5 0.74,-0.06 1.565,-0.1 2.3,0.3 0.5,0.286 0.894,1.5 -0.3,1.5 -0.54,-0.034 -1.537,-0.346 -2.25,-0.7 -1.066,0.12 -2.39,0.32 -3.5,0.8 -1.25,2.1 -1.81,2.4 -2.25,2.4 -1.215,-0.32 -0.56,-1.93 -0.1,-2.2 0.55,-0.47 1.195,-0.74 1.4,-0.8 0.09,-0.15 1.384,-2.69 1.7,-3.75 -0.3,-1.024 -0.37,-2.106 -0.2,-2.75 0.78,-1.018 1.5,-0.35 1.5,0.4zM7.6,8c-0.27,1.057 -1.348,3.084 -1.3,3 1.105,-0.485 2.1,-0.63 3.2,-0.8 -0.526,-0.235 -1.146,-0.25 -1.9,-2.2z"/>
+<!--
+  ~
+  ~ Nextcloud Android client application
+  ~
+  ~ @author Tobias Kaminsky
+  ~ Copyright (C) 2020 Tobias Kaminsky
+  ~ Copyright (C) 2020 Nextcloud GmbH
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector
+    android:height="16dp"
+    android:viewportHeight="16"
+    android:viewportWidth="16"
+    android:width="16dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#dc5047"
+        android:pathData="m2.5,1c-0.28,0 -0.5,0.22 -0.5,0.5v13c0,0.28 0.22,0.5 0.5,0.5h11c0.28,0 0.5,-0.22 0.5,-0.5v-10.5l-3,-3z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="m4.9093,8.443v1.057h-0.6181v-3h1.1703q0.3379,0 0.5934,0.1236 0.2576,0.1236 0.3956,0.3523 0.1381,0.2266 0.1381,0.5172 0,0.4409 -0.3029,0.6964 -0.3008,0.2534 -0.8345,0.2534zM4.9093,7.9423h0.5522q0.2452,0 0.3729,-0.1154 0.1298,-0.1154 0.1298,-0.3297 0,-0.2205 -0.1298,-0.3565t-0.3585,-0.1401h-0.5666z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="m7.011,9.5v-3h0.9231q0.3956,0 0.7067,0.1793 0.3132,0.1772 0.4883,0.5069 0.1751,0.3276 0.1751,0.7459v0.1381q0,0.4183 -0.1731,0.7438 -0.171,0.3255 -0.4842,0.5048 -0.3132,0.1793 -0.7067,0.1813zM7.6291,7.0007v2.0027h0.2988q0.3626,0 0.5543,-0.2369 0.1916,-0.2369 0.1957,-0.6779v-0.1586q0,-0.4574 -0.1896,-0.6923 -0.1896,-0.2369 -0.5543,-0.2369z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="m11.56,8.274h-1.1868v1.226h-0.6181v-3h1.9533v0.5007h-1.3352v0.7747h1.1868z" />
 </vector>

From 2734e5382bf8011a32a95eae0da2b6b2060534e3 Mon Sep 17 00:00:00 2001
From: nextcloud-android-bot <android@nextcloud.com>
Date: Wed, 8 Apr 2020 05:41:42 +0000
Subject: [PATCH 3/3] Drone: update Lint results to reflect reduced
 error/warning count [skip ci]

Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 5d6b4fa29027..9612bc22b562 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 95 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 94 warnings</span>