MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-08-24 16:21:16 +02:00
Code Releases Wiki Activity

Level up icons in Activity List. Improve empty record.

Browse Source
This commit is contained in:
vanous 2020-10-27 09:00:42 +01:00
parent e2a75d75d4
commit b364029f82
8 changed files with 137 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/assets/ic_distance.svg
View File

@ -7,9 +7,9 @@
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"
height="19.146656"
viewBox="0 0 19.380181 19.146656"
width="19.38018"
height="24"
viewBox="0 0 24.170443 24"
width="24.170443"
version="1.1"
id="svg6"
sodipodi:docname="ic_distance.svg"
@ -44,27 +44,38 @@
inkscape:snap-others="false"
inkscape:object-nodes="false"
inkscape:zoom="26.103965"
inkscape:cx="19.880713"
inkscape:cy="4.8398397"
inkscape:cx="22.380713"
inkscape:cy="6.9428897"
inkscape:window-x="0"
inkscape:window-y="38"
inkscape:window-maximized="1"
inkscape:current-layer="svg6" />
inkscape:current-layer="svg6"
inkscape:document-rotation="0"
lock-margins="true"
fit-margin-top="2.5"
fit-margin-left="2.5"
fit-margin-right="2.5"
fit-margin-bottom="2.5" />
<path
d="M -0.77182725,-2.0722505 H 23.228173 V 21.927749 H -0.77182725 Z"
d="M 1.7281728,0.0307995 H 25.728173 V 24.030799 H 1.7281728 Z"
fill="none"
id="path2" />
<path
d="m 6.0804285,11.546119 c -0.8360589,0 -1.5201071,-0.684048 -1.5201071,-1.520107 0,-0.8360578 0.6840483,-1.5201055 1.5201071,-1.5201055 0.836059,0 1.5201069,0.6840477 1.5201069,1.5201055 0,0.836059 -0.6840479,1.520107 -1.5201069,1.520107 z M 10.64075,10.178023 c 0,-2.7589943 -2.0141423,-4.712332 -4.5603215,-4.712332 -2.5461794,0 -4.5603214,1.9533377 -4.5603214,4.712332 0,1.778525 1.4821045,4.134691 4.5603214,6.94689 3.0782168,-2.812199 4.5603215,-5.168365 4.5603215,-6.94689 z M 6.0804285,3.9455838 c 3.1922253,0 6.0804285,2.4473729 6.0804285,6.2324392 0,2.523378 -2.029343,5.510388 -6.0804285,8.968632 C 2.029343,15.688411 0,12.701401 0,10.178023 0,6.3929567 2.8882037,3.9455838 6.0804285,3.9455838 Z"
id="path4"
style="stroke-width:1" />
<path
d="m 16.105923,4.2275996 c -0.421371,0 -0.76613,-0.344759 -0.76613,-0.76613 0,-0.4213716 0.344759,-0.7661296 0.76613,-0.7661296 0.421372,0 0.76613,0.344758 0.76613,0.7661296 0,0.421371 -0.344758,0.76613 -0.76613,0.76613 z m 2.29839,-0.689517 c 0,-1.3905256 -1.015122,-2.3750026 -2.29839,-2.3750026 -1.283268,0 -2.29839,0.984477 -2.29839,2.3750026 0,0.896372 0.746977,2.083873 2.29839,3.501214 1.551413,-1.417341 2.29839,-2.604842 2.29839,-3.501214 z m -2.29839,-3.14113259 c 1.608873,0 3.06452,1.23346899 3.06452,3.14113259 0,1.271776 -1.022784,2.777221 -3.06452,4.520167 -2.041736,-1.742946 -3.06452,-3.248391 -3.06452,-4.520167 0,-1.9076636 1.455647,-3.14113259 3.06452,-3.14113259 z"
id="path4-3"
style="stroke-width:0.999999" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 8.399119,18.046615 C 25.927241,13.211774 8.3489042,11.251336 15.01982,7.7851976"
id="path852"
sodipodi:nodetypes="cc" />
<g
id="g3324"
transform="matrix(1,0,0,1.0133493,2.5,2.097751)"
style="stroke-width:0.993391">
<path
d="m 6.0804285,11.546119 c -0.8360589,0 -1.5201071,-0.684048 -1.5201071,-1.520107 0,-0.8360578 0.6840483,-1.5201055 1.5201071,-1.5201055 0.836059,0 1.5201069,0.6840477 1.5201069,1.5201055 0,0.836059 -0.6840479,1.520107 -1.5201069,1.520107 z M 10.64075,10.178023 c 0,-2.7589943 -2.0141423,-4.712332 -4.5603215,-4.712332 -2.5461794,0 -4.5603214,1.9533377 -4.5603214,4.712332 0,1.778525 1.4821045,4.134691 4.5603214,6.94689 3.0782168,-2.812199 4.5603215,-5.168365 4.5603215,-6.94689 z M 6.0804285,3.9455838 c 3.1922253,0 6.0804285,2.4473729 6.0804285,6.2324392 0,2.523378 -2.029343,5.510388 -6.0804285,8.968632 C 2.029343,15.688411 0,12.701401 0,10.178023 0,6.3929567 2.8882037,3.9455838 6.0804285,3.9455838 Z"
id="path4"
style="stroke-width:0.993391" />
<path
d="m 16.105923,4.2275996 c -0.421371,0 -0.76613,-0.344759 -0.76613,-0.76613 0,-0.4213716 0.344759,-0.7661296 0.76613,-0.7661296 0.421372,0 0.76613,0.344758 0.76613,0.7661296 0,0.421371 -0.344758,0.76613 -0.76613,0.76613 z m 2.29839,-0.689517 c 0,-1.3905256 -1.015122,-2.3750026 -2.29839,-2.3750026 -1.283268,0 -2.29839,0.984477 -2.29839,2.3750026 0,0.896372 0.746977,2.083873 2.29839,3.501214 1.551413,-1.417341 2.29839,-2.604842 2.29839,-3.501214 z m -2.29839,-3.14113259 c 1.608873,0 3.06452,1.23346899 3.06452,3.14113259 0,1.271776 -1.022784,2.777221 -3.06452,4.520167 -2.041736,-1.742946 -3.06452,-3.248391 -3.06452,-4.520167 0,-1.9076636 1.455647,-3.14113259 3.06452,-3.14113259 z"
id="path4-3"
style="stroke-width:0.99339" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.993391;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 8.399119,18.046615 C 25.927241,13.211774 8.3489042,11.251336 15.01982,7.7851976"
id="path852"
sodipodi:nodetypes="cc" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

110
app/src/main/assets/ic_intensity.svg
View File

@ -1,94 +1,20 @@
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="20.465673"
viewBox="0 0 12.461885 20.465673"
width="12.461885"
version="1.1"
id="svg6"
sodipodi:docname="ic_intensity2.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<g
id="g852"
transform="matrix(1.2633472,0,0,1.2633472,-7.0842384,-0.67734805)"
style="stroke-width:0.791548">
<path
fill="currentColor"
d="M 5.607515,11.686925 H 8.1252115 L 9.465446,6.8235586 10.96387,12.147587 12.471175,3.5240992 15.471696,11.686925 15.378398,14.515508 12.813693,7.3561261 11.311914,16.735717 9.4890299,10.441173 8.8928532,13.174786 6.4142216,13.174385 Z"
id="path2361"
sodipodi:nodetypes="ccccccccccccc"
style="stroke-width:0.791543"
inkscape:transform-center-x="0.77456355"
inkscape:transform-center-y="-1.4792654" />
<path
d="M 9.1454321,2.0091519 C 9.5324975,1.9556103 9.8035425,1.5818286 9.7477555,1.1785257 9.6919675,0.77522288 9.3296334,0.48905438 8.942568,0.54259588 8.5555035,0.59613728 8.2844579,0.96991921 8.3402456,1.3732221 8.3960336,1.776525 8.7583676,2.0626932 9.1454321,2.0091519 Z M 8.7316404,7.2832811 8.8161724,5.6413122 10.05796,5.9645671 10.13763,7.1563547 10.958841,7.1254797 10.779661,5.3602183 9.3400311,4.9714687 9.3990101,3.8423473 c 0.5335143,0.4866822 1.2879859,0.755973 2.0621139,0.64889 L 11.359694,3.7579588 C 10.691129,3.8504397 10.077409,3.5616792 9.7249045,3.087324 L 9.291882,2.5493755 C 9.1207016,2.3488618 8.8892885,2.2314106 8.6429739,2.2654826 8.537411,2.2800847 8.4721073,2.3264834 8.3665441,2.3410857 L 6.6483576,3.4007966 6.8867229,5.124 7.5904774,5.0266518 7.4180429,3.7800791 8.0159208,3.4358185 7.869675,6.8781207 6.7695976,8.2657413 7.1039661,9.0398223 Z"
id="path4"
style="stroke-width:0.791547"
sodipodi:nodetypes="sssssccccccccccccscccccccccc" />
</g>
<metadata
id="metadata12">
<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>
<defs
id="defs10" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1042"
id="namedview8"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="22.185475"
inkscape:cx="7.4963196"
inkscape:cy="6.3791957"
inkscape:window-x="0"
inkscape:window-y="38"
inkscape:window-maximized="1"
inkscape:current-layer="svg6"
inkscape:document-rotation="0"
inkscape:snap-others="false">
<sodipodi:guide
position="13.511677,10.539359"
orientation="0,-1"
id="guide843" />
<sodipodi:guide
position="6.4686785,10.964203"
orientation="0,-1"
id="guide845" />
<sodipodi:guide
position="5.0713686,10.08525"
orientation="0,-1"
id="guide847" />
<sodipodi:guide
position="4.8009216,8.5977896"
orientation="0,-1"
id="guide849" />
</sodipodi:namedview>
<path
d="M -5.7690573,-1.7671634 H 18.230943 V 22.232837 H -5.7690573 Z"
fill="none"
id="path2" />
<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" height="24" viewBox="-2.7755576e-17 -2.7755576e-17 21.367055 24" width="21.367056" version="1.1" id="svg6" sodipodi:docname="ic_intensity.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<g id="g3949"/>
<metadata id="metadata12">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format/>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<defs id="defs10"/>
<sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1042" id="namedview8" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:zoom="22.185475" inkscape:cx="23.811004" inkscape:cy="13.427636" inkscape:window-x="0" inkscape:window-y="38" inkscape:window-maximized="1" inkscape:current-layer="svg6" inkscape:document-rotation="0" inkscape:snap-others="false" fit-margin-top="2.5" fit-margin-left="2.5" fit-margin-right="2.5" fit-margin-bottom="2.5" lock-margins="true" viewbox-height="25.46567" inkscape:pagecheckerboard="true" scale-x="1" viewbox-x="0" viewbox-y="0">
<sodipodi:guide position="15.732031,12.43419" orientation="0,-1" id="guide843"/>
<sodipodi:guide position="8.6890316,12.859034" orientation="0,-1" id="guide845"/>
<sodipodi:guide position="7.2917227,11.980081" orientation="0,-1" id="guide847"/>
<sodipodi:guide position="7.0212757,10.49262" orientation="0,-1" id="guide849"/>
</sodipodi:namedview>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

