merge-requests/5/merge
m2049r 3 years ago committed by GitHub
parent c1f14f9653
commit 4e31f47482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,33 +1,33 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="135dp"
android:height="48dp"
android:viewportHeight="108.0"
android:viewportWidth="304.0">
android:viewportWidth="304"
android:viewportHeight="108">
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M74.4,65.14q-4.73,-4.88 -4.73,-12.84t4.95,-12.87A16.88,16.88 0,0 1,87 34.52a16.88,16.88 0,0 1,12.4 4.92q4.95,4.92 4.95,12.84A16.91,16.91 0,0 1,99.2 65.11,17.62 17.62,0 0,1 86.58,70 16.2,16.2 0,0 1,74.4 65.14ZM86.58,65.33a11.53,11.53 0,0 0,8.36 -3.48q3.54,-3.48 3.54,-9.61T95.1,42.66a11.11,11.11 0,0 0,-8.24 -3.44,10.7 10.7,0 0,0 -8.11,3.44q-3.26,3.45 -3.26,9.61t3.13,9.61A10.27,10.27 0,0 0,86.58 65.33Z" />
android:pathData="M73.46,65.14q-4.72,-4.87 -4.73,-12.84t5,-12.87a16.9,16.9 0,0 1,12.38 -4.91,16.89 16.89,0 0,1 12.4,4.92q5,4.92 5,12.84a16.89,16.89 0,0 1,-5.15 12.83A17.57,17.57 0,0 1,85.64 70,16.23 16.23,0 0,1 73.46,65.14ZM85.64,65.33A11.51,11.51 0,0 0,94 61.85q3.54,-3.48 3.54,-9.61t-3.38,-9.58a11.08,11.08 0,0 0,-8.24 -3.44,10.71 10.71,0 0,0 -8.11,3.44q-3.25,3.45 -3.26,9.61t3.13,9.61A10.29,10.29 0,0 0,85.64 65.33Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M117.21,35.08v5.57q3.51,-6.14 11.21,-6.14a13,13 0,0 1,9.52 3.79q3.82,3.79 3.82,10.8V69.46h-5.64V50.05q0,-5.2 -2.5,-7.89a9,9 0,0 0,-6.92 -2.69,9.09 9.09,0 0,0 -7,2.69q-2.54,2.69 -2.54,7.89V69.46h-5.7V35.08Z" />
android:pathData="M161.3,70a15.84,15.84 0,0 1,-12 -4.88q-4.62,-4.88 -4.63,-12.9t4.7,-12.87a16.22,16.22 0,0 1,12.18 -4.85q7.48,0 12,4.6a16,16 0,0 1,4.51 11.77,20.16 20.16,0 0,1 -0.25,3.38H150.46a11.8,11.8 0,0 0,3.22 8.11,10.32 10.32,0 0,0 7.61,3 10.62,10.62 0,0 0,5.92 -1.57,9.23 9.23,0 0,0 3.54,-4.13h6.14a15.73,15.73 0,0 1,-5.61 7.45A16.33,16.33 0,0 1,161.3 70ZM169,42.16a11.23,11.23 0,0 0,-15.16 -0.06,11.68 11.68,0 0,0 -3.32,8h21.61A10.68,10.68 0,0 0,169 42.19Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M165.24,70a15.82,15.82 0,0 1,-12 -4.88q-4.63,-4.88 -4.63,-12.9t4.7,-12.87a16.2,16.2 0,0 1,12.18 -4.85q7.48,0 12,4.6A16,16 0,0 1,182 50.87a21.51,21.51 0,0 1,-0.25 3.38L154.4,54.25a11.81,11.81 0,0 0,3.22 8.11,10.3 10.3,0 0,0 7.61,3 10.63,10.63 0,0 0,5.92 -1.57,9.3 9.3,0 0,0 3.54,-4.13h6.14a15.79,15.79 0,0 1,-5.61 7.45A16.33,16.33 0,0 1,165.24 70ZM172.94,42.16a11.23,11.23 0,0 0,-15.16 -0.06,11.65 11.65,0 0,0 -3.32,8h21.61A10.73,10.73 0,0 0,172.94 42.19Z" />
android:pathData="M266.06,65.14q-4.72,-4.87 -4.73,-12.84t4.95,-12.87a18.09,18.09 0,0 1,24.8 0q5,4.92 5,12.85a16.9,16.9 0,0 1,-5.17 12.84A17.61,17.61 0,0 1,278.27 70,16.2 16.2,0 0,1 266.06,65.14ZM278.24,65.33a11.51,11.51 0,0 0,8.36 -3.48q3.54,-3.48 3.54,-9.61t-3.38,-9.58a11.08,11.08 0,0 0,-8.24 -3.44,10.71 10.71,0 0,0 -8.11,3.44q-3.26,3.45 -3.26,9.61t3.13,9.61a10.27,10.27 0,0 0,8 3.45Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M194.8,35.08v5.82q3.07,-6.39 10.46,-6.39v5.95h-1.5q-4.38,0 -6.67,2.29t-2.29,7.92V69.46h-5.7V35.08Z" />
android:pathData="M229.94,35.37V55.59a7.65,7.65 0,0 1,-1.8 4.93c-0.17,0.19 -0.35,0.38 -0.54,0.56a0.52,0.52 0,0 1,-0.11 0.1,6.14 6.14,0 0,1 -0.47,0.42l-0.18,0.13c-0.15,0.11 -0.3,0.22 -0.46,0.32l-0.22,0.13 -0.46,0.25 -0.25,0.12 -0.48,0.2 -0.27,0.1 -0.5,0.14 -0.28,0.08c-0.18,0 -0.37,0.06 -0.55,0.09l-0.26,0a7.55,7.55 0,0 1,-0.83 0,8.67 8.67,0 0,1 -0.89,-0.06l-0.27,0a6,6 0,0 1,-0.61 -0.12l-0.28,-0.07 -0.6,-0.2 -0.23,-0.08a7.92,7.92 0,0 1,-0.78 -0.37h0c-0.24,-0.14 -0.48,-0.29 -0.71,-0.45l-0.18,-0.14a6.4,6.4 0,0 1,-0.5 -0.41l-0.18,-0.16c-0.17,-0.16 -0.33,-0.32 -0.48,-0.49l-0.11,-0.13a6.12,6.12 0,0 1,-0.53 -0.7,7.6 7.6,0 0,1 -1.29,-4.24V35.37h-5.36V54.55l0.06,0.05c0,0.33 -0.06,0.66 -0.06,1A12.92,12.92 0,0 0,212 63.5c0.13,0.17 0.28,0.32 0.41,0.48h0l0.06,0.07h0a12.46,12.46 0,0 0,0.87 0.91l0,0h0l0,0c0.3,0.27 0.6,0.54 0.92,0.79l0.07,0 0.12,0.09c0.3,0.22 0.6,0.43 0.92,0.63l0.1,0.07 0.23,0.12 0.15,0.09h0L216,67l0.35,0.21 0.13,0.06 0.16,0.07 0.08,0 0.18,0.07 0.38,0.17 0.34,0.15 0.28,0.1h0l0.08,0 0.15,0 0.14,0.06h0l0.13,0 0.32,0.09 0.22,0.06 0.26,0.07 0.14,0 0.14,0 0.31,0.07h0l0.47,0.07 0.14,0 0.16,0 0.19,0h0.25a12.33,12.33 0,0 0,2.43 0h0.25l0.19,0 0.16,0 0.14,0 0.47,-0.07h0l0.31,-0.07 0.14,0 0.14,0 0.26,-0.07 0.21,-0.06c0.11,0 0.22,0 0.33,-0.09l0.13,0h0l0.17,-0.07 0.12,0 0.08,0h0l0.28,-0.1 0.11,0 0.67,-0.29 0.12,0 0.08,0 0.16,-0.07 0.13,-0.06c0.21,-0.11 0.41,-0.25 0.62,-0.37l0.23,-0.12 0.1,-0.07c0.32,-0.2 0.62,-0.41 0.92,-0.63l0.12,-0.09 0.07,0c0.32,-0.25 0.62,-0.52 0.92,-0.79l0.05,0h0l0,0c0.3,-0.29 0.59,-0.59 0.87,-0.91h0l0.06,-0.07h0c0.13,-0.16 0.28,-0.31 0.41,-0.48a12.92,12.92 0,0 0,2.69 -7.9c0,-0.34 0,-0.67 -0.06,-1 0,0 0,0 0.06,-0.05V35.37Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M236.38,35.08h5.7V69.46h-5.7V64Q232.93,70 225.17,70a13,13 0,0 1,-9.52 -3.79q-3.82,-3.79 -3.82,-10.74V35.08h5.64V54.56q0,5.14 2.54,7.86a10.15,10.15 0,0 0,13.84 0q2.54,-2.72 2.54,-7.86Z" />
android:pathData="M248.67,26.69m-2.77,0a2.77,2.77 0,1 1,5.54 0a2.77,2.77 0,1 1,-5.54 0" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M254.35,29.57a3.9,3.9 0,0 0,2.76 -6.64,3.85 3.85,0 0,0 -6.58,2.76 3.8,3.8 0,0 0,1.1 2.75A3.64,3.64 0,0 0,254.35 29.57Z" />
android:pathData="M246,34.24V68.61a7.66,7.66 0,0 1,-7.65 7.65v5.36a13,13 0,0 0,13 -13V34.24Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M251.43,76.85a4.48,4.48 0,0 1,-1 3.24,4.61 4.61,0 0,1 -3.33,1h-2.43v4.67h3.56c5.93,0 8.85,-3 8.85,-8.88V35.07h-5.69Z" />
android:pathData="M192.06,69.46V48.38a7.67,7.67 0,0 1,7.66 -7.66V35.37a13,13 0,0 0,-13 13V69.46Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M59,38.31a13.12,13.12 0,0 0,-9.64 -3.79,13.81 13.81,0 0,0 -7.35,2A14,14 0,0 0,36.92 42a12,12 0,0 0,-4.82 -5.54A13.65,13.65 0,0 0,25 34.52q-7.7,0 -11.21,6.14V35.07H8V69.46h5.75V50.05q0,-5.2 2.54,-7.89a9.09,9.09 0,0 1,7 -2.69,9 9,0 0,1 6.91,2.69q2.5,2.69 2.5,7.89v19.4h5.64V50.05q0,-5.2 2.54,-7.89a9.06,9.06 0,0 1,6.92 -2.69,9 9,0 0,1 6.91,2.69c1.69,1.8 2.52,4.43 2.52,7.89V69.46l0,7.39a4.48,4.48 0,0 1,-0.95 3.24,4.59 4.59,0 0,1 -3.33,1H50.41v4.67H54c5.93,0 8.82,-3 8.82,-8.88V49.11C62.82,44.44 61.56,40.84 59,38.31Z" />
android:pathData="M116.59,68.6V48.38a7.65,7.65 0,0 1,1.8 -4.93c0.17,-0.19 0.34,-0.38 0.53,-0.56l0.11,-0.1a4.81,4.81 0,0 1,0.48 -0.42l0.17,-0.13 0.47,-0.32 0.21,-0.13c0.15,-0.09 0.31,-0.17 0.47,-0.25a1.92,1.92 0,0 1,0.25 -0.12l0.47,-0.2 0.28,-0.1 0.49,-0.14 0.29,-0.08c0.18,0 0.36,-0.06 0.55,-0.09l0.25,0a7.55,7.55 0,0 1,0.83 -0.05c0.3,0 0.6,0 0.9,0.06l0.26,0a6,6 0,0 1,0.61 0.12l0.29,0.07 0.59,0.2 0.23,0.08a7,7 0,0 1,0.78 0.37h0c0.25,0.14 0.48,0.29 0.72,0.45l0.17,0.14a6.54,6.54 0,0 1,0.51 0.41l0.17,0.16c0.17,0.16 0.33,0.32 0.48,0.49a0.69,0.69 0,0 1,0.11 0.13,7.4 7.4,0 0,1 1.82,4.94V68.6h5.36V49.42l-0.06,-0.05c0,-0.33 0.06,-0.66 0.06,-1a12.92,12.92 0,0 0,-2.69 -7.9,6.12 6.12,0 0,0 -0.41,-0.48h0l-0.06,-0.07h0a10.65,10.65 0,0 0,-0.87 -0.91l0,0h0l0,-0.05c-0.29,-0.27 -0.6,-0.54 -0.92,-0.79l-0.07,0L132,38c-0.3,-0.22 -0.6,-0.44 -0.92,-0.63l-0.1,-0.07 -0.22,-0.12 -0.15,-0.09h0l-0.13,-0.06 -0.35,-0.21 -0.13,-0.06 -0.16,-0.07 -0.07,0 -0.19,-0.07 -0.37,-0.17 -0.35,-0.15 -0.28,-0.1h0l-0.09,0 -0.14,0 -0.14,-0.06h0l-0.13,0c-0.11,0 -0.22,-0.06 -0.33,-0.09a1.41,1.41 0,0 0,-0.22 -0.06l-0.25,-0.07 -0.14,0 -0.14,0 -0.32,-0.07h0l-0.47,-0.07 -0.13,0 -0.16,0 -0.2,0h-0.24c-0.4,0 -0.81,-0.06 -1.22,-0.06s-0.82,0 -1.22,0.06h-0.24l-0.2,0 -0.16,0 -0.13,0 -0.47,0.07h0l-0.32,0.07 -0.14,0 -0.14,0 -0.25,0.07a1.41,1.41 0,0 0,-0.22 0.06c-0.11,0 -0.22,0 -0.33,0.09l-0.13,0h0l-0.17,0.07 -0.11,0 -0.09,0h0l-0.28,0.1 -0.11,0.05 -0.68,0.29 -0.12,0 -0.08,0 -0.15,0.07 -0.13,0.06c-0.22,0.11 -0.42,0.25 -0.63,0.37l-0.23,0.12 -0.09,0.07a10,10 0,0 0,-0.92 0.63l-0.12,0.09 -0.07,0c-0.32,0.25 -0.63,0.52 -0.93,0.79l0,0.05h0l0,0a12.33,12.33 0,0 0,-0.86 0.91h0l-0.06,0.07h0a6.12,6.12 0,0 0,-0.41 0.48,12.92 12.92,0 0,0 -2.69,7.9c0,0.34 0,0.67 0.06,1l-0.06,0.05V68.6Z" />
<path
android:fillColor="@color/monerujoToolbarText"
android:pathData="M269,65.14q-4.73,-4.88 -4.73,-12.84t4.95,-12.87a18.09,18.09 0,0 1,24.8 0Q299,44.35 299,52.28a16.91,16.91 0,0 1,-5.17 12.84A17.62,17.62 0,0 1,281.21 70,16.2 16.2,0 0,1 269,65.14ZM281.18,65.33a11.53,11.53 0,0 0,8.36 -3.48q3.54,-3.48 3.54,-9.61t-3.38,-9.58a11.11,11.11 0,0 0,-8.24 -3.44,10.7 10.7,0 0,0 -8.11,3.44q-3.26,3.45 -3.26,9.61t3.13,9.61A10.27,10.27 0,0 0,281.21 65.33Z" />
android:pathData="M46.46,34.21a13.35,13.35 0,0 0,-10.63 5.22,13.34 13.34,0 0,0 -18.47,-2.75V34.85l-5.5,0 -0.12,33.4 5.51,0 0.07,-20.77a7.86,7.86 0,0 1,15.72 0.05L33,68.3l5.5,0 0.07,-20.77a7.86,7.86 0,0 1,15.72 0.05L54.2,68.38a7.87,7.87 0,0 1,-7.89 7.83v5.5A13.37,13.37 0,0 0,59.7 68.39l0.08,-22.26h0A13.47,13.47 0,0 0,46.46 34.21Z" />
</vector>

@ -23,14 +23,14 @@
android:translateX="1013.0865"
android:translateY="153.4532">
<path
android:fillColor="#000000"
android:fillColor="@color/monerujoToolbarText"
android:pathData="m 0,0 c 19.062,0 35.203,6.594 48.406,19.797 13.188,13.187 19.797,29.328 19.797,48.391 0,19.062 -6.609,35.203 -19.797,48.406 -13.203,13.187 -29.156,19.797 -47.859,19.797 -18.703,0 -34.656,-6.61 -47.844,-19.797 C -60.5,103.391 -67.094,87.25 -67.094,68.188 c 0,-19.063 6.406,-35.204 19.25,-48.391 C -35.016,6.594 -19.062,0 0,0" />
</group>
<group
android:translateX="1000"
android:translateY="0">
<path
android:fillColor="#000000"
android:fillColor="@color/monerujoToolbarText"
android:pathData="m 0,0 c -44.734,44.359 -101.083,66.547 -169.27,66.547 -48.406,0 -91.424,-11.563 -129.19,-34.656 -37.781,-23.094 -67.626,-55.172 -89.626,-96.235 -19.063,42.532 -47.282,74.969 -84.688,97.344 -37.407,22.359 -79.233,33.547 -125.421,33.547 -90.203,0 -155.936,-35.938 -196.936,-107.797 v 98.157 h -101 v -604 h 101 v 340.843 c 0,60.859 14.881,107.062 44.584,138.594 29.703,31.531 70.425,47.312 122.129,47.312 51.687,0 92.073,-15.781 121.417,-47.312 29.328,-31.532 43.87,-77.735 43.87,-138.594 v -340.843 h 99 v 340.843 c 0,60.859 14.983,107.062 44.686,138.594 29.703,31.531 70.288,47.312 121.632,47.312 51.328,0 91.638,-15.781 121.341,-47.312 29.687,-31.532 44.341,-77.735 44.341,-138.594 v -341 l -0.76,-129.797 c 0,-26.406 -5.245,-45.453 -16.605,-56.828 -11.375,-11.359 -30.543,-17.218 -58.418,-17.218 h -43.217 v -82 h 63.03 c 104.125,0 154.97,51.921 154.97,156.046 v 129.797 357.5 C 66.869,-107.625 44.734,-44.375 0,0" />
</group>
</group>

@ -22,6 +22,8 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginTop="-8dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:src="@drawable/ic_logo_horizontol_xmrujo"
android:visibility="visible" />

Loading…
Cancel
Save