diff --git a/briar-android/artwork/il_transfer_data_dark.svg b/briar-android/artwork/il_transfer_data_dark.svg new file mode 100644 index 0000000000000000000000000000000000000000..4a35f3a9c7e290fb7529c527a442b3d0c505249d --- /dev/null +++ b/briar-android/artwork/il_transfer_data_dark.svg @@ -0,0 +1,30 @@ +<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M41.8301 84C41.8301 85.1046 40.9346 86 39.8301 86L20.9721 86C19.8676 86 18.9721 85.1046 18.9721 84L18.9721 65.6136L41.8301 65.6136L41.8301 84Z" fill="#123060"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5801 84C42.5801 85.5188 41.3489 86.75 39.8301 86.75L20.9721 86.75C19.4533 86.75 18.2221 85.5188 18.2221 84L18.2221 64.8636L42.5801 64.8636L42.5801 84ZM39.8301 85.25C40.5204 85.25 41.0801 84.6904 41.0801 84L41.0801 66.3636L19.7221 66.3636L19.7221 84C19.7221 84.6904 20.2818 85.25 20.9721 85.25L39.8301 85.25Z" fill="#52ADF9"/> +<path d="M46.4014 61.6211C46.4014 63.8302 44.6105 65.6211 42.4014 65.6211L18.4014 65.6211C16.1922 65.6211 14.4014 63.8302 14.4014 61.6211L14.4014 27C14.4014 24.7909 16.1922 23 18.4014 23L42.4014 23C44.6105 23 46.4014 24.7909 46.4014 27L46.4014 61.6211Z" fill="#1E293B"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M47.1514 61.6211C47.1514 64.2445 45.0247 66.3711 42.4014 66.3711L18.4014 66.3711C15.778 66.3711 13.6514 64.2444 13.6514 61.6211L13.6514 27C13.6514 24.3767 15.778 22.25 18.4014 22.25L42.4014 22.25C45.0247 22.25 47.1514 24.3767 47.1514 27L47.1514 61.6211ZM42.4014 64.8711C44.1963 64.8711 45.6514 63.416 45.6514 61.6211L45.6514 27C45.6514 25.2051 44.1963 23.75 42.4014 23.75L18.4014 23.75C16.6064 23.75 15.1514 25.2051 15.1514 27L15.1514 61.6211C15.1514 63.416 16.6064 64.8711 18.4014 64.8711L42.4014 64.8711Z" fill="#52ADF9"/> +<path d="M37.7783 77.5859L33.2226 77.5859L33.2226 74.4576L37.7783 74.4576L37.7783 77.5859Z" fill="#52ADF9"/> +<path d="M27.5796 77.5859L23.0238 77.5859L23.0238 74.4576L27.5796 74.4576L27.5796 77.5859Z" fill="#52ADF9"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M152.001 121C152.001 118.791 153.792 117 156.001 117H180.402C182.611 117 184.402 118.791 184.402 121V164C184.402 166.209 182.611 168 180.402 168H152.001V167.996H149.401C147.192 167.996 145.401 166.205 145.401 163.996V152.676C145.401 152.129 145.626 151.605 146.022 151.228L146.665 150.615C147.062 150.238 147.286 149.714 147.286 149.167V147.094C147.286 146.567 147.078 146.061 146.707 145.687L145.98 144.952C145.609 144.578 145.401 144.072 145.401 143.545V141.437C145.401 140.788 145.716 140.179 146.246 139.804L152.001 135.732V121ZM156.964 123.659C156.964 122.554 157.86 121.659 158.964 121.659H160.258C161.363 121.659 162.258 122.554 162.258 123.659V132.074C162.258 133.179 161.363 134.074 160.258 134.074H158.964C157.86 134.074 156.964 133.179 156.964 132.074V123.659ZM167.555 121.659C166.45 121.659 165.555 122.554 165.555 123.659V132.074C165.555 133.179 166.45 134.074 167.555 134.074H168.849C169.953 134.074 170.849 133.179 170.849 132.074V123.659C170.849 122.554 169.953 121.659 168.849 121.659H167.555ZM174.145 123.659C174.145 122.554 175.041 121.659 176.145 121.659H177.439C178.544 121.659 179.439 122.554 179.439 123.659V132.074C179.439 133.179 178.544 134.074 177.439 134.074H176.145C175.041 134.074 174.145 133.179 174.145 132.074V123.659Z" fill="#1E293B"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M151.251 121C151.251 118.377 153.378 116.25 156.001 116.25H180.402C183.025 116.25 185.152 118.377 185.152 121V164C185.152 166.623 183.025 168.75 180.402 168.75H151.251V168.746H149.401C146.778 168.746 144.651 166.62 144.651 163.996V152.676C144.651 151.923 144.96 151.204 145.505 150.685L146.148 150.072C146.396 149.836 146.536 149.509 146.536 149.167V147.094C146.536 146.764 146.406 146.448 146.174 146.214L145.447 145.48C144.937 144.965 144.651 144.27 144.651 143.545V141.437C144.651 140.544 145.084 139.707 145.813 139.192L151.251 135.343V121ZM152.751 167.25H180.402C182.196 167.25 183.652 165.795 183.652 164V121C183.652 119.205 182.196 117.75 180.402 117.75H156.001C154.206 117.75 152.751 119.205 152.751 121V136.12L146.679 140.416C146.348 140.651 146.151 141.031 146.151 141.437V143.545C146.151 143.874 146.281 144.19 146.513 144.424L147.24 145.159C147.75 145.674 148.036 146.369 148.036 147.094V149.167C148.036 149.919 147.728 150.639 147.183 151.158L146.539 151.771C146.292 152.007 146.151 152.334 146.151 152.676V163.996C146.151 165.791 147.606 167.246 149.401 167.246H152.751V167.25ZM156.214 123.659C156.214 122.14 157.446 120.909 158.964 120.909H160.258C161.777 120.909 163.008 122.14 163.008 123.659V132.074C163.008 133.593 161.777 134.824 160.258 134.824H158.964C157.446 134.824 156.214 133.593 156.214 132.074V123.659ZM158.964 122.409C158.274 122.409 157.714 122.968 157.714 123.659V132.074C157.714 132.764 158.274 133.324 158.964 133.324H160.258C160.949 133.324 161.508 132.765 161.508 132.074V123.659C161.508 122.968 160.949 122.409 160.258 122.409H158.964ZM167.555 122.409C166.864 122.409 166.305 122.968 166.305 123.659V132.074C166.305 132.764 166.864 133.324 167.555 133.324H168.849C169.539 133.324 170.099 132.764 170.099 132.074V123.659C170.099 122.968 169.539 122.409 168.849 122.409H167.555ZM164.805 123.659C164.805 122.14 166.036 120.909 167.555 120.909H168.849C170.367 120.909 171.599 122.14 171.599 123.659V132.074C171.599 133.593 170.367 134.824 168.849 134.824H167.555C166.036 134.824 164.805 133.593 164.805 132.074V123.659ZM173.395 123.659C173.395 122.14 174.627 120.909 176.145 120.909H177.439C178.958 120.909 180.189 122.14 180.189 123.659V132.074C180.189 133.593 178.958 134.824 177.439 134.824H176.145C174.627 134.824 173.395 133.593 173.395 132.074V123.659ZM176.145 122.409C175.455 122.409 174.895 122.968 174.895 123.659V132.074C174.895 132.764 175.455 133.324 176.145 133.324H177.439C178.13 133.324 178.689 132.765 178.689 132.074V123.659C178.689 122.968 178.13 122.409 177.439 122.409H176.145Z" fill="#52ADF9"/> +<path d="M30.4014 111C32.6105 111 34.4014 112.791 34.4014 115C34.4014 117.209 32.6105 119 30.4014 119C28.1922 119 26.4014 117.209 26.4014 115C26.4014 112.791 28.1922 111 30.4014 111Z" fill="#1457C5"/> +<path d="M30.4014 95C32.6105 95 34.4014 96.7909 34.4014 99C34.4014 101.209 32.6105 103 30.4014 103C28.1922 103 26.4014 101.209 26.4014 99C26.4014 96.7909 28.1922 95 30.4014 95Z" fill="#2B8EF1"/> +<path d="M30.4014 127C32.6105 127 34.4014 128.791 34.4014 131C34.4014 133.209 32.6105 135 30.4014 135C28.1922 135 26.4014 133.209 26.4014 131C26.4014 128.791 28.1922 127 30.4014 127Z" fill="#184080"/> +<path d="M168.401 92C166.192 92 164.401 90.2091 164.401 88C164.401 85.7909 166.192 84 168.401 84C170.611 84 172.401 85.7909 172.401 88C172.401 90.2091 170.611 92 168.401 92Z" fill="#1457C5"/> +<path d="M168.401 108C166.192 108 164.401 106.209 164.401 104C164.401 101.791 166.192 100 168.401 100C170.611 100 172.401 101.791 172.401 104C172.401 106.209 170.611 108 168.401 108Z" fill="#2B8EF1"/> +<path d="M168.401 76C166.192 76 164.401 74.2091 164.401 72C164.401 69.7909 166.192 68 168.401 68C170.611 68 172.401 69.7909 172.401 72C172.401 74.2091 170.611 76 168.401 76Z" fill="#184080"/> +<path d="M57.4014 35.0312C57.4014 28.4038 62.774 23.0312 69.4014 23.0312H123.401C130.029 23.0312 135.401 28.4038 135.401 35.0312V156.031C135.401 162.659 130.029 168.031 123.401 168.031H69.4014C62.7739 168.031 57.4014 162.659 57.4014 156.031V35.0312Z" fill="#1E293B"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M123.401 24.5312H69.4014C63.6024 24.5312 58.9014 29.2323 58.9014 35.0312V156.031C58.9014 161.83 63.6024 166.531 69.4014 166.531H123.401C129.2 166.531 133.901 161.83 133.901 156.031V35.0312C133.901 29.2323 129.2 24.5312 123.401 24.5312ZM69.4014 23.0312C62.774 23.0312 57.4014 28.4038 57.4014 35.0312V156.031C57.4014 162.659 62.7739 168.031 69.4014 168.031H123.401C130.029 168.031 135.401 162.659 135.401 156.031V35.0312C135.401 28.4038 130.029 23.0312 123.401 23.0312H69.4014Z" fill="#A3E635"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M96.4014 35.4092C95.5729 35.4092 94.9014 34.7376 94.9014 33.9092C94.9014 33.0808 95.5729 32.4092 96.4014 32.4092C97.2298 32.4092 97.9014 33.0808 97.9014 33.9092C97.9014 34.7376 97.2298 35.4092 96.4014 35.4092ZM96.4014 36.9092C94.7445 36.9092 93.4014 35.566 93.4014 33.9092C93.4014 32.2523 94.7445 30.9092 96.4014 30.9092C98.0582 30.9092 99.4014 32.2523 99.4014 33.9092C99.4014 35.566 98.0582 36.9092 96.4014 36.9092Z" fill="#A3E635"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M77.6514 33.5923C77.6514 33.1781 77.9872 32.8423 78.4014 32.8423H88.4014C88.8156 32.8423 89.1514 33.1781 89.1514 33.5923C89.1514 34.0065 88.8156 34.3423 88.4014 34.3423H78.4014C77.9872 34.3423 77.6514 34.0065 77.6514 33.5923Z" fill="#A3E635"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M103.651 33.5923C103.651 33.1781 103.987 32.8423 104.401 32.8423L114.401 32.8423C114.816 32.8423 115.151 33.1781 115.151 33.5923C115.151 34.0065 114.816 34.3423 114.401 34.3423L104.401 34.3423C103.987 34.3423 103.651 34.0065 103.651 33.5923Z" fill="#A3E635"/> +<path d="M128.401 50.6338C128.401 46.2155 124.82 42.6338 120.401 42.6338H72.4014C67.9831 42.6338 64.4014 46.2155 64.4014 50.6338V146.634C64.4014 151.052 67.9831 154.634 72.4014 154.634H120.401C124.82 154.634 128.401 151.052 128.401 146.634V50.6338Z" fill="#0B1120"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.4014 44.1338H120.401C123.991 44.1338 126.901 47.0439 126.901 50.6338V146.634C126.901 150.224 123.991 153.134 120.401 153.134H72.4014C68.8115 153.134 65.9014 150.224 65.9014 146.634V50.6338C65.9014 47.0439 68.8115 44.1338 72.4014 44.1338ZM120.401 42.6338C124.82 42.6338 128.401 46.2155 128.401 50.6338V146.634C128.401 151.052 124.82 154.634 120.401 154.634H72.4014C67.9831 154.634 64.4014 151.052 64.4014 146.634V50.6338C64.4014 46.2155 67.9831 42.6338 72.4014 42.6338H120.401Z" fill="#A3E635"/> +<path d="M71.4014 104C71.4014 95.1634 78.5648 88 87.4014 88H105.401C114.238 88 121.401 95.1634 121.401 104V148H87.4014C78.5648 148 71.4014 140.837 71.4014 132V104Z" fill="#184080"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M105.401 89.5H87.4014C79.3932 89.5 72.9014 95.9919 72.9014 104V132C72.9014 140.008 79.3932 146.5 87.4014 146.5H119.901V104C119.901 95.9919 113.409 89.5 105.401 89.5ZM87.4014 88C78.5648 88 71.4014 95.1634 71.4014 104V132C71.4014 140.837 78.5648 148 87.4014 148H121.401V104C121.401 95.1634 114.238 88 105.401 88H87.4014Z" fill="#52ADF9"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 109.911C83.957 109.496 84.2928 109.161 84.707 109.161H108.031C108.445 109.161 108.781 109.496 108.781 109.911C108.781 110.325 108.445 110.661 108.031 110.661H84.707C84.2928 110.661 83.957 110.325 83.957 109.911Z" fill="#52ADF9"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 118.004C83.957 117.59 84.2928 117.254 84.707 117.254H108.031C108.445 117.254 108.781 117.59 108.781 118.004C108.781 118.418 108.445 118.754 108.031 118.754H84.707C84.2928 118.754 83.957 118.418 83.957 118.004Z" fill="#52ADF9"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 134.179C83.957 133.764 84.2928 133.429 84.707 133.429H96.3689C96.7831 133.429 97.1189 133.764 97.1189 134.179C97.1189 134.593 96.7831 134.929 96.3689 134.929H84.707C84.2928 134.929 83.957 134.593 83.957 134.179Z" fill="#52ADF9"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 101.825C83.957 101.411 84.2928 101.075 84.707 101.075H108.031C108.445 101.075 108.781 101.411 108.781 101.825C108.781 102.239 108.445 102.575 108.031 102.575H84.707C84.2928 102.575 83.957 102.239 83.957 101.825Z" fill="#52ADF9"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 126.093C83.957 125.679 84.2928 125.343 84.707 125.343H108.1C108.514 125.343 108.85 125.679 108.85 126.093C108.85 126.507 108.514 126.843 108.1 126.843H84.707C84.2928 126.843 83.957 126.507 83.957 126.093Z" fill="#52ADF9"/> +</svg> diff --git a/briar-android/artwork/il_transfer_data_light.svg b/briar-android/artwork/il_transfer_data_light.svg new file mode 100644 index 0000000000000000000000000000000000000000..c9c704d2699c4c87be0cc32463c44d2d4451a6f1 --- /dev/null +++ b/briar-android/artwork/il_transfer_data_light.svg @@ -0,0 +1,30 @@ +<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M41.8301 84C41.8301 85.1046 40.9346 86 39.8301 86L20.9721 86C19.8676 86 18.9721 85.1046 18.9721 84L18.9721 65.6136L41.8301 65.6136L41.8301 84Z" fill="#F9FAFB"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5801 84C42.5801 85.5188 41.3489 86.75 39.8301 86.75L20.9721 86.75C19.4533 86.75 18.2221 85.5188 18.2221 84L18.2221 64.8636L42.5801 64.8636L42.5801 84ZM39.8301 85.25C40.5204 85.25 41.0801 84.6904 41.0801 84L41.0801 66.3636L19.7221 66.3636L19.7221 84C19.7221 84.6904 20.2818 85.25 20.9721 85.25L39.8301 85.25Z" fill="#196FDE"/> +<path d="M46.4014 61.6211C46.4014 63.8302 44.6105 65.6211 42.4014 65.6211L18.4014 65.6211C16.1922 65.6211 14.4014 63.8302 14.4014 61.6211L14.4014 27C14.4014 24.7909 16.1922 23 18.4014 23L42.4014 23C44.6105 23 46.4014 24.7909 46.4014 27L46.4014 61.6211Z" fill="#DDEDFE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M47.1514 61.6211C47.1514 64.2445 45.0247 66.3711 42.4014 66.3711L18.4014 66.3711C15.778 66.3711 13.6514 64.2444 13.6514 61.6211L13.6514 27C13.6514 24.3767 15.778 22.25 18.4014 22.25L42.4014 22.25C45.0247 22.25 47.1514 24.3767 47.1514 27L47.1514 61.6211ZM42.4014 64.8711C44.1963 64.8711 45.6514 63.416 45.6514 61.6211L45.6514 27C45.6514 25.2051 44.1963 23.75 42.4014 23.75L18.4014 23.75C16.6064 23.75 15.1514 25.2051 15.1514 27L15.1514 61.6211C15.1514 63.416 16.6064 64.8711 18.4014 64.8711L42.4014 64.8711Z" fill="#196FDE"/> +<path d="M37.7783 77.5859L33.2226 77.5859L33.2226 74.4576L37.7783 74.4576L37.7783 77.5859Z" fill="#196FDE"/> +<path d="M27.5796 77.5859L23.0238 77.5859L23.0238 74.4576L27.5796 74.4576L27.5796 77.5859Z" fill="#196FDE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M152.001 121C152.001 118.791 153.792 117 156.001 117H180.402C182.611 117 184.402 118.791 184.402 121V164C184.402 166.209 182.611 168 180.402 168H152.001V167.996H149.401C147.192 167.996 145.401 166.205 145.401 163.996V152.676C145.401 152.129 145.626 151.605 146.022 151.228L146.665 150.615C147.062 150.238 147.286 149.714 147.286 149.167V147.094C147.286 146.567 147.078 146.061 146.707 145.687L145.98 144.952C145.609 144.578 145.401 144.072 145.401 143.545V141.437C145.401 140.788 145.716 140.179 146.246 139.804L152.001 135.732V121ZM156.964 123.659C156.964 122.554 157.86 121.659 158.964 121.659H160.258C161.363 121.659 162.258 122.554 162.258 123.659V132.074C162.258 133.179 161.363 134.074 160.258 134.074H158.964C157.86 134.074 156.964 133.179 156.964 132.074V123.659ZM167.555 121.659C166.45 121.659 165.555 122.554 165.555 123.659V132.074C165.555 133.179 166.45 134.074 167.555 134.074H168.849C169.953 134.074 170.849 133.179 170.849 132.074V123.659C170.849 122.554 169.953 121.659 168.849 121.659H167.555ZM174.145 123.659C174.145 122.554 175.041 121.659 176.145 121.659H177.439C178.544 121.659 179.439 122.554 179.439 123.659V132.074C179.439 133.179 178.544 134.074 177.439 134.074H176.145C175.041 134.074 174.145 133.179 174.145 132.074V123.659Z" fill="#DDEDFE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M151.251 121C151.251 118.377 153.378 116.25 156.001 116.25H180.402C183.025 116.25 185.152 118.377 185.152 121V164C185.152 166.623 183.025 168.75 180.402 168.75H151.251V168.746H149.401C146.778 168.746 144.651 166.62 144.651 163.996V152.676C144.651 151.923 144.96 151.204 145.505 150.685L146.148 150.072C146.396 149.836 146.536 149.509 146.536 149.167V147.094C146.536 146.764 146.406 146.448 146.174 146.214L145.447 145.48C144.937 144.965 144.651 144.27 144.651 143.545V141.437C144.651 140.544 145.084 139.707 145.813 139.192L151.251 135.343V121ZM152.751 167.25H180.402C182.196 167.25 183.652 165.795 183.652 164V121C183.652 119.205 182.196 117.75 180.402 117.75H156.001C154.206 117.75 152.751 119.205 152.751 121V136.12L146.679 140.416C146.348 140.651 146.151 141.031 146.151 141.437V143.545C146.151 143.874 146.281 144.19 146.513 144.424L147.24 145.159C147.75 145.674 148.036 146.369 148.036 147.094V149.167C148.036 149.919 147.728 150.639 147.183 151.158L146.539 151.771C146.292 152.007 146.151 152.334 146.151 152.676V163.996C146.151 165.791 147.606 167.246 149.401 167.246H152.751V167.25ZM156.214 123.659C156.214 122.14 157.446 120.909 158.964 120.909H160.258C161.777 120.909 163.008 122.14 163.008 123.659V132.074C163.008 133.593 161.777 134.824 160.258 134.824H158.964C157.446 134.824 156.214 133.593 156.214 132.074V123.659ZM158.964 122.409C158.274 122.409 157.714 122.968 157.714 123.659V132.074C157.714 132.764 158.274 133.324 158.964 133.324H160.258C160.949 133.324 161.508 132.765 161.508 132.074V123.659C161.508 122.968 160.949 122.409 160.258 122.409H158.964ZM167.555 122.409C166.864 122.409 166.305 122.968 166.305 123.659V132.074C166.305 132.764 166.864 133.324 167.555 133.324H168.849C169.539 133.324 170.099 132.764 170.099 132.074V123.659C170.099 122.968 169.539 122.409 168.849 122.409H167.555ZM164.805 123.659C164.805 122.14 166.036 120.909 167.555 120.909H168.849C170.367 120.909 171.599 122.14 171.599 123.659V132.074C171.599 133.593 170.367 134.824 168.849 134.824H167.555C166.036 134.824 164.805 133.593 164.805 132.074V123.659ZM173.395 123.659C173.395 122.14 174.627 120.909 176.145 120.909H177.439C178.958 120.909 180.189 122.14 180.189 123.659V132.074C180.189 133.593 178.958 134.824 177.439 134.824H176.145C174.627 134.824 173.395 133.593 173.395 132.074V123.659ZM176.145 122.409C175.455 122.409 174.895 122.968 174.895 123.659V132.074C174.895 132.764 175.455 133.324 176.145 133.324H177.439C178.13 133.324 178.689 132.765 178.689 132.074V123.659C178.689 122.968 178.13 122.409 177.439 122.409H176.145Z" fill="#196FDE"/> +<path d="M30.4014 111C32.6105 111 34.4014 112.791 34.4014 115C34.4014 117.209 32.6105 119 30.4014 119C28.1922 119 26.4014 117.209 26.4014 115C26.4014 112.791 28.1922 111 30.4014 111Z" fill="#8BCAFD"/> +<path d="M30.4014 95C32.6105 95 34.4014 96.7909 34.4014 99C34.4014 101.209 32.6105 103 30.4014 103C28.1922 103 26.4014 101.209 26.4014 99C26.4014 96.7909 28.1922 95 30.4014 95Z" fill="#52ADF9"/> +<path d="M30.4014 127C32.6105 127 34.4014 128.791 34.4014 131C34.4014 133.209 32.6105 135 30.4014 135C28.1922 135 26.4014 133.209 26.4014 131C26.4014 128.791 28.1922 127 30.4014 127Z" fill="#BDDFFE"/> +<path d="M168.401 92C166.192 92 164.401 90.2091 164.401 88C164.401 85.7909 166.192 84 168.401 84C170.611 84 172.401 85.7909 172.401 88C172.401 90.2091 170.611 92 168.401 92Z" fill="#8BCAFD"/> +<path d="M168.401 108C166.192 108 164.401 106.209 164.401 104C164.401 101.791 166.192 100 168.401 100C170.611 100 172.401 101.791 172.401 104C172.401 106.209 170.611 108 168.401 108Z" fill="#52ADF9"/> +<path d="M168.401 76C166.192 76 164.401 74.2091 164.401 72C164.401 69.7909 166.192 68 168.401 68C170.611 68 172.401 69.7909 172.401 72C172.401 74.2091 170.611 76 168.401 76Z" fill="#BDDFFE"/> +<path d="M57.4014 35.0312C57.4014 28.4038 62.774 23.0312 69.4014 23.0312H123.401C130.029 23.0312 135.401 28.4038 135.401 35.0312V156.031C135.401 162.659 130.029 168.031 123.401 168.031H69.4014C62.7739 168.031 57.4014 162.659 57.4014 156.031V35.0312Z" fill="#ECFCCB"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M123.401 24.5312H69.4014C63.6024 24.5312 58.9014 29.2323 58.9014 35.0312V156.031C58.9014 161.83 63.6024 166.531 69.4014 166.531H123.401C129.2 166.531 133.901 161.83 133.901 156.031V35.0312C133.901 29.2323 129.2 24.5312 123.401 24.5312ZM69.4014 23.0312C62.774 23.0312 57.4014 28.4038 57.4014 35.0312V156.031C57.4014 162.659 62.7739 168.031 69.4014 168.031H123.401C130.029 168.031 135.401 162.659 135.401 156.031V35.0312C135.401 28.4038 130.029 23.0312 123.401 23.0312H69.4014Z" fill="#65A30D"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M96.4014 35.4092C95.5729 35.4092 94.9014 34.7376 94.9014 33.9092C94.9014 33.0808 95.5729 32.4092 96.4014 32.4092C97.2298 32.4092 97.9014 33.0808 97.9014 33.9092C97.9014 34.7376 97.2298 35.4092 96.4014 35.4092ZM96.4014 36.9092C94.7445 36.9092 93.4014 35.566 93.4014 33.9092C93.4014 32.2523 94.7445 30.9092 96.4014 30.9092C98.0582 30.9092 99.4014 32.2523 99.4014 33.9092C99.4014 35.566 98.0582 36.9092 96.4014 36.9092Z" fill="#65A30D"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M77.6514 33.5923C77.6514 33.1781 77.9872 32.8423 78.4014 32.8423H88.4014C88.8156 32.8423 89.1514 33.1781 89.1514 33.5923C89.1514 34.0065 88.8156 34.3423 88.4014 34.3423H78.4014C77.9872 34.3423 77.6514 34.0065 77.6514 33.5923Z" fill="#65A30D"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M103.651 33.5923C103.651 33.1781 103.987 32.8423 104.401 32.8423L114.401 32.8423C114.816 32.8423 115.151 33.1781 115.151 33.5923C115.151 34.0065 114.816 34.3423 114.401 34.3423L104.401 34.3423C103.987 34.3423 103.651 34.0065 103.651 33.5923Z" fill="#65A30D"/> +<path d="M128.401 50.6338C128.401 46.2155 124.82 42.6338 120.401 42.6338H72.4014C67.9831 42.6338 64.4014 46.2155 64.4014 50.6338V146.634C64.4014 151.052 67.9831 154.634 72.4014 154.634H120.401C124.82 154.634 128.401 151.052 128.401 146.634V50.6338Z" fill="#F9FAFB"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.4014 44.1338H120.401C123.991 44.1338 126.901 47.0439 126.901 50.6338V146.634C126.901 150.224 123.991 153.134 120.401 153.134H72.4014C68.8115 153.134 65.9014 150.224 65.9014 146.634V50.6338C65.9014 47.0439 68.8115 44.1338 72.4014 44.1338ZM120.401 42.6338C124.82 42.6338 128.401 46.2155 128.401 50.6338V146.634C128.401 151.052 124.82 154.634 120.401 154.634H72.4014C67.9831 154.634 64.4014 151.052 64.4014 146.634V50.6338C64.4014 46.2155 67.9831 42.6338 72.4014 42.6338H120.401Z" fill="#65A30D"/> +<path d="M71.4014 104C71.4014 95.1634 78.5648 88 87.4014 88H105.401C114.238 88 121.401 95.1634 121.401 104V148H87.4014C78.5648 148 71.4014 140.837 71.4014 132V104Z" fill="#DDEDFE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M105.401 89.5H87.4014C79.3932 89.5 72.9014 95.9919 72.9014 104V132C72.9014 140.008 79.3932 146.5 87.4014 146.5H119.901V104C119.901 95.9919 113.409 89.5 105.401 89.5ZM87.4014 88C78.5648 88 71.4014 95.1634 71.4014 104V132C71.4014 140.837 78.5648 148 87.4014 148H121.401V104C121.401 95.1634 114.238 88 105.401 88H87.4014Z" fill="#196FDE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 109.911C83.957 109.496 84.2928 109.161 84.707 109.161H108.031C108.445 109.161 108.781 109.496 108.781 109.911C108.781 110.325 108.445 110.661 108.031 110.661H84.707C84.2928 110.661 83.957 110.325 83.957 109.911Z" fill="#196FDE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 118.004C83.957 117.59 84.2928 117.254 84.707 117.254H108.031C108.445 117.254 108.781 117.59 108.781 118.004C108.781 118.418 108.445 118.754 108.031 118.754H84.707C84.2928 118.754 83.957 118.418 83.957 118.004Z" fill="#196FDE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 134.179C83.957 133.764 84.2928 133.429 84.707 133.429H96.3689C96.7831 133.429 97.1189 133.764 97.1189 134.179C97.1189 134.593 96.7831 134.929 96.3689 134.929H84.707C84.2928 134.929 83.957 134.593 83.957 134.179Z" fill="#196FDE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 101.825C83.957 101.411 84.2928 101.075 84.707 101.075H108.031C108.445 101.075 108.781 101.411 108.781 101.825C108.781 102.239 108.445 102.575 108.031 102.575H84.707C84.2928 102.575 83.957 102.239 83.957 101.825Z" fill="#196FDE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 126.093C83.957 125.679 84.2928 125.343 84.707 125.343H108.1C108.514 125.343 108.85 125.679 108.85 126.093C108.85 126.507 108.514 126.843 108.1 126.843H84.707C84.2928 126.843 83.957 126.507 83.957 126.093Z" fill="#196FDE"/> +</svg> diff --git a/briar-android/artwork/transfer_data.svg b/briar-android/artwork/transfer_data.svg deleted file mode 100644 index af653ac7e8af46c94e4857a3943ce2b976c75ee5..0000000000000000000000000000000000000000 --- a/briar-android/artwork/transfer_data.svg +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="155" height="155" - viewBox="0 0 155 158.05972" fill="none" version="1.1" id="svg24" - sodipodi:docname="transfer_data.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> - <defs id="defs11" /> - <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" - objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" - inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="982" - id="namedview9" showgrid="false" inkscape:zoom="1.4523073" inkscape:cx="8.2820655" - inkscape:cy="-28.56208" inkscape:window-x="1920" inkscape:window-y="72" - inkscape:window-maximized="0" inkscape:current-layer="svg24" /> - <metadata id="metadata30"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g id="g844" transform="translate(0,3.0301033)"> - <path id="path2" style="fill:#82c91e" - d="m 34.888672,24.835938 c -0.929975,-0.02143 -1.778628,0.612487 -1.994141,1.554687 -0.2463,1.0768 0.427106,2.148231 1.503907,2.394531 l 5.339843,1.222656 c -6.856612,4.77068 -12.781629,10.788147 -17.445312,17.767579 -5.4771,8.1968 -9.072016,17.49215 -10.541016,27.21875 -0.217,1.4367 0.827383,2.738037 2.271485,2.898437 1.4442,0.1604 2.74109,-0.880406 2.96289,-2.316406 1.3729,-8.8885 4.672941,-17.381253 9.681641,-24.876953 4.280712,-6.40624 9.717062,-11.928555 16.003906,-16.316407 l -1.271484,5.558594 c -0.2463,1.0768 0.427106,2.150185 1.503906,2.396485 1.0767,0.2463 2.150184,-0.427207 2.396484,-1.503907 l 2.076172,-9.080078 c 0.167435,-0.732007 0.107609,-1.457562 -0.109375,-2.123047 -0.03323,-0.347577 -0.135561,-0.692647 -0.314453,-1.017578 -0.353538,-0.6421 -0.935043,-1.078378 -1.585937,-1.257812 -0.310286,-0.16723 -0.63775,-0.310162 -0.998047,-0.392578 l -9.078125,-2.076172 c -0.134588,-0.03079 -0.269491,-0.04772 -0.402344,-0.05078 z m 76.982418,2.876953 c -0.836,0.0548 -1.63328,0.526718 -2.08203,1.316406 -0.717,1.2635 -0.27106,2.863965 0.96094,3.634765 8.143,5.095901 14.99795,12.028813 20.00195,20.257813 4.93587,8.11686 7.91993,17.252829 8.7461,26.689453 l -4.25,-3.394531 c -0.863,-0.6893 -2.12055,-0.548547 -2.81055,0.314453 -0.689,0.8631 -0.54855,2.121147 0.31445,2.810547 l 7.27735,5.8125 c 1.726,1.3788 4.24209,1.097194 5.62109,-0.628906 l 5.8125,-7.277344 c 0.69,-0.863 0.54855,-2.121147 -0.31445,-2.810547 -0.863,-0.6894 -2.12155,-0.548647 -2.81055,0.314453 l -3.58984,4.494141 c -0.8855,-10.27436 -4.12841,-20.220841 -9.50196,-29.056641 -5.469,-8.9943 -12.97353,-16.564369 -21.89453,-22.105469 -0.46312,-0.287512 -0.97886,-0.40397 -1.48047,-0.371093 z M 45.191406,137.83008 c -0.851573,0.0281 -1.670687,0.44648 -2.164062,1.20898 -0.7895,1.219 -0.44326,2.85471 0.80664,3.59571 9.034,5.356 19.211344,8.51779 29.714844,9.21679 10.5035,0.699 21.011881,-1.08626 30.675782,-5.19726 1.337,-0.569 1.89734,-2.14303 1.27734,-3.45703 -0.621,-1.313 -2.18834,-1.86969 -3.52734,-1.30469 -8.852401,3.73 -18.466473,5.34798 -28.076172,4.70898 -9.609701,-0.64 -18.922925,-3.51767 -27.203126,-8.38867 -0.469612,-0.27637 -0.992962,-0.39966 -1.503906,-0.38281 z" /> - <path id="path8" style="fill:#8a9cb3" - d="M 68.474609,0 C 66.724209,0 65.046294,0.6958487 63.808594,1.9335938 62.570894,3.1713338 61.875,4.8491794 61.875,6.5996094 V 46.199219 c 0,1.7504 0.695894,3.430267 1.933594,4.667969 1.2377,1.237698 2.915615,1.933593 4.666015,1.933593 h 19.800782 c 1.7504,0 3.428315,-0.695895 4.666015,-1.933593 1.2377,-1.237702 1.933594,-2.917569 1.933594,-4.667969 V 6.5996094 c 0,-1.75043 -0.695894,-3.4282757 -1.933594,-4.6660156 C 91.703706,0.6958487 90.025791,0 88.275391,0 Z m 0,3.3007812 h 19.800782 c 0.8752,0 1.715084,0.3459738 2.333984,0.9648438 0.6188,0.61887 0.964844,1.4587744 0.964844,2.3339844 V 46.199219 c 0,0.8752 -0.346044,1.715084 -0.964844,2.333984 C 89.990475,49.152003 89.150591,49.5 88.275391,49.5 H 68.474609 c -0.8752,0 -1.715084,-0.347997 -2.333984,-0.966797 -0.6188,-0.6189 -0.964844,-1.458784 -0.964844,-2.333984 V 6.5996094 c 0,-0.87521 0.346044,-1.7151144 0.964844,-2.3339844 0.6189,-0.61887 1.458784,-0.9648437 2.333984,-0.9648438 z M 11.25,97 0,108.40039 v 22.79883 C 0,133.28922 1.6875,135 3.75,135 h 22.5 c 2.0625,0 3.75,-1.71078 3.75,-3.80078 V 100.80078 C 30,98.710782 28.3125,97 26.25,97 Z M 131,100.59961 c -0.796,0 -1.55909,0.31591 -2.12109,0.87891 -0.563,0.562 -0.87891,1.32509 -0.87891,2.12109 v 13.5 c -0.796,0 -1.55909,0.31591 -2.12109,0.87891 -0.563,0.562 -0.87891,1.32509 -0.87891,2.12109 v 16.5 h 3 v -16.5 h 24 v 16.5 h 3 v -16.5 c 0,-0.796 -0.31591,-1.55909 -0.87891,-2.12109 -0.562,-0.563 -1.32509,-0.87891 -2.12109,-0.87891 v -13.5 c 0,-0.796 -0.31591,-1.55909 -0.87891,-2.12109 -0.562,-0.563 -1.32509,-0.87891 -2.12109,-0.87891 z M 12.806641,100.80078 H 26.25 v 30.39844 H 3.75 V 109.97656 Z M 131,103.59961 h 18 v 13.5 H 131 Z M 9.375,106.5 v 7.59961 h 3.75 V 106.5 Z m 5.625,0 v 7.59961 h 3.75 V 106.5 Z m 5.625,0 v 7.59961 h 3.75 V 106.5 Z" /> - </g> - <path - d="m 78.375,46.2 c 0.8752,0 1.7146,-0.3477 2.3335,-0.9666 0.6188,-0.6188 0.9665,-1.4582 0.9665,-2.3334 0,-0.8752 -0.3477,-1.7146 -0.9665,-2.3335 C 80.0896,39.9477 79.2502,39.6 78.375,39.6 c -0.8752,0 -1.7146,0.3477 -2.3334,0.9665 -0.6189,0.6189 -0.9666,1.4583 -0.9666,2.3335 0,0.8752 0.3477,1.7146 0.9666,2.3334 0.6188,0.6189 1.4582,0.9666 2.3334,0.9666 z" - fill="#8a9cb3" id="path10" /> - <path d="m 134,109.6 h 4.5 v 3 H 134 Z" fill="#8a9cb3" id="path14" /> - <path d="m 141.5,109.6 h 4.5 v 3 h -4.5 z" fill="#8a9cb3" id="path16" /> -</svg> diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java index c6a4f9465d3db0f7fe5be85351fd8fe3b685b6ab..dacf25ed4675faca3cd38b10ec2a26d80c04c074 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.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.briar.android.widget.OnboardingFullDialogFragment; @@ -20,8 +19,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 @@ -33,7 +32,6 @@ public class ChooserFragment extends Fragment { ViewModelProvider.Factory viewModelFactory; private RemovableDriveViewModel viewModel; - private ScrollView scrollView; @Override public void onAttach(Context context) { @@ -51,8 +49,6 @@ public class ChooserFragment extends Fragment { View v = inflater.inflate(R.layout.fragment_transfer_data_chooser, container, false); - scrollView = (ScrollView) v; - Button buttonLearnMore = v.findViewById(R.id.buttonLearnMore); buttonLearnMore.setOnClickListener(e -> showLearnMoreDialog()); @@ -75,8 +71,7 @@ public class ChooserFragment extends Fragment { // as we only support one per ViewModel instance requireActivity().supportFinishAfterTransition(); } else { - // 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)); } } diff --git a/briar-android/src/main/res/drawable-night/il_transfer_data.xml b/briar-android/src/main/res/drawable-night/il_transfer_data.xml new file mode 100644 index 0000000000000000000000000000000000000000..1551b6c1b0a72509bd2d56a8437a7fa98fff7d19 --- /dev/null +++ b/briar-android/src/main/res/drawable-night/il_transfer_data.xml @@ -0,0 +1,105 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="192dp" + android:height="192dp" + android:viewportWidth="192" + android:viewportHeight="192"> + <path + android:fillColor="#123060" + android:pathData="M41.83,84C41.83,85.1 40.93,86 39.83,86L20.97,86C19.87,86 18.97,85.1 18.97,84L18.97,65.61L41.83,65.61L41.83,84Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M42.58,84C42.58,85.52 41.35,86.75 39.83,86.75L20.97,86.75C19.45,86.75 18.22,85.52 18.22,84L18.22,64.86L42.58,64.86L42.58,84ZM39.83,85.25C40.52,85.25 41.08,84.69 41.08,84L41.08,66.36L19.72,66.36L19.72,84C19.72,84.69 20.28,85.25 20.97,85.25L39.83,85.25Z" /> + <path + android:fillColor="#1E293B" + android:pathData="M46.4,61.62C46.4,63.83 44.61,65.62 42.4,65.62L18.4,65.62C16.19,65.62 14.4,63.83 14.4,61.62L14.4,27C14.4,24.79 16.19,23 18.4,23L42.4,23C44.61,23 46.4,24.79 46.4,27L46.4,61.62Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M47.15,61.62C47.15,64.24 45.02,66.37 42.4,66.37L18.4,66.37C15.78,66.37 13.65,64.24 13.65,61.62L13.65,27C13.65,24.38 15.78,22.25 18.4,22.25L42.4,22.25C45.02,22.25 47.15,24.38 47.15,27L47.15,61.62ZM42.4,64.87C44.2,64.87 45.65,63.42 45.65,61.62L45.65,27C45.65,25.21 44.2,23.75 42.4,23.75L18.4,23.75C16.61,23.75 15.15,25.21 15.15,27L15.15,61.62C15.15,63.42 16.61,64.87 18.4,64.87L42.4,64.87Z" /> + <path + android:fillColor="#52ADF9" + android:pathData="M37.78,77.59L33.22,77.59L33.22,74.46L37.78,74.46L37.78,77.59Z" /> + <path + android:fillColor="#52ADF9" + android:pathData="M27.58,77.59L23.02,77.59L23.02,74.46L27.58,74.46L27.58,77.59Z" /> + <path + android:fillColor="#1E293B" + android:fillType="evenOdd" + android:pathData="M152,121C152,118.79 153.79,117 156,117H180.4C182.61,117 184.4,118.79 184.4,121V164C184.4,166.21 182.61,168 180.4,168H152V168H149.4C147.19,168 145.4,166.21 145.4,164V152.68C145.4,152.13 145.63,151.6 146.02,151.23L146.66,150.62C147.06,150.24 147.29,149.71 147.29,149.17V147.09C147.29,146.57 147.08,146.06 146.71,145.69L145.98,144.95C145.61,144.58 145.4,144.07 145.4,143.54V141.44C145.4,140.79 145.72,140.18 146.25,139.8L152,135.73V121ZM156.96,123.66C156.96,122.55 157.86,121.66 158.96,121.66H160.26C161.36,121.66 162.26,122.55 162.26,123.66V132.07C162.26,133.18 161.36,134.07 160.26,134.07H158.96C157.86,134.07 156.96,133.18 156.96,132.07V123.66ZM167.55,121.66C166.45,121.66 165.55,122.55 165.55,123.66V132.07C165.55,133.18 166.45,134.07 167.55,134.07H168.85C169.95,134.07 170.85,133.18 170.85,132.07V123.66C170.85,122.55 169.95,121.66 168.85,121.66H167.55ZM174.15,123.66C174.15,122.55 175.04,121.66 176.15,121.66H177.44C178.54,121.66 179.44,122.55 179.44,123.66V132.07C179.44,133.18 178.54,134.07 177.44,134.07H176.15C175.04,134.07 174.15,133.18 174.15,132.07V123.66Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M151.25,121C151.25,118.38 153.38,116.25 156,116.25H180.4C183.02,116.25 185.15,118.38 185.15,121V164C185.15,166.62 183.02,168.75 180.4,168.75H151.25V168.75H149.4C146.78,168.75 144.65,166.62 144.65,164V152.68C144.65,151.92 144.96,151.2 145.51,150.68L146.15,150.07C146.4,149.84 146.54,149.51 146.54,149.17V147.09C146.54,146.76 146.41,146.45 146.17,146.21L145.45,145.48C144.94,144.96 144.65,144.27 144.65,143.54V141.44C144.65,140.54 145.08,139.71 145.81,139.19L151.25,135.34V121ZM152.75,167.25H180.4C182.2,167.25 183.65,165.79 183.65,164V121C183.65,119.21 182.2,117.75 180.4,117.75H156C154.21,117.75 152.75,119.21 152.75,121V136.12L146.68,140.42C146.35,140.65 146.15,141.03 146.15,141.44V143.54C146.15,143.87 146.28,144.19 146.51,144.42L147.24,145.16C147.75,145.67 148.04,146.37 148.04,147.09V149.17C148.04,149.92 147.73,150.64 147.18,151.16L146.54,151.77C146.29,152.01 146.15,152.33 146.15,152.68V164C146.15,165.79 147.61,167.25 149.4,167.25H152.75V167.25ZM156.21,123.66C156.21,122.14 157.45,120.91 158.96,120.91H160.26C161.78,120.91 163.01,122.14 163.01,123.66V132.07C163.01,133.59 161.78,134.82 160.26,134.82H158.96C157.45,134.82 156.21,133.59 156.21,132.07V123.66ZM158.96,122.41C158.27,122.41 157.71,122.97 157.71,123.66V132.07C157.71,132.76 158.27,133.32 158.96,133.32H160.26C160.95,133.32 161.51,132.76 161.51,132.07V123.66C161.51,122.97 160.95,122.41 160.26,122.41H158.96ZM167.55,122.41C166.86,122.41 166.3,122.97 166.3,123.66V132.07C166.3,132.76 166.86,133.32 167.55,133.32H168.85C169.54,133.32 170.1,132.76 170.1,132.07V123.66C170.1,122.97 169.54,122.41 168.85,122.41H167.55ZM164.8,123.66C164.8,122.14 166.04,120.91 167.55,120.91H168.85C170.37,120.91 171.6,122.14 171.6,123.66V132.07C171.6,133.59 170.37,134.82 168.85,134.82H167.55C166.04,134.82 164.8,133.59 164.8,132.07V123.66ZM173.4,123.66C173.4,122.14 174.63,120.91 176.15,120.91H177.44C178.96,120.91 180.19,122.14 180.19,123.66V132.07C180.19,133.59 178.96,134.82 177.44,134.82H176.15C174.63,134.82 173.4,133.59 173.4,132.07V123.66ZM176.15,122.41C175.46,122.41 174.9,122.97 174.9,123.66V132.07C174.9,132.76 175.46,133.32 176.15,133.32H177.44C178.13,133.32 178.69,132.76 178.69,132.07V123.66C178.69,122.97 178.13,122.41 177.44,122.41H176.15Z" /> + <path + android:fillColor="#1457C5" + android:pathData="M30.4,111C32.61,111 34.4,112.79 34.4,115C34.4,117.21 32.61,119 30.4,119C28.19,119 26.4,117.21 26.4,115C26.4,112.79 28.19,111 30.4,111Z" /> + <path + android:fillColor="#2B8EF1" + android:pathData="M30.4,95C32.61,95 34.4,96.79 34.4,99C34.4,101.21 32.61,103 30.4,103C28.19,103 26.4,101.21 26.4,99C26.4,96.79 28.19,95 30.4,95Z" /> + <path + android:fillColor="#184080" + android:pathData="M30.4,127C32.61,127 34.4,128.79 34.4,131C34.4,133.21 32.61,135 30.4,135C28.19,135 26.4,133.21 26.4,131C26.4,128.79 28.19,127 30.4,127Z" /> + <path + android:fillColor="#1457C5" + android:pathData="M168.4,92C166.19,92 164.4,90.21 164.4,88C164.4,85.79 166.19,84 168.4,84C170.61,84 172.4,85.79 172.4,88C172.4,90.21 170.61,92 168.4,92Z" /> + <path + android:fillColor="#2B8EF1" + android:pathData="M168.4,108C166.19,108 164.4,106.21 164.4,104C164.4,101.79 166.19,100 168.4,100C170.61,100 172.4,101.79 172.4,104C172.4,106.21 170.61,108 168.4,108Z" /> + <path + android:fillColor="#184080" + android:pathData="M168.4,76C166.19,76 164.4,74.21 164.4,72C164.4,69.79 166.19,68 168.4,68C170.61,68 172.4,69.79 172.4,72C172.4,74.21 170.61,76 168.4,76Z" /> + <path + android:fillColor="#1E293B" + android:pathData="M57.4,35.03C57.4,28.4 62.77,23.03 69.4,23.03H123.4C130.03,23.03 135.4,28.4 135.4,35.03V156.03C135.4,162.66 130.03,168.03 123.4,168.03H69.4C62.77,168.03 57.4,162.66 57.4,156.03V35.03Z" /> + <path + android:fillColor="#A3E635" + android:fillType="evenOdd" + android:pathData="M123.4,24.53H69.4C63.6,24.53 58.9,29.23 58.9,35.03V156.03C58.9,161.83 63.6,166.53 69.4,166.53H123.4C129.2,166.53 133.9,161.83 133.9,156.03V35.03C133.9,29.23 129.2,24.53 123.4,24.53ZM69.4,23.03C62.77,23.03 57.4,28.4 57.4,35.03V156.03C57.4,162.66 62.77,168.03 69.4,168.03H123.4C130.03,168.03 135.4,162.66 135.4,156.03V35.03C135.4,28.4 130.03,23.03 123.4,23.03H69.4Z" /> + <path + android:fillColor="#A3E635" + android:fillType="evenOdd" + android:pathData="M96.4,35.41C95.57,35.41 94.9,34.74 94.9,33.91C94.9,33.08 95.57,32.41 96.4,32.41C97.23,32.41 97.9,33.08 97.9,33.91C97.9,34.74 97.23,35.41 96.4,35.41ZM96.4,36.91C94.74,36.91 93.4,35.57 93.4,33.91C93.4,32.25 94.74,30.91 96.4,30.91C98.06,30.91 99.4,32.25 99.4,33.91C99.4,35.57 98.06,36.91 96.4,36.91Z" /> + <path + android:fillColor="#A3E635" + android:fillType="evenOdd" + android:pathData="M77.65,33.59C77.65,33.18 77.99,32.84 78.4,32.84H88.4C88.82,32.84 89.15,33.18 89.15,33.59C89.15,34.01 88.82,34.34 88.4,34.34H78.4C77.99,34.34 77.65,34.01 77.65,33.59Z" /> + <path + android:fillColor="#A3E635" + android:fillType="evenOdd" + android:pathData="M103.65,33.59C103.65,33.18 103.99,32.84 104.4,32.84L114.4,32.84C114.82,32.84 115.15,33.18 115.15,33.59C115.15,34.01 114.82,34.34 114.4,34.34L104.4,34.34C103.99,34.34 103.65,34.01 103.65,33.59Z" /> + <path + android:fillColor="#0B1120" + android:pathData="M128.4,50.63C128.4,46.22 124.82,42.63 120.4,42.63H72.4C67.98,42.63 64.4,46.22 64.4,50.63V146.63C64.4,151.05 67.98,154.63 72.4,154.63H120.4C124.82,154.63 128.4,151.05 128.4,146.63V50.63Z" /> + <path + android:fillColor="#A3E635" + android:fillType="evenOdd" + android:pathData="M72.4,44.13H120.4C123.99,44.13 126.9,47.04 126.9,50.63V146.63C126.9,150.22 123.99,153.13 120.4,153.13H72.4C68.81,153.13 65.9,150.22 65.9,146.63V50.63C65.9,47.04 68.81,44.13 72.4,44.13ZM120.4,42.63C124.82,42.63 128.4,46.22 128.4,50.63V146.63C128.4,151.05 124.82,154.63 120.4,154.63H72.4C67.98,154.63 64.4,151.05 64.4,146.63V50.63C64.4,46.22 67.98,42.63 72.4,42.63H120.4Z" /> + <path + android:fillColor="#184080" + android:pathData="M71.4,104C71.4,95.16 78.56,88 87.4,88H105.4C114.24,88 121.4,95.16 121.4,104V148H87.4C78.56,148 71.4,140.84 71.4,132V104Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M105.4,89.5H87.4C79.39,89.5 72.9,95.99 72.9,104V132C72.9,140.01 79.39,146.5 87.4,146.5H119.9V104C119.9,95.99 113.41,89.5 105.4,89.5ZM87.4,88C78.56,88 71.4,95.16 71.4,104V132C71.4,140.84 78.56,148 87.4,148H121.4V104C121.4,95.16 114.24,88 105.4,88H87.4Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M83.96,109.91C83.96,109.5 84.29,109.16 84.71,109.16H108.03C108.44,109.16 108.78,109.5 108.78,109.91C108.78,110.32 108.44,110.66 108.03,110.66H84.71C84.29,110.66 83.96,110.32 83.96,109.91Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M83.96,118C83.96,117.59 84.29,117.25 84.71,117.25H108.03C108.44,117.25 108.78,117.59 108.78,118C108.78,118.42 108.44,118.75 108.03,118.75H84.71C84.29,118.75 83.96,118.42 83.96,118Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M83.96,134.18C83.96,133.76 84.29,133.43 84.71,133.43H96.37C96.78,133.43 97.12,133.76 97.12,134.18C97.12,134.59 96.78,134.93 96.37,134.93H84.71C84.29,134.93 83.96,134.59 83.96,134.18Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M83.96,101.82C83.96,101.41 84.29,101.07 84.71,101.07H108.03C108.44,101.07 108.78,101.41 108.78,101.82C108.78,102.24 108.44,102.57 108.03,102.57H84.71C84.29,102.57 83.96,102.24 83.96,101.82Z" /> + <path + android:fillColor="#52ADF9" + android:fillType="evenOdd" + android:pathData="M83.96,126.09C83.96,125.68 84.29,125.34 84.71,125.34H108.1C108.51,125.34 108.85,125.68 108.85,126.09C108.85,126.51 108.51,126.84 108.1,126.84H84.71C84.29,126.84 83.96,126.51 83.96,126.09Z" /> +</vector> diff --git a/briar-android/src/main/res/drawable/ic_transfer_data.xml b/briar-android/src/main/res/drawable/ic_transfer_data.xml deleted file mode 100644 index 68d313e52b40bec466bad587780c05bb6410e847..0000000000000000000000000000000000000000 --- a/briar-android/src/main/res/drawable/ic_transfer_data.xml +++ /dev/null @@ -1,21 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="155dp" - android:height="155dp" - android:viewportWidth="155" - android:viewportHeight="155"> - <path - android:fillColor="@color/briar_lime_400" - android:pathData="m34.889,27.866c-0.93,-0.021 -1.779,0.612 -1.994,1.555 -0.246,1.077 0.427,2.148 1.504,2.395l5.34,1.223c-6.857,4.771 -12.782,10.788 -17.445,17.768 -5.477,8.197 -9.072,17.492 -10.541,27.219 -0.217,1.437 0.827,2.738 2.271,2.898 1.444,0.16 2.741,-0.88 2.963,-2.316 1.373,-8.889 4.673,-17.381 9.682,-24.877 4.281,-6.406 9.717,-11.929 16.004,-16.316l-1.271,5.559c-0.246,1.077 0.427,2.15 1.504,2.396 1.077,0.246 2.15,-0.427 2.396,-1.504l2.076,-9.08c0.167,-0.732 0.108,-1.458 -0.109,-2.123 -0.033,-0.348 -0.136,-0.693 -0.314,-1.018 -0.354,-0.642 -0.935,-1.078 -1.586,-1.258 -0.31,-0.167 -0.638,-0.31 -0.998,-0.393l-9.078,-2.076c-0.135,-0.031 -0.269,-0.048 -0.402,-0.051zM111.871,30.743c-0.836,0.055 -1.633,0.527 -2.082,1.316 -0.717,1.263 -0.271,2.864 0.961,3.635 8.143,5.096 14.998,12.029 20.002,20.258 4.936,8.117 7.92,17.253 8.746,26.689l-4.25,-3.395c-0.863,-0.689 -2.121,-0.549 -2.811,0.314 -0.689,0.863 -0.549,2.121 0.314,2.811l7.277,5.813c1.726,1.379 4.242,1.097 5.621,-0.629l5.813,-7.277c0.69,-0.863 0.549,-2.121 -0.314,-2.811 -0.863,-0.689 -2.122,-0.549 -2.811,0.314l-3.59,4.494c-0.886,-10.274 -4.128,-20.221 -9.502,-29.057 -5.469,-8.994 -12.974,-16.564 -21.895,-22.105 -0.463,-0.288 -0.979,-0.404 -1.48,-0.371zM45.191,140.86c-0.852,0.028 -1.671,0.446 -2.164,1.209 -0.789,1.219 -0.443,2.855 0.807,3.596 9.034,5.356 19.211,8.518 29.715,9.217 10.503,0.699 21.012,-1.086 30.676,-5.197 1.337,-0.569 1.897,-2.143 1.277,-3.457 -0.621,-1.313 -2.188,-1.87 -3.527,-1.305 -8.852,3.73 -18.466,5.348 -28.076,4.709 -9.61,-0.64 -18.923,-3.518 -27.203,-8.389 -0.47,-0.276 -0.993,-0.4 -1.504,-0.383z" /> - <path - android:fillColor="?attr/colorControlNormal" - android:pathData="M68.475,3.03C66.724,3.03 65.046,3.726 63.809,4.964 62.571,6.201 61.875,7.879 61.875,9.63L61.875,49.229c0,1.75 0.696,3.43 1.934,4.668 1.238,1.238 2.916,1.934 4.666,1.934h19.801c1.75,0 3.428,-0.696 4.666,-1.934 1.238,-1.238 1.934,-2.918 1.934,-4.668L94.875,9.63c0,-1.75 -0.696,-3.428 -1.934,-4.666C91.704,3.726 90.026,3.03 88.275,3.03ZM68.475,6.331h19.801c0.875,0 1.715,0.346 2.334,0.965 0.619,0.619 0.965,1.459 0.965,2.334L91.574,49.229c0,0.875 -0.346,1.715 -0.965,2.334C89.99,52.182 89.151,52.53 88.275,52.53L68.475,52.53c-0.875,0 -1.715,-0.348 -2.334,-0.967 -0.619,-0.619 -0.965,-1.459 -0.965,-2.334L65.176,9.63c0,-0.875 0.346,-1.715 0.965,-2.334 0.619,-0.619 1.459,-0.965 2.334,-0.965zM11.25,100.03 L0,111.43v22.799C0,136.319 1.688,138.03 3.75,138.03h22.5c2.063,0 3.75,-1.711 3.75,-3.801L30,103.831C30,101.741 28.313,100.03 26.25,100.03ZM131,103.63c-0.796,0 -1.559,0.316 -2.121,0.879 -0.563,0.562 -0.879,1.325 -0.879,2.121v13.5c-0.796,0 -1.559,0.316 -2.121,0.879 -0.563,0.562 -0.879,1.325 -0.879,2.121v16.5h3v-16.5h24v16.5h3v-16.5c0,-0.796 -0.316,-1.559 -0.879,-2.121 -0.562,-0.563 -1.325,-0.879 -2.121,-0.879v-13.5c0,-0.796 -0.316,-1.559 -0.879,-2.121 -0.562,-0.563 -1.325,-0.879 -2.121,-0.879zM12.807,103.831L26.25,103.831v30.398L3.75,134.229L3.75,113.007ZM131,106.63h18v13.5L131,120.13ZM9.375,109.53v7.6h3.75L13.125,109.53ZM15,109.53v7.6h3.75L18.75,109.53ZM20.625,109.53v7.6h3.75L24.375,109.53Z" /> - <path - android:fillColor="?attr/colorControlNormal" - android:pathData="m78.375,46.2c0.875,0 1.715,-0.348 2.333,-0.967 0.619,-0.619 0.966,-1.458 0.966,-2.333 0,-0.875 -0.348,-1.715 -0.966,-2.333C80.09,39.948 79.25,39.6 78.375,39.6c-0.875,0 -1.715,0.348 -2.333,0.966 -0.619,0.619 -0.967,1.458 -0.967,2.333 0,0.875 0.348,1.715 0.967,2.333 0.619,0.619 1.458,0.967 2.333,0.967z" /> - <path - android:fillColor="?attr/colorControlNormal" - android:pathData="m134,109.6h4.5v3H134Z" /> - <path - android:fillColor="?attr/colorControlNormal" - android:pathData="m141.5,109.6h4.5v3h-4.5z" /> -</vector> diff --git a/briar-android/src/main/res/drawable/il_transfer_data.xml b/briar-android/src/main/res/drawable/il_transfer_data.xml new file mode 100644 index 0000000000000000000000000000000000000000..5e21244d60a777a90df2e2dcb57f58d30e2bde28 --- /dev/null +++ b/briar-android/src/main/res/drawable/il_transfer_data.xml @@ -0,0 +1,105 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="192dp" + android:height="192dp" + android:viewportWidth="192" + android:viewportHeight="192"> + <path + android:fillColor="#F9FAFB" + android:pathData="M41.83,84C41.83,85.1 40.93,86 39.83,86L20.97,86C19.87,86 18.97,85.1 18.97,84L18.97,65.61L41.83,65.61L41.83,84Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M42.58,84C42.58,85.52 41.35,86.75 39.83,86.75L20.97,86.75C19.45,86.75 18.22,85.52 18.22,84L18.22,64.86L42.58,64.86L42.58,84ZM39.83,85.25C40.52,85.25 41.08,84.69 41.08,84L41.08,66.36L19.72,66.36L19.72,84C19.72,84.69 20.28,85.25 20.97,85.25L39.83,85.25Z" /> + <path + android:fillColor="#DDEDFE" + android:pathData="M46.4,61.62C46.4,63.83 44.61,65.62 42.4,65.62L18.4,65.62C16.19,65.62 14.4,63.83 14.4,61.62L14.4,27C14.4,24.79 16.19,23 18.4,23L42.4,23C44.61,23 46.4,24.79 46.4,27L46.4,61.62Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M47.15,61.62C47.15,64.24 45.02,66.37 42.4,66.37L18.4,66.37C15.78,66.37 13.65,64.24 13.65,61.62L13.65,27C13.65,24.38 15.78,22.25 18.4,22.25L42.4,22.25C45.02,22.25 47.15,24.38 47.15,27L47.15,61.62ZM42.4,64.87C44.2,64.87 45.65,63.42 45.65,61.62L45.65,27C45.65,25.21 44.2,23.75 42.4,23.75L18.4,23.75C16.61,23.75 15.15,25.21 15.15,27L15.15,61.62C15.15,63.42 16.61,64.87 18.4,64.87L42.4,64.87Z" /> + <path + android:fillColor="#196FDE" + android:pathData="M37.78,77.59L33.22,77.59L33.22,74.46L37.78,74.46L37.78,77.59Z" /> + <path + android:fillColor="#196FDE" + android:pathData="M27.58,77.59L23.02,77.59L23.02,74.46L27.58,74.46L27.58,77.59Z" /> + <path + android:fillColor="#DDEDFE" + android:fillType="evenOdd" + android:pathData="M152,121C152,118.79 153.79,117 156,117H180.4C182.61,117 184.4,118.79 184.4,121V164C184.4,166.21 182.61,168 180.4,168H152V168H149.4C147.19,168 145.4,166.21 145.4,164V152.68C145.4,152.13 145.63,151.6 146.02,151.23L146.66,150.62C147.06,150.24 147.29,149.71 147.29,149.17V147.09C147.29,146.57 147.08,146.06 146.71,145.69L145.98,144.95C145.61,144.58 145.4,144.07 145.4,143.54V141.44C145.4,140.79 145.72,140.18 146.25,139.8L152,135.73V121ZM156.96,123.66C156.96,122.55 157.86,121.66 158.96,121.66H160.26C161.36,121.66 162.26,122.55 162.26,123.66V132.07C162.26,133.18 161.36,134.07 160.26,134.07H158.96C157.86,134.07 156.96,133.18 156.96,132.07V123.66ZM167.55,121.66C166.45,121.66 165.55,122.55 165.55,123.66V132.07C165.55,133.18 166.45,134.07 167.55,134.07H168.85C169.95,134.07 170.85,133.18 170.85,132.07V123.66C170.85,122.55 169.95,121.66 168.85,121.66H167.55ZM174.15,123.66C174.15,122.55 175.04,121.66 176.15,121.66H177.44C178.54,121.66 179.44,122.55 179.44,123.66V132.07C179.44,133.18 178.54,134.07 177.44,134.07H176.15C175.04,134.07 174.15,133.18 174.15,132.07V123.66Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M151.25,121C151.25,118.38 153.38,116.25 156,116.25H180.4C183.02,116.25 185.15,118.38 185.15,121V164C185.15,166.62 183.02,168.75 180.4,168.75H151.25V168.75H149.4C146.78,168.75 144.65,166.62 144.65,164V152.68C144.65,151.92 144.96,151.2 145.51,150.68L146.15,150.07C146.4,149.84 146.54,149.51 146.54,149.17V147.09C146.54,146.76 146.41,146.45 146.17,146.21L145.45,145.48C144.94,144.96 144.65,144.27 144.65,143.54V141.44C144.65,140.54 145.08,139.71 145.81,139.19L151.25,135.34V121ZM152.75,167.25H180.4C182.2,167.25 183.65,165.79 183.65,164V121C183.65,119.21 182.2,117.75 180.4,117.75H156C154.21,117.75 152.75,119.21 152.75,121V136.12L146.68,140.42C146.35,140.65 146.15,141.03 146.15,141.44V143.54C146.15,143.87 146.28,144.19 146.51,144.42L147.24,145.16C147.75,145.67 148.04,146.37 148.04,147.09V149.17C148.04,149.92 147.73,150.64 147.18,151.16L146.54,151.77C146.29,152.01 146.15,152.33 146.15,152.68V164C146.15,165.79 147.61,167.25 149.4,167.25H152.75V167.25ZM156.21,123.66C156.21,122.14 157.45,120.91 158.96,120.91H160.26C161.78,120.91 163.01,122.14 163.01,123.66V132.07C163.01,133.59 161.78,134.82 160.26,134.82H158.96C157.45,134.82 156.21,133.59 156.21,132.07V123.66ZM158.96,122.41C158.27,122.41 157.71,122.97 157.71,123.66V132.07C157.71,132.76 158.27,133.32 158.96,133.32H160.26C160.95,133.32 161.51,132.76 161.51,132.07V123.66C161.51,122.97 160.95,122.41 160.26,122.41H158.96ZM167.55,122.41C166.86,122.41 166.3,122.97 166.3,123.66V132.07C166.3,132.76 166.86,133.32 167.55,133.32H168.85C169.54,133.32 170.1,132.76 170.1,132.07V123.66C170.1,122.97 169.54,122.41 168.85,122.41H167.55ZM164.8,123.66C164.8,122.14 166.04,120.91 167.55,120.91H168.85C170.37,120.91 171.6,122.14 171.6,123.66V132.07C171.6,133.59 170.37,134.82 168.85,134.82H167.55C166.04,134.82 164.8,133.59 164.8,132.07V123.66ZM173.4,123.66C173.4,122.14 174.63,120.91 176.15,120.91H177.44C178.96,120.91 180.19,122.14 180.19,123.66V132.07C180.19,133.59 178.96,134.82 177.44,134.82H176.15C174.63,134.82 173.4,133.59 173.4,132.07V123.66ZM176.15,122.41C175.46,122.41 174.9,122.97 174.9,123.66V132.07C174.9,132.76 175.46,133.32 176.15,133.32H177.44C178.13,133.32 178.69,132.76 178.69,132.07V123.66C178.69,122.97 178.13,122.41 177.44,122.41H176.15Z" /> + <path + android:fillColor="#8BCAFD" + android:pathData="M30.4,111C32.61,111 34.4,112.79 34.4,115C34.4,117.21 32.61,119 30.4,119C28.19,119 26.4,117.21 26.4,115C26.4,112.79 28.19,111 30.4,111Z" /> + <path + android:fillColor="#52ADF9" + android:pathData="M30.4,95C32.61,95 34.4,96.79 34.4,99C34.4,101.21 32.61,103 30.4,103C28.19,103 26.4,101.21 26.4,99C26.4,96.79 28.19,95 30.4,95Z" /> + <path + android:fillColor="#BDDFFE" + android:pathData="M30.4,127C32.61,127 34.4,128.79 34.4,131C34.4,133.21 32.61,135 30.4,135C28.19,135 26.4,133.21 26.4,131C26.4,128.79 28.19,127 30.4,127Z" /> + <path + android:fillColor="#8BCAFD" + android:pathData="M168.4,92C166.19,92 164.4,90.21 164.4,88C164.4,85.79 166.19,84 168.4,84C170.61,84 172.4,85.79 172.4,88C172.4,90.21 170.61,92 168.4,92Z" /> + <path + android:fillColor="#52ADF9" + android:pathData="M168.4,108C166.19,108 164.4,106.21 164.4,104C164.4,101.79 166.19,100 168.4,100C170.61,100 172.4,101.79 172.4,104C172.4,106.21 170.61,108 168.4,108Z" /> + <path + android:fillColor="#BDDFFE" + android:pathData="M168.4,76C166.19,76 164.4,74.21 164.4,72C164.4,69.79 166.19,68 168.4,68C170.61,68 172.4,69.79 172.4,72C172.4,74.21 170.61,76 168.4,76Z" /> + <path + android:fillColor="#ECFCCB" + android:pathData="M57.4,35.03C57.4,28.4 62.77,23.03 69.4,23.03H123.4C130.03,23.03 135.4,28.4 135.4,35.03V156.03C135.4,162.66 130.03,168.03 123.4,168.03H69.4C62.77,168.03 57.4,162.66 57.4,156.03V35.03Z" /> + <path + android:fillColor="#65A30D" + android:fillType="evenOdd" + android:pathData="M123.4,24.53H69.4C63.6,24.53 58.9,29.23 58.9,35.03V156.03C58.9,161.83 63.6,166.53 69.4,166.53H123.4C129.2,166.53 133.9,161.83 133.9,156.03V35.03C133.9,29.23 129.2,24.53 123.4,24.53ZM69.4,23.03C62.77,23.03 57.4,28.4 57.4,35.03V156.03C57.4,162.66 62.77,168.03 69.4,168.03H123.4C130.03,168.03 135.4,162.66 135.4,156.03V35.03C135.4,28.4 130.03,23.03 123.4,23.03H69.4Z" /> + <path + android:fillColor="#65A30D" + android:fillType="evenOdd" + android:pathData="M96.4,35.41C95.57,35.41 94.9,34.74 94.9,33.91C94.9,33.08 95.57,32.41 96.4,32.41C97.23,32.41 97.9,33.08 97.9,33.91C97.9,34.74 97.23,35.41 96.4,35.41ZM96.4,36.91C94.74,36.91 93.4,35.57 93.4,33.91C93.4,32.25 94.74,30.91 96.4,30.91C98.06,30.91 99.4,32.25 99.4,33.91C99.4,35.57 98.06,36.91 96.4,36.91Z" /> + <path + android:fillColor="#65A30D" + android:fillType="evenOdd" + android:pathData="M77.65,33.59C77.65,33.18 77.99,32.84 78.4,32.84H88.4C88.82,32.84 89.15,33.18 89.15,33.59C89.15,34.01 88.82,34.34 88.4,34.34H78.4C77.99,34.34 77.65,34.01 77.65,33.59Z" /> + <path + android:fillColor="#65A30D" + android:fillType="evenOdd" + android:pathData="M103.65,33.59C103.65,33.18 103.99,32.84 104.4,32.84L114.4,32.84C114.82,32.84 115.15,33.18 115.15,33.59C115.15,34.01 114.82,34.34 114.4,34.34L104.4,34.34C103.99,34.34 103.65,34.01 103.65,33.59Z" /> + <path + android:fillColor="#F9FAFB" + android:pathData="M128.4,50.63C128.4,46.22 124.82,42.63 120.4,42.63H72.4C67.98,42.63 64.4,46.22 64.4,50.63V146.63C64.4,151.05 67.98,154.63 72.4,154.63H120.4C124.82,154.63 128.4,151.05 128.4,146.63V50.63Z" /> + <path + android:fillColor="#65A30D" + android:fillType="evenOdd" + android:pathData="M72.4,44.13H120.4C123.99,44.13 126.9,47.04 126.9,50.63V146.63C126.9,150.22 123.99,153.13 120.4,153.13H72.4C68.81,153.13 65.9,150.22 65.9,146.63V50.63C65.9,47.04 68.81,44.13 72.4,44.13ZM120.4,42.63C124.82,42.63 128.4,46.22 128.4,50.63V146.63C128.4,151.05 124.82,154.63 120.4,154.63H72.4C67.98,154.63 64.4,151.05 64.4,146.63V50.63C64.4,46.22 67.98,42.63 72.4,42.63H120.4Z" /> + <path + android:fillColor="#DDEDFE" + android:pathData="M71.4,104C71.4,95.16 78.56,88 87.4,88H105.4C114.24,88 121.4,95.16 121.4,104V148H87.4C78.56,148 71.4,140.84 71.4,132V104Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M105.4,89.5H87.4C79.39,89.5 72.9,95.99 72.9,104V132C72.9,140.01 79.39,146.5 87.4,146.5H119.9V104C119.9,95.99 113.41,89.5 105.4,89.5ZM87.4,88C78.56,88 71.4,95.16 71.4,104V132C71.4,140.84 78.56,148 87.4,148H121.4V104C121.4,95.16 114.24,88 105.4,88H87.4Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M83.96,109.91C83.96,109.5 84.29,109.16 84.71,109.16H108.03C108.44,109.16 108.78,109.5 108.78,109.91C108.78,110.32 108.44,110.66 108.03,110.66H84.71C84.29,110.66 83.96,110.32 83.96,109.91Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M83.96,118C83.96,117.59 84.29,117.25 84.71,117.25H108.03C108.44,117.25 108.78,117.59 108.78,118C108.78,118.42 108.44,118.75 108.03,118.75H84.71C84.29,118.75 83.96,118.42 83.96,118Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M83.96,134.18C83.96,133.76 84.29,133.43 84.71,133.43H96.37C96.78,133.43 97.12,133.76 97.12,134.18C97.12,134.59 96.78,134.93 96.37,134.93H84.71C84.29,134.93 83.96,134.59 83.96,134.18Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M83.96,101.82C83.96,101.41 84.29,101.07 84.71,101.07H108.03C108.44,101.07 108.78,101.41 108.78,101.82C108.78,102.24 108.44,102.57 108.03,102.57H84.71C84.29,102.57 83.96,102.24 83.96,101.82Z" /> + <path + android:fillColor="#196FDE" + android:fillType="evenOdd" + android:pathData="M83.96,126.09C83.96,125.68 84.29,125.34 84.71,125.34H108.1C108.51,125.34 108.85,125.68 108.85,126.09C108.85,126.51 108.51,126.84 108.1,126.84H84.71C84.29,126.84 83.96,126.51 83.96,126.09Z" /> +</vector> diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml index 3bfc7c9f0ba15370876369edc5a9a84a961f9e00..697d55b4a090d3d5b62d142ab528afe590c399c0 100644 --- a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml +++ b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml @@ -1,81 +1,88 @@ <?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:layout_height="0dp" + android:layout_weight="1"> - <ImageView - android:id="@+id/imageView" - android:layout_width="@dimen/hero_square" - android:layout_height="@dimen/hero_square" - 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_transfer_data" - tools:ignore="ContentDescription" /> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <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:text="@string/removable_drive_intro" - android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" - app:layout_constraintBottom_toTopOf="@+id/buttonLearnMore" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/imageView" /> + <ImageView + android:id="@+id/imageView" + android:layout_width="@dimen/hero_square" + android:layout_height="@dimen/hero_square" + 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_transfer_data" + tools:ignore="ContentDescription" /> - <Button - android:id="@+id/buttonLearnMore" - style="@style/BriarButtonFlat.Positive" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/margin_large" - android:padding="16dp" - android:text="@string/learn_more" - android:textAllCaps="false" - android:textSize="14sp" - app:layout_constraintBottom_toTopOf="@id/sendButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/introView" /> + <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:text="@string/removable_drive_intro" + android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" + app:layout_constraintBottom_toTopOf="@+id/buttonLearnMore" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/imageView" /> - <Button - android:id="@+id/sendButton" - style="@style/BriarButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_large" - android:layout_marginTop="@dimen/margin_large" - android:text="@string/removable_drive_title_send" - app:layout_constraintBottom_toTopOf="@+id/receiveButton" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + <Button + android:id="@+id/buttonLearnMore" + style="@style/BriarButtonFlat.Positive" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/margin_large" + android:padding="16dp" + android:text="@string/learn_more" + android:textAllCaps="false" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/introView" /> - <Button - android:id="@+id/receiveButton" - style="@style/BriarButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="@dimen/margin_large" - android:text="@string/removable_drive_title_receive" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.constraintlayout.widget.ConstraintLayout> + </ScrollView> -</ScrollView> + <Button + android:id="@+id/sendButton" + style="@style/BriarButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/margin_large" + android:layout_marginTop="8dp" + android:text="@string/removable_drive_title_send" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + <Button + android:id="@+id/receiveButton" + style="@style/BriarButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/margin_large" + android:text="@string/removable_drive_title_receive" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + +</LinearLayout>