90
app/src/main/assets/ic_shoe.svg
View File

@ -1,74 +1,20 @@
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 24 24"
height="24"
viewBox="0 0 24 24"
width="24"
version="1.1"
id="svg1685"
sodipodi:docname="ic_shoe.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<metadata
id="metadata1691">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs1689" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1042"
id="namedview1687"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="22.185475"
inkscape:cx="24.454686"
inkscape:cy="8.5363032"
inkscape:window-x="0"
inkscape:window-y="38"
inkscape:window-maximized="1"
inkscape:current-layer="g1683">
<sodipodi:guide
position="6.9189413,13.542708"
orientation="1,0"
id="guide2254" />
<sodipodi:guide
position="7.4147612,14.252632"
orientation="0,-1"
id="guide2256" />
</sodipodi:namedview>
<g
id="g1683">
<rect
fill="none"
height="24"
width="24"
id="rect1679" />
<path
d="M 18.51,15.68 17.1,14.27 21.58,9.79 23,11.2 Z M 14.185167,13.058927 18.05,9.08 13.8,4.82 9.9251666,8.7989268 l -1.42,-1.42 L 13.8,2 v 0 l 7.08,7.08 -5.274833,5.388927 z M 15.24,15.26 13.83,16.67 v 0 L 10.5,20 H 1 V 17.37 C 1,16.53 1.52,15.8 2.3,15.49 2.88,15.26 3.58,14.93 4.27,14.47 l 1.38,1.38 C 5.74,15.95 5.87,16 6,16 c 0.13,0 0.26,-0.05 0.36,-0.15 0.2,-0.2 0.2,-0.51 0,-0.71 L 5.08,13.86 c 0.27,-0.24 0.53,-0.51 0.77,-0.8 l 1.27,1.27 c 0.09,0.1 0.23,0.15 0.35,0.15 0.12,0 0.25,-0.05 0.35,-0.15 0.2,-0.2 0.2,-0.51 0,-0.71 l -1.4,-1.4 C 6.61,11.88 6.76,11.5 6.87,11.1 l 1.71,1.72 c 0.09,0.1 0.23,0.15 0.35,0.15 0.12,0 0.25,-0.05 0.35,-0.15 0.19,-0.2 0.19,-0.5 0.01,-0.7 l -2.3710587,-2.372632 1.42,-1.41 z m -2.82,0 -1.67,-1.68 -3.33,3.32 C 6.64,17.68 5.37,17.68 4.59,16.89 L 4.4,16.72 3.93,16.96 C 3.64,17.1 3.34,17.23 3.04,17.35 L 3.03,18 h 6.64 z"
id="path1681"
sodipodi:nodetypes="ccccccccccccccccccccscccssscccssscccsccccccccccccccc" />
</g>
<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" enable-background="new 0 0 24 24" height="24" viewBox="0 0 27 24" width="27" version="1.1" id="svg1685" sodipodi:docname="ic_shoe.svg" inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<metadata id="metadata1691">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format/>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<defs id="defs1689"/>
<sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1042" id="namedview1687" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:zoom="22.185475" inkscape:cx="11.936505" inkscape:cy="9.4419739" inkscape:window-x="0" inkscape:window-y="38" inkscape:window-maximized="1" inkscape:current-layer="g1683" inkscape:document-rotation="0" lock-margins="false" fit-margin-left="2.5" fit-margin-right="2.5" fit-margin-top="2.5" fit-margin-bottom="2.5" inkscape:pagecheckerboard="true">
<sodipodi:guide position="8.418941,13.042708" orientation="1,0" id="guide2254"/>
<sodipodi:guide position="8.914761,13.752632" orientation="0,-1" id="guide2256"/>
</sodipodi:namedview>
<g id="g1683" transform="translate(1.5,0.4999999)">
<rect fill="none" height="24" width="24" id="rect1679" x="0" y="0"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
View File

