MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-04 05:57:33 +01:00
Code Releases Wiki Activity

Xiaomi-protobuf: Map some missing freestyle workouts

Browse Source
This commit is contained in:
José Rebelo 2025-01-20 20:28:14 +00:00
parent 033e263b6b
commit 0d8e270686
4 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
View File

@ -156,7 +156,7 @@ public enum ActivityKind {
FITNESS_EXERCISES(0x04000061, R.string.activity_type_fitness_exercises),
CROSSFIT(0x04000062, R.string.activity_type_crossfit),
FUNCTIONAL_TRAINING(0x04000063, R.string.activity_type_functional_training),
PHYSICAL_TRAINING(0x04000064, R.string.activity_type_physical_training),
PHYSICAL_TRAINING(0x04000064, R.string.activity_type_physical_training, R.drawable.ic_activity_free_training),
TAEKWONDO(0x04000065, R.string.activity_type_taekwondo),
TAE_BO(0x04000066, R.string.activity_type_tae_bo),
CROSS_COUNTRY_RUNNING(0x04000067, R.string.activity_type_cross_country_running),
@ -184,7 +184,7 @@ public enum ActivityKind {
LONG_JUMP(0x0400007d, R.string.activity_type_long_jump),
HIGH_JUMP(0x0400007e, R.string.activity_type_high_jump),
TRAMPOLINE(0x0400007f, R.string.activity_type_trampoline),
DUMBBELL(0x04000080, R.string.activity_type_dumbbell),
DUMBBELL(0x04000080, R.string.activity_type_dumbbell, R.drawable.ic_activity_dumbbell),
BELLY_DANCE(0x04000081, R.string.activity_type_belly_dance),
JAZZ_DANCE(0x04000082, R.string.activity_type_jazz_dance),
LATIN_DANCE(0x04000083, R.string.activity_type_latin_dance),
@ -297,6 +297,7 @@ public enum ActivityKind {
TRAIL_RUN(0x040000f2, R.string.activity_type_trail_run, R.drawable.ic_activity_trail_run),
UPPER_BODY(0x040000f3, R.string.activity_type_upper_body),
LOWER_BODY(0x040000ff, R.string.activity_type_lower_body),
BARBELL(0x04000100, R.string.activity_type_barbell, R.drawable.ic_activity_barbell),
;
private final int code;

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
View File

@ -157,6 +157,18 @@ public class XiaomiSimpleActivityParser {
case 310: // aerobics 0x0136
summary.setActivityKind(ActivityKind.AEROBICS.getCode());
break;
case 311: // physical training
summary.setActivityKind(ActivityKind.PHYSICAL_TRAINING.getCode());
break;
case 313: // dumbbell
summary.setActivityKind(ActivityKind.DUMBBELL.getCode());
break;
case 314: // barbell
summary.setActivityKind(ActivityKind.BARBELL.getCode());
break;
case 318: // sit-ups
summary.setActivityKind(ActivityKind.SIT_UPS.getCode());
break;
case 320: // upper body 0x0140
summary.setActivityKind(ActivityKind.UPPER_BODY.getCode());
break;

32
app/src/main/res/drawable/ic_activity_barbell.xml Normal file
View File

@ -0,0 +1,32 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="471.48"
android:viewportHeight="471.48">
<!--
Licensed under public domain
https://www.svgrepo.com/svg/103470/barbell
-->
<path
android:fillColor="#7E7E7E"
android:pathData="M71.87,52.87c-5.52,0 -10,4.48 -10,10v109.5c0,5.52 4.48,10 10,10s10,-4.48 10,-10V62.87C81.87,57.35 77.4,52.87 71.87,52.87z" />
<path
android:fillColor="#7E7E7E"
android:pathData="M46.72,70.1c-5.52,0 -10,4.48 -10,10v27.52H10c-5.52,0 -10,4.48 -10,10s4.48,10 10,10h26.72v27.52c0,5.52 4.48,10 10,10s10,-4.48 10,-10V80.1C56.72,74.57 52.24,70.1 46.72,70.1z" />
<path
android:fillColor="#7E7E7E"
android:pathData="M399.6,52.87c-5.52,0 -10,4.48 -10,10v109.5c0,5.52 4.48,10 10,10s10,-4.48 10,-10V62.87C409.6,57.35 405.13,52.87 399.6,52.87z" />
<path
android:fillColor="#7E7E7E"
android:pathData="M374.45,52.87c-5.52,0 -10,4.48 -10,10v44.75h-12.21V90.62c0,-5.52 -4.48,-10 -10,-10s-10,4.48 -10,10v17H139.24V90.62c0,-5.52 -4.48,-10 -10,-10s-10,4.48 -10,10v17h-12.21V62.87c0,-5.52 -4.48,-10 -10,-10s-10,4.48 -10,10v109.5c0,5.52 4.48,10 10,10s10,-4.48 10,-10V127.62h12.21v270.98h-11.75c-5.52,0 -10,4.48 -10,10s4.48,10 10,10h43.5c5.52,0 10,-4.48 10,-10s-4.48,-10 -10,-10h-11.75V127.62h192.99v270.98h-11.75c-5.52,0 -10,4.48 -10,10s4.48,10 10,10h43.5c5.52,0 10,-4.48 10,-10s-4.48,-10 -10,-10h-11.75V127.62h12.21v44.75c0,5.52 4.48,10 10,10s10,-4.48 10,-10V62.87C384.45,57.35 379.97,52.87 374.45,52.87z" />
<path
android:fillColor="#7E7E7E"
android:pathData="M461.48,107.62h-26.72V80.1c0,-5.52 -4.48,-10 -10,-10s-10,4.48 -10,10v75.05c0,5.52 4.48,10 10,10s10,-4.48 10,-10V127.62h26.72c5.52,0 10,-4.48 10,-10S467,107.62 461.48,107.62z" />
</vector>

1
app/src/main/res/values/strings.xml
View File

@ -1410,6 +1410,7 @@
<string name="activity_type_high_jump">High jump</string>
<string name="activity_type_trampoline">Trampoline</string>
<string name="activity_type_dumbbell">Dumbbell</string>
<string name="activity_type_barbell">Barbell</string>
<string name="activity_type_belly_dance">Belly dance</string>
<string name="activity_type_jazz_dance">Jazz dance</string>
<string name="activity_type_latin_dance">Latin dance</string>