From 9f1fc55be99695513d5577031f57070b7f0b9d88 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Sun, 18 Apr 2021 16:09:35 +0200
Subject: [PATCH] (FIX #756) update thumbnail for HM GovUK

and combine HM Revenue & Customs (HMRC) and HM GovUK

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 .../andotp/Utilities/EntryThumbnail.java      |  4 +--
 app/src/main/res/drawable/thumb_gov_uk.xml    | 36 +++++++++++++++++++
 app/src/main/res/drawable/thumb_govuk.xml     |  6 ----
 app/src/main/res/drawable/thumb_hmrc.xml      | 32 -----------------
 4 files changed, 38 insertions(+), 40 deletions(-)
 create mode 100644 app/src/main/res/drawable/thumb_gov_uk.xml
 delete mode 100644 app/src/main/res/drawable/thumb_govuk.xml
 delete mode 100644 app/src/main/res/drawable/thumb_hmrc.xml

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
index 2fae6f19..b1ff4e4e 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
@@ -197,7 +197,7 @@ public class EntryThumbnail {
         GoDaddy(R.drawable.thumb_godaddy),
         Gogs(R.drawable.thumb_gogs),
         Google(R.drawable.thumb_google),
-        GovUK(R.drawable.thumb_govuk),
+        GovUK(R.drawable.thumb_gov_uk),
         Grammarly(R.drawable.thumb_grammarly),
         Greenhost(R.drawable.thumb_greenhost),
         GTwoA(R.drawable.thumb_g2a),
@@ -205,7 +205,7 @@ public class EntryThumbnail {
         Heroku(R.drawable.thumb_heroku),
         Hetzner(R.drawable.thumb_hetzner),
         HitBTC(R.drawable.thumb_hitbtc),
-        HMRC(R.drawable.thumb_hmrc),
+        HMRC(R.drawable.thumb_gov_uk),
         HomeAssistant(R.drawable.thumb_home_assistant),
         HostingDE(R.drawable.thumb_hosting_de),
         Hover(R.drawable.thumb_hover),
diff --git a/app/src/main/res/drawable/thumb_gov_uk.xml b/app/src/main/res/drawable/thumb_gov_uk.xml
new file mode 100644
index 00000000..7816899b
--- /dev/null
+++ b/app/src/main/res/drawable/thumb_gov_uk.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="132.02dp"
+    android:height="96dp"
+    android:viewportWidth="132.02"
+    android:viewportHeight="96">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m65.98,92.8c16.9,0 32.8,1.1 47.1,3.2 4,-16.9 8.9,-26.7 14,-33.5l-9.6,-3.4c1,4.9 1.1,7.2 0,10.2 -1.5,-1.4 -3,-4.3 -4.2,-8.7l-4.7,15.4c2.8,-2 5,-3.2 7.5,-3.3 -4.4,9.4 -10,11.9 -13.6,11.2 -4.3,-0.8 -6.3,-4.6 -5.6,-7.9 1,-4.7 5.7,-5.9 8,-0.5 4.3,-8.7 -3,-11.4 -7.6,-8.8 7.1,-7.2 7.9,-13.5 2.1,-21.1 -8,6.1 -8.1,12.3 -4.5,20.8 -4.7,-5.4 -12.1,-2.5 -9.5,6.2 3.4,-5.2 7.9,-2 7.2,3.1 -0.6,4.3 -6.4,7.8 -13.5,7.2 -10.3,-0.9 -10.9,-8 -11.2,-13.8 2.5,-0.5 7.1,1.8 11,7.3l1.3,-16.4c-4.1,4.4 -8,5.3 -12.3,5.4 1.4,-4.4 8,-11.6 8,-11.6h-20.4c0,0 6.4,7.2 7.9,11.6 -4.2,-0.1 -8,-1 -12.3,-5.4l1.4,16.4c3.9,-5.5 8.5,-7.7 10.9,-7.3 -0.3,5.8 -0.9,12.8 -11.1,13.8 -7.2,0.6 -12.9,-2.9 -13.5,-7.2 -0.7,-5 3.8,-8.3 7.1,-3.1 2.7,-8.7 -4.6,-11.6 -9.4,-6.2 3.7,-8.5 3.6,-14.7 -4.6,-20.8 -5.8,7.6 -5,13.9 2.2,21.1 -4.7,-2.6 -11.9,0.1 -7.7,8.8 2.3,-5.5 7.1,-4.2 8.1,0.5 0.7,3.3 -1.3,7.1 -5.7,7.9 -3.5,0.7 -9,-1.8 -13.5,-11.2 2.5,0.1 4.7,1.3 7.5,3.3l-4.7,-15.4c-1.2,4.4 -2.7,7.2 -4.3,8.7 -1.1,-3 -0.9,-5.3 0,-10.2l-9.5,3.4c5,6.9 9.9,16.7 14,33.5 14.8,-2.1 30.8,-3.2 47.7,-3.2z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m69.68,17.7 l8.9,4.7V9.3l-8.9,2.8c-0.2,-0.3 -0.5,-0.6 -0.9,-0.9l3.6,-11.2h-12.8l3.5,11.2c-0.3,0.3 -0.6,0.5 -0.9,0.9l-8.8,-2.8v13.1l8.8,-4.7c0.3,0.3 0.6,0.7 0.9,0.9l-5,15.4v0.1c-0.2,0.8 -0.4,1.6 -0.4,2.4 0,4.1 3.1,7.5 7,8.1h0.2c0.3,0 0.7,0.1 1,0.1 0.4,0 0.7,0 1,-0.1h0.2c4,-0.6 7.1,-4.1 7.1,-8.1 0,-0.8 -0.1,-1.7 -0.4,-2.4V34l-5.1,-15.4c0.4,-0.2 0.7,-0.6 1,-0.9z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m89.28,35.8c-3.6,1.5 -7.8,-0.2 -9.2,-3.8 -1.4,-3.6 0.2,-7.7 3.9,-9.1 3.6,-1.5 7.7,0.3 9.2,3.8 1.4,3.6 -0.3,7.7 -3.9,9.1z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m127.68,57.2c-3.6,1.5 -7.8,-0.2 -9.2,-3.8 -1.5,-3.6 0.2,-7.7 3.9,-9.1 3.6,-1.5 7.7,0.3 9.2,3.8 1.3,3.5 -0.4,7.6 -3.9,9.1z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m122.98,39.5c-3.6,1.5 -7.7,-0.2 -9.1,-3.7 -1.5,-3.6 0.2,-7.8 3.7,-9.1 3.6,-1.5 7.7,0.2 9.2,3.8 1.5,3.5 -0.3,7.5 -3.8,9z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m107.08,30.2c-3.6,1.5 -7.8,-0.2 -9.1,-3.7 -1.5,-3.6 0.2,-7.8 3.8,-9.2 3.6,-1.4 7.7,0.3 9.2,3.9 1.3,3.5 -0.4,7.5 -3.9,9z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m42.68,35.8c3.5,1.5 7.7,-0.2 9.1,-3.8 1.5,-3.6 -0.2,-7.7 -3.9,-9.1 -3.6,-1.5 -7.6,0.3 -9.1,3.8 -1.3,3.6 0.4,7.7 3.9,9.1z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m4.38,57.2c3.5,1.5 7.7,-0.2 9.1,-3.8 1.5,-3.6 -0.2,-7.7 -3.9,-9.1 -3.5,-1.5 -7.6,0.3 -9.1,3.8 -1.4,3.5 0.3,7.6 3.9,9.1z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m8.98,39.5c3.6,1.5 7.8,-0.2 9.2,-3.7 1.5,-3.6 -0.2,-7.8 -3.9,-9.1 -3.6,-1.5 -7.6,0.2 -9.1,3.8 -1.4,3.5 0.3,7.5 3.8,9z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m24.98,30.2c3.5,1.5 7.7,-0.2 9.1,-3.7 1.5,-3.6 -0.2,-7.8 -3.9,-9.2 -3.6,-1.4 -7.6,0.3 -9.1,3.9 -1.4,3.5 0.3,7.5 3.9,9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/thumb_govuk.xml b/app/src/main/res/drawable/thumb_govuk.xml
deleted file mode 100644
index 1b939376..00000000
--- a/app/src/main/res/drawable/thumb_govuk.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="94.1dp" android:viewportHeight="97"
-    android:viewportWidth="132" android:width="128.0536dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:fillType="evenOdd"
-        android:pathData="M25,30.2C28.5,31.7 32.7,30 34.1,26.5 35.6,22.9 33.9,18.7 30.2,17.3 26.6,15.9 22.6,17.6 21.1,21.2 19.7,24.7 21.4,28.7 25,30.2L25,30.2ZM9,39.5C12.6,41 16.8,39.3 18.2,35.8 19.7,32.2 18,28 14.3,26.7 10.7,25.2 6.7,26.9 5.2,30.5 3.8,34 5.5,38 9,39.5L9,39.5ZM4.4,57.2C7.9,58.7 12.1,57 13.5,53.4 15,49.8 13.3,45.7 9.6,44.3 6.1,42.8 2,44.6 0.5,48.1 -0.9,51.6 0.8,55.7 4.4,57.2L4.4,57.2ZM42.7,35.8C46.2,37.3 50.4,35.6 51.8,32 53.3,28.4 51.6,24.3 47.9,22.9 44.3,21.4 40.3,23.2 38.8,26.7 37.5,30.3 39.2,34.4 42.7,35.8L42.7,35.8ZM107.1,30.2C103.5,31.7 99.3,30 98,26.5 96.5,22.9 98.2,18.7 101.8,17.3 105.4,15.9 109.5,17.6 111,21.2 112.3,24.7 110.6,28.7 107.1,30.2L107.1,30.2ZM123,39.5C119.4,41 115.3,39.3 113.9,35.8 112.4,32.2 114.1,28 117.6,26.7 121.2,25.2 125.3,26.9 126.8,30.5 128.3,34 126.5,38 123,39.5L123,39.5ZM127.7,57.2C124.1,58.7 119.9,57 118.5,53.4 117,49.8 118.7,45.7 122.4,44.3 126,42.8 130.1,44.6 131.6,48.1 132.9,51.6 131.2,55.7 127.7,57.2L127.7,57.2ZM89.3,35.8C85.7,37.3 81.5,35.6 80.1,32 78.7,28.4 80.3,24.3 84,22.9 87.6,21.4 91.7,23.2 93.2,26.7 94.6,30.3 92.9,34.4 89.3,35.8L89.3,35.8ZM69.7,17.7L69.7,17.7 78.6,22.4 78.6,9.3 69.7,12.1 69.7,12.1C69.5,11.8 69.2,11.5 68.8,11.2L68.8,11.2 72.4,0 66,0 59.6,0 63.1,11.2 63.1,11.2C62.8,11.5 62.5,11.7 62.2,12.1L62.2,12.1 53.4,9.3 53.4,22.4 62.2,17.7 62.2,17.7C62.5,18 62.8,18.4 63.1,18.6L58.1,34C58.1,34 58.1,34 58.1,34.1L58.1,34.1 58.1,34.1C57.9,34.9 57.7,35.7 57.7,36.5 57.7,40.6 60.8,44 64.7,44.6L64.9,44.6C65.2,44.6 65.6,44.7 65.9,44.7 66.3,44.7 66.6,44.7 66.9,44.6L67.1,44.6C71.1,44 74.2,40.5 74.2,36.5 74.2,35.7 74.1,34.8 73.8,34.1L73.8,34.1 73.8,34.1C73.8,34.1 73.8,34.1 73.8,34L68.7,18.6C69.1,18.4 69.4,18 69.7,17.7L69.7,17.7ZM66,92.8C82.9,92.8 98.8,93.9 113.1,96 117.1,79.1 122,69.3 127.1,62.5L117.5,59.1C118.5,64 118.6,66.3 117.5,69.3 116,67.9 114.5,65 113.3,60.6L108.6,76C111.4,74 113.6,72.8 116.1,72.7 111.7,82.1 106.1,84.6 102.5,83.9 98.2,83.1 96.2,79.3 96.9,76 97.9,71.3 102.6,70.1 104.9,75.5 109.2,66.8 101.9,64.1 97.3,66.7 104.4,59.5 105.2,53.2 99.4,45.6 91.4,51.7 91.3,57.9 94.9,66.4 90.2,61 82.8,63.9 85.4,72.6 88.8,67.4 93.3,70.6 92.6,75.7 92,80 86.2,83.5 79.1,82.9 68.8,82 68.2,74.9 67.9,69.1 70.4,68.6 75,70.9 78.9,76.4L80.2,60C76.1,64.4 72.2,65.3 67.9,65.4 69.3,61 75.9,53.8 75.9,53.8L66.4,53.8 66.4,53.8 66.4,53.8 55.5,53.8C55.5,53.8 61.9,61 63.4,65.4 59.2,65.3 55.4,64.4 51.1,60L52.5,76.4C56.4,70.9 61,68.7 63.4,69.1 63.1,74.9 62.5,81.9 52.3,82.9 45.1,83.5 39.4,80 38.8,75.7 38.1,70.7 42.6,67.4 45.9,72.6 48.6,63.9 41.3,61 36.5,66.4 40.2,57.9 40.1,51.7 31.9,45.6 26.1,53.2 26.9,59.5 34.1,66.7 29.4,64.1 22.2,66.8 26.4,75.5 28.7,70 33.5,71.3 34.5,76 35.2,79.3 33.2,83.1 28.8,83.9 25.3,84.6 19.8,82.1 15.3,72.7 17.8,72.8 20,74 22.8,76L18.1,60.6C16.9,65 15.4,67.8 13.8,69.3 12.7,66.3 12.9,64 13.8,59.1L4.3,62.5C9.3,69.4 14.2,79.2 18.3,96 33.1,93.9 49.1,92.8 66,92.8L66,92.8Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/app/src/main/res/drawable/thumb_hmrc.xml b/app/src/main/res/drawable/thumb_hmrc.xml
deleted file mode 100644
index 5f1fd268..00000000
--- a/app/src/main/res/drawable/thumb_hmrc.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<vector android:height="100dp" android:viewportHeight="200.0"
-    android:viewportWidth="334.8805" android:width="167dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#01928c" android:pathData="m0,198.99l4.72,0l0,-199.04l-4.72,0l0,199.04z"/>
-    <path android:fillColor="#231f20" android:pathData="m28.3,99.82l5.34,0l0,17.26l21.14,0l0,-17.26l5.34,0l0,40.14l-5.34,0l0,-18.38l-21.14,0l0,18.38l-5.34,0l0,-40.14z"/>
-    <path android:fillColor="#231f20" android:pathData="m67.52,99.82l7.31,0l12.65,33.73 12.71,-33.73l7.31,0l0,40.14l-5.06,0l0,-33.39l-0.11,0l-12.54,33.39l-4.55,0l-12.54,-33.39l-0.11,0l0,33.39l-5.06,0l0,-40.14z"/>
-    <path android:fillColor="#231f20" android:pathData="m130.87,99.82l18.89,0c7.53,0 12.2,4.1 12.2,10.51 0,4.83 -2.14,8.83 -6.97,10.17l0,0.11c4.67,0.9 5.62,4.33 6.02,8.26 0.34,3.93 0.11,8.32 2.36,11.07l-5.96,0c-1.52,-1.63 -0.67,-5.96 -1.46,-9.9 -0.56,-3.93 -1.52,-7.25 -6.69,-7.25l-13.04,0l0,17.15l-5.34,0l0,-40.14zM147.34,118.32c5,0 9.28,-1.29 9.28,-7.14 0,-3.93 -2.14,-6.86 -7.14,-6.86l-13.27,0l0,14l11.13,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m191.95,130.73c-1.29,6.41 -5.9,9.9 -12.42,9.9 -9.28,0 -13.66,-6.41 -13.94,-15.29 0,-8.71 5.73,-15.12 13.66,-15.12 10.29,0 13.43,9.61 13.15,16.64l-21.75,0c-0.17,5.06 2.7,9.56 9.05,9.56 3.94,0 6.69,-1.91 7.53,-5.68l4.72,0zM187.34,122.63c-0.22,-4.55 -3.66,-8.21 -8.38,-8.21 -5,0 -7.98,3.77 -8.32,8.21l16.7,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m208.32,139.94l-5.12,0l-10.79,-29.06l5.34,0l8.15,24.23l0.11,0l7.92,-24.23l5,0l-10.63,29.06z"/>
-    <path android:fillColor="#231f20" android:pathData="m245.65,130.73c-1.29,6.41 -5.9,9.9 -12.42,9.9 -9.28,0 -13.66,-6.41 -13.94,-15.29 0,-8.71 5.73,-15.12 13.66,-15.12 10.29,0 13.43,9.61 13.15,16.64l-21.75,0c-0.17,5.06 2.7,9.56 9.05,9.56 3.94,0 6.69,-1.91 7.53,-5.68l4.72,0zM241.04,122.63c-0.22,-4.55 -3.66,-8.21 -8.38,-8.21 -5,0 -7.98,3.77 -8.32,8.21l16.7,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m250.02,110.88l4.5,0l0,4.61l0.11,0c2.02,-3.6 5.29,-5.28 9.44,-5.28 7.65,0 10.01,4.39 10.01,10.62l0,19.12l-4.78,0l0,-19.68c0,-3.54 -2.25,-5.85 -5.9,-5.85 -5.79,0 -8.6,3.88 -8.6,9.11l0,16.42l-4.78,0l0,-29.06z"/>
-    <path android:fillColor="#231f20" android:pathData="m303.75,139.94l-4.5,0l0,-4.61l-0.11,0c-2.02,3.6 -5.29,5.28 -9.44,5.28 -7.65,0 -10.01,-4.39 -10.01,-10.62l0,-19.12l4.78,0l0,19.68c0,3.54 2.25,5.85 5.9,5.85 5.79,0 8.6,-3.88 8.6,-9.11l0,-16.41l4.78,0l0,29.06z"/>
-    <path android:fillColor="#231f20" android:pathData="m334.42,130.73c-1.29,6.41 -5.9,9.9 -12.42,9.9 -9.28,0 -13.66,-6.41 -13.94,-15.29 0,-8.71 5.73,-15.12 13.66,-15.12 10.29,0 13.43,9.61 13.15,16.64l-21.75,0c-0.17,5.06 2.7,9.56 9.05,9.56 3.94,0 6.69,-1.91 7.53,-5.68l4.72,0zM329.81,122.63c-0.22,-4.55 -3.65,-8.21 -8.38,-8.21 -5,0 -7.98,3.77 -8.32,8.21l16.7,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m49.66,194c-2.42,3.77 -6.97,5.68 -11.36,5.68 -10.85,0 -12.54,-7.7 -12.54,-10.96 0,-6.3 4.27,-9.45 9.39,-12.14 -2.25,-3.21 -4.44,-5.34 -4.44,-9.45 0,-4.39 3.26,-8.27 9.05,-8.27 5,0 9.73,2.76 9.73,8.21 0,4.78 -3.66,8.21 -7.53,10.4l7.25,8.83c0.73,-1.97 1.18,-4.1 1.29,-6.24l4.55,0c-0.39,4.72 -1.01,6.35 -2.7,9.89l7.81,9.05l-6.24,0l-4.27,-5zM37.8,179.61c-3.77,2.14 -6.97,4.27 -6.97,9.05 0,4.05 3.77,6.8 7.65,6.8 3.66,0 6.58,-1.85 8.55,-4.78l-9.22,-11.07zM44.72,167.36c0,-2.3 -1.74,-4.27 -4.61,-4.27 -2.25,0 -4.61,1.35 -4.61,4.27 0,2.42 2.14,4.78 3.88,6.97 2.3,-1.46 5.34,-3.6 5.34,-6.97"/>
-    <path android:fillColor="#231f20" android:pathData="m106.44,170.97c-1.12,-5.68 -5.68,-8.54 -11.24,-8.54 -9.56,0 -13.6,7.87 -13.6,16.25 0,9.16 4.05,16.81 13.66,16.81 7.03,0 11.07,-4.95 11.58,-11.58l5.34,0c-1.01,10.01 -7.25,16.08 -17.37,16.08 -12.48,0 -18.55,-9.22 -18.55,-20.91 0,-11.64 6.63,-21.14 19,-21.14 8.38,0 15.29,4.5 16.53,13.04l-5.34,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m140.51,199.01l-4.5,0l0,-4.61l-0.11,0c-2.02,3.6 -5.29,5.28 -9.44,5.28 -7.65,0 -10.01,-4.39 -10.01,-10.62l0,-19.12l4.78,0l0,19.68c0,3.54 2.25,5.85 5.9,5.85 5.79,0 8.6,-3.88 8.6,-9.11l0,-16.41l4.78,0l0,29.06z"/>
-    <path android:fillColor="#231f20" android:pathData="m149.46,189.85c0.17,4.27 3.88,5.62 7.81,5.62 2.98,0 7.03,-0.67 7.03,-4.33 0,-3.71 -4.72,-4.33 -9.5,-5.4 -4.72,-1.07 -9.5,-2.64 -9.5,-8.21 0,-5.85 5.79,-8.26 10.85,-8.26 6.41,0 11.53,2.02 11.92,9.11l-4.78,0c-0.34,-3.71 -3.6,-4.89 -6.75,-4.89 -2.87,0 -6.18,0.79 -6.18,3.71 0,3.43 5.06,3.99 9.5,5.06 4.78,1.07 9.5,2.64 9.5,8.27 0,6.92 -6.46,9.17 -12.37,9.17 -6.52,0 -12.03,-2.64 -12.31,-9.84l4.78,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m180.04,169.95l5.79,0l0,4.22l-5.79,0l0,18.04c0,2.19 0.62,2.58 3.6,2.58l2.19,0l0,4.22l-3.66,0c-4.95,0 -6.91,-1.01 -6.91,-6.35l0,-18.49l-4.95,0l0,-4.22l4.95,0l0,-8.71l4.78,0l0,8.71z"/>
-    <path android:fillColor="#231f20" android:pathData="m201.26,169.27c9.22,0 14.11,6.69 14.11,15.24 0,8.49 -4.89,15.18 -14.11,15.18s-14.11,-6.69 -14.11,-15.18c0,-8.55 4.89,-15.24 14.11,-15.24m0,26.2c5,0 9.05,-3.93 9.05,-10.96 0,-7.08 -4.05,-11.02 -9.05,-11.02 -5,0 -9.05,3.93 -9.05,11.02 0,7.03 4.05,10.96 9.05,10.96"/>
-    <path android:fillColor="#231f20" android:pathData="m219.69,169.95l4.5,0l0,4.27l0.11,0c2.14,-3.26 5.4,-4.95 9.39,-4.95 3.54,0 6.8,1.41 7.98,4.95 1.97,-3.09 5.4,-4.95 9.11,-4.95 5.79,0 9.67,2.42 9.67,8.43l0,21.31l-4.78,0l0,-19.06c0,-3.6 -0.95,-6.46 -5.62,-6.46 -4.61,0 -7.59,2.93 -7.59,7.42l0,18.1l-4.78,0l0,-19.06c0,-3.77 -1.18,-6.46 -5.45,-6.46 -5.68,0 -7.76,5.23 -7.76,7.42l0,18.1l-4.78,0l0,-29.06z"/>
-    <path android:fillColor="#231f20" android:pathData="m269.35,189.85c0.17,4.27 3.88,5.62 7.81,5.62 2.98,0 7.03,-0.67 7.03,-4.33 0,-3.71 -4.72,-4.33 -9.5,-5.4 -4.72,-1.07 -9.5,-2.64 -9.5,-8.21 0,-5.85 5.79,-8.26 10.85,-8.26 6.41,0 11.53,2.02 11.92,9.11l-4.78,0c-0.34,-3.71 -3.6,-4.89 -6.75,-4.89 -2.87,0 -6.18,0.79 -6.18,3.71 0,3.43 5.06,3.99 9.5,5.06 4.78,1.07 9.5,2.64 9.5,8.27 0,6.92 -6.46,9.17 -12.37,9.17 -6.52,0 -12.03,-2.64 -12.31,-9.84l4.78,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m87.68,43.83c-0.61,-0.08 -1.45,-0.19 -2,-0.26 0.56,-1.21 0.9,-1.91 0.9,-1.91 0.03,-0.23 0.66,-1.32 0.91,-2.23 0.23,-0.73 0.36,-2.09 0.36,-2.31 0,-2.34 -0.82,-4.45 -2.19,-5.99 -1.37,-1.53 -3.28,-2.48 -5.47,-2.48 -0.44,0 -0.97,0.02 -2.19,0.26 -1.24,0.31 -1.83,0.48 -2.93,0.77 -1.86,0.57 -2.62,0.87 -5.27,2.15 -0.27,0.13 -0.38,0.36 -0.43,0.54 -0.05,0.18 -0.04,0.32 -0.04,0.32l-0.11,9.88l-1.66,0l0,-10.8s-0.01,-0.31 0.11,-0.68c0.12,-0.37 0.39,-0.72 0.85,-1.02 0.36,-0.23 0.72,-0.44 1.08,-0.64 -0.4,-0.27 -0.67,-0.72 -0.67,-1.23 0,-0.82 0.67,-1.49 1.48,-1.49 0.82,0 1.49,0.66 1.49,1.49 0,0.08 -0.02,0.15 -0.02,0.22 0.03,-0.01 0.06,-0.02 0.09,-0.03 0.33,-0.11 0.69,-0.22 1.04,-0.33 -0.45,-0.25 -0.76,-0.73 -0.76,-1.29 0,-0.82 0.67,-1.49 1.48,-1.49 0.82,0 1.49,0.66 1.49,1.49 0,0.25 -0.08,0.49 -0.18,0.69 0.72,-0.2 1.23,-0.33 1.23,-0.33 0.07,-0.02 0.14,-0.03 0.22,-0.05 -0.4,-0.27 -0.66,-0.72 -0.66,-1.23 0,-0.82 0.66,-1.48 1.48,-1.48 0.83,0 1.48,0.66 1.48,1.48 0,0.29 -0.08,0.55 -0.22,0.78 0.01,-0 0.02,-0 0.03,-0.01 0.52,-0.09 1.1,-0.1 1.62,-0.1 -0.18,-0.25 -0.28,-0.54 -0.28,-0.86 0,-0.83 0.67,-1.49 1.48,-1.49 0.82,0 1.48,0.66 1.48,1.49 0,0.45 -0.21,0.85 -0.53,1.13 0.56,0.14 1.09,0.32 1.6,0.56 -0.04,-0.14 -0.07,-0.28 -0.07,-0.43 0,-0.82 0.67,-1.49 1.49,-1.49 0.82,0 1.48,0.66 1.48,1.49 0,0.72 -0.52,1.32 -1.2,1.45 0.45,0.34 0.88,0.72 1.26,1.14l0,-0.05c0,-0.82 0.67,-1.48 1.48,-1.48 0.82,0 1.48,0.66 1.48,1.48 0,0.82 -0.66,1.48 -1.48,1.48 -0.15,0 -0.28,-0.03 -0.41,-0.07 0.28,0.43 0.53,0.88 0.74,1.34 0.27,-0.39 0.71,-0.65 1.23,-0.65 0.82,0 1.48,0.66 1.48,1.48 0,0.82 -0.67,1.48 -1.48,1.48 -0.17,0 -0.32,-0.04 -0.47,-0.09 0.09,0.41 0.16,0.82 0.21,1.25 0.17,-0.07 0.37,-0.11 0.57,-0.11 0.82,0 1.48,0.66 1.48,1.48 0,0.82 -0.66,1.48 -1.48,1.48 -0.23,0 -0.44,-0.06 -0.64,-0.15 -0.02,0.16 -0.05,0.33 -0.07,0.49 -0.05,0.17 -0.09,0.32 -0.13,0.47 0.73,0.09 1.29,0.71 1.29,1.47 0,0.82 -0.66,1.48 -1.48,1.48 -0.31,0 -0.59,-0.09 -0.83,-0.26 -0.2,0.47 -0.46,1.09 -0.75,1.79"/>
-    <path android:fillColor="#231f20" android:pathData="m65.73,42.67c-0.79,0 -1.42,-0.64 -1.42,-1.42 0,-0.79 0.63,-1.42 1.42,-1.42l0,0 0.01,0c0.79,0 1.42,0.64 1.42,1.42 0,0.78 -0.63,1.42 -1.42,1.42l-0.01,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m65.74,39.22c0.75,0 1.36,-0.61 1.36,-1.36 0,-0.75 -0.6,-1.36 -1.36,-1.36l-0.01,0 -0,0c-0.75,0 -1.36,0.61 -1.36,1.36 0,0.75 0.6,1.36 1.36,1.36l0.01,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m65.73,35.89c-0.72,-0 -1.29,-0.58 -1.29,-1.29 0,-0.72 0.57,-1.29 1.29,-1.3l0.01,0c0.72,0 1.29,0.58 1.29,1.3 0,0.71 -0.57,1.29 -1.29,1.29l-0.01,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m65.74,29.81c0.67,-0 1.22,-0.55 1.22,-1.22 0,-0.68 -0.55,-1.22 -1.22,-1.22l-0.01,0c-0.67,0 -1.22,0.55 -1.22,1.22 0,0.67 0.54,1.22 1.22,1.22l0.01,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m65.73,32.77c-0.68,-0 -1.23,-0.56 -1.23,-1.23s0.55,-1.23 1.23,-1.24l0.01,0c0.68,0 1.23,0.56 1.23,1.24s-0.55,1.23 -1.23,1.23l-0.01,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m70.02,13.18c-0.02,-0.09 -0.12,-0.2 -0.27,-0.2 -0.18,0 -0.26,0.12 -0.29,0.21 -0.28,1.09 -0.84,2.11 -2.97,2.3 0.09,-0.93 0.34,-1.64 0.76,-2.14 0.4,-0.43 0.95,-0.72 1.76,-0.89 0.03,-0 0.12,-0.02 0.18,-0.08 0.03,-0.04 0.07,-0.1 0.06,-0.2 0,-0.1 -0.05,-0.16 -0.08,-0.2 -0.06,-0.05 -0.14,-0.06 -0.18,-0.06l-3.25,0 -0.33,0 -2.92,0c-0.04,-0 -0.11,0.01 -0.18,0.06 -0.04,0.04 -0.08,0.09 -0.08,0.2 -0.01,0.09 0.03,0.16 0.06,0.2 0.05,0.06 0.15,0.08 0.18,0.08 0.81,0.17 1.36,0.46 1.76,0.89 0.42,0.5 0.67,1.21 0.76,2.14 -2.14,-0.18 -2.7,-1.21 -2.97,-2.3 -0.03,-0.08 -0.11,-0.21 -0.29,-0.21 -0.15,0 -0.25,0.11 -0.27,0.2l-0.01,0.02l0,5.94c0,0.11 0.09,0.26 0.3,0.25 0.22,0 0.27,-0.12 0.29,-0.17l0.01,-0.03c0.51,-1.24 1.57,-2.04 2.95,-2.24 -0.08,0.98 -0.34,1.71 -0.78,2.22 -0.4,0.43 -0.93,0.71 -1.75,0.89l-0.02,0c-0.05,0.01 -0.11,0.03 -0.15,0.08 -0.03,0.04 -0.07,0.1 -0.06,0.21 0,0.09 0.05,0.15 0.08,0.19 0.06,0.05 0.13,0.06 0.19,0.07l2.9,0 0.33,0 3.23,0c0.06,-0.01 0.13,-0.02 0.19,-0.07 0.04,-0.03 0.08,-0.09 0.08,-0.19 0.01,-0.11 -0.03,-0.17 -0.06,-0.21 -0.04,-0.04 -0.1,-0.07 -0.15,-0.08l-0.02,-0c-0.82,-0.17 -1.35,-0.45 -1.75,-0.89 -0.44,-0.52 -0.7,-1.25 -0.78,-2.22 1.38,0.21 2.45,1.01 2.95,2.24l0.01,0.03c0.03,0.05 0.08,0.17 0.29,0.17 0.22,0.01 0.31,-0.14 0.31,-0.25l0,-5.94l-0.01,-0.02z"/>
-    <path android:fillColor="#231f20" android:pathData="m65.74,27.17c1.73,0 3.14,-1.41 3.14,-3.14s-1.41,-3.14 -3.14,-3.14l-0.01,0c-1.73,0 -3.15,1.41 -3.15,3.14s1.41,3.14 3.15,3.14l0.01,0z"/>
-    <path android:fillColor="#231f20" android:pathData="m43.04,42.03c-0.24,0.16 -0.52,0.26 -0.83,0.26 -0.82,0 -1.48,-0.66 -1.48,-1.48 0,-0.76 0.56,-1.38 1.29,-1.47 -0.04,-0.14 -0.08,-0.3 -0.13,-0.47 -0.02,-0.17 -0.04,-0.33 -0.07,-0.49 -0.19,0.09 -0.41,0.15 -0.64,0.15 -0.82,0 -1.48,-0.66 -1.48,-1.48 0,-0.82 0.66,-1.48 1.48,-1.48 0.2,0 0.39,0.04 0.57,0.11 0.05,-0.43 0.12,-0.84 0.21,-1.25 -0.15,0.05 -0.3,0.09 -0.47,0.09 -0.81,0 -1.48,-0.67 -1.48,-1.48 0,-0.82 0.67,-1.48 1.48,-1.48 0.52,0 0.96,0.26 1.23,0.65 0.22,-0.47 0.47,-0.91 0.74,-1.34 -0.13,0.04 -0.26,0.06 -0.41,0.06 -0.82,0 -1.48,-0.66 -1.48,-1.48 0,-0.82 0.66,-1.49 1.48,-1.49 0.81,0 1.48,0.66 1.48,1.49l0,0.04c0.39,-0.41 0.81,-0.79 1.26,-1.14 -0.68,-0.13 -1.2,-0.73 -1.2,-1.45 0,-0.82 0.67,-1.49 1.48,-1.49 0.82,0 1.49,0.66 1.49,1.49 0,0.15 -0.03,0.29 -0.08,0.43 0.51,-0.24 1.05,-0.42 1.6,-0.56 -0.32,-0.27 -0.53,-0.68 -0.53,-1.13 0,-0.82 0.66,-1.49 1.48,-1.49 0.81,0 1.48,0.66 1.48,1.49 0,0.32 -0.11,0.62 -0.28,0.86 0.52,0 1.11,0.02 1.62,0.11 0.01,0 0.02,0 0.03,0.01 -0.14,-0.23 -0.22,-0.49 -0.22,-0.78 0,-0.82 0.66,-1.48 1.48,-1.48 0.82,0 1.48,0.66 1.48,1.48 0,0.52 -0.26,0.96 -0.66,1.23 0.08,0.01 0.15,0.03 0.22,0.05 0,0 0.51,0.13 1.23,0.33 -0.11,-0.21 -0.18,-0.44 -0.18,-0.69 0,-0.82 0.67,-1.49 1.49,-1.49 0.82,0 1.48,0.66 1.48,1.49 0,0.55 -0.3,1.03 -0.76,1.28 0.35,0.11 0.71,0.22 1.04,0.33 0.03,0.01 0.06,0.02 0.09,0.03 -0,-0.07 -0.02,-0.15 -0.02,-0.22 0,-0.82 0.67,-1.49 1.49,-1.49 0.82,0 1.48,0.66 1.48,1.49 0,0.52 -0.27,0.97 -0.67,1.23 0.36,0.2 0.72,0.41 1.08,0.64 0.46,0.3 0.73,0.66 0.85,1.02 0.12,0.37 0.11,0.68 0.11,0.68l0,10.8l-1.66,0l-0.11,-9.89s0.01,-0.13 -0.04,-0.32c-0.05,-0.18 -0.16,-0.42 -0.43,-0.54 -2.66,-1.28 -3.42,-1.57 -5.27,-2.15 -1.1,-0.29 -1.69,-0.46 -2.93,-0.77 -1.21,-0.24 -1.74,-0.26 -2.19,-0.26 -2.18,0 -4.09,0.95 -5.47,2.48 -1.37,1.54 -2.19,3.65 -2.19,5.99 0,0.22 0.13,1.58 0.36,2.31 0.25,0.9 0.88,1.99 0.91,2.22 0,0 0.34,0.7 0.9,1.91 -0.55,0.07 -1.39,0.18 -2,0.26 -0.29,-0.7 -0.55,-1.31 -0.75,-1.79"/>
-    <path android:fillColor="#231f20" android:pathData="m89,45.01c-0.15,-0.21 -0.38,-0.34 -0.68,-0.39 -0.1,-0.02 -2.92,-0.39 -3.25,-0.43 -0.1,-0.01 -0.22,0.06 -0.25,0.23 -0.04,0.19 0.09,0.3 0.17,0.32l-0.02,-0.01c1.5,0.7 2.39,2.12 2.41,3.81 -2.33,-0.48 -2.92,-1.68 -3.06,-3.33 0,-0.07 -0.07,-0.2 -0.26,-0.22 -0.17,-0.01 -0.26,0.07 -0.29,0.15l-0,0.01 -0.89,7.14l0,0.01c0,0.1 0.07,0.22 0.22,0.26s0.28,-0.05 0.32,-0.16c0.71,-1.51 2.11,-2.41 3.78,-2.45 -0.45,1.68 -1.7,2.98 -3.33,3.42l0.01,0c-1.22,-0.13 -2.44,-0.25 -3.68,-0.35 -1.18,-0.35 -2.05,-0.99 -2.37,-2.46 0.02,-0.19 0.05,-0.38 0.13,-0.57 0.3,-0.81 0.88,-1.34 1.54,-1.11 0.68,0.26 0.75,1.02 0.45,1.83 -0.13,0.34 -0.32,0.61 -0.53,0.82 0.71,-0.01 1.34,-0.26 1.84,-0.97 0.83,-1.18 0.73,-2.99 -0.56,-3.74 -0.84,-0.49 -2.01,0.08 -2.9,1.19 0.27,-1.75 1.33,-3.29 1.45,-4.63 0.17,-1.9 -0.56,-4.01 -1.6,-4.59 -1.08,0.4 -2.07,2.36 -2.16,4.25 -0.06,1.35 0.85,3.13 0.9,4.91 -0.73,-1.27 -1.85,-2.02 -2.76,-1.64 -1.38,0.56 -1.73,2.35 -1.07,3.62 0.41,0.77 0.99,1.1 1.69,1.21 -0.19,-0.23 -0.34,-0.53 -0.41,-0.88 -0.18,-0.84 -0.02,-1.59 0.7,-1.75 0.68,-0.15 1.18,0.45 1.37,1.29 0.06,0.27 0.07,0.53 0.03,0.77l0,-0c-0.54,1.27 -1.51,1.71 -2.71,2.01 -1.23,-0.05 -2.46,-0.1 -3.71,-0.13l-0.13,-0.03c-1.75,-0.28 -2.64,-1.4 -2.82,-3.49 1.54,0.23 2.73,1.13 3.29,2.51 0.03,0.08 0.12,0.21 0.32,0.21 0.24,0 0.32,-0.16 0.32,-0.26l0,-6.59 0,-0.02c-0.03,-0.11 -0.13,-0.21 -0.3,-0.21 -0.18,0 -0.27,0.12 -0.3,0.2l0,0l-0.01,0.01c-0.31,1.22 -0.94,2.37 -3.34,2.56 0.2,-2.33 1.26,-3.05 2.82,-3.39 0.04,0 0.12,-0.02 0.18,-0.09 0.03,-0.03 0.08,-0.09 0.08,-0.19l0,-0.02c-0.01,-0.1 -0.06,-0.17 -0.1,-0.2 -0.06,-0.05 -0.14,-0.07 -0.17,-0.07l-3.41,0 -0.39,0 -3.4,0c-0.04,-0 -0.11,0.01 -0.17,0.07 -0.04,0.04 -0.09,0.1 -0.1,0.2l0,0.02c0,0.1 0.05,0.16 0.08,0.19 0.06,0.07 0.14,0.09 0.18,0.09 1.56,0.34 2.63,1.06 2.82,3.39 -2.4,-0.2 -3.03,-1.34 -3.34,-2.56l-0.01,-0.01l0,-0c-0.03,-0.08 -0.12,-0.2 -0.3,-0.2 -0.17,0 -0.27,0.11 -0.3,0.21l0,0.02 0,6.59c0,0.11 0.09,0.26 0.32,0.26 0.21,0 0.3,-0.13 0.33,-0.21 0.56,-1.38 1.76,-2.28 3.29,-2.51 -0.17,2.1 -1.07,3.21 -2.81,3.49l-0.13,0.03c-1.24,0.03 -2.48,0.07 -3.71,0.13 -1.21,-0.3 -2.18,-0.74 -2.71,-2.01l0,0c-0.04,-0.24 -0.03,-0.5 0.03,-0.77 0.18,-0.84 0.69,-1.44 1.37,-1.29 0.72,0.16 0.88,0.9 0.7,1.75 -0.08,0.35 -0.22,0.65 -0.42,0.88 0.7,-0.11 1.28,-0.44 1.69,-1.21 0.66,-1.28 0.31,-3.06 -1.07,-3.62 -0.91,-0.38 -2.03,0.38 -2.76,1.64 0.05,-1.78 0.96,-3.56 0.9,-4.91 -0.09,-1.89 -1.08,-3.85 -2.16,-4.25 -1.04,0.58 -1.77,2.69 -1.6,4.59 0.12,1.35 1.18,2.89 1.45,4.63 -0.89,-1.11 -2.06,-1.68 -2.9,-1.19 -1.29,0.75 -1.39,2.56 -0.56,3.74 0.5,0.7 1.13,0.95 1.83,0.97 -0.21,-0.2 -0.4,-0.48 -0.53,-0.82 -0.3,-0.81 -0.23,-1.58 0.45,-1.83 0.65,-0.24 1.24,0.3 1.53,1.11 0.07,0.19 0.11,0.39 0.13,0.57 -0.32,1.47 -1.18,2.11 -2.37,2.46 -1.24,0.11 -2.46,0.22 -3.68,0.35l0.01,-0c-1.63,-0.44 -2.88,-1.74 -3.32,-3.42 1.67,0.04 3.07,0.94 3.78,2.45 0.04,0.1 0.17,0.19 0.32,0.16 0.16,-0.04 0.22,-0.16 0.22,-0.26l0,-0.01l-0.89,-7.14 -0.01,-0.01c-0.03,-0.08 -0.12,-0.16 -0.29,-0.15 -0.19,0.02 -0.26,0.14 -0.26,0.22 -0.15,1.65 -0.73,2.85 -3.06,3.33 0.02,-1.7 0.91,-3.12 2.41,-3.81l-0.02,0.01c0.08,-0.02 0.21,-0.13 0.17,-0.32 -0.03,-0.17 -0.15,-0.24 -0.25,-0.23 -0.33,0.04 -3.15,0.42 -3.25,0.43 -0.3,0.05 -0.54,0.18 -0.68,0.39 -0.16,0.22 -0.21,0.51 -0.15,0.86 0.08,0.48 1.06,7.37 1.16,8.01 0.01,0.05 0.08,0.7 0.11,0.89 0.03,0.2 0.28,0.4 0.28,0.4s1.44,0.97 1.7,1.17c0.24,0.19 0.1,0.51 0.1,0.51l-1.28,1.87c-0.1,0.13 -0.16,0.25 -0.16,0.25 -0.03,0.08 -0.04,0.16 -0.04,0.24 0,0.23 0.1,0.43 0.28,0.55l21.06,0.01l0.52,0l20.96,-0.01c0.17,-0.13 0.28,-0.33 0.28,-0.55 0,-0.08 -0.01,-0.17 -0.04,-0.24 0,0 -0.05,-0.13 -0.16,-0.25l-1.28,-1.87s-0.14,-0.33 0.11,-0.51c0.25,-0.2 1.69,-1.17 1.69,-1.17s0.26,-0.2 0.29,-0.4c0.02,-0.19 0.1,-0.84 0.11,-0.89 0.09,-0.63 1.07,-7.53 1.16,-8.01 0.06,-0.35 0.01,-0.64 -0.15,-0.86m-31.73,11.84 l-4.7,0.25c-0.47,0.03 -0.89,-0.34 -0.91,-0.82l-0.04,-0.67c-0.02,-0.48 0.34,-0.88 0.83,-0.9l4.69,-0.26c0.48,-0.02 0.89,0.34 0.91,0.82l0.04,0.66c0.02,0.48 -0.34,0.89 -0.82,0.91m10.36,-1.19 l-1.67,1.67c-0.06,0.06 -0.14,0.09 -0.22,0.1l-0.01,0c-0.08,-0 -0.16,-0.04 -0.22,-0.1l-1.67,-1.67c-0.14,-0.14 -0.14,-0.35 0,-0.48l1.67,-1.67c0.06,-0.06 0.14,-0.09 0.22,-0.09l0.01,0c0.08,0 0.16,0.03 0.22,0.09l1.67,1.67c0.14,0.13 0.14,0.34 0,0.48m12.18,0.62c-0.02,0.48 -0.44,0.84 -0.91,0.82l-4.7,-0.25c-0.47,-0.02 -0.84,-0.43 -0.82,-0.91l0.04,-0.66c0.02,-0.48 0.43,-0.85 0.92,-0.82l4.69,0.26c0.48,0.02 0.85,0.43 0.83,0.9l-0.04,0.67z"/>
-    <path android:fillColor="#231f20" android:pathData="m65.73,-0.03c22.14,0 40.15,18.01 40.15,40.15 0,22.14 -18.01,40.15 -40.15,40.15s-40.15,-18.01 -40.15,-40.15c0,-22.14 18.01,-40.15 40.15,-40.15m0,75.6c19.55,0 35.45,-15.9 35.45,-35.45 0,-19.55 -15.9,-35.45 -35.45,-35.45s-35.45,15.9 -35.45,35.45c0,19.55 15.9,35.45 35.45,35.45"/>
-</vector>