@ -20,6 +20,7 @@ package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.format.DateUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -136,6 +137,11 @@ public class ActivityListingChartFragment extends AbstractChartFragment {
//have an "Unknown Activity" in the list in case there are no active sessions
List<StepAnalysis.StepSession> result = new ArrayList<>();
int tsTo = tsDateFrom + 24 * 60 * 60 - 1;
if (DateUtils.isToday(tsDateFrom * 1000L)) {
Calendar day = Calendar.getInstance();
day.set(Calendar.SECOND, 0);
tsTo = (int) (day.getTimeInMillis() / 1000);
}
result.add(new StepAnalysis.StepSession(new Date(tsDateFrom * 1000L), new Date(tsTo * 1000L), 0, 0, 0, 0, ActivityKind.TYPE_UNKNOWN));
return result;
}

23
app/src/main/res/drawable/ic_distance.xml
View File

@ -1,5 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="19.38018dp" android:height="19.146656dp" android:viewportWidth="19.38018" android:tint="#7E7E7E" android:viewportHeight="19.146656">
<path android:fillColor="#FF000000" android:pathData="M6.08 11.546c-0.836 0-1.52-0.684-1.52-1.52s0.684-1.52 1.52-1.52S7.6 9.19 7.6 10.026s-0.683 1.52-1.52 1.52zm4.56-1.368c0-2.759-2.013-4.712-4.56-4.712-2.546 0-4.56 1.953-4.56 4.712 0 1.778 1.482 4.135 4.56 6.947 3.079-2.812 4.56-5.168 4.56-6.947zM6.08 3.946c3.193 0 6.08 2.447 6.08 6.232 0 2.523-2.029 5.51-6.08 8.969C2.03 15.688 0 12.7 0 10.178c0-3.785 2.888-6.232 6.08-6.232z" android:strokeWidth="1"/>
<path android:fillColor="#FF000000" android:pathData="M16.106 4.228c-0.422 0-0.766-0.345-0.766-0.766 0-0.422 0.345-0.767 0.766-0.767 0.421 0 0.766 0.345 0.766 0.767 0 0.42-0.345 0.766-0.766 0.766zm2.298-0.69c0-1.39-1.015-2.375-2.298-2.375-1.283 0-2.299 0.985-2.299 2.375 0 0.897 0.747 2.084 2.299 3.501 1.551-1.417 2.298-2.604 2.298-3.5zm-2.298-3.141c1.609 0 3.064 1.234 3.064 3.141 0 1.272-1.022 2.777-3.064 4.52-2.042-1.743-3.065-3.248-3.065-4.52 0-1.908 1.456-3.141 3.065-3.141z" android:strokeWidth="0.999999"/>
<path android:pathData="M8.4 18.047c17.527-4.835-0.051-6.796 6.62-10.262" android:strokeWidth="1" android:strokeColor="#000000" android:fillType="evenOdd"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.170443dp"
android:height="24dp"
android:tint="#7E7E7E"
android:viewportWidth="24.170443"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M8.58 13.798c-0.836 0-1.52-0.693-1.52-1.54 0-0.848 0.684-1.54 1.52-1.54s1.52 0.692 1.52 1.54c0 0.847-0.684 1.54-1.52 1.54zm4.56-1.386c0-2.796-2.013-4.776-4.56-4.776-2.546 0-4.56 1.98-4.56 4.776 0 1.802 1.482 4.19 4.56 7.04 3.079-2.85 4.56-5.238 4.56-7.04zM8.58 6.096c3.193 0 6.08 2.48 6.08 6.316 0 2.557-2.029 5.583-6.08 9.088-4.05-3.504-6.08-6.531-6.08-9.088 0-3.836 2.888-6.316 6.08-6.316z"
android:strokeWidth="0.993391" />
<path
android:fillColor="#FF000000"
android:pathData="M18.606 6.382c-0.422 0-0.766-0.35-0.766-0.777 0-0.427 0.345-0.776 0.766-0.776 0.421 0 0.766 0.35 0.766 0.776 0 0.427-0.345 0.777-0.766 0.777zm2.298-0.699c0-1.409-1.015-2.407-2.298-2.407-1.283 0-2.299 0.998-2.299 2.407 0 0.908 0.747 2.112 2.299 3.548 1.551-1.436 2.298-2.64 2.298-3.548zM18.606 2.5c1.609 0 3.064 1.25 3.064 3.183 0 1.289-1.022 2.814-3.064 4.58-2.042-1.766-3.065-3.291-3.065-4.58 0-1.933 1.456-3.183 3.065-3.183z"
android:strokeWidth="0.99339" />
<path
android:fillType="evenOdd"
android:pathData="M10.9 20.385c17.527-4.9-0.051-6.886 6.62-10.398"
android:strokeWidth="0.993391"
android:strokeColor="#000000" />
</vector>

17
app/src/main/res/drawable/ic_intensity.xml
View File

@ -1,4 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="12.461885dp" android:height="20.465673dp" android:tint="#7E7E7E" android:viewportWidth="12.461885" android:viewportHeight="20.465673">
<path android:pathData="M0 14.087h3.18l1.694-6.144 1.893 6.726L8.67 3.775l3.79 10.312-0.117 3.574-3.24-9.045-1.897 11.85-2.303-7.953-0.753 3.454H1.018z" android:strokeWidth="0.791543" android:fillColor="#FF000000"/>
<path android:fillColor="#FF000000" android:pathData="M4.47 1.86C4.959 1.794 5.3 1.322 5.23 0.813 5.16 0.302 4.703-0.06 4.214 0.008c-0.489 0.068-0.831 0.54-0.76 1.05 0.07 0.509 0.528 0.87 1.017 0.803zM3.947 8.525L4.054 6.45l1.568 0.408 0.101 1.506 1.038-0.04-0.227-2.23-1.819-0.49 0.075-1.427c0.674 0.615 1.627 0.955 2.605 0.82L7.267 4.07c-0.845 0.117-1.62-0.248-2.065-0.847l-0.547-0.68C4.438 2.29 4.146 2.142 3.835 2.185 3.7 2.203 3.619 2.262 3.485 2.28L1.316 3.62l0.301 2.177 0.89-0.123-0.219-1.575 0.756-0.435-0.185 4.35-1.39 1.752 0.423 0.978z" android:strokeWidth="0.791547"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="21.367056dp"
android:height="24dp"
android:tint="#7E7E7E"
android:viewportWidth="21.367056"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="m2.5,15.5784h4.1775L8.9012,9.8743 11.3875,16.1187 13.8885,6.0045 18.8671,15.5784 18.7123,18.896 14.4568,10.4989 11.965,21.5 8.9404,14.1173 7.9512,17.3235 3.8385,17.323Z"
android:strokeWidth="0.999994" />
<path
android:fillColor="#FF000000"
android:pathData="M8.9696,4.2276C9.4586,4.1648 9.801,3.7264 9.7306,3.2534 9.6601,2.7804 9.2023,2.4448 8.7133,2.5076 8.2243,2.5704 7.8819,3.0088 7.9524,3.4818 8.0229,3.9548 8.4806,4.2904 8.9696,4.2276ZM8.4469,10.4135 L8.5536,8.4877 10.1225,8.8668 10.2231,10.2646 11.2606,10.2284 11.0342,8.158 9.2155,7.7021 9.29,6.3777C9.964,6.9486 10.9171,7.2644 11.8951,7.1388L11.767,6.2788C10.9224,6.3872 10.147,6.0486 9.7017,5.4922L9.1546,4.8612C8.9384,4.6261 8.646,4.4883 8.3348,4.5283 8.2015,4.5454 8.119,4.5998 7.9856,4.617L5.8149,5.8599 6.1161,7.881 7.0052,7.7668 6.7873,6.3047 7.5427,5.9009 7.3579,9.9383l-1.3898,1.6275 0.4224,0.9079z"
android:strokeWidth="1" />
</vector>

