From 48ab5f4966ad4b215b48091490c7e6c3262117ad Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 20 Oct 2022 14:01:01 -0300
Subject: [PATCH] Replace illustration for mailbox download
---
.../artwork/il_mailbox_setup_dark.svg | 31 +++++
.../artwork/il_mailbox_setup_light.svg | 31 +++++
.../mailbox/SetupDownloadFragment.java | 8 +-
.../res/drawable-night/il_mailbox_setup.xml | 106 ++++++++++++++++
.../main/res/drawable/il_mailbox_setup.xml | 106 ++++++++++++++++
.../fragment_mailbox_setup_download.xml | 114 +++++++++---------
.../layout/fragment_mailbox_setup_intro.xml | 4 +-
7 files changed, 335 insertions(+), 65 deletions(-)
create mode 100644 briar-android/artwork/il_mailbox_setup_dark.svg
create mode 100644 briar-android/artwork/il_mailbox_setup_light.svg
create mode 100644 briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
create mode 100644 briar-android/src/main/res/drawable/il_mailbox_setup.xml
diff --git a/briar-android/artwork/il_mailbox_setup_dark.svg b/briar-android/artwork/il_mailbox_setup_dark.svg
new file mode 100644
index 0000000000..4f35239358
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_setup_dark.svg
@@ -0,0 +1,31 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M189.401 29C189.401 22.3726 184.029 17 177.401 17H86.4014C79.7739 17 74.4014 22.3726 74.4014 29V163C74.4014 169.627 79.7739 175 86.4014 175H177.401C184.029 175 189.401 169.627 189.401 163V29Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.4014 18.5H177.401C183.2 18.5 187.901 23.201 187.901 29V163C187.901 168.799 183.2 173.5 177.401 173.5H86.4014C80.6024 173.5 75.9014 168.799 75.9014 163V29C75.9014 23.201 80.6024 18.5 86.4014 18.5ZM177.401 17C184.029 17 189.401 22.3726 189.401 29V163C189.401 169.627 184.029 175 177.401 175H86.4014C79.7739 175 74.4014 169.627 74.4014 163V29C74.4014 22.3726 79.7739 17 86.4014 17H177.401Z" fill="#52ADF9"/>
+<path d="M183.401 35C183.401 30.5817 179.82 27 175.401 27H88.4014C83.9831 27 80.4014 30.5817 80.4014 35V157C80.4014 161.418 83.9831 165 88.4014 165H175.401C179.82 165 183.401 161.418 183.401 157V35Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.4014 28.5H175.401C178.991 28.5 181.901 31.4101 181.901 35V157C181.901 160.59 178.991 163.5 175.401 163.5H88.4014C84.8115 163.5 81.9014 160.59 81.9014 157V35C81.9014 31.4102 84.8115 28.5 88.4014 28.5ZM175.401 27C179.82 27 183.401 30.5817 183.401 35V157C183.401 161.418 179.82 165 175.401 165H88.4014C83.9831 165 80.4014 161.418 80.4014 157V35C80.4014 30.5817 83.9831 27 88.4014 27H175.401Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M131.901 38.2559C131.073 38.2559 130.401 37.5843 130.401 36.7559C130.401 35.9274 131.073 35.2559 131.901 35.2559C132.73 35.2559 133.401 35.9274 133.401 36.7559C133.401 37.5843 132.73 38.2559 131.901 38.2559ZM131.901 39.7559C130.245 39.7559 128.901 38.4127 128.901 36.7559C128.901 35.099 130.245 33.7559 131.901 33.7559C133.558 33.7559 134.901 35.099 134.901 36.7559C134.901 38.4127 133.558 39.7559 131.901 39.7559Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M115.846 74H146.957C148.136 74 149.266 74.4731 150.1 75.3152C150.933 76.1573 151.401 77.2994 151.401 78.4903L151.401 116.975C151.401 118.69 149.421 119.625 148.119 118.526L140.055 112.571H115.846C114.667 112.571 113.537 112.098 112.703 111.256C111.87 110.414 111.401 109.272 111.401 108.081V78.4903C111.401 77.2994 111.87 76.1573 112.703 75.3152C113.537 74.4731 114.667 74 115.846 74ZM127.669 93.897H118.512V81.1845H144.29V93.897H135.285V98.2936H138.579C139.173 98.2936 139.47 99.0191 139.05 99.4434L131.948 106.618C131.688 106.881 131.266 106.881 131.006 106.618L123.904 99.4434C123.484 99.0191 123.782 98.2936 124.376 98.2936H127.669V93.897Z" fill="#A3E635"/>
+<path d="M3.40137 29.0259C3.40137 22.3985 8.77395 17.0259 15.4014 17.0259H55.4014C62.0288 17.0259 67.4014 22.3985 67.4014 29.0259V125.026C67.4014 131.653 62.0288 137.026 55.4014 137.026H15.4014C8.77395 137.026 3.40137 131.653 3.40137 125.026V29.0259Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.4014 18.5259H15.4014C9.60238 18.5259 4.90137 23.2269 4.90137 29.0259V125.026C4.90137 130.825 9.60238 135.526 15.4014 135.526H55.4014C61.2004 135.526 65.9014 130.825 65.9014 125.026V29.0259C65.9014 23.2269 61.2004 18.5259 55.4014 18.5259ZM15.4014 17.0259C8.77395 17.0259 3.40137 22.3985 3.40137 29.0259V125.026C3.40137 131.653 8.77395 137.026 15.4014 137.026H55.4014C62.0288 137.026 67.4014 131.653 67.4014 125.026V29.0259C67.4014 22.3985 62.0288 17.0259 55.4014 17.0259H15.4014Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.4013 27.0109C34.8823 27.0109 34.4397 26.5831 34.4397 26.0282C34.4397 25.4732 34.8823 25.0454 35.4013 25.0454C35.9202 25.0454 36.3628 25.4732 36.3628 26.0282C36.3628 26.5831 35.9202 27.0109 35.4013 27.0109ZM35.4013 28.5109C34.0418 28.5109 32.9397 27.3994 32.9397 26.0282C32.9397 24.657 34.0418 23.5454 35.4013 23.5454C36.7607 23.5454 37.8628 24.657 37.8628 26.0282C37.8628 27.3994 36.7607 28.5109 35.4013 28.5109Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.8823 25.7661C19.8823 25.3519 20.2181 25.0161 20.6323 25.0161H28.8375C29.2517 25.0161 29.5875 25.3519 29.5875 25.7661C29.5875 26.1803 29.2517 26.5161 28.8375 26.5161H20.6323C20.2181 26.5161 19.8823 26.1803 19.8823 25.7661Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.2153 25.7661C41.2153 25.3519 41.5511 25.0161 41.9653 25.0161L50.1705 25.0161C50.5847 25.0161 50.9205 25.3519 50.9205 25.7661C50.9205 26.1803 50.5847 26.5161 50.1705 26.5161L41.9653 26.5161C41.5511 26.5161 41.2153 26.1803 41.2153 25.7661Z" fill="#A3E635"/>
+<path d="M61.6577 41.2485C61.6577 36.8303 58.076 33.2485 53.6577 33.2485H17.1449C12.7266 33.2485 9.1449 36.8303 9.1449 41.2485V117.938C9.1449 122.356 12.7266 125.938 17.1449 125.938H53.6577C58.076 125.938 61.6577 122.356 61.6577 117.938V41.2485Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1449 34.7485H53.6577C57.2476 34.7485 60.1577 37.6587 60.1577 41.2485V117.938C60.1577 121.528 57.2476 124.438 53.6577 124.438H17.1449C13.555 124.438 10.6449 121.528 10.6449 117.938V41.2485C10.6449 37.6587 13.555 34.7485 17.1449 34.7485ZM53.6577 33.2485C58.076 33.2485 61.6577 36.8303 61.6577 41.2485V117.938C61.6577 122.356 58.076 125.938 53.6577 125.938H17.1449C12.7266 125.938 9.1449 122.356 9.1449 117.938V41.2485C9.1449 36.8303 12.7266 33.2485 17.1449 33.2485H53.6577Z" fill="#A3E635"/>
+<path d="M27.5469 74.9572V88.4241C27.5469 89.5172 28.4295 90.4188 29.5245 90.4188H30.4518C31.5356 90.4188 32.4295 89.5172 32.4295 88.4241V74.9572H27.5469Z" fill="#82C91E"/>
+<path d="M32.4183 68.4663V65.9307C32.4183 64.8376 31.5356 63.936 30.4518 63.936H29.5245C28.4407 63.936 27.5469 64.8376 27.5469 65.9307V68.4663H32.4183Z" fill="#82C91E"/>
+<path d="M43.256 79.3977V65.9307C43.256 64.8376 42.3733 63.936 41.2895 63.936H40.3622C39.2784 63.936 38.3846 64.8376 38.3846 65.9307V79.3977H43.256Z" fill="#82C91E"/>
+<path d="M38.3846 85.8883V88.4239C38.3846 89.517 39.2784 90.4186 40.3622 90.4186H41.2895C42.3733 90.4186 43.2672 89.517 43.2672 88.4239V85.8883H38.3846Z" fill="#82C91E"/>
+<path d="M26.7645 80.1855H24.2506C23.1668 80.1855 22.2729 81.0758 22.2729 82.1802V83.1156C22.2729 84.2087 23.1556 85.1103 24.2506 85.1103H26.7645V80.1855Z" fill="#A3E635"/>
+<path d="M46.5517 80.1855H33.2V85.1103H46.5517C47.6355 85.1103 48.5293 84.2087 48.5293 83.1156V82.1802C48.5293 81.0758 47.6355 80.1855 46.5517 80.1855Z" fill="#A3E635"/>
+<path d="M37.6023 69.2544H24.2506C23.1668 69.2544 22.2729 70.1447 22.2729 71.2491V72.1845C22.2729 73.2776 23.1556 74.1792 24.2506 74.1792H37.6023V69.2544Z" fill="#A3E635"/>
+<path d="M46.5517 69.2544H44.0378V74.1791H46.5517C47.6355 74.1791 48.5294 73.2888 48.5294 72.1844V71.2491C48.5294 70.1447 47.6355 69.2544 46.5517 69.2544Z" fill="#A3E635"/>
+<path d="M67.4014 155C67.4014 150.582 63.8196 147 59.4014 147H47.4014C42.9831 147 39.4014 150.582 39.4014 155V167C39.4014 171.418 42.9831 175 47.4014 175H59.4014C63.8196 175 67.4014 171.418 67.4014 167V155Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.4014 148.5H59.4014C62.9912 148.5 65.9014 151.41 65.9014 155V167C65.9014 170.59 62.9912 173.5 59.4014 173.5H47.4014C43.8115 173.5 40.9014 170.59 40.9014 167V155C40.9014 151.41 43.8115 148.5 47.4014 148.5ZM59.4014 147C63.8196 147 67.4014 150.582 67.4014 155V167C67.4014 171.418 63.8196 175 59.4014 175H47.4014C42.9831 175 39.4014 171.418 39.4014 167V155C39.4014 150.582 42.9831 147 47.4014 147H59.4014Z" fill="#52ADF9"/>
+<path d="M56.3172 155.31H52.9994L48.7515 162.624H52.9994L51.7425 167.727L58.0515 159.633H53.8791L56.3172 155.31Z" fill="#52ADF9"/>
+<path d="M31.4014 155C31.4014 150.582 27.8196 147 23.4014 147H11.4014C6.98309 147 3.40137 150.582 3.40137 155V167C3.40137 171.418 6.98309 175 11.4014 175H23.4014C27.8196 175 31.4014 171.418 31.4014 167V155Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4014 148.5H23.4014C26.9912 148.5 29.9014 151.41 29.9014 155V167C29.9014 170.59 26.9912 173.5 23.4014 173.5H11.4014C7.81152 173.5 4.90137 170.59 4.90137 167V155C4.90137 151.41 7.81152 148.5 11.4014 148.5ZM23.4014 147C27.8196 147 31.4014 150.582 31.4014 155V167C31.4014 171.418 27.8196 175 23.4014 175H11.4014C6.98309 175 3.40137 171.418 3.40137 167V155C3.40137 150.582 6.98309 147 11.4014 147H23.4014Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1787 158.864C11.9957 158.047 12.9655 157.399 14.0329 156.957C15.1003 156.515 16.2444 156.287 17.3997 156.287C18.5551 156.287 19.6991 156.515 20.7665 156.957C21.8339 157.399 22.8038 158.047 23.6207 158.864L22.56 159.924C21.8824 159.247 21.0779 158.709 20.1925 158.343C19.3071 157.976 18.3581 157.787 17.3997 157.787C16.4414 157.787 15.4924 157.976 14.607 158.343C13.7216 158.709 12.9171 159.247 12.2394 159.924L11.1787 158.864Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5059 161.187C14.0174 160.676 14.6246 160.27 15.2929 159.993C15.9613 159.716 16.6776 159.574 17.4009 159.574C18.1243 159.574 18.8406 159.716 19.5089 159.993C20.1773 160.27 20.7845 160.676 21.296 161.187L20.2353 162.248C19.8631 161.875 19.4212 161.58 18.9349 161.379C18.4486 161.177 17.9273 161.074 17.4009 161.074C16.8745 161.074 16.3533 161.177 15.867 161.379C15.3807 161.58 14.9388 161.875 14.5666 162.248L13.5059 161.187Z" fill="#A3E635"/>
+<path d="M18.3581 164.126C18.3581 164.654 17.9296 165.083 17.401 165.083C16.8724 165.083 16.4438 164.654 16.4438 164.126C16.4438 163.597 16.8724 163.168 17.401 163.168C17.9296 163.168 18.3581 163.597 18.3581 164.126Z" fill="#A3E635"/>
+</svg>
diff --git a/briar-android/artwork/il_mailbox_setup_light.svg b/briar-android/artwork/il_mailbox_setup_light.svg
new file mode 100644
index 0000000000..6aefc130ff
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_setup_light.svg
@@ -0,0 +1,31 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M189.854 29C189.854 22.3726 184.481 17 177.854 17H86.8535C80.2261 17 74.8535 22.3726 74.8535 29V163C74.8535 169.627 80.2261 175 86.8535 175H177.854C184.481 175 189.854 169.627 189.854 163V29Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.8535 18.5H177.854C183.653 18.5 188.354 23.201 188.354 29V163C188.354 168.799 183.653 173.5 177.854 173.5H86.8535C81.0545 173.5 76.3535 168.799 76.3535 163V29C76.3535 23.201 81.0545 18.5 86.8535 18.5ZM177.854 17C184.481 17 189.854 22.3726 189.854 29V163C189.854 169.627 184.481 175 177.854 175H86.8535C80.2261 175 74.8535 169.627 74.8535 163V29C74.8535 22.3726 80.2261 17 86.8535 17H177.854Z" fill="#196FDE"/>
+<path d="M183.854 35C183.854 30.5817 180.272 27 175.854 27H88.8535C84.4352 27 80.8535 30.5817 80.8535 35V157C80.8535 161.418 84.4352 165 88.8535 165H175.854C180.272 165 183.854 161.418 183.854 157V35Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.8535 28.5H175.854C179.443 28.5 182.354 31.4101 182.354 35V157C182.354 160.59 179.443 163.5 175.854 163.5H88.8535C85.2637 163.5 82.3535 160.59 82.3535 157V35C82.3535 31.4102 85.2637 28.5 88.8535 28.5ZM175.854 27C180.272 27 183.854 30.5817 183.854 35V157C183.854 161.418 180.272 165 175.854 165H88.8535C84.4352 165 80.8535 161.418 80.8535 157V35C80.8535 30.5817 84.4352 27 88.8535 27H175.854Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.354 38.2559C131.525 38.2559 130.854 37.5843 130.854 36.7559C130.854 35.9274 131.525 35.2559 132.354 35.2559C133.182 35.2559 133.854 35.9274 133.854 36.7559C133.854 37.5843 133.182 38.2559 132.354 38.2559ZM132.354 39.7559C130.697 39.7559 129.354 38.4127 129.354 36.7559C129.354 35.099 130.697 33.7559 132.354 33.7559C134.01 33.7559 135.354 35.099 135.354 36.7559C135.354 38.4127 134.01 39.7559 132.354 39.7559Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M116.298 74H147.409C148.588 74 149.718 74.4731 150.552 75.3152C151.385 76.1573 151.854 77.2994 151.854 78.4903L151.854 116.975C151.854 118.69 149.873 119.625 148.571 118.526L140.508 112.571H116.298C115.119 112.571 113.989 112.098 113.155 111.256C112.322 110.414 111.854 109.272 111.854 108.081V78.4903C111.854 77.2994 112.322 76.1573 113.155 75.3152C113.989 74.4731 115.119 74 116.298 74ZM128.122 93.897H118.965V81.1845H144.742V93.897H135.737V98.2936H139.031C139.625 98.2936 139.922 99.0191 139.502 99.4434L132.401 106.618C132.14 106.881 131.718 106.881 131.458 106.618L124.356 99.4434C123.936 99.0191 124.234 98.2936 124.828 98.2936H128.122V93.897Z" fill="#82C91E"/>
+<path d="M3.85352 29.0259C3.85352 22.3985 9.2261 17.0259 15.8535 17.0259H55.8535C62.4809 17.0259 67.8535 22.3985 67.8535 29.0259V125.026C67.8535 131.653 62.4809 137.026 55.8535 137.026H15.8535C9.2261 137.026 3.85352 131.653 3.85352 125.026V29.0259Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.8535 18.5259H15.8535C10.0545 18.5259 5.35352 23.2269 5.35352 29.0259V125.026C5.35352 130.825 10.0545 135.526 15.8535 135.526H55.8535C61.6525 135.526 66.3535 130.825 66.3535 125.026V29.0259C66.3535 23.2269 61.6525 18.5259 55.8535 18.5259ZM15.8535 17.0259C9.2261 17.0259 3.85352 22.3985 3.85352 29.0259V125.026C3.85352 131.653 9.2261 137.026 15.8535 137.026H55.8535C62.4809 137.026 67.8535 131.653 67.8535 125.026V29.0259C67.8535 22.3985 62.4809 17.0259 55.8535 17.0259H15.8535Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.8534 27.0109C35.3345 27.0109 34.8919 26.5831 34.8919 26.0282C34.8919 25.4732 35.3345 25.0454 35.8534 25.0454C36.3723 25.0454 36.8149 25.4732 36.8149 26.0282C36.8149 26.5831 36.3723 27.0109 35.8534 27.0109ZM35.8534 28.5109C34.4939 28.5109 33.3919 27.3994 33.3919 26.0282C33.3919 24.657 34.4939 23.5454 35.8534 23.5454C37.2129 23.5454 38.3149 24.657 38.3149 26.0282C38.3149 27.3994 37.2129 28.5109 35.8534 28.5109Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.334 25.7661C20.334 25.3519 20.6698 25.0161 21.084 25.0161H29.2891C29.7033 25.0161 30.0391 25.3519 30.0391 25.7661C30.0391 26.1803 29.7033 26.5161 29.2891 26.5161H21.084C20.6698 26.5161 20.334 26.1803 20.334 25.7661Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.6675 25.7661C41.6675 25.3519 42.0033 25.0161 42.4175 25.0161L50.6226 25.0161C51.0368 25.0161 51.3726 25.3519 51.3726 25.7661C51.3726 26.1803 51.0368 26.5161 50.6226 26.5161L42.4175 26.5161C42.0033 26.5161 41.6675 26.1803 41.6675 25.7661Z" fill="#65A30D"/>
+<path d="M62.1099 41.2485C62.1099 36.8303 58.5281 33.2485 54.1099 33.2485H17.597C13.1788 33.2485 9.59705 36.8303 9.59705 41.2485V117.938C9.59705 122.356 13.1788 125.938 17.597 125.938H54.1099C58.5281 125.938 62.1099 122.356 62.1099 117.938V41.2485Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.597 34.7485H54.1099C57.6997 34.7485 60.6099 37.6587 60.6099 41.2485V117.938C60.6099 121.528 57.6997 124.438 54.1099 124.438H17.597C14.0072 124.438 11.097 121.528 11.097 117.938V41.2485C11.097 37.6587 14.0072 34.7485 17.597 34.7485ZM54.1099 33.2485C58.5281 33.2485 62.1099 36.8303 62.1099 41.2485V117.938C62.1099 122.356 58.5281 125.938 54.1099 125.938H17.597C13.1788 125.938 9.59705 122.356 9.59705 117.938V41.2485C9.59705 36.8303 13.1788 33.2485 17.597 33.2485H54.1099Z" fill="#65A30D"/>
+<path d="M27.9985 74.9572V88.4241C27.9985 89.5172 28.8812 90.4188 29.9761 90.4188H30.9035C31.9873 90.4188 32.8811 89.5172 32.8811 88.4241V74.9572H27.9985Z" fill="#82C91E"/>
+<path d="M32.8699 68.4663V65.9307C32.8699 64.8376 31.9873 63.936 30.9035 63.936H29.9761C28.8924 63.936 27.9985 64.8376 27.9985 65.9307V68.4663H32.8699Z" fill="#82C91E"/>
+<path d="M43.7076 79.3977V65.9307C43.7076 64.8376 42.825 63.936 41.7412 63.936H40.8138C39.7301 63.936 38.8362 64.8376 38.8362 65.9307V79.3977H43.7076Z" fill="#82C91E"/>
+<path d="M38.8362 85.8883V88.4239C38.8362 89.517 39.7301 90.4186 40.8138 90.4186H41.7412C42.825 90.4186 43.7188 89.517 43.7188 88.4239V85.8883H38.8362Z" fill="#82C91E"/>
+<path d="M27.2166 80.1855H24.7027C23.6189 80.1855 22.7251 81.0758 22.7251 82.1802V83.1156C22.7251 84.2087 23.6078 85.1103 24.7027 85.1103H27.2166V80.1855Z" fill="#A3E635"/>
+<path d="M47.0038 80.1855H33.6521V85.1103H47.0038C48.0876 85.1103 48.9814 84.2087 48.9814 83.1156V82.1802C48.9814 81.0758 48.0876 80.1855 47.0038 80.1855Z" fill="#A3E635"/>
+<path d="M38.0544 69.2544H24.7027C23.6189 69.2544 22.7251 70.1447 22.7251 71.2491V72.1845C22.7251 73.2776 23.6078 74.1792 24.7027 74.1792H38.0544V69.2544Z" fill="#A3E635"/>
+<path d="M47.0039 69.2544H44.49V74.1791H47.0039C48.0877 74.1791 48.9815 73.2888 48.9815 72.1844V71.2491C48.9815 70.1447 48.0877 69.2544 47.0039 69.2544Z" fill="#A3E635"/>
+<path d="M67.8535 155C67.8535 150.582 64.2718 147 59.8535 147H47.8535C43.4352 147 39.8535 150.582 39.8535 155V167C39.8535 171.418 43.4352 175 47.8535 175H59.8535C64.2718 175 67.8535 171.418 67.8535 167V155Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.8535 148.5H59.8535C63.4434 148.5 66.3535 151.41 66.3535 155V167C66.3535 170.59 63.4434 173.5 59.8535 173.5H47.8535C44.2637 173.5 41.3535 170.59 41.3535 167V155C41.3535 151.41 44.2637 148.5 47.8535 148.5ZM59.8535 147C64.2718 147 67.8535 150.582 67.8535 155V167C67.8535 171.418 64.2718 175 59.8535 175H47.8535C43.4352 175 39.8535 171.418 39.8535 167V155C39.8535 150.582 43.4352 147 47.8535 147H59.8535Z" fill="#196FDE"/>
+<path d="M56.7688 155.31H53.4511L49.2031 162.624H53.4511L52.1942 167.727L58.5032 159.633H54.3307L56.7688 155.31Z" fill="#196FDE"/>
+<path d="M31.8535 155C31.8535 150.582 28.2718 147 23.8535 147H11.8535C7.43524 147 3.85351 150.582 3.85351 155V167C3.85351 171.418 7.43524 175 11.8535 175H23.8535C28.2718 175 31.8535 171.418 31.8535 167V155Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8535 148.5H23.8535C27.4434 148.5 30.3535 151.41 30.3535 155V167C30.3535 170.59 27.4434 173.5 23.8535 173.5H11.8535C8.26366 173.5 5.35351 170.59 5.35351 167V155C5.35351 151.41 8.26366 148.5 11.8535 148.5ZM23.8535 147C28.2718 147 31.8535 150.582 31.8535 155V167C31.8535 171.418 28.2718 175 23.8535 175H11.8535C7.43524 175 3.85351 171.418 3.85351 167V155C3.85351 150.582 7.43524 147 11.8535 147H23.8535Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6309 158.864C12.4478 158.047 13.4177 157.399 14.4851 156.957C15.5525 156.515 16.6965 156.287 17.8519 156.287C19.0072 156.287 20.1513 156.515 21.2187 156.957C22.2861 157.399 23.2559 158.047 24.0729 158.864L23.0122 159.924C22.3345 159.247 21.53 158.709 20.6446 158.343C19.7592 157.976 18.8102 157.787 17.8519 157.787C16.8935 157.787 15.9445 157.976 15.0591 158.343C14.1737 158.709 13.3692 159.247 12.6916 159.924L11.6309 158.864Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.958 161.187C14.4695 160.676 15.0768 160.27 15.7451 159.993C16.4134 159.716 17.1297 159.574 17.8531 159.574C18.5765 159.574 19.2928 159.716 19.9611 159.993C20.6294 160.27 21.2367 160.676 21.7482 161.187L20.6875 162.248C20.3153 161.875 19.8734 161.58 19.387 161.379C18.9007 161.177 18.3795 161.074 17.8531 161.074C17.3267 161.074 16.8055 161.177 16.3191 161.379C15.8328 161.58 15.3909 161.875 15.0187 162.248L13.958 161.187Z" fill="#65A30D"/>
+<path d="M18.8098 164.126C18.8098 164.654 18.3813 165.083 17.8527 165.083C17.324 165.083 16.8955 164.654 16.8955 164.126C16.8955 163.597 17.324 163.168 17.8527 163.168C18.3813 163.168 18.8098 163.597 18.8098 164.126Z" fill="#65A30D"/>
+</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
index 74595a0152..bf76492b74 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.ScrollView;
import org.briarproject.briar.R;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
@@ -21,8 +20,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.FOCUS_DOWN;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -36,7 +35,6 @@ public class SetupDownloadFragment extends Fragment {
private MailboxViewModel viewModel;
private CameraPermissionManager permissionManager;
- private ScrollView scrollView;
private final ActivityResultLauncher<String[]> permissionLauncher =
registerForActivityResult(new RequestMultiplePermissions(), r -> {
@@ -62,7 +60,6 @@ public class SetupDownloadFragment extends Fragment {
@Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_mailbox_setup_download,
container, false);
- scrollView = v.findViewById(R.id.scrollView);
permissionManager = new CameraPermissionManager(requireActivity(),
permissionLauncher::launch);
@@ -80,8 +77,7 @@ public class SetupDownloadFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.mailbox_setup_title);
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
// Permissions may have been granted manually while we were stopped
permissionManager.resetPermissions();
}
diff --git a/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml b/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
new file mode 100644
index 0000000000..aecec6a67e
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
@@ -0,0 +1,106 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="192">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M189.4,29C189.4,22.37 184.03,17 177.4,17H86.4C79.77,17 74.4,22.37 74.4,29V163C74.4,169.63 79.77,175 86.4,175H177.4C184.03,175 189.4,169.63 189.4,163V29Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M86.4,18.5H177.4C183.2,18.5 187.9,23.2 187.9,29V163C187.9,168.8 183.2,173.5 177.4,173.5H86.4C80.6,173.5 75.9,168.8 75.9,163V29C75.9,23.2 80.6,18.5 86.4,18.5ZM177.4,17C184.03,17 189.4,22.37 189.4,29V163C189.4,169.63 184.03,175 177.4,175H86.4C79.77,175 74.4,169.63 74.4,163V29C74.4,22.37 79.77,17 86.4,17H177.4Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M183.4,35C183.4,30.58 179.82,27 175.4,27H88.4C83.98,27 80.4,30.58 80.4,35V157C80.4,161.42 83.98,165 88.4,165H175.4C179.82,165 183.4,161.42 183.4,157V35Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M88.4,28.5H175.4C178.99,28.5 181.9,31.41 181.9,35V157C181.9,160.59 178.99,163.5 175.4,163.5H88.4C84.81,163.5 81.9,160.59 81.9,157V35C81.9,31.41 84.81,28.5 88.4,28.5ZM175.4,27C179.82,27 183.4,30.58 183.4,35V157C183.4,161.42 179.82,165 175.4,165H88.4C83.98,165 80.4,161.42 80.4,157V35C80.4,30.58 83.98,27 88.4,27H175.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M131.9,38.26C131.07,38.26 130.4,37.58 130.4,36.76C130.4,35.93 131.07,35.26 131.9,35.26C132.73,35.26 133.4,35.93 133.4,36.76C133.4,37.58 132.73,38.26 131.9,38.26ZM131.9,39.76C130.24,39.76 128.9,38.41 128.9,36.76C128.9,35.1 130.24,33.76 131.9,33.76C133.56,33.76 134.9,35.1 134.9,36.76C134.9,38.41 133.56,39.76 131.9,39.76Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M115.85,74H146.96C148.14,74 149.27,74.47 150.1,75.32C150.93,76.16 151.4,77.3 151.4,78.49L151.4,116.97C151.4,118.69 149.42,119.63 148.12,118.53L140.05,112.57H115.85C114.67,112.57 113.54,112.1 112.7,111.26C111.87,110.41 111.4,109.27 111.4,108.08V78.49C111.4,77.3 111.87,76.16 112.7,75.32C113.54,74.47 114.67,74 115.85,74ZM127.67,93.9H118.51V81.18H144.29V93.9H135.29V98.29H138.58C139.17,98.29 139.47,99.02 139.05,99.44L131.95,106.62C131.69,106.88 131.27,106.88 131.01,106.62L123.9,99.44C123.48,99.02 123.78,98.29 124.38,98.29H127.67V93.9Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M3.4,29.03C3.4,22.4 8.77,17.03 15.4,17.03H55.4C62.03,17.03 67.4,22.4 67.4,29.03V125.03C67.4,131.65 62.03,137.03 55.4,137.03H15.4C8.77,137.03 3.4,131.65 3.4,125.03V29.03Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M55.4,18.53H15.4C9.6,18.53 4.9,23.23 4.9,29.03V125.03C4.9,130.82 9.6,135.53 15.4,135.53H55.4C61.2,135.53 65.9,130.82 65.9,125.03V29.03C65.9,23.23 61.2,18.53 55.4,18.53ZM15.4,17.03C8.77,17.03 3.4,22.4 3.4,29.03V125.03C3.4,131.65 8.77,137.03 15.4,137.03H55.4C62.03,137.03 67.4,131.65 67.4,125.03V29.03C67.4,22.4 62.03,17.03 55.4,17.03H15.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M35.4,27.01C34.88,27.01 34.44,26.58 34.44,26.03C34.44,25.47 34.88,25.05 35.4,25.05C35.92,25.05 36.36,25.47 36.36,26.03C36.36,26.58 35.92,27.01 35.4,27.01ZM35.4,28.51C34.04,28.51 32.94,27.4 32.94,26.03C32.94,24.66 34.04,23.55 35.4,23.55C36.76,23.55 37.86,24.66 37.86,26.03C37.86,27.4 36.76,28.51 35.4,28.51Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M19.88,25.77C19.88,25.35 20.22,25.02 20.63,25.02H28.84C29.25,25.02 29.59,25.35 29.59,25.77C29.59,26.18 29.25,26.52 28.84,26.52H20.63C20.22,26.52 19.88,26.18 19.88,25.77Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M41.22,25.77C41.22,25.35 41.55,25.02 41.97,25.02L50.17,25.02C50.58,25.02 50.92,25.35 50.92,25.77C50.92,26.18 50.58,26.52 50.17,26.52L41.97,26.52C41.55,26.52 41.22,26.18 41.22,25.77Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M61.66,41.25C61.66,36.83 58.08,33.25 53.66,33.25H17.14C12.73,33.25 9.14,36.83 9.14,41.25V117.94C9.14,122.36 12.73,125.94 17.14,125.94H53.66C58.08,125.94 61.66,122.36 61.66,117.94V41.25Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M17.14,34.75H53.66C57.25,34.75 60.16,37.66 60.16,41.25V117.94C60.16,121.53 57.25,124.44 53.66,124.44H17.14C13.56,124.44 10.64,121.53 10.64,117.94V41.25C10.64,37.66 13.56,34.75 17.14,34.75ZM53.66,33.25C58.08,33.25 61.66,36.83 61.66,41.25V117.94C61.66,122.36 58.08,125.94 53.66,125.94H17.14C12.73,125.94 9.14,122.36 9.14,117.94V41.25C9.14,36.83 12.73,33.25 17.14,33.25H53.66Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M27.55,74.96V88.42C27.55,89.52 28.43,90.42 29.52,90.42H30.45C31.54,90.42 32.43,89.52 32.43,88.42V74.96H27.55Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M32.42,68.47V65.93C32.42,64.84 31.54,63.94 30.45,63.94H29.52C28.44,63.94 27.55,64.84 27.55,65.93V68.47H32.42Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M43.26,79.4V65.93C43.26,64.84 42.37,63.94 41.29,63.94H40.36C39.28,63.94 38.38,64.84 38.38,65.93V79.4H43.26Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M38.38,85.89V88.42C38.38,89.52 39.28,90.42 40.36,90.42H41.29C42.37,90.42 43.27,89.52 43.27,88.42V85.89H38.38Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M26.76,80.19H24.25C23.17,80.19 22.27,81.08 22.27,82.18V83.12C22.27,84.21 23.16,85.11 24.25,85.11H26.76V80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M46.55,80.19H33.2V85.11H46.55C47.64,85.11 48.53,84.21 48.53,83.12V82.18C48.53,81.08 47.64,80.19 46.55,80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M37.6,69.25H24.25C23.17,69.25 22.27,70.14 22.27,71.25V72.18C22.27,73.28 23.16,74.18 24.25,74.18H37.6V69.25Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M46.55,69.25H44.04V74.18H46.55C47.64,74.18 48.53,73.29 48.53,72.18V71.25C48.53,70.14 47.64,69.25 46.55,69.25Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M67.4,155C67.4,150.58 63.82,147 59.4,147H47.4C42.98,147 39.4,150.58 39.4,155V167C39.4,171.42 42.98,175 47.4,175H59.4C63.82,175 67.4,171.42 67.4,167V155Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M47.4,148.5H59.4C62.99,148.5 65.9,151.41 65.9,155V167C65.9,170.59 62.99,173.5 59.4,173.5H47.4C43.81,173.5 40.9,170.59 40.9,167V155C40.9,151.41 43.81,148.5 47.4,148.5ZM59.4,147C63.82,147 67.4,150.58 67.4,155V167C67.4,171.42 63.82,175 59.4,175H47.4C42.98,175 39.4,171.42 39.4,167V155C39.4,150.58 42.98,147 47.4,147H59.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M56.32,155.31H53L48.75,162.62H53L51.74,167.73L58.05,159.63H53.88L56.32,155.31Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M31.4,155C31.4,150.58 27.82,147 23.4,147H11.4C6.98,147 3.4,150.58 3.4,155V167C3.4,171.42 6.98,175 11.4,175H23.4C27.82,175 31.4,171.42 31.4,167V155Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M11.4,148.5H23.4C26.99,148.5 29.9,151.41 29.9,155V167C29.9,170.59 26.99,173.5 23.4,173.5H11.4C7.81,173.5 4.9,170.59 4.9,167V155C4.9,151.41 7.81,148.5 11.4,148.5ZM23.4,147C27.82,147 31.4,150.58 31.4,155V167C31.4,171.42 27.82,175 23.4,175H11.4C6.98,175 3.4,171.42 3.4,167V155C3.4,150.58 6.98,147 11.4,147H23.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M11.18,158.86C12,158.05 12.97,157.4 14.03,156.96C15.1,156.51 16.24,156.29 17.4,156.29C18.56,156.29 19.7,156.51 20.77,156.96C21.83,157.4 22.8,158.05 23.62,158.86L22.56,159.92C21.88,159.25 21.08,158.71 20.19,158.34C19.31,157.98 18.36,157.79 17.4,157.79C16.44,157.79 15.49,157.98 14.61,158.34C13.72,158.71 12.92,159.25 12.24,159.92L11.18,158.86Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M13.51,161.19C14.02,160.68 14.62,160.27 15.29,159.99C15.96,159.72 16.68,159.57 17.4,159.57C18.12,159.57 18.84,159.72 19.51,159.99C20.18,160.27 20.78,160.68 21.3,161.19L20.24,162.25C19.86,161.88 19.42,161.58 18.93,161.38C18.45,161.18 17.93,161.07 17.4,161.07C16.87,161.07 16.35,161.18 15.87,161.38C15.38,161.58 14.94,161.88 14.57,162.25L13.51,161.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M18.36,164.13C18.36,164.65 17.93,165.08 17.4,165.08C16.87,165.08 16.44,164.65 16.44,164.13C16.44,163.6 16.87,163.17 17.4,163.17C17.93,163.17 18.36,163.6 18.36,164.13Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_mailbox_setup.xml b/briar-android/src/main/res/drawable/il_mailbox_setup.xml
new file mode 100644
index 0000000000..97f79a54a6
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_mailbox_setup.xml
@@ -0,0 +1,106 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="192">
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M189.85,29C189.85,22.37 184.48,17 177.85,17H86.85C80.23,17 74.85,22.37 74.85,29V163C74.85,169.63 80.23,175 86.85,175H177.85C184.48,175 189.85,169.63 189.85,163V29Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M86.85,18.5H177.85C183.65,18.5 188.35,23.2 188.35,29V163C188.35,168.8 183.65,173.5 177.85,173.5H86.85C81.05,173.5 76.35,168.8 76.35,163V29C76.35,23.2 81.05,18.5 86.85,18.5ZM177.85,17C184.48,17 189.85,22.37 189.85,29V163C189.85,169.63 184.48,175 177.85,175H86.85C80.23,175 74.85,169.63 74.85,163V29C74.85,22.37 80.23,17 86.85,17H177.85Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M183.85,35C183.85,30.58 180.27,27 175.85,27H88.85C84.44,27 80.85,30.58 80.85,35V157C80.85,161.42 84.44,165 88.85,165H175.85C180.27,165 183.85,161.42 183.85,157V35Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M88.85,28.5H175.85C179.44,28.5 182.35,31.41 182.35,35V157C182.35,160.59 179.44,163.5 175.85,163.5H88.85C85.26,163.5 82.35,160.59 82.35,157V35C82.35,31.41 85.26,28.5 88.85,28.5ZM175.85,27C180.27,27 183.85,30.58 183.85,35V157C183.85,161.42 180.27,165 175.85,165H88.85C84.44,165 80.85,161.42 80.85,157V35C80.85,30.58 84.44,27 88.85,27H175.85Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M132.35,38.26C131.52,38.26 130.85,37.58 130.85,36.76C130.85,35.93 131.52,35.26 132.35,35.26C133.18,35.26 133.85,35.93 133.85,36.76C133.85,37.58 133.18,38.26 132.35,38.26ZM132.35,39.76C130.7,39.76 129.35,38.41 129.35,36.76C129.35,35.1 130.7,33.76 132.35,33.76C134.01,33.76 135.35,35.1 135.35,36.76C135.35,38.41 134.01,39.76 132.35,39.76Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:fillType="evenOdd"
+ android:pathData="M116.3,74H147.41C148.59,74 149.72,74.47 150.55,75.32C151.38,76.16 151.85,77.3 151.85,78.49L151.85,116.97C151.85,118.69 149.87,119.63 148.57,118.53L140.51,112.57H116.3C115.12,112.57 113.99,112.1 113.15,111.26C112.32,110.41 111.85,109.27 111.85,108.08V78.49C111.85,77.3 112.32,76.16 113.15,75.32C113.99,74.47 115.12,74 116.3,74ZM128.12,93.9H118.96V81.18H144.74V93.9H135.74V98.29H139.03C139.63,98.29 139.92,99.02 139.5,99.44L132.4,106.62C132.14,106.88 131.72,106.88 131.46,106.62L124.36,99.44C123.94,99.02 124.23,98.29 124.83,98.29H128.12V93.9Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M3.85,29.03C3.85,22.4 9.23,17.03 15.85,17.03H55.85C62.48,17.03 67.85,22.4 67.85,29.03V125.03C67.85,131.65 62.48,137.03 55.85,137.03H15.85C9.23,137.03 3.85,131.65 3.85,125.03V29.03Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M55.85,18.53H15.85C10.05,18.53 5.35,23.23 5.35,29.03V125.03C5.35,130.82 10.05,135.53 15.85,135.53H55.85C61.65,135.53 66.35,130.82 66.35,125.03V29.03C66.35,23.23 61.65,18.53 55.85,18.53ZM15.85,17.03C9.23,17.03 3.85,22.4 3.85,29.03V125.03C3.85,131.65 9.23,137.03 15.85,137.03H55.85C62.48,137.03 67.85,131.65 67.85,125.03V29.03C67.85,22.4 62.48,17.03 55.85,17.03H15.85Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M35.85,27.01C35.33,27.01 34.89,26.58 34.89,26.03C34.89,25.47 35.33,25.05 35.85,25.05C36.37,25.05 36.81,25.47 36.81,26.03C36.81,26.58 36.37,27.01 35.85,27.01ZM35.85,28.51C34.49,28.51 33.39,27.4 33.39,26.03C33.39,24.66 34.49,23.55 35.85,23.55C37.21,23.55 38.31,24.66 38.31,26.03C38.31,27.4 37.21,28.51 35.85,28.51Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M20.33,25.77C20.33,25.35 20.67,25.02 21.08,25.02H29.29C29.7,25.02 30.04,25.35 30.04,25.77C30.04,26.18 29.7,26.52 29.29,26.52H21.08C20.67,26.52 20.33,26.18 20.33,25.77Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M41.67,25.77C41.67,25.35 42,25.02 42.42,25.02L50.62,25.02C51.04,25.02 51.37,25.35 51.37,25.77C51.37,26.18 51.04,26.52 50.62,26.52L42.42,26.52C42,26.52 41.67,26.18 41.67,25.77Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M62.11,41.25C62.11,36.83 58.53,33.25 54.11,33.25H17.6C13.18,33.25 9.6,36.83 9.6,41.25V117.94C9.6,122.36 13.18,125.94 17.6,125.94H54.11C58.53,125.94 62.11,122.36 62.11,117.94V41.25Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M17.6,34.75H54.11C57.7,34.75 60.61,37.66 60.61,41.25V117.94C60.61,121.53 57.7,124.44 54.11,124.44H17.6C14.01,124.44 11.1,121.53 11.1,117.94V41.25C11.1,37.66 14.01,34.75 17.6,34.75ZM54.11,33.25C58.53,33.25 62.11,36.83 62.11,41.25V117.94C62.11,122.36 58.53,125.94 54.11,125.94H17.6C13.18,125.94 9.6,122.36 9.6,117.94V41.25C9.6,36.83 13.18,33.25 17.6,33.25H54.11Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M28,74.96V88.42C28,89.52 28.88,90.42 29.98,90.42H30.9C31.99,90.42 32.88,89.52 32.88,88.42V74.96H28Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M32.87,68.47V65.93C32.87,64.84 31.99,63.94 30.9,63.94H29.98C28.89,63.94 28,64.84 28,65.93V68.47H32.87Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M43.71,79.4V65.93C43.71,64.84 42.83,63.94 41.74,63.94H40.81C39.73,63.94 38.84,64.84 38.84,65.93V79.4H43.71Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M38.84,85.89V88.42C38.84,89.52 39.73,90.42 40.81,90.42H41.74C42.83,90.42 43.72,89.52 43.72,88.42V85.89H38.84Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.22,80.19H24.7C23.62,80.19 22.73,81.08 22.73,82.18V83.12C22.73,84.21 23.61,85.11 24.7,85.11H27.22V80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M47,80.19H33.65V85.11H47C48.09,85.11 48.98,84.21 48.98,83.12V82.18C48.98,81.08 48.09,80.19 47,80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M38.05,69.25H24.7C23.62,69.25 22.73,70.14 22.73,71.25V72.18C22.73,73.28 23.61,74.18 24.7,74.18H38.05V69.25Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M47,69.25H44.49V74.18H47C48.09,74.18 48.98,73.29 48.98,72.18V71.25C48.98,70.14 48.09,69.25 47,69.25Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M67.85,155C67.85,150.58 64.27,147 59.85,147H47.85C43.44,147 39.85,150.58 39.85,155V167C39.85,171.42 43.44,175 47.85,175H59.85C64.27,175 67.85,171.42 67.85,167V155Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M47.85,148.5H59.85C63.44,148.5 66.35,151.41 66.35,155V167C66.35,170.59 63.44,173.5 59.85,173.5H47.85C44.26,173.5 41.35,170.59 41.35,167V155C41.35,151.41 44.26,148.5 47.85,148.5ZM59.85,147C64.27,147 67.85,150.58 67.85,155V167C67.85,171.42 64.27,175 59.85,175H47.85C43.44,175 39.85,171.42 39.85,167V155C39.85,150.58 43.44,147 47.85,147H59.85Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M56.77,155.31H53.45L49.2,162.62H53.45L52.19,167.73L58.5,159.63H54.33L56.77,155.31Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M31.85,155C31.85,150.58 28.27,147 23.85,147H11.85C7.44,147 3.85,150.58 3.85,155V167C3.85,171.42 7.44,175 11.85,175H23.85C28.27,175 31.85,171.42 31.85,167V155Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M11.85,148.5H23.85C27.44,148.5 30.35,151.41 30.35,155V167C30.35,170.59 27.44,173.5 23.85,173.5H11.85C8.26,173.5 5.35,170.59 5.35,167V155C5.35,151.41 8.26,148.5 11.85,148.5ZM23.85,147C28.27,147 31.85,150.58 31.85,155V167C31.85,171.42 28.27,175 23.85,175H11.85C7.44,175 3.85,171.42 3.85,167V155C3.85,150.58 7.44,147 11.85,147H23.85Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M11.63,158.86C12.45,158.05 13.42,157.4 14.49,156.96C15.55,156.51 16.7,156.29 17.85,156.29C19.01,156.29 20.15,156.51 21.22,156.96C22.29,157.4 23.26,158.05 24.07,158.86L23.01,159.92C22.33,159.25 21.53,158.71 20.64,158.34C19.76,157.98 18.81,157.79 17.85,157.79C16.89,157.79 15.94,157.98 15.06,158.34C14.17,158.71 13.37,159.25 12.69,159.92L11.63,158.86Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M13.96,161.19C14.47,160.68 15.08,160.27 15.75,159.99C16.41,159.72 17.13,159.57 17.85,159.57C18.58,159.57 19.29,159.72 19.96,159.99C20.63,160.27 21.24,160.68 21.75,161.19L20.69,162.25C20.32,161.88 19.87,161.58 19.39,161.38C18.9,161.18 18.38,161.07 17.85,161.07C17.33,161.07 16.81,161.18 16.32,161.38C15.83,161.58 15.39,161.88 15.02,162.25L13.96,161.19Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M18.81,164.13C18.81,164.65 18.38,165.08 17.85,165.08C17.32,165.08 16.9,164.65 16.9,164.13C16.9,163.6 17.32,163.17 17.85,163.17C18.38,163.17 18.81,163.6 18.81,164.13Z" />
+</vector>
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml b/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
index c3850b4af3..45bec3efb6 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
@@ -1,63 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true"
- tools:context=".android.mailbox.MailboxActivity">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_rect_width"
- android:layout_height="@dimen/hero_rect_width"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/introView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_mailbox"
- app:tint="@color/briar_brand_green"
- tools:ignore="ContentDescription" />
-
- <TextView
- android:id="@+id/introView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:text="@string/mailbox_setup_download"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/scanButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
- <Button
- android:id="@+id/scanButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:drawablePadding="8dp"
- android:text="@string/mailbox_setup_button_scan"
- app:drawableLeftCompat="@drawable/ic_qr_code"
- app:drawableStartCompat="@drawable/ic_qr_code"
- app:drawableTint="@color/button_text"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- tools:visibility="visible" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
+ android:layout_height="0dp"
+ android:layout_weight="1">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_width"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/introView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_mailbox_setup"
+ tools:ignore="ContentDescription" />
+
+ <TextView
+ android:id="@+id/introView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:text="@string/mailbox_setup_download"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <Button
+ android:id="@+id/scanButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_large"
+ android:drawablePadding="8dp"
+ android:text="@string/mailbox_setup_button_scan"
+ app:drawableLeftCompat="@drawable/ic_qr_code"
+ app:drawableStartCompat="@drawable/ic_qr_code"
+ app:drawableTint="@color/button_text"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:visibility="visible" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml b/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
index 8fee198d7d..5639d8a59a 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
@@ -34,9 +34,7 @@
android:id="@+id/introView"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
+ android:layout_margin="@dimen/margin_large"
android:text="@string/mailbox_setup_intro"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintBottom_toBottomOf="parent"
--
GitLab