mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-11-27 20:36:51 +01:00
Activity icons, fastlane screenshots, pebble widget steps fix
This commit is contained in:
vanous
parent
73b2be6da8
commit
30ebad8617
83
app/src/main/assets/sports_badmington.svg
Normal file
83
app/src/main/assets/sports_badmington.svg
Normal file
@ -0,0 +1,83 @@
|
||||
<?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="svg12"
|
||||
sodipodi:docname="sports_badmington.svg"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
||||
<metadata
|
||||
id="metadata18">
|
||||
<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="defs16" />
|
||||
<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="namedview14"
|
||||
showgrid="false"
|
||||
inkscape:zoom="11.092738"
|
||||
inkscape:cx="37.162384"
|
||||
inkscape:cy="25.090418"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="38"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg12" />
|
||||
<g
|
||||
id="g4">
|
||||
<rect
|
||||
fill="none"
|
||||
height="24"
|
||||
width="24"
|
||||
id="rect2" />
|
||||
</g>
|
||||
<path
|
||||
d="m 19.950218,3.6501062 c -2.34,-2.34 -6.62,-1.87 -9.55,1.06 -1.6,1.6 -2.52,3.87 -2.54,5.4599998 -0.02,1.580001 0.26,3.890001 -1.35,5.500001 l -4.24,4.24 1.42,1.42 4.24,-4.24 c 1.61,-1.61 3.92,-1.33 5.5,-1.35 1.58,-0.02 3.86,-0.94 5.46,-2.54 2.92,-2.930001 3.4,-7.2100008 1.06,-9.5500008 z m -9.2,9.1900008 c -1.53,-1.53 -1.05,-4.6100008 1.06,-6.7200008 2.11,-2.11 5.18,-2.59 6.72,-1.06 1.53,1.53 1.05,4.61 -1.06,6.7200008 -2.11,2.11 -5.18,2.59 -6.72,1.06 z"
|
||||
id="path6"
|
||||
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<g
|
||||
id="g912"
|
||||
transform="translate(0.23401207,-0.05573492)"
|
||||
style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
|
||||
<path
|
||||
d="m 21.377568,21.02156 c 0.09302,0 0.182529,0.03675 0.247467,0.10325 0.136896,0.1365 0.136896,0.35875 0,0.49525 -0.06494,0.06475 -0.154447,0.1015 -0.247467,0.1015 -0.09302,0 -0.182529,-0.03675 -0.247467,-0.10325 -0.136896,-0.1365 -0.136896,-0.35875 0,-0.49525 0.06494,-0.06475 0.154448,-0.1015 0.247467,-0.1015 m 0,-0.35 c -0.179019,0 -0.359793,0.06825 -0.496689,0.20475 -0.273793,0.273 -0.273793,0.71575 0,0.9905 0.136896,0.1365 0.31767,0.20475 0.496689,0.20475 0.179019,0 0.359793,-0.06825 0.496689,-0.20475 0.273793,-0.273 0.273793,-0.71575 0,-0.9905 -0.136896,-0.1365 -0.31767,-0.20475 -0.496689,-0.20475 z"
|
||||
id="path8"
|
||||
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<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-opacity:1"
|
||||
d="M 20.944499,21.92275 15.722053,19.209022"
|
||||
id="path892"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<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-opacity:1"
|
||||
d="M 22.004584,21.06064 18.758901,15.993056"
|
||||
id="path892-5"
|
||||
sodipodi:nodetypes="cc" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.7 KiB |
183
app/src/main/assets/sports_pingpong.svg
Normal file
183
app/src/main/assets/sports_pingpong.svg
Normal file
@ -0,0 +1,183 @@
|
||||
<?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="svg12"
|
||||
sodipodi:docname="sports_pingpong.svg"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
||||
<metadata
|
||||
id="metadata18">
|
||||
<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="defs16" />
|
||||
<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="namedview14"
|
||||
showgrid="false"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:object-nodes="false"
|
||||
inkscape:snap-nodes="false"
|
||||
inkscape:snap-others="false"
|
||||
inkscape:zoom="22.627417"
|
||||
inkscape:cx="23.738095"
|
||||
inkscape:cy="10.519266"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="38"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg12">
|
||||
<sodipodi:guide
|
||||
position="17.574052,26.877722"
|
||||
orientation="0,-1"
|
||||
id="guide883" />
|
||||
<sodipodi:guide
|
||||
position="5.3138494,18.987309"
|
||||
orientation="0,-1"
|
||||
id="guide885" />
|
||||
<sodipodi:guide
|
||||
position="16.549801,18.358566"
|
||||
orientation="1,0"
|
||||
id="guide887" />
|
||||
<sodipodi:guide
|
||||
position="3.265625,18"
|
||||
orientation="0,-1"
|
||||
id="guide891" />
|
||||
<sodipodi:guide
|
||||
position="10.949107,18.751942"
|
||||
orientation="1,0"
|
||||
id="guide895" />
|
||||
<sodipodi:guide
|
||||
position="12.650582,18.409437"
|
||||
orientation="1,0"
|
||||
id="guide897" />
|
||||
<sodipodi:guide
|
||||
position="13.542061,11.233501"
|
||||
orientation="1,0"
|
||||
id="guide918" />
|
||||
<sodipodi:guide
|
||||
position="11.468388,20.840117"
|
||||
orientation="0,-1"
|
||||
id="guide1057" />
|
||||
</sodipodi:namedview>
|
||||
<g
|
||||
id="g4">
|
||||
<rect
|
||||
fill="none"
|
||||
height="24"
|
||||
width="24"
|
||||
id="rect2" />
|
||||
</g>
|
||||
<g
|
||||
id="g1055"
|
||||
transform="translate(2.5371378,-1.0662573)">
|
||||
<path
|
||||
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;paint-order:fill markers stroke"
|
||||
id="path879"
|
||||
sodipodi:type="arc"
|
||||
sodipodi:arc-type="arc"
|
||||
sodipodi:open="true"
|
||||
sodipodi:start="0.57990613"
|
||||
sodipodi:end="5.706593"
|
||||
sodipodi:ry="4.9496808"
|
||||
sodipodi:rx="4.9498253"
|
||||
sodipodi:cy="-2.7809553"
|
||||
sodipodi:cx="11.285412"
|
||||
d="M 15.42601,-0.06880041 A 4.9498253,4.9496808 0 0 1 9.8662919,1.9609384 4.9498253,4.9496808 0 0 1 6.3355933,-2.7891565 4.9498253,4.9496808 0 0 1 9.8820139,-7.5275256 4.9498253,4.9496808 0 0 1 15.434976,-5.4793745"
|
||||
transform="rotate(70)" />
|
||||
<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-opacity:1"
|
||||
d="M 7.3821866,15.25384 8.8768583,19.144697 10.734492,18.468573 9.3596982,14.509489"
|
||||
id="path893"
|
||||
sodipodi:nodetypes="cccc" />
|
||||
<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-opacity:1"
|
||||
d="m 10.430878,12.618946 c -1.3828921,1.73803 -0.9630282,1.977724 -1.0299969,2.18556"
|
||||
id="path899"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<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-opacity:1"
|
||||
d="m 5.3453234,14.469936 c 2.1538725,0.450753 2.0286568,0.932477 2.211948,1.049226"
|
||||
id="path899-4"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<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-opacity:1"
|
||||
d="m 10.430878,12.618946 -5.0855546,1.85099"
|
||||
id="path916" />
|
||||
<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-opacity:1"
|
||||
d="M 11.035259,11.555228 4.2170508,14.036853"
|
||||
id="path920" />
|
||||
</g>
|
||||
<circle
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.999997;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
|
||||
id="path930"
|
||||
cx="6.5668674"
|
||||
cy="8.329855"
|
||||
r="1.5" />
|
||||
<path
|
||||
style="fill:#feffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;paint-order:fill markers stroke"
|
||||
id="path879-7"
|
||||
sodipodi:type="arc"
|
||||
sodipodi:arc-type="arc"
|
||||
sodipodi:open="true"
|
||||
sodipodi:start="0.57990613"
|
||||
sodipodi:end="5.706593"
|
||||
sodipodi:ry="4.9496808"
|
||||
sodipodi:rx="4.9498253"
|
||||
sodipodi:cy="-18.507776"
|
||||
sodipodi:cx="2.4408588"
|
||||
transform="rotate(110)"
|
||||
d="m 6.5814574,-15.795621 a 4.9498253,4.9496808 0 0 1 -5.5597185,2.029738 4.9498253,4.9496808 0 0 1 -3.5306986,-4.750094 4.9498253,4.9496808 0 0 1 3.5464206,-4.73837 4.9498253,4.9496808 0 0 1 5.5529616,2.048152" />
|
||||
<g
|
||||
id="g1016"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
transform="translate(2.7714608,-1.6578345)">
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 10.885327,15.160729 -1.3593007,3.936457 1.8576347,0.676124 1.500166,-3.928054"
|
||||
id="path893-2"
|
||||
sodipodi:nodetypes="cccc" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 14.911147,15.097075 c -2.176542,0.442503 -2.00898,0.896002 -2.193875,1.012167"
|
||||
id="path899-2"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 9.8255917,13.246085 c 1.3602233,1.729779 0.9546563,2.018314 1.0200213,2.225566"
|
||||
id="path899-4-6"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 14.911147,15.097075 9.8255917,13.246085"
|
||||
id="path916-1" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 7.3 KiB |
@ -190,13 +190,18 @@ public class ActivityKind {
|
||||
case TYPE_YOGA:
|
||||
return R.drawable.ic_activity_yoga;
|
||||
|
||||
// TODO: find icons
|
||||
case TYPE_SOCCER:
|
||||
return R.drawable.ic_activity_soccer;
|
||||
case TYPE_ROWING_MACHINE:
|
||||
return R.drawable.ic_activity_rowing;
|
||||
case TYPE_CRICKET:
|
||||
return R.drawable.ic_activity_cricket;
|
||||
case TYPE_BASKETBALL:
|
||||
return R.drawable.ic_activity_basketball;
|
||||
case TYPE_PINGPONG:
|
||||
return R.drawable.ic_activity_pingpong;
|
||||
case TYPE_BADMINTON:
|
||||
return R.drawable.ic_activity_badmington;
|
||||
|
||||
case TYPE_NOT_WORN: // fall through
|
||||
case TYPE_ACTIVITY: // fall through
|
||||
|
||||
@ -46,13 +46,12 @@ public class DailyTotals {
|
||||
long all_steps = 0;
|
||||
long all_sleep = 0;
|
||||
|
||||
|
||||
if (context instanceof GBApplication) {
|
||||
GBApplication gbApp = (GBApplication) context;
|
||||
List<? extends GBDevice> devices = gbApp.getDeviceManager().getDevices();
|
||||
for (GBDevice device : devices) {
|
||||
DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
|
||||
if (!coordinator.supportsActivityDataFetching()) {
|
||||
if (!coordinator.supportsActivityDataFetching() && !coordinator.supportsActivityTracking()) {
|
||||
continue;
|
||||
}
|
||||
long[] all_daily = getDailyTotalsForDevice(device, day);
|
||||
@ -60,8 +59,8 @@ public class DailyTotals {
|
||||
all_sleep += all_daily[1] + all_daily[2];
|
||||
}
|
||||
}
|
||||
LOG.debug("gbwidget daily totals, all steps:" + all_steps);
|
||||
LOG.debug("gbwidget daily totals, all sleep:" + all_sleep);
|
||||
//LOG.debug("gbwidget daily totals, all steps:" + all_steps);
|
||||
//LOG.debug("gbwidget daily totals, all sleep:" + all_sleep);
|
||||
return new long[]{all_steps, all_sleep};
|
||||
}
|
||||
|
||||
|
||||
32
app/src/main/res/drawable/ic_activity_badmington.xml
Normal file
32
app/src/main/res/drawable/ic_activity_badmington.xml
Normal file
@ -0,0 +1,32 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="m19.9502,3.6501c-2.34,-2.34 -6.62,-1.87 -9.55,1.06 -1.6,1.6 -2.52,3.87 -2.54,5.46 -0.02,1.58 0.26,3.89 -1.35,5.5l-4.24,4.24 1.42,1.42 4.24,-4.24c1.61,-1.61 3.92,-1.33 5.5,-1.35 1.58,-0.02 3.86,-0.94 5.46,-2.54 2.92,-2.93 3.4,-7.21 1.06,-9.55zM10.7502,12.8401c-1.53,-1.53 -1.05,-4.61 1.06,-6.72 2.11,-2.11 5.18,-2.59 6.72,-1.06 1.53,1.53 1.05,4.61 -1.06,6.72 -2.11,2.11 -5.18,2.59 -6.72,1.06z"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"/>
|
||||
<path
|
||||
android:pathData="m21.6116,20.9658c0.093,0 0.1825,0.0367 0.2475,0.1032 0.1369,0.1365 0.1369,0.3587 0,0.4952 -0.0649,0.0648 -0.1544,0.1015 -0.2475,0.1015 -0.093,0 -0.1825,-0.0367 -0.2475,-0.1032 -0.1369,-0.1365 -0.1369,-0.3587 0,-0.4952 0.0649,-0.0648 0.1544,-0.1015 0.2475,-0.1015m0,-0.35c-0.179,0 -0.3598,0.0683 -0.4967,0.2048 -0.2738,0.273 -0.2738,0.7157 0,0.9905 0.1369,0.1365 0.3177,0.2048 0.4967,0.2048 0.179,0 0.3598,-0.0683 0.4967,-0.2048 0.2738,-0.273 0.2738,-0.7157 0,-0.9905 -0.1369,-0.1365 -0.3177,-0.2048 -0.4967,-0.2048z"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"/>
|
||||
<path
|
||||
android:pathData="M21.1785,21.867 L15.9561,19.1533"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M22.2386,21.0049 L18.9929,15.9373"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
</vector>
|
||||
10
app/src/main/res/drawable/ic_activity_basketball.xml
Normal file
10
app/src/main/res/drawable/ic_activity_basketball.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="@color/secondarytext">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM5.23,7.75C6.1,8.62 6.7,9.74 6.91,11H4.07C4.22,9.82 4.63,8.72 5.23,7.75zM4.07,13h2.84c-0.21,1.26 -0.81,2.38 -1.68,3.25C4.63,15.28 4.22,14.18 4.07,13zM11,19.93c-1.73,-0.22 -3.29,-1 -4.49,-2.14c1.3,-1.24 2.19,-2.91 2.42,-4.79H11V19.93zM11,11H8.93C8.69,9.12 7.81,7.44 6.5,6.2C7.71,5.06 9.27,4.29 11,4.07V11zM19.93,11h-2.84c0.21,-1.26 0.81,-2.38 1.68,-3.25C19.37,8.72 19.78,9.82 19.93,11zM13,4.07c1.73,0.22 3.29,0.99 4.5,2.13c-1.31,1.24 -2.19,2.92 -2.43,4.8H13V4.07zM13,19.93V13h2.07c0.24,1.88 1.12,3.55 2.42,4.79C16.29,18.93 14.73,19.71 13,19.93zM18.77,16.25c-0.87,-0.86 -1.46,-1.99 -1.68,-3.25h2.84C19.78,14.18 19.37,15.28 18.77,16.25z"/>
|
||||
</vector>
|
||||
16
app/src/main/res/drawable/ic_activity_cricket.xml
Normal file
16
app/src/main/res/drawable/ic_activity_cricket.xml
Normal file
@ -0,0 +1,16 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="@color/secondarytext">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M15.04,12.79l-8.5,-8.5C6.35,4.1 6.09,4 5.83,4S5.32,4.1 5.13,4.29L2.29,7.13c-0.39,0.39 -0.39,1.03 0,1.42l8.5,8.5c0.2,0.2 0.45,0.29 0.71,0.29c0.26,0 0.51,-0.1 0.71,-0.29l2.83,-2.83C15.43,13.82 15.43,13.18 15.04,12.79zM11.5,14.92L4.41,7.83l1.42,-1.42l7.09,7.09L11.5,14.92z"/>
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M14.3412,17.7562l1.4142,-1.4142l4.2426,4.2426l-1.4142,1.4142z"/>
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M18.5,2C16.57,2 15,3.57 15,5.5C15,7.43 16.57,9 18.5,9S22,7.43 22,5.5C22,3.57 20.43,2 18.5,2zM18.5,7C17.67,7 17,6.33 17,5.5S17.67,4 18.5,4S20,4.67 20,5.5S19.33,7 18.5,7z"/>
|
||||
</vector>
|
||||
96
app/src/main/res/drawable/ic_activity_pingpong.xml
Normal file
96
app/src/main/res/drawable/ic_activity_pingpong.xml
Normal file
@ -0,0 +1,96 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M7.8778,13.4059A4.9498,4.9497 70.0081,0 1,4.0689 8.8757,4.9498 4.9497,70.0081 0,1 7.325,3.9333 4.9498,4.9497 70.0081,0 1,12.9905 5.6452,4.9498 4.9497,70.0081 0,1 12.9651,11.5638"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="@color/secondarytext"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:strokeLineCap="square"/>
|
||||
<path
|
||||
android:pathData="M9.9193,14.1876 L11.414,18.0784 13.2716,17.4023 11.8968,13.4432"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="m12.968,11.5527c-1.3829,1.738 -0.963,1.9777 -1.03,2.1856"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="m7.8825,13.4037c2.1539,0.4508 2.0287,0.9325 2.2119,1.0492"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="m12.968,11.5527 l-5.0856,1.851"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M13.5724,10.489 L6.7542,12.9706"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M6.5669,8.3299m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
|
||||
android:strokeWidth="0.999997"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:strokeLineCap="square"/>
|
||||
<path
|
||||
android:pathData="m12.592,11.587a4.9498,4.9497 110.0081,0 1,-0.0058 -5.9186,4.9498 4.9497,110.0081 0,1 5.6712,-1.6931 4.9498,4.9497 110.0081,0 1,3.2397 4.9532,4.9498 4.9497,110.0081 0,1 -3.8239,4.5176"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#feffff"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:strokeLineCap="square"/>
|
||||
<path
|
||||
android:pathData="m13.6568,13.5029 l-1.3593,3.9365 1.8576,0.6761 1.5002,-3.9281"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="m17.6826,13.4392c-2.1765,0.4425 -2.009,0.896 -2.1939,1.0122"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="m12.5971,11.5883c1.3602,1.7298 0.9547,2.0183 1.02,2.2256"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
<path
|
||||
android:pathData="M17.6826,13.4392 L12.5971,11.5883"
|
||||
android:strokeLineJoin="miter"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="@color/secondarytext"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="butt"/>
|
||||
</vector>
|
||||
10
app/src/main/res/drawable/ic_activity_rowing.xml
Normal file
10
app/src/main/res/drawable/ic_activity_rowing.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="@color/secondarytext">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M8.5,14.5L4,19l1.5,1.5L9,17h2L8.5,14.5zM15,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2s2,-0.9 2,-2S16.1,1 15,1zM21,21.01L18,24l-2.99,-3.01V19.5l-7.1,-7.09C7.6,12.46 7.3,12.48 7,12.48v-2.16c1.66,0.03 3.61,-0.87 4.67,-2.04l1.4,-1.55C13.42,6.34 14.06,6 14.72,6h0.03C15.99,6.01 17,7.02 17,8.26v5.75c0,0.84 -0.35,1.61 -0.92,2.16l-3.58,-3.58v-2.27c-0.63,0.52 -1.43,1.02 -2.29,1.39L16.5,18H18L21,21.01z"/>
|
||||
</vector>
|
||||
10
app/src/main/res/drawable/ic_activity_soccer.xml
Normal file
10
app/src/main/res/drawable/ic_activity_soccer.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="@color/secondarytext">
|
||||
<path
|
||||
android:fillColor="@color/secondarytext"
|
||||
android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM13,5.3l1.35,-0.95c1.82,0.56 3.37,1.76 4.38,3.34l-0.39,1.34l-1.35,0.46L13,6.7V5.3zM9.65,4.35L11,5.3v1.4L7.01,9.49L5.66,9.03L5.27,7.69C6.28,6.12 7.83,4.92 9.65,4.35zM7.08,17.11l-1.14,0.1C4.73,15.81 4,13.99 4,12c0,-0.12 0.01,-0.23 0.02,-0.35l1,-0.73L6.4,11.4l1.46,4.34L7.08,17.11zM14.5,19.59C13.71,19.85 12.87,20 12,20s-1.71,-0.15 -2.5,-0.41l-0.69,-1.49L9.45,17h5.11l0.64,1.11L14.5,19.59zM14.27,15H9.73l-1.35,-4.02L12,8.44l3.63,2.54L14.27,15zM18.06,17.21l-1.14,-0.1l-0.79,-1.37l1.46,-4.34l1.39,-0.47l1,0.73C19.99,11.77 20,11.88 20,12C20,13.99 19.27,15.81 18.06,17.21z"/>
|
||||
</vector>
|
||||
@ -3,12 +3,11 @@
|
||||
#Takes screenshots of Gadgetbridge for the fastlane.
|
||||
#Live Activity screenshot not taken, as it needs more inputs.
|
||||
|
||||
VERSION="0421"
|
||||
VERSION="0407"
|
||||
#Version sets clock in Android demo mode to version
|
||||
#to indicate when screenshots have been taken
|
||||
|
||||
DIR="metadata/android/en-US/images/phoneScreenshots/"
|
||||
#DIR="/tmp/"
|
||||
|
||||
#enable demo mode
|
||||
adb shell settings put global sysui_demo_allowed 1
|
||||
@ -27,8 +26,9 @@ sleep 3
|
||||
|
||||
adb shell screencap -p > $DIR"10-MainScreen.png"
|
||||
|
||||
|
||||
adb shell input tap 455 355
|
||||
sleep 0.5
|
||||
read -p "Select a day and press Enter"
|
||||
adb shell screencap -p > $DIR"20-ActivityAndSleep.png"
|
||||
|
||||
adb shell input tap 240 210
|
||||
@ -60,7 +60,7 @@ sleep 0.5
|
||||
adb shell input tap 670 1080
|
||||
sleep 0.5
|
||||
adb shell input keyevent 111
|
||||
sleep 1
|
||||
read -p "Select a day and press Enter"
|
||||
|
||||
adb shell screencap -p > $DIR"50-StepsPerWeek.png"
|
||||
|
||||
@ -71,6 +71,47 @@ adb shell screencap -p > $DIR"60-SpeedZones.png"
|
||||
#Go back to main screen
|
||||
adb shell input keyevent 111
|
||||
|
||||
#sports activities
|
||||
adb shell input tap 540 355
|
||||
read -p "Slide the activities and press Enter"
|
||||
adb shell screencap -p > $DIR"70-SportActivities.png"
|
||||
|
||||
|
||||
adb shell input tap 490 100
|
||||
read -p "Set the filter and press Enter"
|
||||
adb shell screencap -p > $DIR"71-SportActivitiesFilter.png"
|
||||
adb shell input tap 315 1100
|
||||
sleep 0.5
|
||||
adb shell input tap 585 110
|
||||
sleep 0.5
|
||||
adb shell screencap -p > $DIR"72-SportActivitiesSummary.png"
|
||||
|
||||
#dark mode. Here, we re-use old pictures, which due to a bug in f.droid, keep being cached on the server.
|
||||
#so we at least use them for dark mode, but do not add new ones
|
||||
|
||||
read -p "Set dark mode and press Enter"
|
||||
|
||||
adb shell screencap -p > $DIR"1-MainScreen.png"
|
||||
|
||||
adb shell input tap 455 355
|
||||
read -p "Select a day and press Enter"
|
||||
adb shell screencap -p > $DIR"2-ActivityAndSleep.png"
|
||||
|
||||
adb shell input tap 420 210
|
||||
read -p "slightly adjust label on chart and press Enter"
|
||||
adb shell screencap -p > $DIR"3-SleepPerWeek.png"
|
||||
|
||||
adb shell screencap -p > $DIR"4-StepsPerWeek.png"
|
||||
|
||||
adb shell input tap 590 210
|
||||
sleep 0.5
|
||||
adb shell input tap 590 210
|
||||
sleep 0.5
|
||||
adb shell screencap -p > $DIR"5-SpeedZones.png"
|
||||
|
||||
#Go back to main screen
|
||||
adb shell input keyevent 111
|
||||
|
||||
#disable demo mode
|
||||
adb shell am broadcast -a com.android.systemui.demo -e command exit
|
||||
adb shell settings put global sysui_demo_allowed 0
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 61 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 88 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 99 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 92 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 92 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 92 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 140 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 81 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 114 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 131 KiB |
Loading…
Reference in New Issue
Block a user