12
app/src/main/res/drawable/ic_shoe.xml
View File

@ -1,3 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:tint="#7E7E7E" android:viewportHeight="24">
<path android:fillColor="#FF000000" android:pathData="M18.51 15.68l-1.41-1.41 4.48-4.48L23 11.2zm-4.325-2.621L18.05 9.08 13.8 4.82 9.925 8.799l-1.42-1.42L13.8 2l7.08 7.08-5.275 5.389zm1.055 2.201l-1.41 1.41L10.5 20H1v-2.63c0-0.84 0.52-1.57 1.3-1.88 0.58-0.23 1.28-0.56 1.97-1.02l1.38 1.38C5.74 15.95 5.87 16 6 16c0.13 0 0.26-0.05 0.36-0.15 0.2-0.2 0.2-0.51 0-0.71l-1.28-1.28c0.27-0.24 0.53-0.51 0.77-0.8l1.27 1.27c0.09 0.1 0.23 0.15 0.35 0.15 0.12 0 0.25-0.05 0.35-0.15 0.2-0.2 0.2-0.51 0-0.71l-1.4-1.4c0.19-0.34 0.34-0.72 0.45-1.12l1.71 1.72c0.09 0.1 0.23 0.15 0.35 0.15 0.12 0 0.25-0.05 0.35-0.15 0.19-0.2 0.19-0.5 0.01-0.7L6.919 9.747l1.42-1.41zm-2.82 0l-1.67-1.68-3.33 3.32c-0.78 0.78-2.05 0.78-2.83-0.01L4.4 16.72l-0.47 0.24c-0.29 0.14-0.59 0.27-0.89 0.39L3.03 18h6.64z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="27dp"
android:height="24dp"
android:tint="#7E7E7E"
android:viewportWidth="27"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M20.01,16.94 L18.6,15.4517 23.08,10.7228 24.5,12.2111ZM15.6852,14.1733 L19.55,9.9733 15.3,5.4767 11.4252,9.6766 10.0052,8.1778 15.3,2.5v0l7.08,7.4733 -5.2748,5.6883zM16.74,16.4967 L15.33,17.985v0l-3.33,3.515L2.5,21.5L2.5,18.7239c0,-0.8867 0.52,-1.6572 1.3,-1.9844 0.58,-0.2428 1.28,-0.5911 1.97,-1.0767l1.38,1.4567c0.09,0.1056 0.22,0.1583 0.35,0.1583 0.13,0 0.26,-0.0528 0.36,-0.1583 0.2,-0.2111 0.2,-0.5383 0,-0.7494L6.58,15.0189c0.27,-0.2533 0.53,-0.5383 0.77,-0.8444l1.27,1.3406c0.09,0.1056 0.23,0.1583 0.35,0.1583 0.12,0 0.25,-0.0528 0.35,-0.1583 0.2,-0.2111 0.2,-0.5383 0,-0.7494l-1.4,-1.4778c0.19,-0.3589 0.34,-0.76 0.45,-1.1822l1.71,1.8156c0.09,0.1056 0.23,0.1583 0.35,0.1583 0.12,0 0.25,-0.0528 0.35,-0.1583 0.19,-0.2111 0.19,-0.5278 0.01,-0.7389l-2.3711,-2.5044 1.42,-1.4883zM13.92,16.4967 L12.25,14.7233 8.92,18.2278C8.14,19.0511 6.87,19.0511 6.09,18.2172L5.9,18.0378 5.43,18.2911c-0.29,0.1478 -0.59,0.285 -0.89,0.4117L4.53,19.3889h6.64z"
android:strokeWidth="1" />
</vector>

