mirror of
https://github.com/null2264/yokai.git
synced 2025-06-21 10:44:42 +00:00
Fixes to browse/recent anim circles
should be more smooth now
This commit is contained in:
parent
f6db104d76
commit
f490eee34e
4 changed files with 16 additions and 10 deletions
|
@ -14,7 +14,8 @@
|
||||||
android:pivotY="12">
|
android:pivotY="12">
|
||||||
<clip-path
|
<clip-path
|
||||||
android:name="mask"
|
android:name="mask"
|
||||||
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.572 2.515 13.963 2.058 12.319 2.005 C 12.213 2.002 12.106 2 12 2 M 12 10.9 C 11.708 10.9 11.428 11.016 11.222 11.222 C 11.016 11.428 10.9 11.708 10.9 12 C 10.9 12.292 11.016 12.572 11.222 12.778 C 11.428 12.984 11.708 13.1 12 13.1 C 12.292 13.1 12.572 12.984 12.778 12.778 C 12.984 12.572 13.1 12.292 13.1 12 C 13.1 11.708 12.984 11.428 12.778 11.222 C 12.572 11.016 12.292 10.9 12 10.9 C 12 10.9 12 10.9 12 10.9 M 14.19 14.19 L 6 18 L 9.81 9.81 L 18 6"/>
|
android:pathData="M12,2C9.3,2,2,2,2,2v10v10h10h10V12V2C22,2,12.1,2,12,2 M12,10.9c-0.3,0-0.6,0.1-0.8,0.3s-0.3,0.5-0.3,0.8s0.1,0.6,0.3,0.8
|
||||||
|
s0.5,0.3,0.8,0.3s0.6-0.1,0.8-0.3s0.3-0.5,0.3-0.8s-0.1-0.6-0.3-0.8S12.3,10.9,12,10.9L12,10.9 M14.2,14.2L6,18l3.8-8.2L18,6"/>
|
||||||
<path
|
<path
|
||||||
android:name="path"
|
android:name="path"
|
||||||
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12"
|
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12"
|
||||||
|
@ -46,8 +47,8 @@
|
||||||
android:propertyName="pathData"
|
android:propertyName="pathData"
|
||||||
android:startOffset="75"
|
android:startOffset="75"
|
||||||
android:duration="300"
|
android:duration="300"
|
||||||
android:valueFrom="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.572 2.515 13.963 2.058 12.319 2.005 C 12.213 2.002 12.106 2 12 2 M 12 10.9 C 11.708 10.9 11.428 11.016 11.222 11.222 C 11.016 11.428 10.9 11.708 10.9 12 C 10.9 12.292 11.016 12.572 11.222 12.778 C 11.428 12.984 11.708 13.1 12 13.1 C 12.292 13.1 12.572 12.984 12.778 12.778 C 12.984 12.572 13.1 12.292 13.1 12 C 13.1 11.708 12.984 11.428 12.778 11.222 C 12.572 11.016 12.292 10.9 12 10.9 C 12 10.9 12 10.9 12 10.9 M 14.19 14.19 L 6 18 L 9.81 9.81 L 18 6"
|
android:valueFrom="M 12 2 C 9.3 2 2 2 2 2 L 2 12 L 2 22 L 12 22 L 22 22 L 22 12 L 22 2 C 18.767 2 15.533 2 12.3 2 C 12.3 2 12.1 2 12 2 M 12 10.9 C 11.7 10.9 11.4 11 11.2 11.2 C 11 11.4 10.9 11.7 10.9 12 C 10.9 12.3 11 12.6 11.2 12.8 C 11.4 13 11.7 13.1 12 13.1 C 12.3 13.1 12.6 13 12.8 12.8 C 13 12.6 13.1 12.3 13.1 12 C 13.1 11.7 13 11.4 12.8 11.2 C 12.6 11 12.3 10.9 12 10.9 L 12 10.9 M 14.2 14.2 L 6 18 L 9.8 9.8 L 18 6"
|
||||||
android:valueTo="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 C 12 2 12 2 12 2 M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 M 12 12 L 12 12 L 12 12 L 12 12"
|
android:valueTo="M 12 2 C 9.3 2 2 2 2 2 L 2 12 L 2 22 L 12 22 L 22 22 L 22 12 L 22 2 C 22 2 13.8 2 12 2 C 12 2 12 2 12 2 M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 M 12 12 L 12 12 L 12 12 L 12 12"
|
||||||
android:valueType="pathType"
|
android:valueType="pathType"
|
||||||
android:interpolator="@android:interpolator/fast_out_slow_in"/>
|
android:interpolator="@android:interpolator/fast_out_slow_in"/>
|
||||||
</aapt:attr>
|
</aapt:attr>
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
android:pivotY="12">
|
android:pivotY="12">
|
||||||
<clip-path
|
<clip-path
|
||||||
android:name="mask"
|
android:name="mask"
|
||||||
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 C 12 2 12 2 12 2 M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 M 12 12 L 12 12 L 12 12 L 12 12"/>
|
android:pathData="M12,2C9.3,2,2,2,2,2v10v10h10h10V12V2C22,2,12.9,2,12,2L12,2 M12,12L12,12L12,12L12,12L12,12L12,12L12,12L12,12L12,12L12,12
|
||||||
|
M12,12L12,12L12,12L12,12"/>
|
||||||
<path
|
<path
|
||||||
android:name="path"
|
android:name="path"
|
||||||
android:pathData="M 12 20 C 9.879 20 7.843 19.157 6.343 17.657 C 4.843 16.157 4 14.121 4 12 C 4 9.879 4.843 7.843 6.343 6.343 C 7.843 4.843 9.879 4 12 4 C 14.121 4 16.157 4.843 17.657 6.343 C 19.157 7.843 20 9.879 20 12 C 20 14.121 19.157 16.157 17.657 17.657 C 16.157 19.157 14.121 20 12 20 M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z"
|
android:pathData="M 12 20 C 9.879 20 7.843 19.157 6.343 17.657 C 4.843 16.157 4 14.121 4 12 C 4 9.879 4.843 7.843 6.343 6.343 C 7.843 4.843 9.879 4 12 4 C 14.121 4 16.157 4.843 17.657 6.343 C 19.157 7.843 20 9.879 20 12 C 20 14.121 19.157 16.157 17.657 17.657 C 16.157 19.157 14.121 20 12 20 M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z"
|
||||||
|
@ -46,8 +47,8 @@
|
||||||
android:propertyName="pathData"
|
android:propertyName="pathData"
|
||||||
android:startOffset="125"
|
android:startOffset="125"
|
||||||
android:duration="325"
|
android:duration="325"
|
||||||
android:valueFrom="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 C 12 2 12 2 12 2 M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 M 12 12 L 12 12 L 12 12 L 12 12"
|
android:valueFrom="M 12 2 C 9.3 2 2 2 2 2 L 2 12 L 2 22 L 12 22 L 22 22 L 22 12 L 22 2 C 22 2 13.8 2 12 2 C 12 2 12 2 12 2 M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12 M 12 12 L 12 12 L 12 12 L 12 12"
|
||||||
android:valueTo="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.572 2.515 13.963 2.058 12.319 2.005 C 12.213 2.002 12.106 2 12 2 M 12 10.9 C 11.708 10.9 11.428 11.016 11.222 11.222 C 11.016 11.428 10.9 11.708 10.9 12 C 10.9 12.292 11.016 12.572 11.222 12.778 C 11.428 12.984 11.708 13.1 12 13.1 C 12.292 13.1 12.572 12.984 12.778 12.778 C 12.984 12.572 13.1 12.292 13.1 12 C 13.1 11.708 12.984 11.428 12.778 11.222 C 12.572 11.016 12.292 10.9 12 10.9 C 12 10.9 12 10.9 12 10.9 M 14.19 14.19 L 6 18 L 9.81 9.81 L 18 6"
|
android:valueTo="M 12 2 C 9.3 2 2 2 2 2 L 2 12 L 2 22 L 12 22 L 22 22 L 22 12 L 22 2 C 18.767 2 15.533 2 12.3 2 C 12.3 2 12.1 2 12 2 M 12 10.9 C 11.7 10.9 11.4 11 11.2 11.2 C 11 11.4 10.9 11.7 10.9 12 C 10.9 12.3 11 12.6 11.2 12.8 C 11.4 13 11.7 13.1 12 13.1 C 12.3 13.1 12.6 13 12.8 12.8 C 13 12.6 13.1 12.3 13.1 12 C 13.1 11.7 13 11.4 12.8 11.2 C 12.6 11 12.3 10.9 12 10.9 L 12 10.9 M 14.2 14.2 L 6 18 L 9.8 9.8 L 18 6"
|
||||||
android:valueType="pathType"
|
android:valueType="pathType"
|
||||||
android:interpolator="@android:interpolator/fast_out_slow_in"/>
|
android:interpolator="@android:interpolator/fast_out_slow_in"/>
|
||||||
</aapt:attr>
|
</aapt:attr>
|
||||||
|
|
|
@ -36,7 +36,8 @@
|
||||||
android:pivotY="12">
|
android:pivotY="12">
|
||||||
<clip-path
|
<clip-path
|
||||||
android:name="mask_1"
|
android:name="mask_1"
|
||||||
android:pathData="M 12 2 C 6.5 2 2 6.5 2 12 C 2 17.5 6.5 22 12 22 C 17.5 22 22 17.5 22 12 C 22 6.5 17.5 2 12 2 M 11.2 12.3 L 11.2 6.1 L 12.7 6.1 L 12.7 12.4 L 11.2 12.3 Z"/>
|
android:pathData="M12,2C9.3,2,2,2,2,2s0,7.2,0,10c0,2.6,0,10,0,10s7.1,0,10,0c2.6,0,10,0,10,0s0-7.1,0-10c0-2.2,0-10,0-10S15.3,2,12,2
|
||||||
|
M11.2,12.3V6.1h1.5v6.3L11.2,12.3z"/>
|
||||||
<group
|
<group
|
||||||
android:name="group"
|
android:name="group"
|
||||||
android:pivotX="12"
|
android:pivotX="12"
|
||||||
|
@ -44,7 +45,8 @@
|
||||||
android:rotation="125">
|
android:rotation="125">
|
||||||
<clip-path
|
<clip-path
|
||||||
android:name="mask"
|
android:name="mask"
|
||||||
android:pathData="M 12 2 C 6.5 2 2 6.5 2 12 C 2 17.5 6.5 22 12 22 C 17.5 22 22 17.5 22 12 C 22 6.5 17.5 2 12 2 M 11.2 12.3 L 11.2 6.1 L 12.7 6.1 L 12.7 12.4 L 11.2 12.3 Z"/>
|
android:pathData="M12,2C9.3,2,2,2,2,2s0,7.2,0,10c0,2.6,0,10,0,10s7.1,0,10,0c2.6,0,10,0,10,0s0-7.1,0-10c0-2.2,0-10,0-10S15.3,2,12,2
|
||||||
|
M11.2,12.3V6.1h1.5v6.3L11.2,12.3z"/>
|
||||||
<path
|
<path
|
||||||
android:name="path"
|
android:name="path"
|
||||||
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12"
|
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12"
|
||||||
|
|
|
@ -34,7 +34,8 @@
|
||||||
android:pivotY="12">
|
android:pivotY="12">
|
||||||
<clip-path
|
<clip-path
|
||||||
android:name="mask_1"
|
android:name="mask_1"
|
||||||
android:pathData="M 12 2 C 6.5 2 2 6.5 2 12 C 2 17.5 6.5 22 12 22 C 17.5 22 22 17.5 22 12 C 22 6.5 17.5 2 12 2 M 11.2 12.3 L 11.2 6.1 L 12.7 6.1 L 12.7 12.4 L 11.2 12.3 Z"/>
|
android:pathData="M12,2C9.3,2,2,2,2,2s0,7.2,0,10c0,2.6,0,10,0,10s7.1,0,10,0c2.6,0,10,0,10,0s0-7.1,0-10c0-2.2,0-10,0-10S15.3,2,12,2
|
||||||
|
M11.2,12.3V6.1h1.5v6.3L11.2,12.3z"/>
|
||||||
<group
|
<group
|
||||||
android:name="group"
|
android:name="group"
|
||||||
android:pivotX="12"
|
android:pivotX="12"
|
||||||
|
@ -42,7 +43,8 @@
|
||||||
android:rotation="125">
|
android:rotation="125">
|
||||||
<clip-path
|
<clip-path
|
||||||
android:name="mask"
|
android:name="mask"
|
||||||
android:pathData="M 12 2 C 6.5 2 2 6.5 2 12 C 2 17.5 6.5 22 12 22 C 17.5 22 22 17.5 22 12 C 22 6.5 17.5 2 12 2 M 11.2 12.3 L 11.2 6.1 L 12.7 6.1 L 12.7 12.4 L 11.2 12.3 Z"/>
|
android:pathData="M12,2C9.3,2,2,2,2,2s0,7.2,0,10c0,2.6,0,10,0,10s7.1,0,10,0c2.6,0,10,0,10,0s0-7.1,0-10c0-2.2,0-10,0-10S15.3,2,12,2
|
||||||
|
M11.2,12.3V6.1h1.5v6.3L11.2,12.3z"/>
|
||||||
<path
|
<path
|
||||||
android:name="path"
|
android:name="path"
|
||||||
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z M 12 20 C 9.879 20 7.843 19.157 6.343 17.657 C 4.843 16.157 4 14.121 4 12 C 4 9.879 4.843 7.843 6.343 6.343 C 7.843 4.843 9.879 4 12 4 C 14.121 4 16.157 4.843 17.657 6.343 C 19.157 7.843 20 9.879 20 12 C 20 14.121 19.157 16.157 17.657 17.657 C 16.157 19.157 14.121 20 12 20"
|
android:pathData="M 12 2 C 9.349 2 6.804 3.054 4.929 4.929 C 3.054 6.804 2 9.349 2 12 C 2 14.651 3.054 17.196 4.929 19.071 C 6.804 20.946 9.349 22 12 22 C 13.755 22 15.48 21.538 17 20.66 C 18.52 19.783 19.783 18.52 20.66 17 C 21.538 15.48 22 13.755 22 12 C 22 10.245 21.538 8.52 20.66 7 C 19.783 5.48 18.52 4.217 17 3.34 C 15.48 2.462 13.755 2 12 2 Z M 12 20 C 9.879 20 7.843 19.157 6.343 17.657 C 4.843 16.157 4 14.121 4 12 C 4 9.879 4.843 7.843 6.343 6.343 C 7.843 4.843 9.879 4 12 4 C 14.121 4 16.157 4.843 17.657 6.343 C 19.157 7.843 20 9.879 20 12 C 20 14.121 19.157 16.157 17.657 17.657 C 16.157 19.157 14.121 20 12 20"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue