diff --git a/briar-android/artwork/il_add_contact_remote_dark.svg b/briar-android/artwork/il_add_contact_remote_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7a575dcf8b8aa7ec7540f95f21bfd03f8fbe8265
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_dark.svg
@@ -0,0 +1,34 @@
+<svg width="289" height="145" viewBox="0 0 289 145" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M48.8682 41C48.8682 36.5817 45.2864 33 40.8682 33H14.8682C10.4499 33 6.86816 36.5817 6.86816 41V103C6.86816 107.418 10.4499 111 14.8682 111H40.8682C45.2864 111 48.8682 107.418 48.8682 103V41Z" fill="#1E293B"/>
+<path d="M48.8682 47.248H6.86834V101.248H48.8682V47.248Z" fill="#0B1120"/>
+<path d="M11.4736 69.1006C11.4736 66.8914 13.2645 65.1006 15.4736 65.1006H40.2633C42.4724 65.1006 44.2633 66.8914 44.2633 69.1006V79.3936C44.2633 81.6028 42.4724 83.3936 40.2633 83.3936H15.4736C13.2645 83.3936 11.4736 81.6028 11.4736 79.3936V69.1006Z" fill="#184080"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2358 71.5547C17.2358 71.1405 17.5716 70.8047 17.9858 70.8047H37.8583C38.2726 70.8047 38.6083 71.1405 38.6083 71.5547C38.6083 71.9689 38.2726 72.3047 37.8583 72.3047H17.9858C17.5716 72.3047 17.2358 71.9689 17.2358 71.5547Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2358 77.6523C17.2358 77.2381 17.5716 76.9023 17.9858 76.9023H28.6658C29.08 76.9023 29.4158 77.2381 29.4158 77.6523C29.4158 78.0666 29.08 78.4023 28.6658 78.4023H17.9858C17.5716 78.4023 17.2358 78.0666 17.2358 77.6523Z" fill="#52ADF9"/>
+<path d="M27.8682 42.0024C27.3159 42.0024 26.8682 41.5541 26.8682 41.0012C26.8682 40.4482 27.3159 40 27.8682 40C28.4204 40 28.8682 40.4482 28.8682 41.0012C28.8682 41.5541 28.4204 42.0024 27.8682 42.0024Z" fill="#A3E635"/>
+<path d="M19.1182 41.0244C19.1182 40.6102 19.454 40.2744 19.8682 40.2744H23.8682C24.2824 40.2744 24.6182 40.6102 24.6182 41.0244C24.6182 41.4386 24.2824 41.7744 23.8682 41.7744H19.8682C19.454 41.7744 19.1182 41.4386 19.1182 41.0244Z" fill="#A3E635"/>
+<path d="M31.8682 40.2744C31.454 40.2744 31.1182 40.6102 31.1182 41.0244C31.1182 41.4386 31.454 41.7744 31.8682 41.7744H35.8682C36.2824 41.7744 36.6182 41.4386 36.6182 41.0244C36.6182 40.6102 36.2824 40.2744 35.8682 40.2744H31.8682Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.8682 41V103C48.8682 107.418 45.2864 111 40.8682 111H14.8682C10.4499 111 6.86816 107.418 6.86816 103V41C6.86816 36.5817 10.4499 33 14.8682 33H40.8682C45.2864 33 48.8682 36.5817 48.8682 41ZM14.8682 34.5H40.8682C44.458 34.5 47.3682 37.4101 47.3682 41V47.248H8.36816V41C8.36816 37.4101 11.2783 34.5 14.8682 34.5ZM47.3682 48.748V99.748H8.36834V48.748H47.3682ZM47.3682 103V101.248H8.36816V103C8.36816 106.59 11.2783 109.5 14.8682 109.5H40.8682C44.458 109.5 47.3682 106.59 47.3682 103Z" fill="#A3E635"/>
+<path d="M281.868 41C281.868 36.5817 278.286 33 273.868 33H247.868C243.45 33 239.868 36.5817 239.868 41V103C239.868 107.418 243.45 111 247.868 111H273.868C278.286 111 281.868 107.418 281.868 103V41Z" fill="#1E293B"/>
+<path d="M281.868 47.248H239.868V101.248H281.868V47.248Z" fill="#0B1120"/>
+<path d="M244.473 69.1006C244.473 66.8914 246.264 65.1006 248.473 65.1006H273.263C275.472 65.1006 277.263 66.8914 277.263 69.1006V79.3936C277.263 81.6028 275.472 83.3936 273.263 83.3936H248.473C246.264 83.3936 244.473 81.6028 244.473 79.3936V69.1006Z" fill="#365314"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.236 71.5547C250.236 71.1405 250.572 70.8047 250.986 70.8047H270.858C271.273 70.8047 271.608 71.1405 271.608 71.5547C271.608 71.9689 271.273 72.3047 270.858 72.3047H250.986C250.572 72.3047 250.236 71.9689 250.236 71.5547Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.236 77.6523C250.236 77.2381 250.572 76.9023 250.986 76.9023H261.666C262.08 76.9023 262.416 77.2381 262.416 77.6523C262.416 78.0666 262.08 78.4023 261.666 78.4023H250.986C250.572 78.4023 250.236 78.0666 250.236 77.6523Z" fill="#A3E635"/>
+<path d="M260.868 42.0024C260.316 42.0024 259.868 41.5541 259.868 41.0012C259.868 40.4482 260.316 40 260.868 40C261.42 40 261.868 40.4482 261.868 41.0012C261.868 41.5541 261.42 42.0024 260.868 42.0024Z" fill="#52ADF9"/>
+<path d="M252.118 41.0244C252.118 40.6102 252.454 40.2744 252.868 40.2744H256.868C257.282 40.2744 257.618 40.6102 257.618 41.0244C257.618 41.4386 257.282 41.7744 256.868 41.7744H252.868C252.454 41.7744 252.118 41.4386 252.118 41.0244Z" fill="#52ADF9"/>
+<path d="M264.868 40.2744C264.454 40.2744 264.118 40.6102 264.118 41.0244C264.118 41.4386 264.454 41.7744 264.868 41.7744H268.868C269.282 41.7744 269.618 41.4386 269.618 41.0244C269.618 40.6102 269.282 40.2744 268.868 40.2744H264.868Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M281.868 41V103C281.868 107.418 278.286 111 273.868 111H247.868C243.45 111 239.868 107.418 239.868 103V41C239.868 36.5817 243.45 33 247.868 33H273.868C278.286 33 281.868 36.5817 281.868 41ZM247.868 34.5H273.868C277.458 34.5 280.368 37.4101 280.368 41V47.248H241.368V41C241.368 37.4101 244.278 34.5 247.868 34.5ZM280.368 48.748V99.748H241.368V48.748H280.368ZM280.368 103V101.248H241.368V103C241.368 106.59 244.278 109.5 247.868 109.5H273.868C277.458 109.5 280.368 106.59 280.368 103Z" fill="#52ADF9"/>
+<path d="M150.868 54C150.868 49.5817 147.286 46 142.868 46H126.868C122.45 46 118.868 49.5817 118.868 54V70C118.868 74.4183 122.45 78 126.868 78H142.868C147.286 78 150.868 74.4183 150.868 70V54Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M126.868 47.5H142.868C146.458 47.5 149.368 50.4101 149.368 54V70C149.368 73.5899 146.458 76.5 142.868 76.5H126.868C123.278 76.5 120.368 73.5899 120.368 70V54C120.368 50.4101 123.278 47.5 126.868 47.5ZM142.868 46C147.286 46 150.868 49.5817 150.868 54V70C150.868 74.4183 147.286 78 142.868 78H126.868C122.45 78 118.868 74.4183 118.868 70V54C118.868 49.5817 122.45 46 126.868 46H142.868Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M138.934 61.3778C139.519 62.63 139.295 64.1672 138.261 65.2012L134.282 69.1801C132.962 70.5002 130.822 70.5002 129.501 69.1801C128.181 67.8599 128.181 65.7194 129.501 64.3992L133.48 60.4203C134.515 59.386 136.052 59.162 137.305 59.7485L136.108 60.9452C135.551 60.8746 134.969 61.0533 134.541 61.481L130.562 65.4599C129.828 66.1943 129.828 67.385 130.562 68.1194C131.296 68.8538 132.487 68.8538 133.222 68.1194L137.2 64.1405C137.628 63.7132 137.806 63.1314 137.736 62.5749L138.934 61.3778Z" fill="#BEF264"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.432 64.25C133.684 64.8362 135.222 64.6123 136.256 63.578L140.235 59.5991C141.555 58.2789 141.555 56.1385 140.235 54.8183C138.915 53.4981 136.774 53.4981 135.454 54.8183L131.475 58.7971C130.441 59.8312 130.217 61.3686 130.803 62.6209L132 61.4239C131.93 60.8672 132.109 60.2852 132.536 59.8578L136.515 55.8789C137.249 55.1445 138.44 55.1445 139.174 55.8789C139.909 56.6133 139.909 57.8041 139.174 58.5385L135.196 62.5173C134.768 62.945 134.186 63.1236 133.629 63.0532L132.432 64.25Z" fill="#BEF264"/>
+<path d="M169.868 73C169.868 68.5817 166.286 65 161.868 65H145.868C141.45 65 137.868 68.5817 137.868 73V89C137.868 93.4183 141.45 97 145.868 97H161.868C166.286 97 169.868 93.4183 169.868 89V73Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.868 66.5H161.868C165.458 66.5 168.368 69.4101 168.368 73V89C168.368 92.5899 165.458 95.5 161.868 95.5H145.868C142.278 95.5 139.368 92.5899 139.368 89V73C139.368 69.4101 142.278 66.5 145.868 66.5ZM161.868 65C166.286 65 169.868 68.5817 169.868 73V89C169.868 93.4183 166.286 97 161.868 97H145.868C141.45 97 137.868 93.4183 137.868 89V73C137.868 68.5817 141.45 65 145.868 65H161.868Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M157.934 80.3778C158.519 81.63 158.295 83.1672 157.261 84.2012L153.282 88.18C151.962 89.5002 149.822 89.5002 148.501 88.18C147.181 86.8599 147.181 84.7194 148.501 83.3992L152.48 79.4203C153.515 78.386 155.052 78.162 156.305 78.7485L155.108 79.9452C154.551 79.8746 153.969 80.0532 153.541 80.481L149.562 84.4599C148.828 85.1943 148.828 86.385 149.562 87.1194C150.296 87.8538 151.487 87.8538 152.222 87.1194L156.2 83.1405C156.628 82.7132 156.806 82.1314 156.736 81.5749L157.934 80.3778Z" fill="#BEF264"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.432 83.25C152.684 83.8362 154.222 83.6123 155.256 82.578L159.235 78.5991C160.555 77.2789 160.555 75.1385 159.235 73.8183C157.915 72.4981 155.774 72.4981 154.454 73.8183L150.475 77.7971C149.441 78.8312 149.217 80.3686 149.803 81.6209L151 80.4239C150.93 79.8672 151.109 79.2852 151.536 78.8578L155.515 74.8789C156.249 74.1445 157.44 74.1445 158.174 74.8789C158.909 75.6133 158.909 76.8041 158.174 77.5385L154.196 81.5173C153.768 81.945 153.186 82.1236 152.629 82.0532L151.432 83.25Z" fill="#BEF264"/>
+<path d="M87.8682 62C87.8682 64.2091 86.0773 66 83.8682 66C81.659 66 79.8682 64.2091 79.8682 62C79.8682 59.7909 81.659 58 83.8682 58C86.0773 58 87.8682 59.7909 87.8682 62Z" fill="#1457C5"/>
+<path d="M103.868 62C103.868 64.2091 102.077 66 99.8682 66C97.659 66 95.8682 64.2091 95.8682 62C95.8682 59.7909 97.659 58 99.8682 58C102.077 58 103.868 59.7909 103.868 62Z" fill="#2B8EF1"/>
+<path d="M71.8682 62C71.8682 64.2091 70.0773 66 67.8682 66C65.659 66 63.8682 64.2091 63.8682 62C63.8682 59.7909 65.659 58 67.8682 58C70.0773 58 71.8682 59.7909 71.8682 62Z" fill="#184080"/>
+<path d="M200.868 81C200.868 78.7909 202.659 77 204.868 77C207.077 77 208.868 78.7909 208.868 81C208.868 83.2091 207.077 85 204.868 85C202.659 85 200.868 83.2091 200.868 81Z" fill="#4D7C0F"/>
+<path d="M184.868 81C184.868 78.7909 186.659 77 188.868 77C191.077 77 192.868 78.7909 192.868 81C192.868 83.2091 191.077 85 188.868 85C186.659 85 184.868 83.2091 184.868 81Z" fill="#82C91E"/>
+<path d="M216.868 81C216.868 78.7909 218.659 77 220.868 77C223.077 77 224.868 78.7909 224.868 81C224.868 83.2091 223.077 85 220.868 85C218.659 85 216.868 83.2091 216.868 81Z" fill="#365314"/>
+</svg>
diff --git a/briar-android/artwork/il_add_contact_remote_light.svg b/briar-android/artwork/il_add_contact_remote_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ec2d9361f6128afc29e859cc5f8869490d3db5bd
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_light.svg
@@ -0,0 +1,40 @@
+<svg width="289" height="145" viewBox="0 0 289 145" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M48.3203 41C48.3203 36.5817 44.7386 33 40.3203 33H14.3203C9.90203 33 6.32031 36.5817 6.32031 41V103C6.32031 107.418 9.90203 111 14.3203 111H40.3203C44.7386 111 48.3203 107.418 48.3203 103V41Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.3203 34.5H40.3203C43.9102 34.5 46.8203 37.4101 46.8203 41V103C46.8203 106.59 43.9102 109.5 40.3203 109.5H14.3203C10.7305 109.5 7.82031 106.59 7.82031 103V41C7.82031 37.4101 10.7305 34.5 14.3203 34.5ZM40.3203 33C44.7386 33 48.3203 36.5817 48.3203 41V103C48.3203 107.418 44.7386 111 40.3203 111H14.3203C9.90203 111 6.32031 107.418 6.32031 103V41C6.32031 36.5817 9.90203 33 14.3203 33H40.3203Z" fill="#65A30D"/>
+<path d="M48.3203 47.248H6.32049V101.248H48.3203V47.248Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.82049 48.748H46.8203V99.748H7.82049V48.748ZM48.3203 47.248V101.248H6.32049V47.248H48.3203Z" fill="#65A30D"/>
+<path d="M10.9258 69.1006C10.9258 66.8914 12.7166 65.1006 14.9258 65.1006H39.7154C41.9245 65.1006 43.7154 66.8914 43.7154 69.1006V79.3936C43.7154 81.6028 41.9245 83.3936 39.7154 83.3936H14.9258C12.7166 83.3936 10.9258 81.6028 10.9258 79.3936V69.1006Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6885 71.5547C16.6885 71.1405 17.0243 70.8047 17.4385 70.8047H37.311C37.7252 70.8047 38.061 71.1405 38.061 71.5547C38.061 71.9689 37.7252 72.3047 37.311 72.3047H17.4385C17.0243 72.3047 16.6885 71.9689 16.6885 71.5547Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6885 77.6523C16.6885 77.2381 17.0243 76.9023 17.4385 76.9023H28.1185C28.5327 76.9023 28.8685 77.2381 28.8685 77.6523C28.8685 78.0666 28.5327 78.4023 28.1185 78.4023H17.4385C17.0243 78.4023 16.6885 78.0666 16.6885 77.6523Z" fill="#196FDE"/>
+<path d="M26.3203 41.0012C26.3203 41.5541 26.768 42.0024 27.3203 42.0024C27.8726 42.0024 28.3203 41.5541 28.3203 41.0012C28.3203 40.4482 27.8726 40 27.3203 40C26.768 40 26.3203 40.4482 26.3203 41.0012Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5703 41.0244C18.5703 40.6102 18.9061 40.2744 19.3203 40.2744H23.3203C23.7345 40.2744 24.0703 40.6102 24.0703 41.0244C24.0703 41.4386 23.7345 41.7744 23.3203 41.7744H19.3203C18.9061 41.7744 18.5703 41.4386 18.5703 41.0244Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.5703 41.0244C30.5703 40.6102 30.9061 40.2744 31.3203 40.2744H35.3203C35.7345 40.2744 36.0703 40.6102 36.0703 41.0244C36.0703 41.4386 35.7345 41.7744 35.3203 41.7744H31.3203C30.9061 41.7744 30.5703 41.4386 30.5703 41.0244Z" fill="#65A30D"/>
+<path d="M150.32 54C150.32 49.5817 146.739 46 142.32 46H126.32C121.902 46 118.32 49.5817 118.32 54V70C118.32 74.4183 121.902 78 126.32 78H142.32C146.739 78 150.32 74.4183 150.32 70V54Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M126.32 47.5H142.32C145.91 47.5 148.82 50.4101 148.82 54V70C148.82 73.5899 145.91 76.5 142.32 76.5H126.32C122.73 76.5 119.82 73.5899 119.82 70V54C119.82 50.4101 122.73 47.5 126.32 47.5ZM142.32 46C146.739 46 150.32 49.5817 150.32 54V70C150.32 74.4183 146.739 78 142.32 78H126.32C121.902 78 118.32 74.4183 118.32 70V54C118.32 49.5817 121.902 46 126.32 46H142.32Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.932 60.4207C134.253 59.1005 136.393 59.1005 137.713 60.4207C139.033 61.7409 139.033 63.8814 137.713 65.2015L133.734 69.1804C132.414 70.5006 130.274 70.5006 128.953 69.1804C127.633 67.8602 127.633 65.7197 128.953 64.3996L132.932 60.4207ZM136.653 61.4814C135.918 60.7469 134.727 60.7469 133.993 61.4814L130.014 65.4602C129.28 66.1946 129.28 67.3853 130.014 68.1197C130.749 68.8541 131.939 68.8541 132.674 68.1197L136.653 64.1409C137.387 63.4065 137.387 62.2158 136.653 61.4814Z" fill="#BEF264"/>
+<path d="M137.184 59.3223L138.813 60.9512L137.184 62.5802L135.555 60.9512L137.184 59.3223Z" fill="#D9D9D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M135.708 63.5783C134.388 64.8985 132.248 64.8985 130.927 63.5783C129.607 62.2581 129.607 60.1177 130.927 58.7975L134.906 54.8186C136.226 53.4984 138.367 53.4984 139.687 54.8186C141.007 56.1388 141.007 58.2793 139.687 59.5995L135.708 63.5783ZM131.988 62.5177C132.723 63.2521 133.913 63.2521 134.648 62.5177L138.626 58.5388C139.361 57.8044 139.361 56.6137 138.626 55.8793C137.892 55.1449 136.701 55.1449 135.967 55.8793L131.988 59.8581C131.254 60.5925 131.254 61.7833 131.988 62.5177Z" fill="#BEF264"/>
+<path d="M131.457 64.6768L129.828 63.0478L131.457 61.4189L133.086 63.0478L131.457 64.6768Z" fill="#D9D9D9"/>
+<path d="M281.32 41C281.32 36.5817 277.739 33 273.32 33H247.32C242.902 33 239.32 36.5817 239.32 41V103C239.32 107.418 242.902 111 247.32 111H273.32C277.739 111 281.32 107.418 281.32 103V41Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M247.32 34.5H273.32C276.91 34.5 279.82 37.4101 279.82 41V103C279.82 106.59 276.91 109.5 273.32 109.5H247.32C243.73 109.5 240.82 106.59 240.82 103V41C240.82 37.4101 243.73 34.5 247.32 34.5ZM273.32 33C277.739 33 281.32 36.5817 281.32 41V103C281.32 107.418 277.739 111 273.32 111H247.32C242.902 111 239.32 107.418 239.32 103V41C239.32 36.5817 242.902 33 247.32 33H273.32Z" fill="#196FDE"/>
+<path d="M281.32 47.248H239.32V101.248H281.32V47.248Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M240.82 48.748H279.82V99.748H240.82V48.748ZM281.32 47.248V101.248H239.32V47.248H281.32Z" fill="#196FDE"/>
+<path d="M243.925 69.1006C243.925 66.8914 245.716 65.1006 247.925 65.1006H272.715C274.924 65.1006 276.715 66.8914 276.715 69.1006V79.3936C276.715 81.6028 274.924 83.3936 272.715 83.3936H247.925C245.716 83.3936 243.925 81.6028 243.925 79.3936V69.1006Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.688 71.5547C249.688 71.1405 250.023 70.8047 250.438 70.8047H270.31C270.724 70.8047 271.06 71.1405 271.06 71.5547C271.06 71.9689 270.724 72.3047 270.31 72.3047H250.438C250.023 72.3047 249.688 71.9689 249.688 71.5547Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.688 77.6523C249.688 77.2381 250.023 76.9023 250.438 76.9023H261.117C261.532 76.9023 261.867 77.2381 261.867 77.6523C261.867 78.0666 261.532 78.4023 261.117 78.4023H250.438C250.023 78.4023 249.688 78.0666 249.688 77.6523Z" fill="#65A30D"/>
+<path d="M259.32 41.0012C259.32 41.5541 259.768 42.0024 260.32 42.0024C260.873 42.0024 261.32 41.5541 261.32 41.0012C261.32 40.4482 260.873 40 260.32 40C259.768 40 259.32 40.4482 259.32 41.0012Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M251.57 41.0244C251.57 40.6102 251.906 40.2744 252.32 40.2744H256.32C256.735 40.2744 257.07 40.6102 257.07 41.0244C257.07 41.4386 256.735 41.7744 256.32 41.7744H252.32C251.906 41.7744 251.57 41.4386 251.57 41.0244Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M263.57 41.0244C263.57 40.6102 263.906 40.2744 264.32 40.2744H268.32C268.735 40.2744 269.07 40.6102 269.07 41.0244C269.07 41.4386 268.735 41.7744 268.32 41.7744H264.32C263.906 41.7744 263.57 41.4386 263.57 41.0244Z" fill="#196FDE"/>
+<path d="M169.32 73C169.32 68.5817 165.739 65 161.32 65H145.32C140.902 65 137.32 68.5817 137.32 73V89C137.32 93.4183 140.902 97 145.32 97H161.32C165.739 97 169.32 93.4183 169.32 89V73Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.32 66.5H161.32C164.91 66.5 167.82 69.4101 167.82 73V89C167.82 92.5899 164.91 95.5 161.32 95.5H145.32C141.73 95.5 138.82 92.5899 138.82 89V73C138.82 69.4101 141.73 66.5 145.32 66.5ZM161.32 65C165.739 65 169.32 68.5817 169.32 73V89C169.32 93.4183 165.739 97 161.32 97H145.32C140.902 97 137.32 93.4183 137.32 89V73C137.32 68.5817 140.902 65 145.32 65H161.32Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.932 79.4207C153.253 78.1005 155.393 78.1005 156.713 79.4207C158.033 80.7409 158.033 82.8814 156.713 84.2015L152.734 88.1804C151.414 89.5006 149.274 89.5006 147.953 88.1804C146.633 86.8602 146.633 84.7197 147.953 83.3996L151.932 79.4207ZM155.653 80.4814C154.918 79.7469 153.727 79.7469 152.993 80.4814L149.014 84.4602C148.28 85.1946 148.28 86.3853 149.014 87.1197C149.749 87.8541 150.939 87.8541 151.674 87.1197L155.653 83.1409C156.387 82.4065 156.387 81.2158 155.653 80.4814Z" fill="#BEF264"/>
+<path d="M156.184 78.3223L157.813 79.9512L156.184 81.5802L154.555 79.9512L156.184 78.3223Z" fill="#D9D9D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M154.708 82.5783C153.388 83.8985 151.248 83.8985 149.927 82.5783C148.607 81.2581 148.607 79.1177 149.927 77.7975L153.906 73.8186C155.226 72.4984 157.367 72.4984 158.687 73.8186C160.007 75.1388 160.007 77.2793 158.687 78.5995L154.708 82.5783ZM150.988 81.5177C151.723 82.2521 152.913 82.2521 153.648 81.5177L157.626 77.5388C158.361 76.8044 158.361 75.6137 157.626 74.8793C156.892 74.1449 155.701 74.1449 154.967 74.8793L150.988 78.8581C150.254 79.5925 150.254 80.7833 150.988 81.5177Z" fill="#BEF264"/>
+<path d="M150.457 83.6768L148.828 82.0478L150.457 80.4189L152.086 82.0478L150.457 83.6768Z" fill="#D9D9D9"/>
+<path d="M87.3203 62C87.3203 64.2091 85.5295 66 83.3203 66C81.1112 66 79.3203 64.2091 79.3203 62C79.3203 59.7909 81.1112 58 83.3203 58C85.5295 58 87.3203 59.7909 87.3203 62Z" fill="#8BCAFD"/>
+<path d="M103.32 62C103.32 64.2091 101.529 66 99.3203 66C97.1112 66 95.3203 64.2091 95.3203 62C95.3203 59.7909 97.1112 58 99.3203 58C101.529 58 103.32 59.7909 103.32 62Z" fill="#52ADF9"/>
+<path d="M71.3203 62C71.3203 64.2091 69.5295 66 67.3203 66C65.1112 66 63.3203 64.2091 63.3203 62C63.3203 59.7909 65.1112 58 67.3203 58C69.5295 58 71.3203 59.7909 71.3203 62Z" fill="#BDDFFE"/>
+<path d="M200.32 81C200.32 78.7909 202.111 77 204.32 77C206.529 77 208.32 78.7909 208.32 81C208.32 83.2091 206.529 85 204.32 85C202.111 85 200.32 83.2091 200.32 81Z" fill="#BEF264"/>
+<path d="M184.32 81C184.32 78.7909 186.111 77 188.32 77C190.529 77 192.32 78.7909 192.32 81C192.32 83.2091 190.529 85 188.32 85C186.111 85 184.32 83.2091 184.32 81Z" fill="#A3E635"/>
+<path d="M216.32 81C216.32 78.7909 218.111 77 220.32 77C222.529 77 224.32 78.7909 224.32 81C224.32 83.2091 222.529 85 220.32 85C218.111 85 216.32 83.2091 216.32 81Z" fill="#D9F99D"/>
+</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
index 38f46b4f43f4603ebdba5f81ed6d358180b6e652..42097e32ad86582a5ce3c19ca08d77d62216f723 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
@@ -1,15 +1,12 @@
package org.briarproject.briar.android.contact.add.remote;
-import android.animation.ObjectAnimator;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.widget.Button;
-import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@@ -33,12 +30,12 @@ import androidx.lifecycle.ViewModelProvider;
import static android.content.Context.CLIPBOARD_SERVICE;
import static android.widget.Toast.LENGTH_SHORT;
import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
import static org.briarproject.briar.android.util.UiUtils.observeOnce;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
-public class LinkExchangeFragment extends BaseFragment
- implements OnGlobalLayoutListener {
+public class LinkExchangeFragment extends BaseFragment {
private static final String TAG = LinkExchangeFragment.class.getName();
@@ -92,29 +89,13 @@ public class LinkExchangeFragment extends BaseFragment
observeOnce(viewModel.getHandshakeLink(), this,
this::onHandshakeLinkLoaded);
-
- if (savedInstanceState == null) {
- ScrollView scrollView = (ScrollView) v;
- // we need to wait for views to be laid out to get the heights
- scrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
- }
-
return v;
}
@Override
- public void onGlobalLayout() {
- ScrollView scrollView = (ScrollView) requireView();
- View layout = scrollView.getChildAt(0);
- int scrollBy = layout.getHeight() - scrollView.getHeight();
- if (scrollBy > 0) {
- // smoothScrollTo() is too fast due to the transition animation
- ObjectAnimator animator = ObjectAnimator
- .ofInt(scrollView, "scrollY", scrollBy);
- animator.setDuration(1000);
- animator.start();
- }
- layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+ public void onStart() {
+ super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
private void onHandshakeLinkLoaded(String link) {
diff --git a/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml b/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c3f9245b8ed20e5377b707a2a849632aaaf5366
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml
@@ -0,0 +1,114 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="145">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M48.87,41C48.87,36.58 45.29,33 40.87,33H14.87C10.45,33 6.87,36.58 6.87,41V103C6.87,107.42 10.45,111 14.87,111H40.87C45.29,111 48.87,107.42 48.87,103V41Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M48.87,47.25H6.87V101.25H48.87V47.25Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M11.47,69.1C11.47,66.89 13.26,65.1 15.47,65.1H40.26C42.47,65.1 44.26,66.89 44.26,69.1V79.39C44.26,81.6 42.47,83.39 40.26,83.39H15.47C13.26,83.39 11.47,81.6 11.47,79.39V69.1Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M17.24,71.55C17.24,71.14 17.57,70.8 17.99,70.8H37.86C38.27,70.8 38.61,71.14 38.61,71.55C38.61,71.97 38.27,72.3 37.86,72.3H17.99C17.57,72.3 17.24,71.97 17.24,71.55Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M17.24,77.65C17.24,77.24 17.57,76.9 17.99,76.9H28.67C29.08,76.9 29.42,77.24 29.42,77.65C29.42,78.07 29.08,78.4 28.67,78.4H17.99C17.57,78.4 17.24,78.07 17.24,77.65Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.87,42C27.32,42 26.87,41.55 26.87,41C26.87,40.45 27.32,40 27.87,40C28.42,40 28.87,40.45 28.87,41C28.87,41.55 28.42,42 27.87,42Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M19.12,41.02C19.12,40.61 19.45,40.27 19.87,40.27H23.87C24.28,40.27 24.62,40.61 24.62,41.02C24.62,41.44 24.28,41.77 23.87,41.77H19.87C19.45,41.77 19.12,41.44 19.12,41.02Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M31.87,40.27C31.45,40.27 31.12,40.61 31.12,41.02C31.12,41.44 31.45,41.77 31.87,41.77H35.87C36.28,41.77 36.62,41.44 36.62,41.02C36.62,40.61 36.28,40.27 35.87,40.27H31.87Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M48.87,41V103C48.87,107.42 45.29,111 40.87,111H14.87C10.45,111 6.87,107.42 6.87,103V41C6.87,36.58 10.45,33 14.87,33H40.87C45.29,33 48.87,36.58 48.87,41ZM14.87,34.5H40.87C44.46,34.5 47.37,37.41 47.37,41V47.25H8.37V41C8.37,37.41 11.28,34.5 14.87,34.5ZM47.37,48.75V99.75H8.37V48.75H47.37ZM47.37,103V101.25H8.37V103C8.37,106.59 11.28,109.5 14.87,109.5H40.87C44.46,109.5 47.37,106.59 47.37,103Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M281.87,41C281.87,36.58 278.29,33 273.87,33H247.87C243.45,33 239.87,36.58 239.87,41V103C239.87,107.42 243.45,111 247.87,111H273.87C278.29,111 281.87,107.42 281.87,103V41Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M281.87,47.25H239.87V101.25H281.87V47.25Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M244.47,69.1C244.47,66.89 246.26,65.1 248.47,65.1H273.26C275.47,65.1 277.26,66.89 277.26,69.1V79.39C277.26,81.6 275.47,83.39 273.26,83.39H248.47C246.26,83.39 244.47,81.6 244.47,79.39V69.1Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M250.24,71.55C250.24,71.14 250.57,70.8 250.99,70.8H270.86C271.27,70.8 271.61,71.14 271.61,71.55C271.61,71.97 271.27,72.3 270.86,72.3H250.99C250.57,72.3 250.24,71.97 250.24,71.55Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M250.24,77.65C250.24,77.24 250.57,76.9 250.99,76.9H261.67C262.08,76.9 262.42,77.24 262.42,77.65C262.42,78.07 262.08,78.4 261.67,78.4H250.99C250.57,78.4 250.24,78.07 250.24,77.65Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M260.87,42C260.32,42 259.87,41.55 259.87,41C259.87,40.45 260.32,40 260.87,40C261.42,40 261.87,40.45 261.87,41C261.87,41.55 261.42,42 260.87,42Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M252.12,41.02C252.12,40.61 252.45,40.27 252.87,40.27H256.87C257.28,40.27 257.62,40.61 257.62,41.02C257.62,41.44 257.28,41.77 256.87,41.77H252.87C252.45,41.77 252.12,41.44 252.12,41.02Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M264.87,40.27C264.45,40.27 264.12,40.61 264.12,41.02C264.12,41.44 264.45,41.77 264.87,41.77H268.87C269.28,41.77 269.62,41.44 269.62,41.02C269.62,40.61 269.28,40.27 268.87,40.27H264.87Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M281.87,41V103C281.87,107.42 278.29,111 273.87,111H247.87C243.45,111 239.87,107.42 239.87,103V41C239.87,36.58 243.45,33 247.87,33H273.87C278.29,33 281.87,36.58 281.87,41ZM247.87,34.5H273.87C277.46,34.5 280.37,37.41 280.37,41V47.25H241.37V41C241.37,37.41 244.28,34.5 247.87,34.5ZM280.37,48.75V99.75H241.37V48.75H280.37ZM280.37,103V101.25H241.37V103C241.37,106.59 244.28,109.5 247.87,109.5H273.87C277.46,109.5 280.37,106.59 280.37,103Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M150.87,54C150.87,49.58 147.29,46 142.87,46H126.87C122.45,46 118.87,49.58 118.87,54V70C118.87,74.42 122.45,78 126.87,78H142.87C147.29,78 150.87,74.42 150.87,70V54Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M126.87,47.5H142.87C146.46,47.5 149.37,50.41 149.37,54V70C149.37,73.59 146.46,76.5 142.87,76.5H126.87C123.28,76.5 120.37,73.59 120.37,70V54C120.37,50.41 123.28,47.5 126.87,47.5ZM142.87,46C147.29,46 150.87,49.58 150.87,54V70C150.87,74.42 147.29,78 142.87,78H126.87C122.45,78 118.87,74.42 118.87,70V54C118.87,49.58 122.45,46 126.87,46H142.87Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M138.93,61.38C139.52,62.63 139.29,64.17 138.26,65.2L134.28,69.18C132.96,70.5 130.82,70.5 129.5,69.18C128.18,67.86 128.18,65.72 129.5,64.4L133.48,60.42C134.51,59.39 136.05,59.16 137.3,59.75L136.11,60.95C135.55,60.87 134.97,61.05 134.54,61.48L130.56,65.46C129.83,66.19 129.83,67.39 130.56,68.12C131.3,68.85 132.49,68.85 133.22,68.12L137.2,64.14C137.63,63.71 137.81,63.13 137.74,62.57L138.93,61.38Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M132.43,64.25C133.68,64.84 135.22,64.61 136.26,63.58L140.24,59.6C141.55,58.28 141.55,56.14 140.24,54.82C138.91,53.5 136.77,53.5 135.45,54.82L131.48,58.8C130.44,59.83 130.22,61.37 130.8,62.62L132,61.42C131.93,60.87 132.11,60.29 132.54,59.86L136.51,55.88C137.25,55.14 138.44,55.14 139.17,55.88C139.91,56.61 139.91,57.8 139.17,58.54L135.2,62.52C134.77,62.94 134.19,63.12 133.63,63.05L132.43,64.25Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M169.87,73C169.87,68.58 166.29,65 161.87,65H145.87C141.45,65 137.87,68.58 137.87,73V89C137.87,93.42 141.45,97 145.87,97H161.87C166.29,97 169.87,93.42 169.87,89V73Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M145.87,66.5H161.87C165.46,66.5 168.37,69.41 168.37,73V89C168.37,92.59 165.46,95.5 161.87,95.5H145.87C142.28,95.5 139.37,92.59 139.37,89V73C139.37,69.41 142.28,66.5 145.87,66.5ZM161.87,65C166.29,65 169.87,68.58 169.87,73V89C169.87,93.42 166.29,97 161.87,97H145.87C141.45,97 137.87,93.42 137.87,89V73C137.87,68.58 141.45,65 145.87,65H161.87Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M157.93,80.38C158.52,81.63 158.29,83.17 157.26,84.2L153.28,88.18C151.96,89.5 149.82,89.5 148.5,88.18C147.18,86.86 147.18,84.72 148.5,83.4L152.48,79.42C153.51,78.39 155.05,78.16 156.3,78.75L155.11,79.95C154.55,79.87 153.97,80.05 153.54,80.48L149.56,84.46C148.83,85.19 148.83,86.39 149.56,87.12C150.3,87.85 151.49,87.85 152.22,87.12L156.2,83.14C156.63,82.71 156.81,82.13 156.74,81.57L157.93,80.38Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M151.43,83.25C152.68,83.84 154.22,83.61 155.26,82.58L159.24,78.6C160.55,77.28 160.55,75.14 159.24,73.82C157.91,72.5 155.77,72.5 154.45,73.82L150.48,77.8C149.44,78.83 149.22,80.37 149.8,81.62L151,80.42C150.93,79.87 151.11,79.29 151.54,78.86L155.51,74.88C156.25,74.14 157.44,74.14 158.17,74.88C158.91,75.61 158.91,76.8 158.17,77.54L154.2,81.52C153.77,81.94 153.19,82.12 152.63,82.05L151.43,83.25Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M87.87,62C87.87,64.21 86.08,66 83.87,66C81.66,66 79.87,64.21 79.87,62C79.87,59.79 81.66,58 83.87,58C86.08,58 87.87,59.79 87.87,62Z" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M103.87,62C103.87,64.21 102.08,66 99.87,66C97.66,66 95.87,64.21 95.87,62C95.87,59.79 97.66,58 99.87,58C102.08,58 103.87,59.79 103.87,62Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M71.87,62C71.87,64.21 70.08,66 67.87,66C65.66,66 63.87,64.21 63.87,62C63.87,59.79 65.66,58 67.87,58C70.08,58 71.87,59.79 71.87,62Z" />
+ <path
+ android:fillColor="#4D7C0F"
+ android:pathData="M200.87,81C200.87,78.79 202.66,77 204.87,77C207.08,77 208.87,78.79 208.87,81C208.87,83.21 207.08,85 204.87,85C202.66,85 200.87,83.21 200.87,81Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M184.87,81C184.87,78.79 186.66,77 188.87,77C191.08,77 192.87,78.79 192.87,81C192.87,83.21 191.08,85 188.87,85C186.66,85 184.87,83.21 184.87,81Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M216.87,81C216.87,78.79 218.66,77 220.87,77C223.08,77 224.87,78.79 224.87,81C224.87,83.21 223.08,85 220.87,85C218.66,85 216.87,83.21 216.87,81Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_add_contact_remote.xml b/briar-android/src/main/res/drawable/il_add_contact_remote.xml
new file mode 100644
index 0000000000000000000000000000000000000000..36d63f8af4a2d8b31bbe36e9abd4594e935f4399
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_add_contact_remote.xml
@@ -0,0 +1,138 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="145">
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M48.32,41C48.32,36.58 44.74,33 40.32,33H14.32C9.9,33 6.32,36.58 6.32,41V103C6.32,107.42 9.9,111 14.32,111H40.32C44.74,111 48.32,107.42 48.32,103V41Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M14.32,34.5H40.32C43.91,34.5 46.82,37.41 46.82,41V103C46.82,106.59 43.91,109.5 40.32,109.5H14.32C10.73,109.5 7.82,106.59 7.82,103V41C7.82,37.41 10.73,34.5 14.32,34.5ZM40.32,33C44.74,33 48.32,36.58 48.32,41V103C48.32,107.42 44.74,111 40.32,111H14.32C9.9,111 6.32,107.42 6.32,103V41C6.32,36.58 9.9,33 14.32,33H40.32Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M48.32,47.25H6.32V101.25H48.32V47.25Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M7.82,48.75H46.82V99.75H7.82V48.75ZM48.32,47.25V101.25H6.32V47.25H48.32Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M10.93,69.1C10.93,66.89 12.72,65.1 14.93,65.1H39.72C41.92,65.1 43.72,66.89 43.72,69.1V79.39C43.72,81.6 41.92,83.39 39.72,83.39H14.93C12.72,83.39 10.93,81.6 10.93,79.39V69.1Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M16.69,71.55C16.69,71.14 17.02,70.8 17.44,70.8H37.31C37.73,70.8 38.06,71.14 38.06,71.55C38.06,71.97 37.73,72.3 37.31,72.3H17.44C17.02,72.3 16.69,71.97 16.69,71.55Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M16.69,77.65C16.69,77.24 17.02,76.9 17.44,76.9H28.12C28.53,76.9 28.87,77.24 28.87,77.65C28.87,78.07 28.53,78.4 28.12,78.4H17.44C17.02,78.4 16.69,78.07 16.69,77.65Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M26.32,41C26.32,41.55 26.77,42 27.32,42C27.87,42 28.32,41.55 28.32,41C28.32,40.45 27.87,40 27.32,40C26.77,40 26.32,40.45 26.32,41Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M18.57,41.02C18.57,40.61 18.91,40.27 19.32,40.27H23.32C23.73,40.27 24.07,40.61 24.07,41.02C24.07,41.44 23.73,41.77 23.32,41.77H19.32C18.91,41.77 18.57,41.44 18.57,41.02Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M30.57,41.02C30.57,40.61 30.91,40.27 31.32,40.27H35.32C35.73,40.27 36.07,40.61 36.07,41.02C36.07,41.44 35.73,41.77 35.32,41.77H31.32C30.91,41.77 30.57,41.44 30.57,41.02Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M150.32,54C150.32,49.58 146.74,46 142.32,46H126.32C121.9,46 118.32,49.58 118.32,54V70C118.32,74.42 121.9,78 126.32,78H142.32C146.74,78 150.32,74.42 150.32,70V54Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M126.32,47.5H142.32C145.91,47.5 148.82,50.41 148.82,54V70C148.82,73.59 145.91,76.5 142.32,76.5H126.32C122.73,76.5 119.82,73.59 119.82,70V54C119.82,50.41 122.73,47.5 126.32,47.5ZM142.32,46C146.74,46 150.32,49.58 150.32,54V70C150.32,74.42 146.74,78 142.32,78H126.32C121.9,78 118.32,74.42 118.32,70V54C118.32,49.58 121.9,46 126.32,46H142.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M132.93,60.42C134.25,59.1 136.39,59.1 137.71,60.42C139.03,61.74 139.03,63.88 137.71,65.2L133.73,69.18C132.41,70.5 130.27,70.5 128.95,69.18C127.63,67.86 127.63,65.72 128.95,64.4L132.93,60.42ZM136.65,61.48C135.92,60.75 134.73,60.75 133.99,61.48L130.01,65.46C129.28,66.19 129.28,67.39 130.01,68.12C130.75,68.85 131.94,68.85 132.67,68.12L136.65,64.14C137.39,63.41 137.39,62.22 136.65,61.48Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M137.18,59.32L138.81,60.95L137.18,62.58L135.55,60.95L137.18,59.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M135.71,63.58C134.39,64.9 132.25,64.9 130.93,63.58C129.61,62.26 129.61,60.12 130.93,58.8L134.91,54.82C136.23,53.5 138.37,53.5 139.69,54.82C141.01,56.14 141.01,58.28 139.69,59.6L135.71,63.58ZM131.99,62.52C132.72,63.25 133.91,63.25 134.65,62.52L138.63,58.54C139.36,57.8 139.36,56.61 138.63,55.88C137.89,55.14 136.7,55.14 135.97,55.88L131.99,59.86C131.25,60.59 131.25,61.78 131.99,62.52Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M131.46,64.68L129.83,63.05L131.46,61.42L133.09,63.05L131.46,64.68Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M281.32,41C281.32,36.58 277.74,33 273.32,33H247.32C242.9,33 239.32,36.58 239.32,41V103C239.32,107.42 242.9,111 247.32,111H273.32C277.74,111 281.32,107.42 281.32,103V41Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M247.32,34.5H273.32C276.91,34.5 279.82,37.41 279.82,41V103C279.82,106.59 276.91,109.5 273.32,109.5H247.32C243.73,109.5 240.82,106.59 240.82,103V41C240.82,37.41 243.73,34.5 247.32,34.5ZM273.32,33C277.74,33 281.32,36.58 281.32,41V103C281.32,107.42 277.74,111 273.32,111H247.32C242.9,111 239.32,107.42 239.32,103V41C239.32,36.58 242.9,33 247.32,33H273.32Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M281.32,47.25H239.32V101.25H281.32V47.25Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M240.82,48.75H279.82V99.75H240.82V48.75ZM281.32,47.25V101.25H239.32V47.25H281.32Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M243.93,69.1C243.93,66.89 245.72,65.1 247.93,65.1H272.71C274.92,65.1 276.71,66.89 276.71,69.1V79.39C276.71,81.6 274.92,83.39 272.71,83.39H247.93C245.72,83.39 243.93,81.6 243.93,79.39V69.1Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M249.69,71.55C249.69,71.14 250.02,70.8 250.44,70.8H270.31C270.72,70.8 271.06,71.14 271.06,71.55C271.06,71.97 270.72,72.3 270.31,72.3H250.44C250.02,72.3 249.69,71.97 249.69,71.55Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M249.69,77.65C249.69,77.24 250.02,76.9 250.44,76.9H261.12C261.53,76.9 261.87,77.24 261.87,77.65C261.87,78.07 261.53,78.4 261.12,78.4H250.44C250.02,78.4 249.69,78.07 249.69,77.65Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M259.32,41C259.32,41.55 259.77,42 260.32,42C260.87,42 261.32,41.55 261.32,41C261.32,40.45 260.87,40 260.32,40C259.77,40 259.32,40.45 259.32,41Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M251.57,41.02C251.57,40.61 251.91,40.27 252.32,40.27H256.32C256.73,40.27 257.07,40.61 257.07,41.02C257.07,41.44 256.73,41.77 256.32,41.77H252.32C251.91,41.77 251.57,41.44 251.57,41.02Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M263.57,41.02C263.57,40.61 263.91,40.27 264.32,40.27H268.32C268.73,40.27 269.07,40.61 269.07,41.02C269.07,41.44 268.73,41.77 268.32,41.77H264.32C263.91,41.77 263.57,41.44 263.57,41.02Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M169.32,73C169.32,68.58 165.74,65 161.32,65H145.32C140.9,65 137.32,68.58 137.32,73V89C137.32,93.42 140.9,97 145.32,97H161.32C165.74,97 169.32,93.42 169.32,89V73Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M145.32,66.5H161.32C164.91,66.5 167.82,69.41 167.82,73V89C167.82,92.59 164.91,95.5 161.32,95.5H145.32C141.73,95.5 138.82,92.59 138.82,89V73C138.82,69.41 141.73,66.5 145.32,66.5ZM161.32,65C165.74,65 169.32,68.58 169.32,73V89C169.32,93.42 165.74,97 161.32,97H145.32C140.9,97 137.32,93.42 137.32,89V73C137.32,68.58 140.9,65 145.32,65H161.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M151.93,79.42C153.25,78.1 155.39,78.1 156.71,79.42C158.03,80.74 158.03,82.88 156.71,84.2L152.73,88.18C151.41,89.5 149.27,89.5 147.95,88.18C146.63,86.86 146.63,84.72 147.95,83.4L151.93,79.42ZM155.65,80.48C154.92,79.75 153.73,79.75 152.99,80.48L149.01,84.46C148.28,85.19 148.28,86.39 149.01,87.12C149.75,87.85 150.94,87.85 151.67,87.12L155.65,83.14C156.39,82.41 156.39,81.22 155.65,80.48Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M156.18,78.32L157.81,79.95L156.18,81.58L154.55,79.95L156.18,78.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M154.71,82.58C153.39,83.9 151.25,83.9 149.93,82.58C148.61,81.26 148.61,79.12 149.93,77.8L153.91,73.82C155.23,72.5 157.37,72.5 158.69,73.82C160.01,75.14 160.01,77.28 158.69,78.6L154.71,82.58ZM150.99,81.52C151.72,82.25 152.91,82.25 153.65,81.52L157.63,77.54C158.36,76.8 158.36,75.61 157.63,74.88C156.89,74.14 155.7,74.14 154.97,74.88L150.99,78.86C150.25,79.59 150.25,80.78 150.99,81.52Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M150.46,83.68L148.83,82.05L150.46,80.42L152.09,82.05L150.46,83.68Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M87.32,62C87.32,64.21 85.53,66 83.32,66C81.11,66 79.32,64.21 79.32,62C79.32,59.79 81.11,58 83.32,58C85.53,58 87.32,59.79 87.32,62Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M103.32,62C103.32,64.21 101.53,66 99.32,66C97.11,66 95.32,64.21 95.32,62C95.32,59.79 97.11,58 99.32,58C101.53,58 103.32,59.79 103.32,62Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M71.32,62C71.32,64.21 69.53,66 67.32,66C65.11,66 63.32,64.21 63.32,62C63.32,59.79 65.11,58 67.32,58C69.53,58 71.32,59.79 71.32,62Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:pathData="M200.32,81C200.32,78.79 202.11,77 204.32,77C206.53,77 208.32,78.79 208.32,81C208.32,83.21 206.53,85 204.32,85C202.11,85 200.32,83.21 200.32,81Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M184.32,81C184.32,78.79 186.11,77 188.32,77C190.53,77 192.32,78.79 192.32,81C192.32,83.21 190.53,85 188.32,85C186.11,85 184.32,83.21 184.32,81Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M216.32,81C216.32,78.79 218.11,77 220.32,77C222.53,77 224.32,78.79 224.32,81C224.32,83.21 222.53,85 220.32,85C218.11,85 216.32,83.21 216.32,81Z" />
+</vector>
diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml
index cdd06e18aea12276fecb14b8772a5932129a41d1..4ebd1a64c6af89f1f0537985ab6a1368d68d7e0b 100644
--- a/briar-android/src/main/res/layout/fragment_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml
@@ -1,232 +1,250 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/margin_large">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_percent="0.5" />
-
- <TextView
- android:id="@+id/stepOne"
- style="@style/StepBubble"
- android:text="@string/step_1"
- app:layout_constraintBottom_toTopOf="@+id/stepOneText"
- app:layout_constraintEnd_toStartOf="@+id/guideline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0" />
-
- <TextView
- android:id="@+id/stepOneText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:text="@string/send_link_title"
- app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
- app:layout_constraintEnd_toStartOf="@+id/guideline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/stepOne" />
-
- <View
- android:id="@+id/stepConnector"
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_margin="16dp"
- android:alpha="0.5"
- android:background="@color/briar_accent"
- app:layout_constraintBottom_toBottomOf="@+id/stepOne"
- app:layout_constraintEnd_toStartOf="@+id/stepTwo"
- app:layout_constraintStart_toEndOf="@+id/stepOne"
- app:layout_constraintTop_toTopOf="@+id/stepOne" />
-
- <TextView
- android:id="@+id/stepTwo"
- style="@style/StepBubble.Upcoming"
- android:text="@string/step_2"
- app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="@+id/guideline"
- app:layout_constraintTop_toTopOf="@+id/stepOne"
- app:layout_constraintVertical_bias="0.0"
- app:layout_constraintVertical_chainStyle="packed" />
-
- <TextView
- android:id="@+id/stepTwoText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:alpha="0.5"
- android:text="@string/add_contact_choose_nickname"
- app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/guideline"
- app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/yourLinkIcon"
- android:layout_width="38dp"
- android:layout_height="38dp"
- android:layout_marginTop="32dp"
- android:background="@drawable/bubble_accent"
- android:scaleType="center"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/stepOneText"
- app:srcCompat="@drawable/ic_call_made"
- app:tint="@android:color/white" />
-
- <TextView
- android:id="@+id/yourLink"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
- android:gravity="left|start"
- android:text="@string/your_link"
- android:textSize="16sp"
- app:layout_constraintBottom_toBottomOf="@+id/yourLinkIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/yourLinkIcon"
- app:layout_constraintTop_toTopOf="@+id/yourLinkIcon" />
-
- <TextView
- android:id="@+id/linkView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:background="@android:color/white"
- android:ellipsize="end"
- android:padding="8dp"
- android:singleLine="true"
- android:textColor="@color/briar_primary"
- android:textIsSelectable="true"
- android:textSize="18sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/yourLinkIcon"
- tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv" />
-
- <Button
- android:id="@+id/copyButton"
- style="@style/BriarButtonFlat.Positive.Tiny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="8dp"
- android:enabled="false"
- android:text="@string/copy_button"
- app:drawableLeftCompat="@drawable/ic_content_copy"
- app:drawableStartCompat="@drawable/ic_content_copy"
- app:layout_constraintEnd_toStartOf="@id/shareButton"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintHorizontal_chainStyle="packed"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/linkView" />
-
- <Button
- android:id="@+id/shareButton"
- style="@style/BriarButtonFlat.Positive.Tiny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="8dp"
- android:enabled="false"
- android:text="@string/share_button"
- app:drawableLeftCompat="@drawable/social_share_blue"
- app:drawableStartCompat="@drawable/social_share_blue"
- app:layout_constraintBottom_toBottomOf="@id/copyButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toEndOf="@id/copyButton"
- app:layout_constraintTop_toTopOf="@id/copyButton" />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/linkInputIcon"
- android:layout_width="38dp"
- android:layout_height="38dp"
- android:layout_marginTop="16dp"
- android:background="@drawable/bubble_accent"
- android:scaleType="center"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/copyButton"
- app:srcCompat="@drawable/ic_call_received"
- app:tint="@android:color/white" />
-
- <TextView
- android:id="@+id/inputLink"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
- android:gravity="left|start"
- android:text="@string/contact_link_intro"
- android:textSize="16sp"
- app:layout_constraintBottom_toBottomOf="@+id/linkInputIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/linkInputIcon"
- app:layout_constraintTop_toTopOf="@+id/linkInputIcon" />
-
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/linkInputLayout"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- app:errorEnabled="true"
- app:hintEnabled="false"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/linkInputIcon">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/linkInput"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:hint="@string/contact_link_hint"
- android:importantForAutofill="no"
- android:inputType="textUri" />
-
- </com.google.android.material.textfield.TextInputLayout>
-
- <Button
- android:id="@+id/pasteButton"
- style="@style/BriarButtonFlat.Positive.Tiny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="8dp"
- android:text="@string/paste_button"
- app:drawableLeftCompat="@drawable/ic_content_paste"
- app:drawableStartCompat="@drawable/ic_content_paste"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
- app:layout_constraintVertical_bias="0.0" />
-
- <Button
- android:id="@+id/addButton"
- style="@style/BriarButton"
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:enabled="false"
- android:text="@string/continue_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/pasteButton"
- app:layout_constraintVertical_bias="1.0"
- tools:enabled="true" />
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+ android:padding="@dimen/margin_large">
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintGuide_percent="0.5" />
+
+ <TextView
+ android:id="@+id/stepOne"
+ style="@style/StepBubble"
+ android:text="@string/step_1"
+ app:layout_constraintBottom_toTopOf="@+id/stepOneText"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
+
+ <TextView
+ android:id="@+id/stepOneText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:text="@string/send_link_title"
+ app:layout_constraintBottom_toTopOf="@+id/imageView"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/stepOne" />
+
+ <View
+ android:id="@+id/stepConnector"
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:layout_margin="16dp"
+ android:alpha="0.5"
+ android:background="@color/briar_accent"
+ app:layout_constraintBottom_toBottomOf="@+id/stepOne"
+ app:layout_constraintEnd_toStartOf="@+id/stepTwo"
+ app:layout_constraintStart_toEndOf="@+id/stepOne"
+ app:layout_constraintTop_toTopOf="@+id/stepOne" />
+
+ <TextView
+ android:id="@+id/stepTwo"
+ style="@style/StepBubble.Upcoming"
+ android:text="@string/step_2"
+ app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/guideline"
+ app:layout_constraintTop_toTopOf="@+id/stepOne"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintVertical_chainStyle="packed" />
+
+ <TextView
+ android:id="@+id/stepTwoText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:alpha="0.5"
+ android:text="@string/add_contact_choose_nickname"
+ app:layout_constraintBottom_toTopOf="@+id/imageView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/guideline"
+ app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
+
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_height"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/stepOneText"
+ app:srcCompat="@drawable/il_add_contact_remote"
+ tools:ignore="ContentDescription" />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/yourLinkIcon"
+ android:layout_width="38dp"
+ android:layout_height="38dp"
+ android:layout_marginTop="8dp"
+ android:background="@drawable/bubble_accent"
+ android:scaleType="center"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ app:srcCompat="@drawable/ic_call_made"
+ app:tint="@android:color/white" />
+
+ <TextView
+ android:id="@+id/yourLink"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
+ android:gravity="left|start"
+ android:text="@string/your_link"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="@+id/yourLinkIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/yourLinkIcon"
+ app:layout_constraintTop_toTopOf="@+id/yourLinkIcon" />
+
+ <TextView
+ android:id="@+id/linkView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:background="@android:color/white"
+ android:ellipsize="end"
+ android:padding="8dp"
+ android:singleLine="true"
+ android:textColor="@color/briar_primary"
+ android:textIsSelectable="true"
+ android:textSize="18sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/yourLinkIcon"
+ tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv" />
+
+ <Button
+ android:id="@+id/copyButton"
+ style="@style/BriarButtonFlat.Positive.Tiny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
+ android:enabled="false"
+ android:text="@string/copy_button"
+ app:drawableLeftCompat="@drawable/ic_content_copy"
+ app:drawableStartCompat="@drawable/ic_content_copy"
+ app:layout_constraintEnd_toStartOf="@id/shareButton"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintHorizontal_chainStyle="packed"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linkView" />
+
+ <Button
+ android:id="@+id/shareButton"
+ style="@style/BriarButtonFlat.Positive.Tiny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
+ android:enabled="false"
+ android:text="@string/share_button"
+ app:drawableLeftCompat="@drawable/social_share_blue"
+ app:drawableStartCompat="@drawable/social_share_blue"
+ app:layout_constraintBottom_toBottomOf="@id/copyButton"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toEndOf="@id/copyButton"
+ app:layout_constraintTop_toTopOf="@id/copyButton" />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/linkInputIcon"
+ android:layout_width="38dp"
+ android:layout_height="38dp"
+ android:layout_marginTop="16dp"
+ android:background="@drawable/bubble_accent"
+ android:scaleType="center"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/copyButton"
+ app:srcCompat="@drawable/ic_call_received"
+ app:tint="@android:color/white" />
+
+ <TextView
+ android:id="@+id/inputLink"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
+ android:gravity="left|start"
+ android:text="@string/contact_link_intro"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="@+id/linkInputIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/linkInputIcon"
+ app:layout_constraintTop_toTopOf="@+id/linkInputIcon" />
+
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/linkInputLayout"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ app:errorEnabled="true"
+ app:hintEnabled="false"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linkInputIcon">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/linkInput"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:hint="@string/contact_link_hint"
+ android:importantForAutofill="no"
+ android:inputType="textUri" />
+
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <Button
+ android:id="@+id/pasteButton"
+ style="@style/BriarButtonFlat.Positive.Tiny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
+ android:text="@string/paste_button"
+ app:drawableLeftCompat="@drawable/ic_content_paste"
+ app:drawableStartCompat="@drawable/ic_content_paste"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
+ app:layout_constraintVertical_bias="0.0" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </ScrollView>
+
+ <Button
+ android:id="@+id/addButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="16dp"
+ android:enabled="false"
+ android:text="@string/continue_button"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/pasteButton"
+ app:layout_constraintVertical_bias="1.0"
+ tools:enabled="true" />
+
+</LinearLayout>