Commit 09b92546 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Geoffrey Métais

Play pause animation uses the right pause

parent 92109ac6
......@@ -2,42 +2,53 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4682"
version="1.1"
inkscape:version="0.92.3 (unknown)"
sodipodi:docname="ic_pause_normal.svg"
inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4682"
version="1.1"
inkscape:version="0.92.4 (33fec40, 2019-01-16)"
sodipodi:docname="ic_pause.svg"
inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4684" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="31.678384"
inkscape:cx="6.2140391"
inkscape:cy="12.744278"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="960"
inkscape:window-height="1028"
inkscape:window-x="1920"
inkscape:window-y="15"
inkscape:window-maximized="0">
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.919596"
inkscape:cx="-29.373305"
inkscape:cy="10.245583"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1053"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:snap-grids="true"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:bbox-paths="true"
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true">
<inkscape:grid
type="xygrid"
id="grid3002" />
......@@ -50,7 +61,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -59,21 +70,11 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1028.3622)">
<rect
y="1032.3622"
x="6"
height="16"
width="4"
id="rect5038-4"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.06904495;marker:none;enable-background:accumulate"
ry="2" />
<rect
y="1032.3622"
x="14"
height="16"
width="4"
id="rect5040-2"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
ry="2" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.06904495;marker:none;enable-background:accumulate"
d="m 8,1031.3622 c -1.108,0 -2,0.892 -2,2 v 14 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 v -14 c 0,-1.108 -0.892,-2 -2,-2 z m 8,0 c -1.108,0 -2,0.892 -2,2 v 14 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 v -14 c 0,-1.108 -0.892,-2 -2,-2 z"
id="rect7475"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssssssssssssss"/>
</g>
</svg>
......@@ -13,7 +13,7 @@
android:pivotY="18">
<path
android:name="path_1"
android:pathData="M 8.326 3.883 C 7.581 3.928 7 4.545 7 5.291 C 7 9.527 7 13.764 7 18 L 29.313 18.467 C 29.841 18.478 30.368 18.489 30.896 18.5 C 31.126 17.896 30.939 17.162 30.314 16.787 C 29.881 16.527 29.448 16.267 29.015 16.007 C 23.259 12.554 17.504 9.101 11.749 5.648 L 9.137 4.08 C 8.893 3.934 8.61 3.866 8.326 3.883 C 8.326 3.883 8.326 3.883 8.326 3.883 M 7 18 C 7 21.162 7 24.324 7 27.486 C 7 28.559 7 29.632 7 30.705 C 6.999 31.803 8.195 32.482 9.137 31.918 L 12.189 30.086 C 17.734 26.759 23.278 23.432 28.822 20.104 C 29.319 19.806 29.817 19.507 30.314 19.209 C 30.937 18.835 31.125 18.104 30.898 17.5 C 30.017 17.518 29.135 17.537 28.254 17.555 L 26.309 17.596 C 19.873 17.731 13.436 17.865 7 18"
android:pathData="M 30.314 16.787 C 29.693 16.414 29.072 16.042 28.451 15.669 C 27.812 15.285 27.172 14.902 26.533 14.518 L 9.137 4.08 C 8.893 3.934 8.61 3.866 8.326 3.883 C 8.326 3.883 8.326 3.883 8.326 3.883 C 7.581 3.928 7 4.545 7 5.291 C 7 9.527 7 13.764 7 18 L 24.007 18.356 C 25.171 18.38 26.334 18.405 27.498 18.429 C 28.631 18.453 29.763 18.476 30.896 18.5 C 31.126 17.896 30.939 17.162 30.314 16.787 M 30.898 17.5 C 29.384 17.532 27.869 17.563 26.355 17.595 C 25.477 17.613 24.598 17.632 23.72 17.65 L 7 18 C 7 21.041 7 24.083 7 27.125 C 7 28.318 7 29.512 7 30.705 C 6.999 31.803 8.195 32.482 9.137 31.918 C 9.831 31.501 10.525 31.085 11.22 30.668 L 25.003 22.396 C 25.698 21.979 26.392 21.562 27.087 21.145 C 28.163 20.5 29.238 19.854 30.314 19.209 C 30.937 18.835 31.125 18.104 30.898 17.5"
android:fillColor="?attr/player_icon_color"
android:strokeWidth="1"/>
</group>
......@@ -25,8 +25,8 @@
android:propertyName="pathData"
android:duration="300"
android:repeatCount="0"
android:valueFrom="M 6 12 C 6 12.795 6.316 13.559 6.879 14.121 C 7.441 14.684 8.205 15 9 15 L 27 15 C 27.795 15 28.559 14.684 29.121 14.121 C 29.684 13.559 30 12.795 30 12 C 30 11.205 29.684 10.441 29.121 9.879 C 28.559 9.316 27.795 9 27 9 L 9 9 C 8.205 9 7.441 9.316 6.879 9.879 C 6.316 10.441 6 11.205 6 12 M 6.879 21.879 C 6.316 22.441 6 23.205 6 24 C 6 24.795 6.316 25.559 6.879 26.121 C 7.441 26.684 8.205 27 9 27 L 27 27 C 27.795 27 28.559 26.684 29.121 26.121 C 29.684 25.559 30 24.795 30 24 C 30 23.205 29.684 22.441 29.121 21.879 C 28.559 21.316 27.795 21 27 21 L 9 21 C 8.205 21 7.441 21.316 6.879 21.879"
android:valueTo="M 8.326 3.883 C 7.581 3.928 7 4.545 7 5.291 C 7 9.527 7 13.764 7 18 L 29.313 18.467 C 29.841 18.478 30.368 18.489 30.896 18.5 C 31.126 17.896 30.939 17.162 30.314 16.787 C 29.881 16.527 29.448 16.267 29.015 16.007 C 23.259 12.554 17.504 9.101 11.749 5.648 L 9.137 4.08 C 8.893 3.934 8.61 3.866 8.326 3.883 C 8.326 3.883 8.326 3.883 8.326 3.883 M 7 18 C 7 21.162 7 24.324 7 27.486 C 7 28.559 7 29.632 7 30.705 C 6.999 31.803 8.195 32.482 9.137 31.918 L 12.189 30.086 C 17.734 26.759 23.278 23.432 28.822 20.104 C 29.319 19.806 29.817 19.507 30.314 19.209 C 30.937 18.835 31.125 18.104 30.898 17.5 C 30.017 17.518 29.135 17.537 28.254 17.555 L 26.309 17.596 C 19.873 17.731 13.436 17.865 7 18"
android:valueFrom="M 31.5 12 C 31.5 11.2 31.19 10.475 30.683 9.938 C 30.137 9.36 29.362 9 28.5 9 L 7.5 9 C 6.515 9 5.643 9.47 5.097 10.199 C 4.722 10.7 4.5 11.323 4.5 12 C 4.5 12.804 4.813 13.531 5.324 14.069 C 5.87 14.643 6.642 15 7.5 15 L 28.5 15 C 29.4 15 30.205 14.608 30.754 13.984 C 31.219 13.456 31.5 12.762 31.5 12 C 31.5 12 31.5 12 31.5 12 M 31.5 24 C 31.5 23.265 31.238 22.593 30.802 22.073 C 30.253 21.416 29.427 21 28.5 21 L 7.5 21 C 6.639 21 5.865 21.359 5.319 21.936 C 4.811 22.473 4.5 23.199 4.5 24 C 4.5 24.826 4.83 25.572 5.367 26.113 C 5.91 26.661 6.664 27 7.5 27 L 28.5 27 C 29.3 27 30.025 26.69 30.561 26.183 C 31.14 25.637 31.5 24.862 31.5 24 C 31.5 24 31.5 24 31.5 24"
android:valueTo="M 30.314 16.787 C 29.693 16.414 29.072 16.042 28.451 15.669 C 27.812 15.285 27.172 14.902 26.533 14.518 L 9.137 4.08 C 8.893 3.934 8.61 3.866 8.326 3.883 C 8.326 3.883 8.326 3.883 8.326 3.883 C 7.581 3.928 7 4.545 7 5.291 C 7 9.527 7 13.764 7 18 L 24.007 18.356 C 25.171 18.38 26.334 18.405 27.498 18.429 C 28.631 18.453 29.763 18.476 30.896 18.5 C 31.126 17.896 30.939 17.162 30.314 16.787 M 30.898 17.5 C 29.384 17.532 27.869 17.563 26.355 17.595 C 25.477 17.613 24.598 17.632 23.72 17.65 L 7 18 C 7 21.041 7 24.083 7 27.125 C 7 28.318 7 29.512 7 30.705 C 6.999 31.803 8.195 32.482 9.137 31.918 C 9.831 31.501 10.525 31.085 11.22 30.668 L 25.003 22.396 C 25.698 21.979 26.392 21.562 27.087 21.145 C 28.163 20.5 29.238 19.854 30.314 19.209 C 30.937 18.835 31.125 18.104 30.898 17.5"
android:valueType="pathType"
android:interpolator="@android:interpolator/fast_out_slow_in" />
</aapt:attr>
......
......@@ -13,7 +13,7 @@
android:pivotY="18">
<path
android:name="path_1"
android:pathData="M 24 30 C 23.205 30 22.441 29.684 21.879 29.121 C 21.316 28.559 21 27.795 21 27 L 21 9 C 21 8.205 21.316 7.441 21.879 6.879 C 22.441 6.316 23.205 6 24 6 C 24.795 6 25.559 6.316 26.121 6.879 C 26.684 7.441 27 8.205 27 9 L 27 27 C 27 27.795 26.684 28.559 26.121 29.121 C 25.559 29.684 24.795 30 24 30 M 12 30 C 11.205 30 10.441 29.684 9.879 29.121 C 9.316 28.559 9 27.795 9 27 L 9 9 C 9 8.205 9.316 7.441 9.879 6.879 C 10.441 6.316 11.205 6 12 6 C 12.795 6 13.559 6.316 14.121 6.879 C 14.684 7.441 15 8.205 15 9 L 15 27 C 15 27.795 14.684 28.559 14.121 29.121 C 13.559 29.684 12.795 30 12 30"
android:pathData="M 12 4.5 C 10.338 4.5 9 5.838 9 7.5 L 9 28.5 C 9 30.162 10.338 31.5 12 31.5 C 13.662 31.5 15 30.162 15 28.5 L 15 7.5 C 15 5.838 13.662 4.5 12 4.5 Z M 24 4.5 C 22.338 4.5 21 5.838 21 7.5 L 21 28.5 C 21 30.162 22.338 31.5 24 31.5 C 25.662 31.5 27 30.162 27 28.5 L 27 7.5 C 27 5.838 25.662 4.5 24 4.5 Z"
android:fillColor="?attr/player_icon_color"
android:strokeWidth="1"/>
</group>
......@@ -24,8 +24,8 @@
<objectAnimator
android:propertyName="pathData"
android:duration="300"
android:valueFrom="M 8.326 3.883 C 7.581 3.928 7 4.545 7 5.291 C 7 9.527 7 13.764 7 18 L 29.313 18.467 C 29.841 18.478 30.368 18.489 30.896 18.5 C 31.126 17.896 30.939 17.162 30.314 16.787 C 29.881 16.527 29.448 16.267 29.015 16.007 C 23.259 12.554 17.504 9.101 11.749 5.648 L 9.137 4.08 C 8.893 3.934 8.61 3.866 8.326 3.883 C 8.326 3.883 8.326 3.883 8.326 3.883 M 7 18 C 7 21.162 7 24.324 7 27.486 C 7 28.559 7 29.632 7 30.705 C 6.999 31.803 8.195 32.482 9.137 31.918 L 12.189 30.086 C 17.734 26.759 23.278 23.432 28.822 20.104 C 29.319 19.806 29.817 19.507 30.314 19.209 C 30.937 18.835 31.125 18.104 30.898 17.5 C 30.017 17.518 29.135 17.537 28.254 17.555 L 26.309 17.596 C 19.873 17.731 13.436 17.865 7 18"
android:valueTo="M 6 12 C 6 12.795 6.316 13.559 6.879 14.121 C 7.441 14.684 8.205 15 9 15 L 27 15 C 27.795 15 28.559 14.684 29.121 14.121 C 29.684 13.559 30 12.795 30 12 C 30 11.205 29.684 10.441 29.121 9.879 C 28.559 9.316 27.795 9 27 9 L 9 9 C 8.205 9 7.441 9.316 6.879 9.879 C 6.316 10.441 6 11.205 6 12 M 6.879 21.879 C 6.316 22.441 6 23.205 6 24 C 6 24.795 6.316 25.559 6.879 26.121 C 7.441 26.684 8.205 27 9 27 L 27 27 C 27.795 27 28.559 26.684 29.121 26.121 C 29.684 25.559 30 24.795 30 24 C 30 23.205 29.684 22.441 29.121 21.879 C 28.559 21.316 27.795 21 27 21 L 9 21 C 8.205 21 7.441 21.316 6.879 21.879"
android:valueFrom="M 30.314 16.787 C 29.693 16.414 29.072 16.042 28.451 15.669 C 27.812 15.285 27.172 14.902 26.533 14.518 L 9.137 4.08 C 8.893 3.934 8.61 3.866 8.326 3.883 C 8.326 3.883 8.326 3.883 8.326 3.883 C 7.581 3.928 7 4.545 7 5.291 C 7 9.527 7 13.764 7 18 L 24.007 18.356 C 25.171 18.38 26.334 18.405 27.498 18.429 C 28.631 18.453 29.763 18.476 30.896 18.5 C 31.126 17.896 30.939 17.162 30.314 16.787 M 30.898 17.5 C 29.384 17.532 27.869 17.563 26.355 17.595 C 25.477 17.613 24.598 17.632 23.72 17.65 L 7 18 C 7 21.041 7 24.083 7 27.125 C 7 28.318 7 29.512 7 30.705 C 6.999 31.803 8.195 32.482 9.137 31.918 C 9.831 31.501 10.525 31.085 11.22 30.668 L 25.003 22.396 C 25.698 21.979 26.392 21.562 27.087 21.145 C 28.163 20.5 29.238 19.854 30.314 19.209 C 30.937 18.835 31.125 18.104 30.898 17.5"
android:valueTo="M 31.5 12 C 31.5 11.2 31.19 10.475 30.683 9.938 C 30.137 9.36 29.362 9 28.5 9 L 7.5 9 C 6.515 9 5.643 9.47 5.097 10.199 C 4.722 10.7 4.5 11.323 4.5 12 C 4.5 12.804 4.813 13.531 5.324 14.069 C 5.87 14.643 6.642 15 7.5 15 L 28.5 15 C 29.4 15 30.205 14.608 30.754 13.984 C 31.219 13.456 31.5 12.762 31.5 12 C 31.5 12 31.5 12 31.5 12 M 31.5 24 C 31.5 23.265 31.238 22.593 30.802 22.073 C 30.253 21.416 29.427 21 28.5 21 L 7.5 21 C 6.639 21 5.865 21.359 5.319 21.936 C 4.811 22.473 4.5 23.199 4.5 24 C 4.5 24.826 4.83 25.572 5.367 26.113 C 5.91 26.661 6.664 27 7.5 27 L 28.5 27 C 29.3 27 30.025 26.69 30.561 26.183 C 31.14 25.637 31.5 24.862 31.5 24 C 31.5 24 31.5 24 31.5 24"
android:valueType="pathType"
android:interpolator="@android:interpolator/fast_out_slow_in"/>
</aapt:attr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment