Merge branch 'master' of github.com:andOTP/andOTP

# Conflicts:
#	app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java

app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java

@@ -40,14 +40,19 @@ private enum AssetType {
 
     public enum EntryThumbnails {
         Default(R.mipmap.ic_launcher_round),
+        OnePassword(R.drawable.thumb_1password),
         Adobe(R.drawable.thumb_adobe),
+        Airbrake(R.drawable.thumb_airbrake),
         AllegroPl(R.drawable.thumb_allegropl),
         Amazon(R.drawable.thumb_amazon),
         AmazonWebServices(R.drawable.thumb_amazonwebservices),
         AngelList(R.drawable.thumb_angellist),
+        AnimeBytes(R.drawable.thumb_animebytes),
         Apple(R.drawable.thumb_apple),
         ArenaNet(R.drawable.thumb_arenanet),
         Atlassian(R.drawable.thumb_atlassian),
+        AVM(R.drawable.thumb_avm),
+        Backblaze(R.drawable.thumb_backblaze),
         BattleNet(R.drawable.thumb_battlenet),
         Binance(R.drawable.thumb_binance),
         BitBucket(R.drawable.thumb_bitbucket),
@@ -62,38 +67,47 @@ public enum EntryThumbnails {
         BlockchainInfo(R.drawable.thumb_blockchain_info),
         CloudDownload(R.drawable.thumb_cloud_download),
         Cloudflare(R.drawable.thumb_cloudflare),
+        Codegiant(R.drawable.thumb_codegiant),
         Coinbase(R.drawable.thumb_coinbase),
         ComputerBase(R.drawable.thumb_computerbase),
         CozyCloud(R.drawable.thumb_cozycloud),
         Debian(R.drawable.thumb_debian),
         Degiro(R.drawable.thumb_degiro),
         DigitalOcean(R.drawable.thumb_digital_ocean),
         Discord(R.drawable.thumb_discord),
+        Discourse(R.drawable.thumb_discourse),
         Disroot(R.drawable.thumb_disroot),
         Dropbox(R.drawable.thumb_dropbox),
         Email(R.drawable.thumb_email),
+        EpicGames(R.drawable.thumb_epic_games),
         Evernote(R.drawable.thumb_evernote),
         Facebook(R.drawable.thumb_facebook),
         Fingerprint(R.drawable.thumb_fingerprint),
         Firefox(R.drawable.thumb_firefox),
         Flight(R.drawable.thumb_flight_takeoff),
+        Floatplane(R.drawable.thumb_floatplane),
         Gamepad(R.drawable.thumb_gamepad),
         Gandi(R.drawable.thumb_gandi),
         Git(R.drawable.thumb_git),
         Gitea(R.drawable.thumb_gitea),
         Github(R.drawable.thumb_github),
         Gitlab(R.drawable.thumb_gitlab),
         GoDaddy(R.drawable.thumb_godaddy),
+        Gogs(R.drawable.thumb_gogs),
         Google(R.drawable.thumb_google),
         HackerOne(R.drawable.thumb_hackerone),
         Heroku(R.drawable.thumb_heroku),
         Hetzner(R.drawable.thumb_hetzner),
         HMRC(R.drawable.thumb_hmrc),
+        HomeAssistant(R.drawable.thumb_home_assistant),
         HumbleBundle(R.drawable.thumb_humblebundle),
         HurricaneElectric(R.drawable.thumb_hurricane_electric),
         Iconomi(R.drawable.thumb_iconomi),
         IFTTT(R.drawable.thumb_ifttt),
+        Instagram(R.drawable.thumb_instagram),
+        INWX(R.drawable.thumb_inwx),
         Itchio(R.drawable.thumb_itchio),
+        Jagex(R.drawable.thumb_jagex),
         Kickstarter(R.drawable.thumb_kickstarter),
         Kraken(R.drawable.thumb_kraken),
         Kucoin(R.drawable.thumb_kucoin),
@@ -104,6 +118,7 @@ public enum EntryThumbnails {
         Mailgun(R.drawable.thumb_mailgun),
         Mapbox(R.drawable.thumb_mapbox),
         Mastodon(R.drawable.thumb_mastodon),
+        Matomo(R.drawable.thumb_matomo),
         Mediawiki(R.mipmap.thumb_mediawiki, AssetType.Bitmap),
         Mega(R.drawable.thumb_mega),
         Microsoft(R.drawable.thumb_microsoft),
@@ -115,11 +130,16 @@ public enum EntryThumbnails {
         Nintendo(R.drawable.thumb_nintendo),
         NPM(R.drawable.thumb_npm),
         Office(R.drawable.thumb_office),
+        Okta(R.drawable.thumb_okta),
+        OnlineNet(R.drawable.thumb_online),
         OpenVZ(R.drawable.thumb_openvz),
         Origin(R.drawable.thumb_origin),
         OVH(R.drawable.thumb_ovh),
+        Packet(R.drawable.thumb_packet),
         Patreon(R.drawable.thumb_patreon),
         PayPal(R.drawable.thumb_paypal),
+        Phabricator(R.drawable.thumb_phabricator),
+        phpMyAdmin(R.drawable.thumb_phpmyadmin),
         Plurk(R.drawable.thumb_plurk),
         ProtonMail(R.drawable.thumb_protonmail),
         Rackspace(R.drawable.thumb_rackspace),
@@ -131,10 +151,12 @@ public enum EntryThumbnails {
         Sciebo(R.drawable.thumb_sciebo),
         Seafile(R.mipmap.thumb_seafile, AssetType.Bitmap),
         School(R.drawable.thumb_school),
+        Sentry(R.drawable.thumb_sentry),
         Skrill(R.drawable.thumb_skrill),
         Slack(R.drawable.thumb_slack),
         Snapchat(R.drawable.thumb_snapchat),
         SourceForge(R.drawable.thumb_sourceforge),
+        Squarespace(R.drawable.thumb_squarespace),
         Steam(R.drawable.thumb_steam),
         Stripe(R.drawable.thumb_stripe),
         Sync(R.drawable.thumb_sync),
@@ -154,7 +176,9 @@ public enum EntryThumbnails {
         Vultr(R.drawable.thumb_vultr),
         Wallabag(R.drawable.thumb_wallabag),
         Wallet(R.drawable.thumb_wallet),
-        Wordpress(R.drawable.thumb_wordpress);
+        Wargaming(R.drawable.thumb_wargaming),
+        Wordpress(R.drawable.thumb_wordpress),
+        Zoho(R.drawable.thumb_zoho);
 
         private int resource;
         private AssetType assetType;

app/src/main/res/drawable/thumb_1password.xml

@@ -0,0 +1,49 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="102"
+    android:viewportHeight="102"
+    android:width="102dp"
+    android:height="102dp">
+    <group
+        android:translateX="-379"
+        android:translateY="-673">
+        <group
+            android:translateX="190"
+            android:translateY="640">
+            <group
+                android:translateX="190"
+                android:translateY="33">
+                <group
+                    android:translateX="0.299401">
+                    <path
+                        android:pathData="M99.401199 50A49.7006 50 0 0 1 49.7006 100 49.7006 50 0 0 1 0 50 49.7006 50 0 0 1 49.7006 0 49.7006 50 0 0 1 99.401199 50Z"
+                        android:fillColor="#000000" />
+                    <path
+                        android:pathData="M99.401199 50A49.7006 50 0 0 1 49.7006 100 49.7006 50 0 0 1 0 50 49.7006 50 0 0 1 49.7006 0 49.7006 50 0 0 1 99.401199 50Z"
+                        android:fillColor="#ffffff" />
+                    <path
+                        android:pathData="M96.401199 50A46.7006 47 0 0 1 49.7006 97 46.7006 47 0 0 1 3 50 46.7006 47 0 0 1 49.7006 3 46.7006 47 0 0 1 96.401199 50Z"
+                        android:strokeWidth="6"
+                        android:strokeColor="#eeeff3" />
+                    <path
+                        android:pathData="M98.201199 50A48.500599 48.799999 0 0 1 49.7006 98.799999 48.500599 48.799999 0 0 1 1.2000008 50 48.500599 48.799999 0 0 1 49.7006 1.2000008 48.500599 48.799999 0 0 1 98.201199 50Z"
+                        android:strokeWidth="2.4"
+                        android:strokeColor="#ced1d9" />
+                    <path
+                        android:pathData="M63.645371 49.280575A14.302331 14.028777 0 0 1 49.34304 63.309352 14.302331 14.028777 0 0 1 35.040709 49.280575 14.302331 14.028777 0 0 1 49.34304 35.251798 14.302331 14.028777 0 0 1 63.645371 49.280575Z"
+                        android:fillColor="#eceff1" />
+                    <path
+                        android:pathData="M55.063973 30.215827l-12.156981 0 0 10.071943 3.84971 4.028777 -3.84971 4.028777 0 22.158273 12.156981 0 0 -10.071942 -3.849711 -4.028777 3.849711 -4.028777z"
+                        android:fillColor="#505a78" />
+                    <path
+                        android:pathData="M81.10775 50A32.122269 32.33551 0 0 1 48.985481 82.33551 32.122269 32.33551 0 0 1 16.863213 50 32.122269 32.33551 0 0 1 48.985481 17.66449 32.122269 32.33551 0 0 1 81.10775 50Z"
+                        android:strokeWidth="6.551999"
+                        android:strokeColor="#eeeff3" />
+                    <path
+                        android:pathData="M84.383751 50A35.39827 35.611511 0 0 1 48.985481 85.611511 35.39827 35.611511 0 0 1 13.587212 50 35.39827 35.611511 0 0 1 48.985481 14.388489 35.39827 35.611511 0 0 1 84.383751 50Z"
+                        android:strokeWidth="9.172798"
+                        android:strokeColor="#1a8cff" />
+                </group>
+            </group>
+        </group>
+    </group>
+</vector>

app/src/main/res/drawable/thumb_airbrake.xml

@@ -0,0 +1,4 @@
+<vector android:viewportWidth="102" android:viewportHeight="102"
+    android:width="102dp" android:height="102dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#f58c54" android:pathData="M50.95 0l49.754 25.5v51L50.95 102 1.195 76.5v-51zm-6.012 54.398l4.457 -11.863c0.95 -2.598 2.047 -7.062 2.047 -7.062h0.145l2.047 7.063L58.1 54.398zM27.695 73.72h5.773c3.652 0 4.895 -0.863 6.063 -3.863l3.215 -8.262H60.28l3.215 8.262c1.168 3 2.484 3.863 6.137 3.863h5.7v-7.395H74.16c-1.238 0 -1.824 -0.266 -2.262 -1.465L56.555 26.4H46.547L31.13 64.86c-0.437 1.2 -1.02 1.465 -2.266 1.465h-1.168zm0 0" />
+</vector>

app/src/main/res/drawable/thumb_animebytes.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:fillColor="#FFED106A"
+      android:pathData="m66.762,0.032c-0.255,0.164 -0.507,0.329 -0.753,0.498 -5.673,3.219 -9.502,9.31 -9.502,16.298 0,8.397 5.525,15.503 13.138,17.882 0.205,0.08 0.406,0.157 0.599,0.226 0.084,0.03 0.148,0.056 0.202,0.08 11.836,2.623 21.013,12.317 22.868,24.423 0.226,1.477 0.344,2.99 0.344,4.531 0,16.38 -13.278,29.659 -29.659,29.659 -2.919,0 -5.739,-0.424 -8.404,-1.21 -2.36,-0.773 -4.591,-1.739 -6.693,-2.917 -5.617,-3.147 -10.314,-7.791 -14.084,-14.221 -5.822,-9.908 -7.859,-20.721 -6.124,-32.435 2.452,-16.556 10.284,-30.482 23.491,-41.784C22.485,6.604 0,32.658 0,63.968c0,35.346 28.654,64 64,64 14.4,0 27.688,-4.756 38.381,-12.783l-0.019,0.038 0.022,0.011c0.008,12.11 12.837,12.734 12.837,12.734h12.756H128V63.968C128,29.548 100.827,1.479 66.762,0.032Z"/>
+</vector>

app/src/main/res/drawable/thumb_atlassian.xml

@@ -1,7 +1,7 @@
-<vector android:height="256dp" android:viewportHeight="321"
-    android:viewportWidth="321" android:width="256dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="M154.3,27.4c-5.9,7.2 -20.8,39.3 -22.7,49.2 -0.2,1 -1.1,4.8 -2,8.4 -3.2,12.6 -4.4,26 -4.1,43 0.4,18.7 0.7,21.6 4,35.5 5,21.1 6.5,24.6 36.4,84.2 15.7,31.4 23.9,46.6 25.4,47.4 1.5,0.9 15.4,1.2 50.5,1.2 46.8,-0 48.4,-0 51,-2 5.8,-4.3 8.4,1.5 -60.4,-136.2 -35,-70.2 -64.8,-129.1 -66.1,-130.9 -3.4,-4.6 -8.1,-4.5 -12,0.2z" android:strokeColor="#00000000"/>
-    <path android:fillColor="#000000"
-        android:pathData="M94.2,147.6c-2.7,1.9 -70.2,137.2 -70.2,140.7 0,3.4 4,7.7 7.2,7.8 1.3,-0 23.2,0.1 48.8,0.1 34.5,0.1 47.1,-0.2 48.8,-1.1 2.8,-1.5 6.6,-9.9 9.2,-20 2.5,-10.3 3.2,-14.9 3.5,-26.6 0.9,-33.6 -10.7,-67.3 -32.2,-93.7 -3,-3.7 -6.3,-7 -7.3,-7.3 -4.1,-1.3 -5.9,-1.3 -7.8,0.1z" android:strokeColor="#00000000"/>
+<vector android:height="200dp" android:viewportHeight="200"
+    android:viewportWidth="200" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#0052cc"
+        android:pathData="M62.904065,93.041876c-2.725,-2.911 -6.971,-2.746 -8.823,0.958l-44.687,89.376a5.342,5.342 0 0 0 4.778,7.732l62.233,0a5.151,5.151 0 0 0 4.779,-2.954c13.419,-27.745 5.289,-69.93 -18.28,-95.112z"/>
+    <path android:fillColor="#0052cc"
+        android:pathData="M95.692065,11.752876c-24.994,39.6 -23.345,83.458 -6.882,116.385l30.008,60.016a5.342,5.342 0 0 0 4.778,2.953l62.232,0a5.342,5.342 0 0 0 4.778,-7.732s-83.721,-167.466 -85.827,-171.656c-1.883,-3.751 -6.666,-3.802 -9.087,0.034z"/>
 </vector>

app/src/main/res/drawable/thumb_avm.xml

@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="m33.219,67.589c-0.4,1.135 -0.467,2.137 -0.501,2.804v15.624h12.587v-49.544l-45.304,49.544h16.96l14.857,-16.459c0.834,-0.901 1.569,-2.437 1.402,-1.97"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.01345322"
+      android:fillColor="#ed2229"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m61.095,56.972c0.401,-1.135 0.468,-2.137 0.501,-2.804v-17.194h-12.119v50.479l59.827,-65.335 -17.26,0.033 -29.513,32.851c-0.868,0.901 -1.602,2.404 -1.436,1.97"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.01345322"
+      android:fillColor="#007fd6"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M103.729,60.344 L128,33.836v52.182L114.913,86.018L114.913,66.354L91.61,92.06v-26.141l-36.19,39.963h-17.194l65.502,-71.478v25.941"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.01345322"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>