45
app/src/main/res/layout/activity_list_item.xml
View File

@ -106,7 +106,7 @@
<ImageView
android:id="@+id/line_layout_gps_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_height="19dp"
android:layout_gravity="end"
android:contentDescription="@string/candidate_item_device_image"
app:srcCompat="@android:drawable/ic_menu_mylocation" />
@ -116,22 +116,23 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginTop="6dp"
android:gravity="bottom"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/line_layout_step"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:gravity="start"
android:gravity="bottom|start"
android:orientation="horizontal">
<ImageView
android:id="@+id/line_layout_step_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="start"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="bottom|start"
android:contentDescription="@string/candidate_item_device_image"
app:srcCompat="@drawable/ic_shoe" />
@ -140,13 +141,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:gravity="start"
android:maxLines="1"
android:scrollHorizontally="false"
android:text="2000" />
android:text="15000" />
</LinearLayout>
@ -160,8 +160,8 @@
<ImageView
android:id="@+id/line_layout_intensity_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="start"
android:contentDescription="@string/candidate_item_device_image"
app:srcCompat="@drawable/ic_intensity" />
@ -171,13 +171,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:gravity="start"
android:maxLines="1"
android:scrollHorizontally="false"
android:text="200" />
android:text="101" />
</LinearLayout>
@ -191,8 +190,8 @@
<ImageView
android:id="@+id/line_layout_distance_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="start"
android:contentDescription="@string/candidate_item_device_image"
app:srcCompat="@drawable/ic_distance" />
@ -202,13 +201,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:gravity="start"
android:maxLines="1"
android:scrollHorizontally="false"
android:text="2.5km" />
android:text="15.1km" />
</LinearLayout>
@ -222,8 +220,8 @@
<ImageView
android:id="@+id/line_layout_hr_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_gravity="start"
android:contentDescription="@string/candidate_item_device_image"
app:srcCompat="@drawable/ic_heartrate" />
@ -233,13 +231,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:layout_weight="1"
android:gravity="start"
android:maxLines="1"
android:scrollHorizontally="false"
android:text="2.5km" />
android:text="122" />
</LinearLayout>