diff --git a/mailbox-android/artwork/qr_code_scan.svg b/mailbox-android/artwork/qr_code_scan.svg
new file mode 100644
index 0000000000000000000000000000000000000000..35c4bc2ee12b136a90af775133f16c2bf6731427
--- /dev/null
+++ b/mailbox-android/artwork/qr_code_scan.svg
@@ -0,0 +1,241 @@
+<?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:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="410"
+ height="160"
+ viewBox="0 0 108.47916 42.333332"
+ version="1.1"
+ id="svg4725">
+ <defs
+ id="defs4719">
+ <linearGradient
+ gradientTransform="matrix(-0.26458333,0,0,0.26458333,95.839394,162.56889)"
+ gradientUnits="userSpaceOnUse"
+ y2="410.56311"
+ x2="106.46393"
+ y1="410.56311"
+ x1="27.851271"
+ id="linearGradient2342-79"
+ xlink:href="#linearGradient2340" />
+ <linearGradient
+ id="linearGradient2340">
+ <stop
+ id="stop2336"
+ offset="0"
+ style="stop-color:#ffff3f;stop-opacity:1;" />
+ <stop
+ id="stop2338"
+ offset="1"
+ style="stop-color:#ffff3f;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.26458333,0,0,0.26458333,12.974696,162.30907)"
+ gradientUnits="userSpaceOnUse"
+ y2="410.56311"
+ x2="106.46393"
+ y1="410.56311"
+ x1="27.851271"
+ id="linearGradient2342"
+ xlink:href="#linearGradient2340" />
+ </defs>
+ <metadata
+ id="metadata4722">
+ <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="layer1"
+ transform="translate(0,-254.66668)">
+ <path
+ style="stroke-width:0.1408533"
+ d="m 43.92665,283.93575 -0.605671,-0.60567 -1.000059,-0.33804 c -0.549328,-0.18311 -1.225423,-0.42257 -1.50713,-0.52116 l -0.521158,-0.18311 0.492988,-0.0282 c 1.154996,-0.0563 1.831094,-0.56341 2.014201,-1.5353 0.112684,-0.5775 0.15494,-2.43676 0.112684,-4.64816 -0.02817,-1.14091 -0.02817,-2.16914 0,-2.29591 0.01407,-0.12677 0.07043,-0.33805 0.126767,-0.4789 0.169023,-0.49299 0.04226,-1.67616 -0.267621,-2.47902 -0.04226,-0.12677 -0.267621,-0.59158 -0.492985,-1.04231 -0.591584,-1.155 -0.633841,-1.2536 -0.690181,-1.47896 -0.07043,-0.25354 -0.02817,-0.76061 0.07043,-0.95781 0.0986,-0.1831 0.309878,-0.40847 0.450731,-0.49298 0.183108,-0.0986 0.366218,0.0141 0.662009,0.40847 0.478901,0.63384 1.971947,2.73256 2.211398,3.12694 0.521155,0.84513 0.845119,1.57756 1.126826,2.64805 0.0986,0.35213 0.267621,0.98597 0.380304,1.42262 0.112681,0.43664 0.380304,1.4367 0.577501,2.22548 l 0.36622,1.4367 0.64792,0.73244 c 0.36622,0.40847 0.81695,0.91555 1.01415,1.12683 0.19719,0.22536 0.35213,0.42255 0.35213,0.45073 0,0.0422 -4.859442,4.127 -4.915782,4.127 0.01408,-0.0141 -0.267621,-0.29579 -0.605668,-0.61976 z m -13.226129,-2.30999 c -0.183108,-0.0845 -0.309878,-0.1972 -0.408475,-0.32396 -0.295791,-0.38031 -0.281707,0.33804 -0.267621,-9.64846 l 0.01408,-9.01461 0.0986,-0.16902 c 0.140854,-0.26762 0.281705,-0.40848 0.521155,-0.54933 l 0.225367,-0.12677 5.324256,-0.0141 c 5.986266,-0.0141 5.549622,-0.0282 5.929926,0.30988 0.126767,0.11268 0.253534,0.2817 0.309877,0.40847 0.0986,0.22537 0.0986,0.22537 0.112681,2.00012 l 0.01408,1.77475 -0.253537,-0.0141 c -0.197194,-0.0141 -0.295791,0 -0.450731,0.0704 -0.281705,0.14085 -0.549325,0.40847 -0.718352,0.71835 l -0.140851,0.28171 v -1.80293 -1.80292 h -4.732652 -4.732671 v 7.22578 7.22577 h 4.732671 4.732673 l 0.01408,-4.84535 c 0.01408,-4.64816 0.01408,-4.84536 0.08451,-4.63408 0.04225,0.11269 0.253534,0.56342 0.478901,0.98598 0.774692,1.49304 0.760608,1.39444 0.760608,6.64827 0,3.88755 -0.01408,4.2256 -0.239451,4.66225 -0.15494,0.30987 -0.380304,0.52115 -0.718354,0.66201 l -0.239451,0.0986 -5.084804,-0.0141 -5.098892,0.0141 -0.26762,-0.12676 z m 5.97218,-0.71835 c 0.408474,-0.18311 0.633841,-0.52116 0.619755,-0.92963 0,-0.5775 -0.436645,-1.01415 -1.000059,-1.01415 -0.295791,0 -0.507072,0.0845 -0.732436,0.30988 -0.309877,0.30987 -0.39439,0.76061 -0.18311,1.16908 0.0986,0.19719 0.352134,0.42256 0.563412,0.49299 0.21128,0.0704 0.549328,0.0704 0.732438,-0.0282 z"
+ id="path4201" />
+ <g
+ transform="matrix(0.1408533,0,0,0.1408533,-1.5407968,212.86118)"
+ id="g12">
+ <path
+ id="path10"
+ d="m 256.5,410.2 h 2.3 v 2.3 h 2.3 v 2.3 h -11.5 v -2.3 h 2.3 v -4.6 h 4.6 z m 30,20.8 h 2.3 v -2.3 h -2.3 z m -27.7,-20.8 h 2.3 v -2.3 h -2.3 z m 32.3,20.8 h 2.3 v -2.3 h -2.3 z m -27.7,2.3 H 268 V 431 h -4.6 z m 20.8,0 V 431 h -2.3 v 2.3 z m -9.2,0 h 2.3 v -4.6 H 275 Z m -18.5,-30 v 2.3 h 6.9 v -2.3 z m -2.3,2.3 v -2.3 h -4.6 v 4.6 h 2.3 v -2.3 z m 6.9,-4.6 H 245 v -16.1 h 16.1 z m -2.3,-13.8 h -11.5 v 11.5 h 11.5 z m -9.2,41.5 h 6.9 v -6.9 h -6.9 z m 23,-2.4 v 2.3 h 2.3 v -2.3 z m -16.1,-36.8 h -6.9 v 6.9 h 6.9 z m 36.9,-4.6 V 401 h -16.1 v -16.1 z m -2.3,2.3 h -11.5 v 11.5 h 11.5 z M 245,417.1 h 16.1 v 16.1 H 245 Z m 2.3,13.9 h 11.5 v -11.5 h -11.5 z m 0,-27.7 H 245 v 11.5 h 2.3 z m 30,11.5 v 2.3 h 2.3 v -2.3 z m -7,9.3 v -2.3 H 268 v 2.3 h -4.6 v 4.6 h 4.6 v 2.3 h 2.3 v -4.6 h 2.3 v -2.3 z m -6.9,-30 h 4.6 v -2.3 h -4.6 z m 18.5,18.4 h 4.6 v 2.3 h 2.3 v -6.9 h -2.3 v -4.6 h -2.3 v 6.9 h -6.9 v 2.3 h 2.3 v 2.3 h 2.3 z m 2.3,6.9 h -2.3 v -2.3 h -2.3 v 4.6 h -6.9 v 2.3 h 4.6 v 4.6 h 2.3 v 2.3 h 2.3 v -4.6 h 9.2 V 424 h -6.9 z m 0,0 h 2.3 v -4.6 h -2.3 z m -18.5,0 v -2.3 h 2.3 v -2.3 h 2.3 v -2.3 h 2.3 v -4.6 h 6.9 v -4.6 h -2.3 v 2.3 H 275 v -9.2 h -2.3 v -4.6 h 2.3 v -6.9 h -2.3 v 4.6 h -2.3 v -4.6 h -6.9 v 4.6 h 2.3 v -2.3 h 2.3 v 4.6 h 2.3 v 6.9 h 2.3 v 2.3 h -2.3 v 4.6 H 268 V 401 h -2.3 v -2.3 h -2.3 v 4.6 h 2.3 v 2.3 h -2.3 v 6.9 h 2.3 v -4.6 h 2.3 v 4.6 h -2.3 v 2.3 h -2.3 v 6.9 h 4.6 v -2.3 z m 25.4,2.3 v -2.3 h -4.6 v 2.3 z m -2.3,-32.2 h -6.9 v 6.9 h 6.9 z m -18.5,29.9 h 4.6 v -2.3 h -2.3 v -2.3 h -2.3 z m 4.7,-4.6 v -2.3 h -2.3 v 2.3 z m 13.8,-9.2 h 4.6 v -2.3 h -4.6 z m 2.3,18.5 h 2.3 v -2.3 h -2.3 z m 0,-13.9 h 2.3 v -2.3 h -2.3 z M 270.3,398.7 H 268 v 2.3 h 2.3 z m 0,0" />
+ </g>
+ <path
+ id="path4201-3"
+ d="m 23.479209,285.01681 c 0.332433,-0.14902 0.515844,-0.42414 0.50438,-0.75657 0,-0.46999 -0.355358,-0.82535 -0.813884,-0.82535 -0.240727,0 -0.412674,0.0688 -0.596082,0.25219 -0.252189,0.25219 -0.320969,0.61901 -0.149022,0.95144 0.08024,0.16048 0.286578,0.3439 0.458526,0.40122 0.171947,0.0573 0.447061,0.0573 0.596082,-0.0229 z"
+ style="fill:#ffffff;stroke-width:0.11463147" />
+ <path
+ id="path2320"
+ d="m 20.365334,265.57863 11.180311,-1.85531 v 14.45155 h 9.465341 l -2.1e-5,-14.45155 h -9.46532 z"
+ style="fill:none;fill-opacity:1;stroke:#faf800;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path2322"
+ d="M 31.545645,278.17487 20.365334,265.57863 Z"
+ style="fill:none;stroke:#e3f500;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path2324"
+ d="m 20.365334,265.57863 20.645631,-1.85531 z"
+ style="fill:none;stroke:#eaf600;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path2326"
+ d="m 20.365334,265.57863 c 20.645652,12.59624 20.645652,12.59624 20.645652,12.59624 z"
+ style="fill:#ffff3f;fill-opacity:1;stroke:#def400;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <g
+ transform="matrix(0.26458333,0,0,0.26458333,12.974696,162.30907)"
+ id="layer1-36">
+ <g
+ transform="matrix(0.43325279,0,0,0.43325279,91.730541,226.47373)"
+ id="g12-6" />
+ <path
+ style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 6.3197128,399.9791 H 53.486093 v 72.01294 H 6.3899028 Z"
+ id="path45" />
+ </g>
+ <path
+ id="path54"
+ d="m 27.348843,272.01932 v -1.46728 h -3.851597 -3.851619 v 5.88059 5.8806 h 3.851619 3.851616 l 0.01146,-3.94332 m 1.253099,6.15656 c -0.126095,0.25219 -0.335965,0.7152 -0.955061,0.61815 l -0.194871,0.0802 -4.138197,-0.0115 -4.149659,0.0115 -0.217803,-0.10317 -2.3e-5,1e-5 c -0.149019,-0.0688 -0.252191,-0.16048 -0.332431,-0.26365 -0.240728,-0.3095 -0.229264,0.27512 -0.217799,-7.85225 l 0.01146,-7.33642 0.08024,-0.13756 c 0.114631,-0.2178 0.229259,-0.33243 0.424135,-0.44706 l 0.183412,-0.10317 4.333068,-0.0115 c 4.871836,-0.0115 4.516479,-0.0229 4.825986,0.25219 0.103167,0.0917 0.206333,0.22926 0.252188,0.33243 0.08024,0.18341 0.08024,0.18341 0.0917,1.62777"
+ style="stroke-width:0.11463147" />
+ <path
+ style="stroke-width:0.11463147"
+ id="path10-7"
+ d="m 22.121643,276.18045 h 0.263652 v 0.26365 h 0.263652 v 0.26365 h -1.318262 v -0.26365 h 0.263653 v -0.5273 h 0.527305 z m 3.438944,2.38433 h 0.263652 v -0.26365 h -0.263652 z m -3.175292,-2.38433 h 0.263652 v -0.26365 h -0.263652 z m 3.702596,2.38433 h 0.263653 v -0.26365 h -0.263653 z m -3.175291,0.26366 h 0.527304 v -0.26366 H 22.9126 Z m 2.384334,0 v -0.26366 h -0.263652 v 0.26366 z m -1.054609,0 h 0.263652 v -0.52731 h -0.263652 z m -2.120682,-3.43895 v 0.26365 H 22.9126 v -0.26365 z m -0.263653,0.26365 v -0.26365 h -0.527305 v 0.52731 h 0.263653 v -0.26366 z m 0.790957,-0.5273 h -1.845566 v -1.84557 h 1.845566 z m -0.263652,-1.58192 h -1.318262 v 1.31827 h 1.318262 z m -1.05461,4.75721 h 0.790958 v -0.79096 h -0.790958 z m 2.636524,-0.27511 v 0.26365 h 0.263653 v -0.26365 z m -1.845566,-4.21844 h -0.790958 v 0.79095 h 0.790958 z m 4.229901,-0.52731 v 1.84557 h -1.845567 v -1.84557 z m -0.263653,0.26365 H 24.76963 v 1.31827 h 1.318261 z m -5.28451,3.42749 h 1.845566 v 1.84556 h -1.845566 z m 0.263652,1.59337 h 1.318262 v -1.31826 h -1.318262 z m 0,-3.17529 h -0.263652 v 1.31826 h 0.263652 z m 3.438944,1.31826 v 0.26366 h 0.263653 v -0.26366 z m -0.80242,1.06608 v -0.26366 h -0.263653 v 0.26366 H 22.9126 v 0.5273 h 0.527304 v 0.26365 h 0.263653 v -0.5273 h 0.263652 v -0.26365 z M 22.9126,274.33488 h 0.527304 v -0.26365 H 22.9126 Z m 2.120682,2.10922 h 0.527305 v 0.26365 h 0.263652 v -0.79095 h -0.263652 v -0.52731 h -0.263653 v 0.79096 h -0.790957 v 0.26365 h 0.263653 v 0.26365 h 0.263652 z m 0.263652,0.79096 h -0.263652 v -0.26365 H 24.76963 v 0.5273 h -0.790958 v 0.26365 h 0.527305 v 0.52731 h 0.263653 v 0.26365 h 0.263652 v -0.5273 h 1.054609 v -0.26366 h -0.790957 z m 0,0 h 0.263653 v -0.52731 h -0.263653 z m -2.120682,0 v -0.26365 h 0.263652 v -0.26366 h 0.263653 v -0.26365 h 0.263652 v -0.5273 h 0.790957 v -0.52731 h -0.263652 v 0.26365 h -0.252189 v -1.05461 h -0.263653 v -0.5273 h 0.263653 v -0.79096 h -0.263653 v 0.52731 H 23.71502 v -0.52731 h -0.790957 v 0.52731 h 0.263652 v -0.26366 h 0.263653 v 0.52731 h 0.263652 v 0.79096 h 0.263652 v 0.26365 H 23.71502 v 0.5273 h -0.275116 v -0.5273 h -0.263652 v -0.26365 H 22.9126 v 0.5273 h 0.263652 v 0.26365 H 22.9126 v 0.79096 h 0.263652 v -0.5273 h 0.263652 v 0.5273 h -0.263652 v 0.26365 H 22.9126 v 0.79096 h 0.527304 v -0.26365 z m 2.911639,0.26365 v -0.26365 h -0.527304 v 0.26365 z m -0.263652,-3.69113 h -0.790957 v 0.79095 h 0.790957 z m -2.120682,3.42748 h 0.527305 v -0.26365 h -0.263653 v -0.26366 h -0.263652 z m 0.538768,-0.52731 v -0.26365 h -0.263653 v 0.26365 z m 1.581914,-1.05461 h 0.527305 v -0.26365 h -0.527305 z m 0.263652,2.12069 h 0.263653 v -0.26366 h -0.263653 z m 0,-1.59338 h 0.263653 v -0.26365 h -0.263653 z m -2.384334,-1.31826 h -0.263653 v 0.26365 h 0.263653 z m 0,0" />
+ <g
+ transform="matrix(0.24250902,0,0,0.24202423,79.923654,171.38216)"
+ id="layer1-3">
+ <g
+ transform="matrix(0.43325279,0,0,0.43325279,91.730541,226.47373)"
+ id="g12-6-6" />
+ <path
+ style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 6.3197128,399.9791 H 53.486093 v 72.01294 H 6.3899028 Z"
+ id="path45-0" />
+ </g>
+ <path
+ style="stroke-width:0.1408533"
+ d="m 64.655814,283.98567 0.60567,-0.60567 1.00006,-0.33804 c 0.54933,-0.18311 1.22542,-0.42256 1.50713,-0.52116 l 0.52116,-0.18311 -0.49299,-0.0282 c -1.155,-0.0563 -1.8311,-0.56341 -2.0142,-1.5353 -0.11269,-0.5775 -0.15494,-2.43676 -0.11269,-4.64816 0.0282,-1.14091 0.0282,-2.16914 0,-2.29591 -0.0141,-0.12677 -0.0704,-0.33805 -0.12676,-0.4789 -0.16903,-0.49299 -0.0423,-1.67616 0.26762,-2.47902 0.0423,-0.12677 0.26762,-0.59158 0.49298,-1.04231 0.59159,-1.155 0.63384,-1.2536 0.69018,-1.47896 0.0704,-0.25354 0.0282,-0.76061 -0.0704,-0.95781 -0.0986,-0.1831 -0.30987,-0.40847 -0.45073,-0.49298 -0.18311,-0.0986 -0.36622,0.0141 -0.66201,0.40847 -0.4789,0.63384 -1.97194,2.73256 -2.21139,3.12695 -0.52116,0.84512 -0.84512,1.57755 -1.12683,2.64804 -0.0986,0.35213 -0.26762,0.98597 -0.3803,1.42262 -0.11269,0.43664 -0.38031,1.4367 -0.5775,2.22548 l -0.36622,1.4367 -0.64793,0.73244 c -0.36622,0.40848 -0.81694,0.91555 -1.01414,1.12683 -0.19719,0.22536 -0.35213,0.42256 -0.35213,0.45073 0,0.0422 4.85944,4.127 4.91578,4.127 -0.0141,-0.0141 0.26762,-0.29579 0.60566,-0.61976 z"
+ id="path1314" />
+ <path
+ style="fill:#800000;stroke-width:0.1408533"
+ d="m 77.881944,281.67568 c 0.1831,-0.0845 0.30987,-0.1972 0.40847,-0.32396 0.29579,-0.38031 0.28171,0.33804 0.26762,-9.64845 l -0.0141,-9.01462 -0.0986,-0.16902 c -0.14085,-0.26762 -0.2817,-0.40847 -0.52115,-0.54933 l -0.22537,-0.12676 -5.32426,-0.0141 c -5.98626,-0.0141 -5.54962,-0.0282 -5.92992,0.30988 -0.12677,0.11268 -0.25353,0.2817 -0.30988,0.40847 -0.0986,0.22537 -0.0986,0.22537 -0.11268,2.00012 l -0.0141,1.77475 0.25354,-0.0141 c 0.19719,-0.0141 0.29579,0 0.45073,0.0704 0.2817,0.14085 0.54932,0.40848 0.71835,0.71835 l 0.14085,0.28171 v -1.80292 -1.80293 h 4.73265 4.73267 v 7.22578 7.22577 h -4.73267 -4.73267 l -0.0141,-4.84535 c -0.0141,-4.64816 -0.0141,-4.84535 -0.0845,-4.63407 -0.0423,0.11268 -0.25353,0.56341 -0.4789,0.98597 -0.77469,1.49304 -0.76061,1.39445 -0.76061,6.64827 0,3.88756 0.0141,4.2256 0.23945,4.66225 0.15494,0.30988 0.38031,0.52116 0.71836,0.66201 l 0.23945,0.0986 5.0848,-0.0141 5.09889,0.0141 0.26762,-0.12677 z"
+ id="path1312" />
+ <path
+ style="stroke-width:0.1408533"
+ d="m 71.909754,280.95733 c -0.40847,-0.18311 -0.63384,-0.52116 -0.61975,-0.92963 0,-0.5775 0.43664,-1.01415 1.00006,-1.01415 0.29579,0 0.50707,0.0845 0.73243,0.30988 0.30988,0.30988 0.3944,0.76061 0.18311,1.16908 -0.0986,0.1972 -0.35213,0.42256 -0.56341,0.49299 -0.21128,0.0704 -0.54932,0.0704 -0.73244,-0.0282 z"
+ id="path4201-2" />
+ <g
+ transform="matrix(0.1408533,0,0,0.1408533,34.287842,212.9111)"
+ id="g12-3">
+ <path
+ id="path10-75"
+ d="m 256.5,410.2 h 2.3 v 2.3 h 2.3 v 2.3 h -11.5 v -2.3 h 2.3 v -4.6 h 4.6 z m 30,20.8 h 2.3 v -2.3 h -2.3 z m -27.7,-20.8 h 2.3 v -2.3 h -2.3 z m 32.3,20.8 h 2.3 v -2.3 h -2.3 z m -27.7,2.3 H 268 V 431 h -4.6 z m 20.8,0 V 431 h -2.3 v 2.3 z m -9.2,0 h 2.3 v -4.6 H 275 Z m -18.5,-30 v 2.3 h 6.9 v -2.3 z m -2.3,2.3 v -2.3 h -4.6 v 4.6 h 2.3 v -2.3 z m 6.9,-4.6 H 245 v -16.1 h 16.1 z m -2.3,-13.8 h -11.5 v 11.5 h 11.5 z m -9.2,41.5 h 6.9 v -6.9 h -6.9 z m 23,-2.4 v 2.3 h 2.3 v -2.3 z m -16.1,-36.8 h -6.9 v 6.9 h 6.9 z m 36.9,-4.6 V 401 h -16.1 v -16.1 z m -2.3,2.3 h -11.5 v 11.5 h 11.5 z M 245,417.1 h 16.1 v 16.1 H 245 Z m 2.3,13.9 h 11.5 v -11.5 h -11.5 z m 0,-27.7 H 245 v 11.5 h 2.3 z m 30,11.5 v 2.3 h 2.3 v -2.3 z m -7,9.3 v -2.3 H 268 v 2.3 h -4.6 v 4.6 h 4.6 v 2.3 h 2.3 v -4.6 h 2.3 v -2.3 z m -6.9,-30 h 4.6 v -2.3 h -4.6 z m 18.5,18.4 h 4.6 v 2.3 h 2.3 v -6.9 h -2.3 v -4.6 h -2.3 v 6.9 h -6.9 v 2.3 h 2.3 v 2.3 h 2.3 z m 2.3,6.9 h -2.3 v -2.3 h -2.3 v 4.6 h -6.9 v 2.3 h 4.6 v 4.6 h 2.3 v 2.3 h 2.3 v -4.6 h 9.2 V 424 h -6.9 z m 0,0 h 2.3 v -4.6 h -2.3 z m -18.5,0 v -2.3 h 2.3 v -2.3 h 2.3 v -2.3 h 2.3 v -4.6 h 6.9 v -4.6 h -2.3 v 2.3 H 275 v -9.2 h -2.3 v -4.6 h 2.3 v -6.9 h -2.3 v 4.6 h -2.3 v -4.6 h -6.9 v 4.6 h 2.3 v -2.3 h 2.3 v 4.6 h 2.3 v 6.9 h 2.3 v 2.3 h -2.3 v 4.6 H 268 V 401 h -2.3 v -2.3 h -2.3 v 4.6 h 2.3 v 2.3 h -2.3 v 6.9 h 2.3 v -4.6 h 2.3 v 4.6 h -2.3 v 2.3 h -2.3 v 6.9 h 4.6 v -2.3 z m 25.4,2.3 v -2.3 h -4.6 v 2.3 z m -2.3,-32.2 h -6.9 v 6.9 h 6.9 z m -18.5,29.9 h 4.6 v -2.3 h -2.3 v -2.3 h -2.3 z m 4.7,-4.6 v -2.3 h -2.3 v 2.3 z m 13.8,-9.2 h 4.6 v -2.3 h -4.6 z m 2.3,18.5 h 2.3 v -2.3 h -2.3 z m 0,-13.9 h 2.3 v -2.3 h -2.3 z M 270.3,398.7 H 268 v 2.3 h 2.3 z m 0,0" />
+ </g>
+ <path
+ id="path4201-3-9"
+ d="m 85.103254,285.06673 c -0.33244,-0.14902 -0.51585,-0.42414 -0.50438,-0.75657 0,-0.46999 0.35536,-0.82535 0.81388,-0.82535 0.24073,0 0.41268,0.0688 0.59608,0.25219 0.25219,0.25219 0.32097,0.61902 0.14903,0.95144 -0.0802,0.16049 -0.28658,0.3439 -0.45853,0.40122 -0.17195,0.0573 -0.44706,0.0573 -0.59608,-0.0229 z"
+ style="fill:#ffffff;stroke-width:0.11463147" />
+ <path
+ id="path2320-2"
+ d="m 88.217074,265.62848 -11.18031,-1.85531 v 14.45155 h -9.46534 l 2e-5,-14.45155 h 9.46532 z"
+ style="fill:none;fill-opacity:1;stroke:#faf800;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path2322-2"
+ d="m 77.036814,278.22479 11.18031,-12.59624 z"
+ style="fill:none;stroke:#faf800;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path2324-8"
+ d="m 88.217124,265.62855 -20.64563,-1.85531 z"
+ style="fill:none;stroke:#faf800;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ id="path2326-9"
+ d="m 88.217124,265.62855 c -20.64565,12.59624 -20.64565,12.59624 -20.64565,12.59624 z"
+ style="fill:#ffff3f;fill-opacity:1;stroke:#faf800;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <g
+ transform="matrix(-0.26458333,0,0,0.26458333,95.607764,162.35899)"
+ id="layer1-7">
+ <g
+ transform="matrix(0.43325279,0,0,0.43325279,91.730541,226.47373)"
+ id="g12-6-3" />
+ <path
+ style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 6.3197128,399.9791 H 53.486093 v 72.01294 H 6.3899028 Z"
+ id="path45-6" />
+ </g>
+ <path
+ id="path54-1"
+ d="m 81.233614,272.06924 v -1.46728 h 3.8516 3.85162 v 5.88059 5.8806 h -3.85162 -3.85162 l -0.0115,-3.94332 m -1.25309,6.15656 c 0.12609,0.25219 0.33596,0.7152 0.95506,0.61815 l 0.19487,0.0802 4.1382,-0.0115 4.14965,0.0115 0.21781,-0.10317 2e-5,2e-5 c 0.14902,-0.0688 0.25219,-0.16049 0.33243,-0.26366 0.24073,-0.3095 0.22926,0.27512 0.2178,-7.85225 l -0.0115,-7.33642 -0.0802,-0.13756 c -0.11463,-0.21779 -0.22926,-0.33243 -0.42414,-0.44706 l -0.18341,-0.10316 -4.33306,-0.0115 c -4.87184,-0.0115 -4.51648,-0.0229 -4.82599,0.25219 -0.10317,0.0917 -0.20633,0.22926 -0.25219,0.33243 -0.0802,0.18341 -0.0802,0.18341 -0.0917,1.62777"
+ style="fill:#800000;stroke-width:0.11463147" />
+ <path
+ style="stroke-width:0.11463147"
+ id="path10-7-29"
+ d="m 83.549184,276.23037 h 0.26365 v 0.26365 h 0.26365 v 0.26365 h -1.31826 v -0.26365 h 0.26365 v -0.5273 h 0.52731 z m 3.43894,2.38433 h 0.26365 v -0.26365 h -0.26365 z m -3.17529,-2.38433 h 0.26365 v -0.26365 h -0.26365 z m 3.70259,2.38433 h 0.26366 v -0.26365 h -0.26366 z m -3.17529,0.26366 h 0.52731 v -0.26366 h -0.52731 z m 2.38434,0 v -0.26366 h -0.26366 v 0.26366 z m -1.05461,0 h 0.26365 v -0.52731 h -0.26365 z m -2.12068,-3.43895 v 0.26365 h 0.79095 v -0.26365 z m -0.26366,0.26365 v -0.26365 h -0.5273 v 0.52731 h 0.26365 v -0.26366 z m 0.79096,-0.5273 h -1.84557 v -1.84557 h 1.84557 z m -0.26365,-1.58191 h -1.31827 v 1.31826 h 1.31827 z m -1.05461,4.7572 h 0.79096 v -0.79096 h -0.79096 z m 2.63652,-0.27511 v 0.26365 h 0.26365 v -0.26365 z m -1.84556,-4.21844 h -0.79096 v 0.79096 h 0.79096 z m 4.2299,-0.52731 v 1.84557 h -1.84557 v -1.84557 z m -0.26366,0.26366 h -1.31826 v 1.31826 h 1.31826 z m -5.28451,3.42748 h 1.84557 v 1.84556 h -1.84557 z m 0.26365,1.59337 h 1.31827 v -1.31826 h -1.31827 z m 0,-3.17529 h -0.26365 v 1.31826 h 0.26365 z m 3.43895,1.31826 v 0.26366 h 0.26365 v -0.26366 z m -0.80242,1.06608 v -0.26366 h -0.26365 v 0.26366 h -0.52731 v 0.5273 h 0.52731 v 0.26365 h 0.26365 v -0.5273 h 0.26365 v -0.26365 z m -0.79096,-3.43895 h 0.52731 v -0.26365 h -0.52731 z m 2.12068,2.10922 h 0.52731 v 0.26365 h 0.26365 v -0.79095 h -0.26365 v -0.52731 h -0.26365 v 0.79096 h -0.79096 v 0.26365 h 0.26365 v 0.26365 h 0.26365 z m 0.26366,0.79096 h -0.26366 v -0.26365 h -0.26365 v 0.5273 h -0.79096 v 0.26366 h 0.52731 v 0.5273 h 0.26365 v 0.26365 h 0.26365 v -0.5273 h 1.05461 v -0.26365 h -0.79095 z m 0,0 h 0.26365 v -0.52731 h -0.26365 z m -2.12069,0 v -0.26365 h 0.26366 v -0.26366 h 0.26365 v -0.26365 h 0.26365 v -0.5273 h 0.79096 v -0.52731 h -0.26365 v 0.26365 h -0.25219 v -1.0546 h -0.26366 v -0.52731 h 0.26366 v -0.79096 h -0.26366 v 0.52731 h -0.26365 v -0.52731 h -0.79095 v 0.52731 h 0.26365 v -0.26365 h 0.26365 v 0.5273 h 0.26365 v 0.79096 h 0.26365 v 0.26365 h -0.26365 v 0.5273 h -0.27511 v -0.5273 h -0.26366 v -0.26365 h -0.26365 v 0.5273 h 0.26365 v 0.26365 h -0.26365 v 0.79096 h 0.26365 v -0.5273 h 0.26366 v 0.5273 h -0.26366 v 0.26365 h -0.26365 v 0.79096 h 0.52731 v -0.26365 z m 2.91164,0.26365 v -0.26365 h -0.5273 v 0.26365 z m -0.26365,-3.69113 h -0.79096 v 0.79096 h 0.79096 z m -2.12068,3.42748 h 0.5273 v -0.26365 h -0.26365 v -0.26366 h -0.26365 z m 0.53877,-0.52731 v -0.26365 h -0.26366 v 0.26365 z m 1.58191,-1.05461 h 0.52731 v -0.26365 h -0.52731 z m 0.26365,2.12069 h 0.26366 v -0.26366 h -0.26366 z m 0,-1.59338 h 0.26366 v -0.26365 h -0.26366 z m -2.38433,-1.31826 h -0.26365 v 0.26365 h 0.26365 z m 0,0" />
+ <path
+ style="stroke-width:0.1857059"
+ d="m 97.779781,294.83559 -0.79853,-0.79853 -1.318517,-0.4457 c -0.72425,-0.24141 -1.61564,-0.55711 -1.98705,-0.68711 l -0.68711,-0.24142 0.64997,-0.0371 c 1.52279,-0.0743 2.41418,-0.74282 2.6556,-2.02419 0.14856,-0.7614 0.20427,-3.21271 0.14856,-6.1283 -0.0371,-1.50421 -0.0371,-2.85987 0,-3.027 0.0186,-0.16714 0.0928,-0.4457 0.16713,-0.6314 0.222847,-0.64997 0.0557,-2.2099 -0.35284,-3.26843 -0.0557,-0.16713 -0.35284,-0.77996 -0.64997,-1.37422 -0.77996,-1.52279 -0.83567,-1.65278 -0.90996,-1.94991 -0.0928,-0.33427 -0.0371,-1.00281 0.0928,-1.2628 0.13,-0.24142 0.40856,-0.53855 0.59426,-0.64997 0.24142,-0.13 0.48284,0.0186 0.87282,0.53854 0.631397,0.83568 2.599877,3.6027 2.915577,4.12268 0.68711,1.11423 1.114239,2.0799 1.485649,3.49127 0.13,0.46426 0.35284,1.29994 0.50141,1.87563 0.14856,0.57568 0.5014,1.8942 0.76139,2.93415 l 0.48284,1.8942 0.85424,0.96567 c 0.48284,0.53855 1.0771,1.20709 1.33709,1.48565 0.25998,0.27856 0.46426,0.55712 0.46426,0.59425 0,0.0557 -6.406849,5.44119 -6.481129,5.44119 0.0186,-0.0186 -0.37142,-0.38999 -0.79854,-0.81711 z"
+ id="path1142-3" />
+ <path
+ style="fill:#000000;stroke-width:0.1857059"
+ d="m 80.342004,291.79002 c -0.24142,-0.11143 -0.40855,-0.25999 -0.53855,-0.42713 -0.38998,-0.5014 -0.37141,0.4457 -0.35284,-12.72085 l 0.0186,-11.88518 0.12999,-0.22285 c 0.18571,-0.35284 0.37142,-0.53854 0.68712,-0.72425 l 0.29713,-0.16714 7.01968,-0.0186 c 7.8925,-0.0186 7.31681,-0.0371 7.81822,0.40855 0.16713,0.14857 0.33427,0.37141 0.40855,0.53855 0.12999,0.29713 0.12999,0.29713 0.14856,2.63702 l 0.0186,2.3399 -0.33426,-0.0186 c -0.25999,-0.0186 -0.38999,0 -0.59426,0.0929 -0.37142,0.1857 -0.72426,0.53854 -0.9471,0.9471 l -0.18571,0.37141 v -2.37704 -2.37703 h -6.23972 -6.23972 v 9.52671 9.52671 h 6.22115 6.23971 l 0.0186,-6.38828 c 0.0186,-6.1283 0.0186,-6.38828 0.11143,-6.10972 0.0557,0.14856 0.33427,0.74282 0.6314,1.29994 1.02138,1.96848 1.00281,1.83849 1.00281,8.76532 0,5.12548 -0.0186,5.57117 -0.3157,6.14686 -0.20428,0.40855 -0.50141,0.68711 -0.9471,0.87282 l -0.3157,0.12999 -6.72255,0.0186 -6.72256,0.0186 -0.3157,-0.20428 z"
+ id="path1140-19" />
+ <path
+ style="fill:#ffffff;stroke-width:0.1857059"
+ d="m 88.215934,290.84292 c 0.53855,-0.24142 0.83567,-0.68712 0.81711,-1.22566 0,-0.7614 -0.57569,-1.33708 -1.31852,-1.33708 -0.38998,0 -0.66854,0.11142 -0.96567,0.40855 -0.40855,0.40855 -0.51997,1.00281 -0.24142,1.54136 0.13,0.25998 0.46427,0.55711 0.74283,0.64997 0.27856,0.0928 0.70568,0.0928 0.96567,-0.0371 z"
+ id="path4201-1-4" />
+ <path
+ style="stroke-width:0.1857059"
+ d="m 10.802675,294.78567 0.798536,-0.79854 1.318511,-0.44569 c 0.724254,-0.24142 1.615642,-0.55712 1.987054,-0.68711 l 0.687112,-0.24142 -0.649971,-0.0371 c -1.522789,-0.0743 -2.414177,-0.74282 -2.655595,-2.02419 -0.148564,-0.7614 -0.204276,-3.21272 -0.148564,-6.1283 0.03714,-1.50422 0.03714,-2.85987 0,-3.027 -0.01857,-0.16714 -0.09285,-0.4457 -0.167136,-0.6314 -0.222847,-0.64998 -0.05571,-2.2099 0.352842,-3.26843 0.05571,-0.16713 0.352841,-0.77996 0.64997,-1.37422 0.779965,-1.52279 0.835677,-1.65279 0.909959,-1.94991 0.09285,-0.33427 0.03714,-1.00282 -0.09285,-1.2628 -0.129994,-0.24142 -0.408553,-0.53855 -0.594259,-0.64997 -0.241417,-0.13 -0.482835,0.0186 -0.872817,0.53854 -0.631401,0.83568 -2.5998832,3.6027 -2.9155832,4.12267 -0.687112,1.11424 -1.114235,2.07991 -1.485647,3.49127 -0.129994,0.46427 -0.3528415,1.29995 -0.5014065,1.87563 -0.148565,0.57569 -0.501406,1.8942 -0.7613941,2.93416 l -0.482836,1.8942 -0.854247,0.96567 c -0.482835,0.53854 -1.077094,1.20708 -1.337083,1.48565 -0.259988,0.27855 -0.464264,0.55711 -0.464264,0.59425 0,0.0557 6.4068546,5.44119 6.4811368,5.44119 -0.01857,-0.0186 0.371412,-0.38999 0.798535,-0.81711 z"
+ id="path1142" />
+ <path
+ style="fill:#800000;stroke-width:0.1857059"
+ d="m 28.240459,291.74009 c 0.241418,-0.11142 0.408553,-0.25998 0.538547,-0.42712 0.389983,-0.5014 0.371412,0.4457 0.352842,-12.72085 l -0.01857,-11.88518 -0.129994,-0.22285 c -0.185706,-0.35284 -0.371411,-0.53854 -0.687111,-0.72425 l -0.29713,-0.16714 -7.019683,-0.0186 c -7.892501,-0.0186 -7.316812,-0.0371 -7.818218,0.40855 -0.167136,0.14857 -0.334271,0.37141 -0.408553,0.53855 -0.129995,0.29713 -0.129995,0.29713 -0.148565,2.63702 l -0.01857,2.3399 0.334271,-0.0186 c 0.259988,-0.0186 0.389982,0 0.594258,0.0929 0.371412,0.1857 0.724253,0.53854 0.9471,0.9471 l 0.185706,0.37141 v -2.37704 -2.37703 h 6.23972 6.239718 v 9.52671 9.52671 h -6.221148 -6.239718 l -0.01857,-6.38828 c -0.01857,-6.1283 -0.01857,-6.38828 -0.111424,-6.10973 -0.05571,0.14857 -0.33427,0.74283 -0.6314,1.29995 -1.021382,1.96848 -1.002812,1.83848 -1.002812,8.76531 0,5.12549 0.01857,5.57118 0.315701,6.14687 0.204276,0.40855 0.501405,0.68711 0.947099,0.87282 l 0.3157,0.12999 6.722554,0.0186 6.722554,0.0186 0.3157,-0.20428 z"
+ id="path1140" />
+ <path
+ style="fill:#ffffff;stroke-width:0.1857059"
+ d="m 20.366529,290.79299 c -0.538547,-0.24141 -0.835676,-0.68711 -0.817106,-1.22565 0,-0.7614 0.575688,-1.33709 1.318512,-1.33709 0.389982,0 0.668541,0.11143 0.965671,0.40855 0.408553,0.40856 0.519976,1.00282 0.241417,1.54136 -0.129994,0.25999 -0.464264,0.55712 -0.742823,0.64997 -0.278559,0.0929 -0.705683,0.0929 -0.965671,-0.0371 z"
+ id="path4201-1" />
+ <path
+ style="fill:#ffff3f;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.5"
+ d="m 31.545643,263.72332 8e-6,14.45147 9.465334,8e-5 -1.1e-5,-14.45163 z"
+ id="path5402" />
+ <path
+ style="opacity:0.494;fill:#ffff3f;fill-opacity:1;stroke:none;stroke-width:0.26573557px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 77.036764,263.77317 -8e-6,14.45139 -9.548009,8e-5 1.2e-5,-14.45155 z"
+ id="path5402-5" />
+ <g
+ id="flowRoot1318"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ transform="matrix(0.26458333,0,0,0.26458333,0.60459922,253.19258)"
+ aria-label="1.">
+ <path
+ id="path874"
+ style="font-size:32px"
+ d="m 22.128,10.699219 h -4.512 l -6.976,6.912 3.36,3.488 1.408,-1.408 1.504,-2.08 h 0.064 l -0.256,2.624 -0.032,16.384 h 5.44 z" />
+ <path
+ id="path876"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24px;font-family:'Sinkin Sans';-inkscape-font-specification:'Sinkin Sans Bold'"
+ d="m 31.2165,34.435219 c 0,-1.416 -0.768,-2.424 -2.232,-2.424 -1.464,0 -2.232,1.008 -2.232,2.424 0,1.416 0.768,2.424 2.232,2.424 1.44,0 2.232,-1.008 2.232,-2.424 z" />
+ </g>
+ <g
+ id="flowRoot1318-8"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ transform="matrix(0.26458333,0,0,0.26458333,49.515744,253.26779)"
+ aria-label="2.">
+ <path
+ id="path879"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;font-family:'Sinkin Sans';-inkscape-font-specification:'Sinkin Sans Bold'"
+ d="m 32.4,17.995219 c 0,-3.936 -3.168,-7.616 -10.048,-7.616 -4.096,0 -7.392,1.344 -10.528,4.64 l 3.808,3.712 c 2.24,-2.624 4.384,-3.52 6.88,-3.52 3.264,0 4.416,1.408 4.416,2.752 0,1.248 -0.864,2.304 -4.352,3.392 l -3.52,1.12 c -5.12,1.632 -7.328,4.992 -7.296,8.928 l 0.064,5.216 h 20.544 v -4.832 h -15.68 l 0.512,-0.512 c 0.096,-1.888 1.088,-3.264 3.648,-4.064 l 4.128,-1.312 c 5.152,-1.664 7.424,-4.256 7.424,-7.904 z" />
+ <path
+ id="path881"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32px;font-family:'Sinkin Sans';-inkscape-font-specification:'Sinkin Sans Bold'"
+ d="m 42.0595,33.707219 c 0,-1.888 -1.024,-3.232 -2.976,-3.232 -1.952,0 -2.976,1.344 -2.976,3.232 0,1.888 1.024,3.232 2.976,3.232 1.92,0 2.976,-1.344 2.976,-3.232 z" />
+ </g>
+ </g>
+</svg>
diff --git a/mailbox-android/src/main/AndroidManifest.xml b/mailbox-android/src/main/AndroidManifest.xml
index 79a3a86ccce98a5a69b26677c4edc9d086869123..f0393787f38624b1e8d862fc5969e1cb5c77a8ef 100644
--- a/mailbox-android/src/main/AndroidManifest.xml
+++ b/mailbox-android/src/main/AndroidManifest.xml
@@ -101,7 +101,7 @@
<activity
android:name=".android.keyagreement.MailboxExchangeActivity"
- android:label="@string/add_contact_title"
+ android:label="@string/pairing_title"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
android:theme="@style/BriarTheme.NoActionBar">
<meta-data
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/keyagreement/MailboxExchangeActivity.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/keyagreement/MailboxExchangeActivity.java
index 9caeefa298d6f503f2fbf160add512bd1a0c91f7..add34227bdd5d9084d2bb6c19896359e7fb64c8e 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/keyagreement/MailboxExchangeActivity.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/keyagreement/MailboxExchangeActivity.java
@@ -45,7 +45,7 @@ public class MailboxExchangeActivity extends KeyAgreementActivity implements
@Override
public void onCreate(@Nullable Bundle state) {
super.onCreate(state);
- getSupportActionBar().setTitle(R.string.add_contact_title);
+ getSupportActionBar().setTitle(R.string.pairing_title);
}
protected void startContactExchange(KeyAgreementResult result) {
diff --git a/mailbox-android/src/main/res/drawable/qr_code_scan.xml b/mailbox-android/src/main/res/drawable/qr_code_scan.xml
new file mode 100644
index 0000000000000000000000000000000000000000..30d246cb5f8eeee5dbea1f0b880d9b65b9c99fa1
--- /dev/null
+++ b/mailbox-android/src/main/res/drawable/qr_code_scan.xml
@@ -0,0 +1,207 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="410dp"
+ android:height="160dp"
+ android:viewportWidth="108.47916"
+ android:viewportHeight="42.333332">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m43.927,29.269 l-0.606,-0.606 -1,-0.338c-0.549,-0.183 -1.225,-0.423 -1.507,-0.521l-0.521,-0.183 0.493,-0.028c1.155,-0.056 1.831,-0.563 2.014,-1.535 0.113,-0.577 0.155,-2.437 0.113,-4.648 -0.028,-1.141 -0.028,-2.169 0,-2.296 0.014,-0.127 0.07,-0.338 0.127,-0.479 0.169,-0.493 0.042,-1.676 -0.268,-2.479 -0.042,-0.127 -0.268,-0.592 -0.493,-1.042 -0.592,-1.155 -0.634,-1.254 -0.69,-1.479 -0.07,-0.254 -0.028,-0.761 0.07,-0.958 0.099,-0.183 0.31,-0.408 0.451,-0.493 0.183,-0.099 0.366,0.014 0.662,0.408 0.479,0.634 1.972,2.733 2.211,3.127 0.521,0.845 0.845,1.578 1.127,2.648 0.099,0.352 0.268,0.986 0.38,1.423 0.113,0.437 0.38,1.437 0.578,2.225l0.366,1.437 0.648,0.732c0.366,0.408 0.817,0.916 1.014,1.127 0.197,0.225 0.352,0.423 0.352,0.451 0,0.042 -4.859,4.127 -4.916,4.127 0.014,-0.014 -0.268,-0.296 -0.606,-0.62zM30.701,26.959c-0.183,-0.084 -0.31,-0.197 -0.408,-0.324 -0.296,-0.38 -0.282,0.338 -0.268,-9.648l0.014,-9.015 0.099,-0.169c0.141,-0.268 0.282,-0.408 0.521,-0.549l0.225,-0.127 5.324,-0.014c5.986,-0.014 5.55,-0.028 5.93,0.31 0.127,0.113 0.254,0.282 0.31,0.408 0.099,0.225 0.099,0.225 0.113,2l0.014,1.775 -0.254,-0.014c-0.197,-0.014 -0.296,0 -0.451,0.07 -0.282,0.141 -0.549,0.408 -0.718,0.718l-0.141,0.282v-1.803,-1.803h-4.733,-4.733v7.226,7.226h4.733,4.733l0.014,-4.845c0.014,-4.648 0.014,-4.845 0.085,-4.634 0.042,0.113 0.254,0.563 0.479,0.986 0.775,1.493 0.761,1.394 0.761,6.648 0,3.888 -0.014,4.226 -0.239,4.662 -0.155,0.31 -0.38,0.521 -0.718,0.662l-0.239,0.099 -5.085,-0.014 -5.099,0.014 -0.268,-0.127zM36.673,26.241c0.408,-0.183 0.634,-0.521 0.62,-0.93 0,-0.577 -0.437,-1.014 -1,-1.014 -0.296,0 -0.507,0.084 -0.732,0.31 -0.31,0.31 -0.394,0.761 -0.183,1.169 0.099,0.197 0.352,0.423 0.563,0.493 0.211,0.07 0.549,0.07 0.732,-0.028z"
+ android:strokeWidth="0.1408533"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m34.588,15.973l0.324,0l0,0.324l0.324,0l0,0.324l-1.62,0l0,-0.324l0.324,0l0,-0.648l0.648,0zM38.814,18.902l0.324,0l0,-0.324l-0.324,0zM34.912,15.973l0.324,0l0,-0.324l-0.324,0zM39.462,18.902l0.324,0l0,-0.324l-0.324,0zM35.56,19.226L36.208,19.226L36.208,18.902l-0.648,0zM38.49,19.226L38.49,18.902l-0.324,0l0,0.324zM37.194,19.226l0.324,0l0,-0.648L37.194,18.578ZM34.588,15.001l0,0.324l0.972,0l0,-0.324zM34.264,15.325l0,-0.324l-0.648,0l0,0.648l0.324,0l0,-0.324zM35.236,14.677L32.968,14.677l0,-2.268l2.268,0zM34.912,12.733l-1.62,0l0,1.62l1.62,0zM33.616,18.578l0.972,0l0,-0.972l-0.972,0zM36.856,18.24l0,0.324l0.324,0l0,-0.324zM34.588,13.057l-0.972,0l0,0.972l0.972,0zM39.786,12.409L39.786,14.677l-2.268,0l0,-2.268zM39.462,12.733l-1.62,0l0,1.62l1.62,0zM32.968,16.944l2.268,0l0,2.268L32.968,19.212ZM33.292,18.902l1.62,0l0,-1.62l-1.62,0zM33.292,15.001L32.968,15.001l0,1.62l0.324,0zM37.518,16.62l0,0.324l0.324,0l0,-0.324zM36.532,17.93l0,-0.324L36.208,17.606l0,0.324l-0.648,0l0,0.648l0.648,0l0,0.324l0.324,0l0,-0.648l0.324,0l0,-0.324zM35.56,13.705l0.648,0l0,-0.324l-0.648,0zM38.166,16.296l0.648,0l0,0.324l0.324,0l0,-0.972l-0.324,0l0,-0.648l-0.324,0l0,0.972l-0.972,0l0,0.324l0.324,0l0,0.324l0.324,0zM38.49,17.268l-0.324,0l0,-0.324l-0.324,0l0,0.648l-0.972,0l0,0.324l0.648,0l0,0.648l0.324,0l0,0.324l0.324,0l0,-0.648l1.296,0L39.462,17.916l-0.972,0zM38.49,17.268l0.324,0l0,-0.648l-0.324,0zM35.884,17.268l0,-0.324l0.324,0l0,-0.324l0.324,0l0,-0.324l0.324,0l0,-0.648l0.972,0l0,-0.648l-0.324,0l0,0.324L37.194,15.325l0,-1.296l-0.324,0l0,-0.648l0.324,0l0,-0.972l-0.324,0l0,0.648l-0.324,0l0,-0.648l-0.972,0l0,0.648l0.324,0l0,-0.324l0.324,0l0,0.648l0.324,0l0,0.972l0.324,0l0,0.324l-0.324,0l0,0.648L36.208,15.325L36.208,14.677l-0.324,0l0,-0.324l-0.324,0l0,0.648l0.324,0l0,0.324l-0.324,0l0,0.972l0.324,0l0,-0.648l0.324,0l0,0.648l-0.324,0l0,0.324l-0.324,0l0,0.972l0.648,0l0,-0.324zM39.462,17.592l0,-0.324l-0.648,0l0,0.324zM39.138,13.057l-0.972,0l0,0.972l0.972,0zM36.532,17.268l0.648,0l0,-0.324l-0.324,0l0,-0.324l-0.324,0zM37.194,16.62l0,-0.324l-0.324,0l0,0.324zM39.138,15.325l0.648,0l0,-0.324l-0.648,0zM39.462,17.93l0.324,0l0,-0.324l-0.324,0zM39.462,15.973l0.324,0l0,-0.324l-0.324,0zM36.532,14.353L36.208,14.353l0,0.324l0.324,0zM36.532,14.353"/>
+ <path
+ android:pathData="m23.479,30.35c0.332,-0.149 0.516,-0.424 0.504,-0.757 0,-0.47 -0.355,-0.825 -0.814,-0.825 -0.241,0 -0.413,0.069 -0.596,0.252 -0.252,0.252 -0.321,0.619 -0.149,0.951 0.08,0.16 0.287,0.344 0.459,0.401 0.172,0.057 0.447,0.057 0.596,-0.023z"
+ android:strokeWidth="0.11463147"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="m20.365,10.912 l11.18,-1.855v14.452h9.465l-0,-14.452h-9.465z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#00000000"
+ android:strokeColor="#faf800"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M31.546,23.508 L20.365,10.912Z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#00000000"
+ android:strokeColor="#e3f500"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m20.365,10.912 l20.646,-1.855z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#00000000"
+ android:strokeColor="#eaf600"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m20.365,10.912c20.646,12.596 20.646,12.596 20.646,12.596z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#ffff3f"
+ android:strokeColor="#def400"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M14.647,13.47L27.126,13.47l0,19.053L14.665,32.524Z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ffffff"
+ android:strokeColor="#00000000"
+ android:strokeLineCap="butt"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m27.349,17.353v-1.467h-3.852,-3.852v5.881,5.881h3.852,3.852l0.011,-3.943m1.253,6.157c-0.126,0.252 -0.336,0.715 -0.955,0.618l-0.195,0.08 -4.138,-0.012 -4.15,0.012 -0.218,-0.103 -0,0c-0.149,-0.069 -0.252,-0.16 -0.332,-0.264 -0.241,-0.31 -0.229,0.275 -0.218,-7.852l0.011,-7.336 0.08,-0.138c0.115,-0.218 0.229,-0.332 0.424,-0.447l0.183,-0.103 4.333,-0.012c4.872,-0.012 4.516,-0.023 4.826,0.252 0.103,0.092 0.206,0.229 0.252,0.332 0.08,0.183 0.08,0.183 0.092,1.628"
+ android:strokeWidth="0.11463147"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m22.122,21.514h0.264v0.264h0.264v0.264h-1.318v-0.264h0.264v-0.527h0.527zM25.561,23.898h0.264v-0.264h-0.264zM22.385,21.514h0.264v-0.264h-0.264zM26.088,23.898h0.264v-0.264h-0.264zM22.913,24.162h0.527v-0.264L22.913,23.898ZM25.297,24.162v-0.264h-0.264v0.264zM24.242,24.162h0.264v-0.527h-0.264zM22.122,20.723v0.264L22.913,20.986v-0.264zM21.858,20.986v-0.264h-0.527v0.527h0.264v-0.264zM22.649,20.459h-1.846v-1.846h1.846zM22.385,18.877h-1.318v1.318h1.318zM21.331,23.634h0.791v-0.791h-0.791zM23.967,23.359v0.264h0.264v-0.264zM22.122,19.141h-0.791v0.791h0.791zM26.352,18.614v1.846h-1.846v-1.846zM26.088,18.877L24.77,18.877v1.318h1.318zM20.803,22.305h1.846v1.846h-1.846zM21.067,23.898h1.318v-1.318h-1.318zM21.067,20.723h-0.264v1.318h0.264zM24.506,22.041v0.264h0.264v-0.264zM23.704,23.107v-0.264h-0.264v0.264L22.913,23.107v0.527h0.527v0.264h0.264v-0.527h0.264v-0.264zM22.913,19.668h0.527v-0.264L22.913,19.405ZM25.033,21.777h0.527v0.264h0.264v-0.791h-0.264v-0.527h-0.264v0.791h-0.791v0.264h0.264v0.264h0.264zM25.297,22.568h-0.264v-0.264L24.77,22.305v0.527h-0.791v0.264h0.527v0.527h0.264v0.264h0.264v-0.527h1.055v-0.264h-0.791zM25.297,22.568h0.264v-0.527h-0.264zM23.176,22.568v-0.264h0.264v-0.264h0.264v-0.264h0.264v-0.527h0.791v-0.527h-0.264v0.264h-0.252v-1.055h-0.264v-0.527h0.264v-0.791h-0.264v0.527L23.715,19.141v-0.527h-0.791v0.527h0.264v-0.264h0.264v0.527h0.264v0.791h0.264v0.264L23.715,20.459v0.527h-0.275v-0.527h-0.264v-0.264L22.913,20.195v0.527h0.264v0.264L22.913,20.986v0.791h0.264v-0.527h0.264v0.527h-0.264v0.264L22.913,22.041v0.791h0.527v-0.264zM26.088,22.832v-0.264h-0.527v0.264zM25.824,19.141h-0.791v0.791h0.791zM23.704,22.568h0.527v-0.264h-0.264v-0.264h-0.264zM24.242,22.041v-0.264h-0.264v0.264zM25.824,20.986h0.527v-0.264h-0.527zM26.088,23.107h0.264v-0.264h-0.264zM26.088,21.514h0.264v-0.264h-0.264zM23.704,20.195h-0.264v0.264h0.264zM23.704,20.195"
+ android:strokeWidth="0.11463147"/>
+ <path
+ android:pathData="M81.456,13.52L92.895,13.52l0,17.429L81.473,30.949Z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ffffff"
+ android:strokeColor="#00000000"
+ android:strokeLineCap="butt"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m64.656,29.319 l0.606,-0.606 1,-0.338c0.549,-0.183 1.225,-0.423 1.507,-0.521l0.521,-0.183 -0.493,-0.028c-1.155,-0.056 -1.831,-0.563 -2.014,-1.535 -0.113,-0.577 -0.155,-2.437 -0.113,-4.648 0.028,-1.141 0.028,-2.169 0,-2.296 -0.014,-0.127 -0.07,-0.338 -0.127,-0.479 -0.169,-0.493 -0.042,-1.676 0.268,-2.479 0.042,-0.127 0.268,-0.592 0.493,-1.042 0.592,-1.155 0.634,-1.254 0.69,-1.479 0.07,-0.254 0.028,-0.761 -0.07,-0.958 -0.099,-0.183 -0.31,-0.408 -0.451,-0.493 -0.183,-0.099 -0.366,0.014 -0.662,0.408 -0.479,0.634 -1.972,2.733 -2.211,3.127 -0.521,0.845 -0.845,1.578 -1.127,2.648 -0.099,0.352 -0.268,0.986 -0.38,1.423 -0.113,0.437 -0.38,1.437 -0.577,2.225l-0.366,1.437 -0.648,0.732c-0.366,0.408 -0.817,0.916 -1.014,1.127 -0.197,0.225 -0.352,0.423 -0.352,0.451 0,0.042 4.859,4.127 4.916,4.127 -0.014,-0.014 0.268,-0.296 0.606,-0.62z"
+ android:strokeWidth="0.1408533"/>
+ <path
+ android:pathData="m77.882,27.009c0.183,-0.084 0.31,-0.197 0.408,-0.324 0.296,-0.38 0.282,0.338 0.268,-9.648l-0.014,-9.015 -0.099,-0.169c-0.141,-0.268 -0.282,-0.408 -0.521,-0.549l-0.225,-0.127 -5.324,-0.014c-5.986,-0.014 -5.55,-0.028 -5.93,0.31 -0.127,0.113 -0.254,0.282 -0.31,0.408 -0.099,0.225 -0.099,0.225 -0.113,2l-0.014,1.775 0.254,-0.014c0.197,-0.014 0.296,0 0.451,0.07 0.282,0.141 0.549,0.408 0.718,0.718l0.141,0.282v-1.803,-1.803h4.733,4.733v7.226,7.226h-4.733,-4.733l-0.014,-4.845c-0.014,-4.648 -0.014,-4.845 -0.084,-4.634 -0.042,0.113 -0.254,0.563 -0.479,0.986 -0.775,1.493 -0.761,1.394 -0.761,6.648 0,3.888 0.014,4.226 0.239,4.662 0.155,0.31 0.38,0.521 0.718,0.662l0.239,0.099 5.085,-0.014 5.099,0.014 0.268,-0.127z"
+ android:strokeWidth="0.1408533"
+ android:fillColor="#800000"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m71.91,26.291c-0.408,-0.183 -0.634,-0.521 -0.62,-0.93 0,-0.577 0.437,-1.014 1,-1.014 0.296,0 0.507,0.084 0.732,0.31 0.31,0.31 0.394,0.761 0.183,1.169 -0.099,0.197 -0.352,0.423 -0.563,0.493 -0.211,0.07 -0.549,0.07 -0.732,-0.028z"
+ android:strokeWidth="0.1408533"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m70.417,16.022l0.324,0l0,0.324l0.324,0l0,0.324l-1.62,0l0,-0.324l0.324,0l0,-0.648l0.648,0zM74.642,18.952l0.324,0l0,-0.324l-0.324,0zM70.741,16.022l0.324,0l0,-0.324l-0.324,0zM75.29,18.952l0.324,0l0,-0.324l-0.324,0zM71.389,19.276L72.037,19.276L72.037,18.952l-0.648,0zM74.318,19.276L74.318,18.952l-0.324,0l0,0.324zM73.022,19.276l0.324,0l0,-0.648L73.022,18.628ZM70.417,15.051l0,0.324l0.972,0l0,-0.324zM70.093,15.375l0,-0.324l-0.648,0l0,0.648l0.324,0l0,-0.324zM71.065,14.727L68.797,14.727l0,-2.268l2.268,0zM70.741,12.783l-1.62,0l0,1.62l1.62,0zM69.445,18.628l0.972,0l0,-0.972l-0.972,0zM72.684,18.29l0,0.324l0.324,0l0,-0.324zM70.417,13.107l-0.972,0l0,0.972l0.972,0zM75.614,12.459L75.614,14.727l-2.268,0l0,-2.268zM75.29,12.783l-1.62,0l0,1.62l1.62,0zM68.797,16.994l2.268,0l0,2.268L68.797,19.262ZM69.121,18.952l1.62,0l0,-1.62l-1.62,0zM69.121,15.051L68.797,15.051l0,1.62l0.324,0zM73.346,16.67l0,0.324l0.324,0l0,-0.324zM72.36,17.98l0,-0.324L72.037,17.656l0,0.324l-0.648,0l0,0.648l0.648,0l0,0.324l0.324,0l0,-0.648l0.324,0l0,-0.324zM71.389,13.755l0.648,0l0,-0.324l-0.648,0zM73.994,16.346l0.648,0l0,0.324l0.324,0l0,-0.972l-0.324,0l0,-0.648l-0.324,0l0,0.972l-0.972,0l0,0.324l0.324,0l0,0.324l0.324,0zM74.318,17.318l-0.324,0l0,-0.324l-0.324,0l0,0.648l-0.972,0l0,0.324l0.648,0l0,0.648l0.324,0l0,0.324l0.324,0l0,-0.648l1.296,0L75.29,17.966l-0.972,0zM74.318,17.318l0.324,0l0,-0.648l-0.324,0zM71.713,17.318l0,-0.324l0.324,0l0,-0.324l0.324,0l0,-0.324l0.324,0l0,-0.648l0.972,0l0,-0.648l-0.324,0l0,0.324L73.022,15.375l0,-1.296l-0.324,0l0,-0.648l0.324,0l0,-0.972l-0.324,0l0,0.648l-0.324,0l0,-0.648l-0.972,0l0,0.648l0.324,0l0,-0.324l0.324,0l0,0.648l0.324,0l0,0.972l0.324,0l0,0.324l-0.324,0l0,0.648L72.037,15.375L72.037,14.727l-0.324,0l0,-0.324l-0.324,0l0,0.648l0.324,0l0,0.324l-0.324,0l0,0.972l0.324,0l0,-0.648l0.324,0l0,0.648l-0.324,0l0,0.324l-0.324,0l0,0.972l0.648,0l0,-0.324zM75.29,17.642l0,-0.324l-0.648,0l0,0.324zM74.966,13.107l-0.972,0l0,0.972l0.972,0zM72.36,17.318l0.648,0l0,-0.324l-0.324,0l0,-0.324l-0.324,0zM73.022,16.67l0,-0.324l-0.324,0l0,0.324zM74.966,15.375l0.648,0l0,-0.324l-0.648,0zM75.29,17.98l0.324,0l0,-0.324l-0.324,0zM75.29,16.022l0.324,0l0,-0.324l-0.324,0zM72.36,14.403L72.037,14.403l0,0.324l0.324,0zM72.36,14.403"/>
+ <path
+ android:pathData="m85.103,30.4c-0.332,-0.149 -0.516,-0.424 -0.504,-0.757 0,-0.47 0.355,-0.825 0.814,-0.825 0.241,0 0.413,0.069 0.596,0.252 0.252,0.252 0.321,0.619 0.149,0.951 -0.08,0.16 -0.287,0.344 -0.459,0.401 -0.172,0.057 -0.447,0.057 -0.596,-0.023z"
+ android:strokeWidth="0.11463147"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="m88.217,10.962 l-11.18,-1.855v14.452h-9.465l0,-14.452h9.465z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#00000000"
+ android:strokeColor="#faf800"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m77.037,23.558 l11.18,-12.596z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#00000000"
+ android:strokeColor="#faf800"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m88.217,10.962 l-20.646,-1.855z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#00000000"
+ android:strokeColor="#faf800"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m88.217,10.962c-20.646,12.596 -20.646,12.596 -20.646,12.596z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#ffff3f"
+ android:strokeColor="#faf800"
+ android:fillAlpha="1"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="M93.936,13.52L81.456,13.52l-0,19.053L93.917,32.574Z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="1"
+ android:fillColor="#ffffff"
+ android:strokeColor="#00000000"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m81.234,17.403v-1.467h3.852,3.852v5.881,5.881h-3.852,-3.852l-0.012,-3.943m-1.253,6.157c0.126,0.252 0.336,0.715 0.955,0.618l0.195,0.08 4.138,-0.012 4.15,0.012 0.218,-0.103 0,0c0.149,-0.069 0.252,-0.16 0.332,-0.264 0.241,-0.31 0.229,0.275 0.218,-7.852l-0.012,-7.336 -0.08,-0.138c-0.115,-0.218 -0.229,-0.332 -0.424,-0.447l-0.183,-0.103 -4.333,-0.012c-4.872,-0.012 -4.516,-0.023 -4.826,0.252 -0.103,0.092 -0.206,0.229 -0.252,0.332 -0.08,0.183 -0.08,0.183 -0.092,1.628"
+ android:strokeWidth="0.11463147"
+ android:fillColor="#800000"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m83.549,21.564h0.264v0.264h0.264v0.264h-1.318v-0.264h0.264v-0.527h0.527zM86.988,23.948h0.264v-0.264h-0.264zM83.813,21.564h0.264v-0.264h-0.264zM87.515,23.948h0.264v-0.264h-0.264zM84.34,24.212h0.527v-0.264h-0.527zM86.724,24.212v-0.264h-0.264v0.264zM85.67,24.212h0.264v-0.527h-0.264zM83.549,20.773v0.264h0.791v-0.264zM83.286,21.036v-0.264h-0.527v0.527h0.264v-0.264zM84.076,20.509h-1.846v-1.846h1.846zM83.813,18.927h-1.318v1.318h1.318zM82.758,23.684h0.791v-0.791h-0.791zM85.395,23.409v0.264h0.264v-0.264zM83.549,19.191h-0.791v0.791h0.791zM87.779,18.663v1.846h-1.846v-1.846zM87.515,18.927h-1.318v1.318h1.318zM82.231,22.355h1.846v1.846h-1.846zM82.495,23.948h1.318v-1.318h-1.318zM82.495,20.773h-0.264v1.318h0.264zM85.934,22.091v0.264h0.264v-0.264zM85.131,23.157v-0.264h-0.264v0.264h-0.527v0.527h0.527v0.264h0.264v-0.527h0.264v-0.264zM84.34,19.718h0.527v-0.264h-0.527zM86.461,21.827h0.527v0.264h0.264v-0.791h-0.264v-0.527h-0.264v0.791h-0.791v0.264h0.264v0.264h0.264zM86.724,22.618h-0.264v-0.264h-0.264v0.527h-0.791v0.264h0.527v0.527h0.264v0.264h0.264v-0.527h1.055v-0.264h-0.791zM86.724,22.618h0.264v-0.527h-0.264zM84.604,22.618v-0.264h0.264v-0.264h0.264v-0.264h0.264v-0.527h0.791v-0.527h-0.264v0.264h-0.252v-1.055h-0.264v-0.527h0.264v-0.791h-0.264v0.527h-0.264v-0.527h-0.791v0.527h0.264v-0.264h0.264v0.527h0.264v0.791h0.264v0.264h-0.264v0.527h-0.275v-0.527h-0.264v-0.264h-0.264v0.527h0.264v0.264h-0.264v0.791h0.264v-0.527h0.264v0.527h-0.264v0.264h-0.264v0.791h0.527v-0.264zM87.515,22.882v-0.264h-0.527v0.264zM87.252,19.191h-0.791v0.791h0.791zM85.131,22.618h0.527v-0.264h-0.264v-0.264h-0.264zM85.67,22.091v-0.264h-0.264v0.264zM87.252,21.036h0.527v-0.264h-0.527zM87.515,23.157h0.264v-0.264h-0.264zM87.515,21.564h0.264v-0.264h-0.264zM85.131,20.245h-0.264v0.264h0.264zM85.131,20.245"
+ android:strokeWidth="0.11463147"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m97.78,40.169 l-0.799,-0.799 -1.319,-0.446c-0.724,-0.241 -1.616,-0.557 -1.987,-0.687l-0.687,-0.241 0.65,-0.037c1.523,-0.074 2.414,-0.743 2.656,-2.024 0.149,-0.761 0.204,-3.213 0.149,-6.128 -0.037,-1.504 -0.037,-2.86 0,-3.027 0.019,-0.167 0.093,-0.446 0.167,-0.631 0.223,-0.65 0.056,-2.21 -0.353,-3.268 -0.056,-0.167 -0.353,-0.78 -0.65,-1.374 -0.78,-1.523 -0.836,-1.653 -0.91,-1.95 -0.093,-0.334 -0.037,-1.003 0.093,-1.263 0.13,-0.241 0.409,-0.539 0.594,-0.65 0.241,-0.13 0.483,0.019 0.873,0.539 0.631,0.836 2.6,3.603 2.916,4.123 0.687,1.114 1.114,2.08 1.486,3.491 0.13,0.464 0.353,1.3 0.501,1.876 0.149,0.576 0.501,1.894 0.761,2.934l0.483,1.894 0.854,0.966c0.483,0.539 1.077,1.207 1.337,1.486 0.26,0.279 0.464,0.557 0.464,0.594 0,0.056 -6.407,5.441 -6.481,5.441 0.019,-0.019 -0.371,-0.39 -0.799,-0.817z"
+ android:strokeWidth="0.1857059"/>
+ <path
+ android:pathData="m80.342,37.123c-0.241,-0.111 -0.409,-0.26 -0.539,-0.427 -0.39,-0.501 -0.371,0.446 -0.353,-12.721l0.019,-11.885 0.13,-0.223c0.186,-0.353 0.371,-0.539 0.687,-0.724l0.297,-0.167 7.02,-0.019c7.892,-0.019 7.317,-0.037 7.818,0.409 0.167,0.149 0.334,0.371 0.409,0.539 0.13,0.297 0.13,0.297 0.149,2.637l0.019,2.34 -0.334,-0.019c-0.26,-0.019 -0.39,0 -0.594,0.093 -0.371,0.186 -0.724,0.539 -0.947,0.947l-0.186,0.371v-2.377,-2.377h-6.24,-6.24v9.527,9.527h6.221,6.24l0.019,-6.388c0.019,-6.128 0.019,-6.388 0.111,-6.11 0.056,0.149 0.334,0.743 0.631,1.3 1.021,1.968 1.003,1.838 1.003,8.765 0,5.125 -0.019,5.571 -0.316,6.147 -0.204,0.409 -0.501,0.687 -0.947,0.873l-0.316,0.13 -6.723,0.019 -6.723,0.019 -0.316,-0.204z"
+ android:strokeWidth="0.1857059"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="m88.216,36.176c0.539,-0.241 0.836,-0.687 0.817,-1.226 0,-0.761 -0.576,-1.337 -1.319,-1.337 -0.39,0 -0.669,0.111 -0.966,0.409 -0.409,0.409 -0.52,1.003 -0.241,1.541 0.13,0.26 0.464,0.557 0.743,0.65 0.279,0.093 0.706,0.093 0.966,-0.037z"
+ android:strokeWidth="0.1857059"
+ android:fillColor="#ffffff"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m10.803,40.119 l0.799,-0.799 1.319,-0.446c0.724,-0.241 1.616,-0.557 1.987,-0.687l0.687,-0.241 -0.65,-0.037c-1.523,-0.074 -2.414,-0.743 -2.656,-2.024 -0.149,-0.761 -0.204,-3.213 -0.149,-6.128 0.037,-1.504 0.037,-2.86 0,-3.027 -0.019,-0.167 -0.093,-0.446 -0.167,-0.631 -0.223,-0.65 -0.056,-2.21 0.353,-3.268 0.056,-0.167 0.353,-0.78 0.65,-1.374 0.78,-1.523 0.836,-1.653 0.91,-1.95 0.093,-0.334 0.037,-1.003 -0.093,-1.263 -0.13,-0.241 -0.409,-0.539 -0.594,-0.65 -0.241,-0.13 -0.483,0.019 -0.873,0.539 -0.631,0.836 -2.6,3.603 -2.916,4.123 -0.687,1.114 -1.114,2.08 -1.486,3.491 -0.13,0.464 -0.353,1.3 -0.501,1.876 -0.149,0.576 -0.501,1.894 -0.761,2.934l-0.483,1.894 -0.854,0.966c-0.483,0.539 -1.077,1.207 -1.337,1.486 -0.26,0.279 -0.464,0.557 -0.464,0.594 0,0.056 6.407,5.441 6.481,5.441 -0.019,-0.019 0.371,-0.39 0.799,-0.817z"
+ android:strokeWidth="0.1857059"/>
+ <path
+ android:pathData="m28.24,37.073c0.241,-0.111 0.409,-0.26 0.539,-0.427 0.39,-0.501 0.371,0.446 0.353,-12.721l-0.019,-11.885 -0.13,-0.223c-0.186,-0.353 -0.371,-0.539 -0.687,-0.724l-0.297,-0.167 -7.02,-0.019c-7.893,-0.019 -7.317,-0.037 -7.818,0.409 -0.167,0.149 -0.334,0.371 -0.409,0.539 -0.13,0.297 -0.13,0.297 -0.149,2.637l-0.019,2.34 0.334,-0.019c0.26,-0.019 0.39,0 0.594,0.093 0.371,0.186 0.724,0.539 0.947,0.947l0.186,0.371v-2.377,-2.377h6.24,6.24v9.527,9.527h-6.221,-6.24l-0.019,-6.388c-0.019,-6.128 -0.019,-6.388 -0.111,-6.11 -0.056,0.149 -0.334,0.743 -0.631,1.3 -1.021,1.968 -1.003,1.838 -1.003,8.765 0,5.125 0.019,5.571 0.316,6.147 0.204,0.409 0.501,0.687 0.947,0.873l0.316,0.13 6.723,0.019 6.723,0.019 0.316,-0.204z"
+ android:strokeWidth="0.1857059"
+ android:fillColor="#800000"/>
+ <path
+ android:pathData="m20.367,36.126c-0.539,-0.241 -0.836,-0.687 -0.817,-1.226 0,-0.761 0.576,-1.337 1.319,-1.337 0.39,0 0.669,0.111 0.966,0.409 0.409,0.409 0.52,1.003 0.241,1.541 -0.13,0.26 -0.464,0.557 -0.743,0.65 -0.279,0.093 -0.706,0.093 -0.966,-0.037z"
+ android:strokeWidth="0.1857059"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="m31.546,9.057 l0,14.451 9.465,0 -0,-14.452z"
+ android:strokeAlpha="0.5"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26458332"
+ android:fillColor="#ffff3f"
+ android:fillAlpha="0.5"
+ android:strokeColor="#000000"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m77.037,9.106 l-0,14.451 -9.548,0 0,-14.452z"
+ android:strokeAlpha="0.494"
+ android:strokeLineJoin="miter"
+ android:strokeWidth="0.26573557"
+ android:fillColor="#ffff3f"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.494"
+ android:strokeLineCap="butt"/>
+ <path
+ android:pathData="m6.459,1.357l-1.194,0l-1.846,1.829 0.889,0.923 0.373,-0.373 0.398,-0.55l0.017,0l-0.068,0.694 -0.008,4.335l1.439,0z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="m8.864,7.637c0,-0.375 -0.203,-0.641 -0.591,-0.641 -0.387,0 -0.591,0.267 -0.591,0.641 0,0.375 0.203,0.641 0.591,0.641 0.381,0 0.591,-0.267 0.591,-0.641z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="m58.088,3.362c0,-1.041 -0.838,-2.015 -2.659,-2.015 -1.084,0 -1.956,0.356 -2.786,1.228l1.008,0.982c0.593,-0.694 1.16,-0.931 1.82,-0.931 0.864,0 1.168,0.373 1.168,0.728 0,0.33 -0.229,0.61 -1.151,0.897l-0.931,0.296c-1.355,0.432 -1.939,1.321 -1.93,2.362l0.017,1.38l5.436,0l0,-1.278l-4.149,0l0.135,-0.135c0.025,-0.5 0.288,-0.864 0.965,-1.075l1.092,-0.347c1.363,-0.44 1.964,-1.126 1.964,-2.091z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+ <path
+ android:pathData="m60.644,7.519c0,-0.5 -0.271,-0.855 -0.787,-0.855 -0.516,0 -0.787,0.356 -0.787,0.855 0,0.5 0.271,0.855 0.787,0.855 0.508,0 0.787,-0.356 0.787,-0.855z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"
+ android:fillAlpha="1"/>
+</vector>
diff --git a/mailbox-android/src/main/res/layout/fragment_keyagreement_id.xml b/mailbox-android/src/main/res/layout/fragment_keyagreement_id.xml
index 4098878273008197d49f69e1bc32d407690d1c30..2c8e5e6c9c0119cd6d4b69996d498a45689887cf 100644
--- a/mailbox-android/src/main/res/layout/fragment_keyagreement_id.xml
+++ b/mailbox-android/src/main/res/layout/fragment_keyagreement_id.xml
@@ -36,7 +36,7 @@
android:paddingRight="@dimen/margin_large"
android:paddingTop="@dimen/margin_large"
android:scaleType="fitCenter"
- android:src="@drawable/qr_code_explanation"
+ android:src="@drawable/qr_code_scan"
app:layout_constraintBottom_toTopOf="@id/explanationText"
app:layout_constraintEnd_toEndOf="@id/diagram"
app:layout_constraintStart_toStartOf="@id/diagram"
diff --git a/mailbox-android/src/main/res/layout/fragment_setup_intro.xml b/mailbox-android/src/main/res/layout/fragment_setup_intro.xml
index 9a4e26aeddf16db6c151634e4db8b02729e6f834..edc6126ad77b45f50d538fae4995bbbf66b9cafc 100644
--- a/mailbox-android/src/main/res/layout/fragment_setup_intro.xml
+++ b/mailbox-android/src/main/res/layout/fragment_setup_intro.xml
@@ -21,7 +21,7 @@
android:id="@+id/introExplanationText"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:text="Brief explanation of what the mailbox is and does"
+ android:text="@string/mailbox_setup_explanation"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/mailbox-android/src/main/res/menu/contact_list_actions.xml b/mailbox-android/src/main/res/menu/contact_list_actions.xml
deleted file mode 100644
index c5d0dc76ab40cd91b89391236e33f809d04f09a2..0000000000000000000000000000000000000000
--- a/mailbox-android/src/main/res/menu/contact_list_actions.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <item
- android:id="@+id/action_add_contact"
- android:icon="@drawable/ic_add_white"
- android:title="@string/add_contact_title"
- app:showAsAction="ifRoom"/>
-
-</menu>
\ No newline at end of file
diff --git a/mailbox-android/src/main/res/menu/overview_actions.xml b/mailbox-android/src/main/res/menu/overview_actions.xml
index c5d0dc76ab40cd91b89391236e33f809d04f09a2..e49245c4f00a2fb0065e51358702acecc1d5fdc6 100644
--- a/mailbox-android/src/main/res/menu/overview_actions.xml
+++ b/mailbox-android/src/main/res/menu/overview_actions.xml
@@ -6,7 +6,7 @@
<item
android:id="@+id/action_add_contact"
android:icon="@drawable/ic_add_white"
- android:title="@string/add_contact_title"
+ android:title="@string/pairing_title"
app:showAsAction="ifRoom"/>
</menu>
\ No newline at end of file
diff --git a/mailbox-android/src/main/res/values/strings.xml b/mailbox-android/src/main/res/values/strings.xml
index 294b1c6b08f2a8ce4cc48288ecd355326bfa17ab..7fa90ec952ac3d09da5574068a519a6bc46e47c5 100644
--- a/mailbox-android/src/main/res/values/strings.xml
+++ b/mailbox-android/src/main/res/values/strings.xml
@@ -132,13 +132,13 @@
<string name="contact_deleted_toast">Contact deleted</string>
<!-- Adding Contacts -->
- <string name="add_contact_title">Add a Contact</string>
- <string name="face_to_face">You must meet up with the person you want to add as a contact.\n\nThis will prevent anyone from impersonating you or reading your messages in future.</string>
+ <string name="pairing_title">Pair with Briar</string>
+ <string name="face_to_face">To pair this mailbox with your Briar account you need to scan the QR code from your Briar phone and vice-versa</string>
<string name="continue_button">Continue</string>
<string name="try_again_button">Try Again</string>
- <string name="waiting_for_contact_to_scan">Waiting for contact to scan and connect\u2026</string>
+ <string name="waiting_for_contact_to_scan">Waiting for your Briar phone to scan and connect\u2026</string>
<string name="exchanging_contact_details">Exchanging contact details\u2026</string>
- <string name="contact_added_toast">Contact added: %s</string>
+ <string name="contact_added_toast">Briar account added: %s</string>
<string name="contact_already_exists">Contact %s already exists</string>
<string name="qr_code_invalid">The QR code is invalid</string>
<string name="qr_code_unsupported">The QR code you are trying to scan belongs to an old version of %s which is no longer supported.\n\nPlease ensure that both of you are running the latest version and then try again.</string>
@@ -146,7 +146,7 @@
<string name="connecting_to_device">Connecting to device\u2026</string>
<string name="authenticating_with_device">Authenticating with device\u2026</string>
<string name="connection_error_title">Could not connect to your contact</string>
- <string name="connection_error_explanation">Please check that you\'re both connected to the same Wi-Fi network.</string>
+ <string name="connection_error_explanation">Please check that both your phones are connected to the same Wi-Fi network.</string>
<string name="connection_error_feedback">If this problem persists, please <a href="feedback">send feedback</a> to help us improve the app.</string>
<!-- Introductions -->
@@ -484,4 +484,5 @@
<string name="mailbox_paired">Succesfully paired</string>
<string name="mailbox_already_paired">Your Mailbox is already paired with this Briar account</string>
<string name="mailbox_unpaired">not paired</string>
+ <string name="mailbox_setup_explanation">Brief explanation of what the mailbox is and does</string>
</resources>