Enhance activity list (#74)

This pull request includes several changes to the
`lib/data/model/activity.dart` and related files to add new
functionality and improve the existing codebase. The most important
changes include adding new fields to the `Activity` and
`ActivityPreview` classes, updating repository methods to handle these
new fields, and modifying the UI to display the new data.

### Enhancements to `Activity` and `ActivityPreview` classes:

*
[`lib/data/model/activity.dart`](diffhunk://#diff-c46ef297286fd151fb4d7ff8bd3a19deeb179a317d9405054f4fd3ce2efb2dcbL15-R19):
Added `steps` and `icon` fields to the `Activity` and `ActivityPreview`
classes. Updated constructors and methods to handle these new fields.
[[1]](diffhunk://#diff-c46ef297286fd151fb4d7ff8bd3a19deeb179a317d9405054f4fd3ce2efb2dcbL15-R19)
[[2]](diffhunk://#diff-c46ef297286fd151fb4d7ff8bd3a19deeb179a317d9405054f4fd3ce2efb2dcbR34-R49)
[[3]](diffhunk://#diff-c46ef297286fd151fb4d7ff8bd3a19deeb179a317d9405054f4fd3ce2efb2dcbR61)
[[4]](diffhunk://#diff-c46ef297286fd151fb4d7ff8bd3a19deeb179a317d9405054f4fd3ce2efb2dcbR73)

### Repository updates:

*
[`lib/data/repositories/local_health_impl.dart`](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774L53-R53):
Updated methods in `LocalHealthRepoImpl` to handle the new `steps` field
and removed unnecessary code.
[[1]](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774L53-R53)
[[2]](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774L139-R152)
[[3]](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774L162-L164)
[[4]](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774R183-R189)
[[5]](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774R214)
[[6]](diffhunk://#diff-99442f8cf53d535dc947e240c47d72949d679badbe5c1f253d9d99974446d774R296)

### UI modifications:

*
[`lib/presentation/activities/details/screen/activity_details.dart`](diffhunk://#diff-7de7ecaa5049c970d5d1936f0651b260dc61f35c6a4d3b9850684be7e0f41602L4):
Removed the `setIcon` method and updated the `_buildHeaderDetails`
method to use the new `icon` field from `Activity`.
[[1]](diffhunk://#diff-7de7ecaa5049c970d5d1936f0651b260dc61f35c6a4d3b9850684be7e0f41602L4)
[[2]](diffhunk://#diff-7de7ecaa5049c970d5d1936f0651b260dc61f35c6a4d3b9850684be7e0f41602L33-L49)
[[3]](diffhunk://#diff-7de7ecaa5049c970d5d1936f0651b260dc61f35c6a4d3b9850684be7e0f41602L59)
[[4]](diffhunk://#diff-7de7ecaa5049c970d5d1936f0651b260dc61f35c6a4d3b9850684be7e0f41602L92-R73)
*
[`lib/presentation/activities/details/view_model/activity_detail_state.dart`](diffhunk://#diff-0a5ffcd8a4a95363181af5fa767b76fb921d5bdb7bfaf5a403f44020e53ac87fL1-R32):
Removed the `icon` field and updated the `ActivityDetailState` class
accordingly.
*
[`lib/presentation/activities/details/view_model/activity_detail_view_model.dart`](diffhunk://#diff-18cd0d0c1811259fd4ba54fdd013026e4407fcfd8396025bae89e1ebe8e96557L1-R4):
Updated the `ActivityDetailedViewModel` to handle the new `steps` field
and fetch the workout icon if not provided.
[[1]](diffhunk://#diff-18cd0d0c1811259fd4ba54fdd013026e4407fcfd8396025bae89e1ebe8e96557L1-R4)
[[2]](diffhunk://#diff-18cd0d0c1811259fd4ba54fdd013026e4407fcfd8396025bae89e1ebe8e96557L27-L46)

### Localization updates:

* `lib/l10n/app_de.arb` and `lib/l10n/app_en.arb`: Added new
localization strings for activity details.
[[1]](diffhunk://#diff-36252c65ab82cbff4774b4983cb9027a2bef4cb738d5ea656c0b903939b3871aR12)
[[2]](diffhunk://#diff-9796fde3771f42a3a759ccc941731d83f96037a661e47dde27ce81d3447a69c2R15)

### Miscellaneous changes:

*
[`lib/presentation/activities/list/screen/activities_screen.dart`](diffhunk://#diff-88f7691689bff6b9ae5559a39398280e2b845d3fe6c13d6a14e5387fb374e83cR6):
Added a scroll controller to handle infinite scrolling and updated the
UI to display grouped activities with steps count.
[[1]](diffhunk://#diff-88f7691689bff6b9ae5559a39398280e2b845d3fe6c13d6a14e5387fb374e83cR6)
[[2]](diffhunk://#diff-88f7691689bff6b9ae5559a39398280e2b845d3fe6c13d6a14e5387fb374e83cR24)
[[3]](diffhunk://#diff-88f7691689bff6b9ae5559a39398280e2b845d3fe6c13d6a14e5387fb374e83cR34-L33)
[[4]](diffhunk://#diff-88f7691689bff6b9ae5559a39398280e2b845d3fe6c13d6a14e5387fb374e83cL44-R79)
[[5]](diffhunk://#diff-88f7691689bff6b9ae5559a39398280e2b845d3fe6c13d6a14e5387fb374e83cL70-R147)

Closes #60

Author: Jozys

lib/data/model/activity.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:health/health.dart';
 
 interface class Data<T> {
@@ -11,9 +13,11 @@ interface class Data<T> {
 interface class Activity extends ActivityPreview {
   final List<Data<int>>? heartRates;
   final List<Data<double>>? speed;
+  final int steps;
 
-  const Activity({
+  Activity({
     required super.distance,
+    required this.steps,
     required super.activityType,
     required super.caloriesBurnt,
     required super.start,
@@ -31,14 +35,17 @@ interface class ActivityPreview {
   final DateTime start;
   final DateTime end;
   final String sourceId;
+  Uint8List? icon;
 
-  const ActivityPreview(
-      {required this.activityType,
-      required this.caloriesBurnt,
-      required this.distance,
-      required this.start,
-      required this.end,
-      required this.sourceId});
+  ActivityPreview({
+    required this.activityType,
+    required this.caloriesBurnt,
+    required this.distance,
+    required this.start,
+    required this.end,
+    required this.sourceId,
+    Uint8List? icon,
+  });
 
   int getDuration() {
     return start.difference(end).inSeconds.abs();

lib/data/repositories/local_health_impl.dart

@@ -50,7 +50,7 @@ interface class LocalHealthRepoImpl extends LocalHealthRepository {
   /// Get the total distance covered in the given interval
   @override
   Future<double> getDistanceInInterval(DateTime start, DateTime end) async {
-    var distanceTypes;
+    List<HealthDataType> distanceTypes;
     if (Platform.isAndroid) {
       distanceTypes = [HealthDataType.DISTANCE_DELTA];
     } else if (Platform.isIOS) {
@@ -136,16 +136,19 @@ interface class LocalHealthRepoImpl extends LocalHealthRepository {
       for (var i = 0; i < rawWorkouts!.length; i++) {
         var current = rawWorkouts[i];
         WorkoutHealthValue healthValue = current.value as WorkoutHealthValue;
-        var calories =
-            await getCaloriesBurnedInInterval(current.dateFrom, current.dateTo);
+
+        var kilometres = healthValue.totalDistance != null
+            ? (healthValue.totalDistance! / 1000)
+            : 0.0;
+        // Round kilometres to 2 decimal places
+        kilometres = (((kilometres * 100).toInt()) / 100).toDouble();
+
         ActivityPreview preview = ActivityPreview(
             activityType: healthValue.workoutActivityType,
-            caloriesBurnt: calories,
+            caloriesBurnt: healthValue.totalEnergyBurned ?? 0,
             start: current.dateFrom,
             end: current.dateTo,
-            distance: healthValue.totalDistance != null
-                ? (healthValue.totalDistance! / 1000).toDouble()
-                : 0.0,
+            distance: kilometres,
             sourceId: current.sourceName);
         parsedWorkouts.add(preview);
       }
@@ -159,9 +162,6 @@ interface class LocalHealthRepoImpl extends LocalHealthRepository {
   @override
   Future<Activity?> getActivityDetailed(ActivityPreview preview) async {
     try {
-      List<HealthDataPoint>? data = await getHealthDataInInterval(
-          preview.start, preview.end, [HealthDataType.WORKOUT]);
-
       List<HealthDataPoint>? heartFrequency = await getHealthDataInInterval(
           preview.start, preview.end, [HealthDataType.HEART_RATE]);
       if (heartFrequency == null) {
@@ -177,13 +177,15 @@ interface class LocalHealthRepoImpl extends LocalHealthRepository {
       }
 
       return Activity(
-          caloriesBurnt: preview.caloriesBurnt,
-          distance: preview.distance,
-          end: preview.end,
-          start: preview.start,
-          activityType: preview.activityType,
-          heartRates: heartRates,
-          sourceId: preview.sourceId);
+        caloriesBurnt: preview.caloriesBurnt,
+        distance: preview.distance,
+        steps: await getStepsInInterval(preview.start, preview.end),
+        end: preview.end,
+        start: preview.start,
+        activityType: preview.activityType,
+        heartRates: heartRates,
+        sourceId: preview.sourceId,
+      );
     } catch (e) {
       log.info(e);
       return null;

lib/l10n/app_de.arb

@@ -9,6 +9,7 @@
   "activity_no_activities_found": "Keine Aktivitäten gefunden",
   "activity_last_activity": "Letzte Aktivität",
   "activity_details": "{distance}km in {minutes} Minuten",
+  "activity_details_minutes": "{minutes} Minuten",
   "activity_distance": "Distanz",
   "activity_duration": "Dauer",
   "activity_steps": "Schritte",

lib/l10n/app_en.arb

@@ -12,6 +12,7 @@
   "activity_no_activities_found": "No activities found",
   "activity_last_activity": "Last Activity",
   "activity_details": "{distance}km in {minutes} minutes",
+  "activity_details_minutes": "{minutes} minutes",
   "activity_distance": "Distance",
   "activity_steps": "Steps",
   "activity_duration": "Duration",

lib/presentation/activities/details/screen/activity_details.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:installed_apps/installed_apps.dart';
 import 'package:logging/logging.dart';
 import 'package:movetopia/core/health_authorized_view_model.dart';
 import 'package:movetopia/data/model/activity.dart';
@@ -30,23 +29,6 @@ class ActivityDetailsScreen extends HookConsumerWidget {
           .fetchActivityDetailed(activityPreview);
     }
 
-    Future<void> setIcon() async {
-      if (activityPreview.sourceId.isNotEmpty) {
-        try {
-          var appIcon = (await InstalledApps.getAppInfo(
-                  activityPreview.sourceId.toString()))
-              ?.icon;
-          if (appIcon != null && appIcon.isNotEmpty) {
-            ref
-                .read(activityDetailedViewModelProvider.notifier)
-                .setIcon(appIcon);
-          }
-        } catch (_) {
-          log.info("App icon fetching failed");
-        }
-      }
-    }
-
     useEffect(() {
       Future(
         () async {
@@ -56,7 +38,6 @@ class ActivityDetailsScreen extends HookConsumerWidget {
           if (authState == HealthAuthViewModelState.authorized) {
             await fetchDetailedActivity();
           }
-          await setIcon();
 
           activityDetailNotifier.setLoading(false);
           return null;
@@ -89,7 +70,7 @@ class ActivityDetailsScreen extends HookConsumerWidget {
   Widget _buildHeaderDetails(
       BuildContext context, ActivityDetailState activityState) {
     return HeaderDetails(
-      platformIcon: activityState.icon,
+      platformIcon: activityState.activity.icon,
       title: getTranslatedActivityType(
           context, activityState.activity.activityType),
       start: activityState.activity.start,

lib/presentation/activities/details/view_model/activity_detail_state.dart

@@ -1,40 +1,35 @@
-import 'dart:typed_data';
-
 import 'package:health/health.dart';
 import 'package:logging/logging.dart';
 import 'package:movetopia/data/model/activity.dart';
 
 class ActivityDetailState {
   Activity activity;
-  Uint8List icon;
   bool isLoading;
   final log = Logger('activityDetailedState');
 
-  ActivityDetailState(
-      {required this.activity, required this.isLoading, required this.icon});
+  ActivityDetailState({required this.activity, required this.isLoading});
 
   factory ActivityDetailState.initial() {
     return ActivityDetailState(
-        activity: Activity(
-            distance: 0,
-            activityType: HealthWorkoutActivityType.OTHER,
-            caloriesBurnt: 0,
-            start: DateTime.now(),
-            end: DateTime.now(),
-            heartRates: [],
-            speed: [],
-            sourceId: ""),
-        isLoading: true,
-        icon: Uint8List(0));
+      activity: Activity(
+        distance: 0,
+        activityType: HealthWorkoutActivityType.OTHER,
+        caloriesBurnt: 0,
+        steps: 0,
+        start: DateTime.now(),
+        end: DateTime.now(),
+        heartRates: [],
+        speed: [],
+        sourceId: "",
+      ),
+      isLoading: true,
+    );
   }
 
-  ActivityDetailState copyWith(
-      {Activity? newActivity, bool? loading, Uint8List? newIcon}) {
+  ActivityDetailState copyWith({Activity? newActivity, bool? loading}) {
     //if (newIcon == null && icon != null) newIcon = icon;
     return ActivityDetailState(
-        activity: newActivity ?? activity,
-        isLoading: loading ?? isLoading,
-        icon: newIcon ?? icon);
+        activity: newActivity ?? activity, isLoading: loading ?? isLoading);
   }
 
   int getAverageHeartBeat() {

lib/presentation/activities/details/view_model/activity_detail_view_model.dart

@@ -1,8 +1,7 @@
-import 'dart:typed_data';
-
 import 'package:logging/logging.dart';
 import 'package:movetopia/data/model/activity.dart';
 import 'package:movetopia/data/repositories/local_health_impl.dart';
+import 'package:movetopia/utils/system_utils.dart';
 import 'package:riverpod/riverpod.dart';
 
 import 'activity_detail_state.dart';
@@ -24,24 +23,27 @@ class ActivityDetailedViewModel extends StateNotifier<ActivityDetailState> {
         .read(localHealthRepositoryProvider)
         .getActivityDetailed(preview);
     if (activityDetailed != null) {
+      var activity = Activity(
+          distance: activityDetailed.distance,
+          steps: activityDetailed.steps,
+          activityType: activityDetailed.activityType,
+          caloriesBurnt: activityDetailed.caloriesBurnt,
+          start: activityDetailed.start,
+          end: activityDetailed.end,
+          heartRates: activityDetailed.heartRates,
+          speed: activityDetailed.speed,
+          // icon: preview.icon,
+          sourceId: activityDetailed.sourceId);
+      activity.icon = preview.icon != null && preview.icon!.isNotEmpty
+          ? preview.icon
+          : await getInstalledAppIcon(preview.sourceId);
       state = state.copyWith(
-          newActivity: Activity(
-              distance: activityDetailed.distance,
-              activityType: activityDetailed.activityType,
-              caloriesBurnt: activityDetailed.caloriesBurnt,
-              start: activityDetailed.start,
-              end: activityDetailed.end,
-              heartRates: activityDetailed.heartRates,
-              speed: activityDetailed.speed,
-              sourceId: activityDetailed.sourceId));
+        newActivity: activity,
+      );
     }
   }
 
   void setLoading(bool loading) {
     state = state.copyWith(loading: loading);
   }
-
-  void setIcon(Uint8List? icon) {
-    state = state.copyWith(newIcon: icon);
-  }
 }