improve code (#36)

BenjaminCanape · web-flow · commit 1d08dd9c6a86 · 2023-12-11T22:11:18.000+01:00
* improve code

* change imports

* improve code
diff --git a/lib/data/api/activity_api.dart b/lib/data/api/activity_api.dart
@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';
-import '../model/response/activity_comment_response.dart';
 
 import '../model/request/activity_request.dart';
+import '../model/response/activity_comment_response.dart';
 import '../model/response/activity_response.dart';
 import 'helpers/api_helper.dart';
 
diff --git a/lib/data/model/response/user_response.dart b/lib/data/model/response/user_response.dart
@@ -1,5 +1,5 @@
-
 import 'package:equatable/equatable.dart';
+
 import '../../../domain/entities/user.dart';
 
 /// Represents a response object for a user.
diff --git a/lib/domain/entities/activity.dart b/lib/domain/entities/activity.dart
@@ -1,6 +1,6 @@
 import 'package:equatable/equatable.dart';
-import 'activity_comment.dart';
 
+import 'activity_comment.dart';
 import 'enum/activity_type.dart';
 import 'location.dart';
 import 'user.dart';
diff --git a/lib/domain/repositories/activity_repository.dart b/lib/domain/repositories/activity_repository.dart
@@ -1,7 +1,6 @@
-import '../entities/activity_comment.dart';
-
 import '../../data/model/request/activity_request.dart';
 import '../entities/activity.dart';
+import '../entities/activity_comment.dart';
 
 /// Abstract class representing the activity repository.
 abstract class ActivityRepository {
diff --git a/lib/main.dart b/lib/main.dart
@@ -5,12 +5,12 @@ import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'presentation/common/core/utils/color_utils.dart';
 import 'package:stack_trace/stack_trace.dart' as stack_trace;
 
 import 'core/utils/storage_utils.dart';
 import 'l10n/support_locale.dart';
 import 'presentation/common/core/services/text_to_speech_service.dart';
+import 'presentation/common/core/utils/color_utils.dart';
 import 'presentation/common/core/utils/ui_utils.dart';
 import 'presentation/home/screens/home_screen.dart';
 import 'presentation/login/screens/login_screen.dart';
diff --git a/lib/presentation/common/activity/widgets/activity_comments.dart b/lib/presentation/common/activity/widgets/activity_comments.dart
@@ -1,16 +1,17 @@
 import 'dart:typed_data';
-import 'package:flutter/material.dart';
+
 import 'package:comment_box/comment/comment.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import '../../../../domain/entities/activity.dart';
-import '../../../../domain/entities/activity_comment.dart';
 
 import '../../../../core/utils/storage_utils.dart';
+import '../../../../domain/entities/activity.dart';
+import '../../../../domain/entities/activity_comment.dart';
 import '../../../../domain/entities/user.dart';
 import '../../core/utils/color_utils.dart';
 import '../../core/utils/user_utils.dart';
 import '../view_model/activity_item_view_model.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class ActivityComments extends HookConsumerWidget {
   final Activity currentActivity;
diff --git a/lib/presentation/common/activity/widgets/activity_item.dart b/lib/presentation/common/activity/widgets/activity_item.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:intl/intl.dart';
-import 'activty_like.dart';
 
 import '../../../../domain/entities/activity.dart';
 import '../../core/utils/activity_utils.dart';
@@ -13,6 +12,7 @@ import '../../core/utils/ui_utils.dart';
 import '../../core/utils/user_utils.dart';
 import '../view_model/activity_item_view_model.dart';
 import 'activity_comments.dart';
+import 'activty_like.dart';
 
 class ActivityItem extends HookConsumerWidget {
   final int index;
diff --git a/lib/presentation/common/activity/widgets/activity_list.dart b/lib/presentation/common/activity/widgets/activity_list.dart
@@ -3,10 +3,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:intl/intl.dart';
-import '../view_model/activity_item_view_model.dart';
+
+import '../../../../domain/entities/activity.dart';
 import '../../core/utils/color_utils.dart';
 import '../../core/utils/type_utils.dart';
-import '../../../../domain/entities/activity.dart';
+import '../view_model/activity_item_view_model.dart';
 import 'activity_item.dart';
 
 /// The screen that displays a list of activities grouped by months.
diff --git a/lib/presentation/common/core/utils/ui_utils.dart b/lib/presentation/common/core/utils/ui_utils.dart
@@ -12,7 +12,7 @@ class UIUtils {
   );
 
   /// A function that create the header for a specific title
-  static createHeader(title) {
+  static Column createHeader(title) {
     return Column(children: [
       Container(
         padding: const EdgeInsets.only(left: 0, top: 12),
@@ -27,4 +27,18 @@ class UIUtils {
       const Divider(),
     ]);
   }
+
+  static FloatingActionButton createBackButton(BuildContext context) {
+    return FloatingActionButton(
+      backgroundColor: ColorUtils.main,
+      elevation: 4.0,
+      child: Icon(
+        Icons.arrow_back,
+        color: ColorUtils.white,
+      ),
+      onPressed: () {
+        Navigator.pop(context);
+      },
+    );
+  }
 }
diff --git a/lib/presentation/common/core/utils/user_utils.dart b/lib/presentation/common/core/utils/user_utils.dart
@@ -13,6 +13,12 @@ class UserUtils {
     color: ColorUtils.black,
   );
 
+  static String getNameOrUsername(User user) {
+    return user.firstname != null && user.lastname != null
+        ? '${user.firstname} ${user.lastname}'
+        : user.username;
+  }
+
   /// Go to user profile
   static void goToProfile(User user) {
     navigatorKey.currentState?.push(
diff --git a/lib/presentation/community/screens/pending_requests_screen.dart b/lib/presentation/community/screens/pending_requests_screen.dart
@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../../common/core/utils/color_utils.dart';
-import '../widgets/pending_request_list.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../common/core/utils/ui_utils.dart';
 import '../view_model/pending_request_view_model.dart';
+import '../widgets/pending_request_list.dart';
 
 /// The screen that displays pending requests
 class PendingRequestsScreen extends HookConsumerWidget {
@@ -33,17 +31,7 @@ class PendingRequestsScreen extends HookConsumerWidget {
             ])),
             floatingActionButtonLocation:
                 FloatingActionButtonLocation.centerFloat,
-            floatingActionButton: FloatingActionButton(
-              backgroundColor: ColorUtils.main,
-              elevation: 4.0,
-              child: Icon(
-                Icons.arrow_back,
-                color: ColorUtils.white,
-              ),
-              onPressed: () {
-                Navigator.pop(context);
-              },
-            ),
+            floatingActionButton: UIUtils.createBackButton(context),
           );
   }
 }
diff --git a/lib/presentation/community/view_model/community_view_model.dart b/lib/presentation/community/view_model/community_view_model.dart
@@ -2,6 +2,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../../data/repositories/activity_repository_impl.dart';
 import '../../../data/repositories/user_repository_impl.dart';
+import '../../../domain/entities/activity.dart';
+import '../../../domain/entities/user.dart';
 import 'state/community_state.dart';
 
 /// Provider for the community view model.
@@ -15,11 +17,11 @@ class CommunityViewModel extends StateNotifier<CommunityState> {
 
   CommunityViewModel(this.ref) : super(CommunityState.initial());
 
-  search(String text) {
+  Future<List<User>> search(String text) {
     return ref.read(userRepositoryProvider).search(text);
   }
 
-  getMyAndMyFriendsActivities() {
+  Future<List<Activity>> getMyAndMyFriendsActivities() {
     return ref.read(activityRepositoryProvider).getMyAndMyFriendsActivities();
   }
 }
diff --git a/lib/presentation/community/widgets/pending_request_list.dart b/lib/presentation/community/widgets/pending_request_list.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import '../../common/core/utils/user_utils.dart';
 import '../../../domain/entities/user.dart';
 import '../../common/friendship/widgets/accept_refuse.dart';
 
@@ -22,9 +23,7 @@ class PendingRequestsListWidget extends StatelessWidget {
         final user = users[index];
         return ListTile(
             title: Text(
-              user.firstname != null && user.lastname != null
-                  ? '${user.firstname} ${user.lastname}'
-                  : user.username,
+              UserUtils.getNameOrUsername(user),
             ),
             trailing: AcceptRefuseWidget(
                 userId: user.id, onAccept: onAccept, onReject: onReject));
diff --git a/lib/presentation/community/widgets/search_widget.dart b/lib/presentation/community/widgets/search_widget.dart
@@ -40,9 +40,7 @@ class SearchWidget extends HookConsumerWidget implements PreferredSizeWidget {
         itemBuilder: (BuildContext context, User suggestion) {
           return ListTile(
               title: Text(
-            suggestion.firstname != null && suggestion.lastname != null
-                ? '${suggestion.firstname} ${suggestion.lastname}'
-                : suggestion.username,
+            UserUtils.getNameOrUsername(suggestion),
           ));
         },
         onSuggestionSelected: (User suggestion) =>
diff --git a/lib/presentation/home/screens/home_screen.dart b/lib/presentation/home/screens/home_screen.dart
@@ -12,7 +12,7 @@ import '../../settings/screens/settings_screen.dart';
 import '../view_model/home_view_model.dart';
 
 /// An enumeration representing the available tabs in the home screen.
-enum Tabs { home, list, settings }
+enum Tabs { home, list, community, settings }
 
 /// The home screen widget.
 class HomeScreen extends HookConsumerWidget {
diff --git a/lib/presentation/my_activities/widgets/details_tab.dart b/lib/presentation/my_activities/widgets/details_tab.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:latlong2/latlong.dart';
+import '../../common/core/utils/ui_utils.dart';
 
 import '../../../domain/entities/activity.dart';
 import '../../../domain/entities/enum/activity_type.dart';
@@ -138,17 +139,7 @@ class DetailsTab extends HookConsumerWidget {
                 Positioned(
                   bottom: 16,
                   left: 80,
-                  child: FloatingActionButton(
-                    backgroundColor: ColorUtils.main,
-                    elevation: 4.0,
-                    child: Icon(
-                      Icons.arrow_back,
-                      color: ColorUtils.white,
-                    ),
-                    onPressed: () {
-                      Navigator.pop(context);
-                    },
-                  ),
+                  child: UIUtils.createBackButton(context),
                 ),
               ],
             ),
diff --git a/lib/presentation/new_activity/view_model/sum_up_view_model.dart b/lib/presentation/new_activity/view_model/sum_up_view_model.dart
@@ -68,7 +68,7 @@ class SumUpViewModel extends StateNotifier<SumUpState> {
     });
   }
 
-  getActivity() {
+  Activity getActivity() {
     final startDatetime = ref.read(timerViewModelProvider).startDatetime;
     final endDatetime = startDatetime.add(Duration(
       hours: ref.read(timerViewModelProvider).hours,
diff --git a/lib/presentation/send_new_password/screens/send_new_password_screen.dart b/lib/presentation/send_new_password/screens/send_new_password_screen.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import '../../common/core/utils/color_utils.dart';
 
+import '../../common/core/utils/color_utils.dart';
 import '../../common/core/utils/form_utils.dart';
 import '../../common/core/utils/ui_utils.dart';
 import '../../common/core/validators/login_validators.dart';
diff --git a/lib/presentation/settings/screens/edit_password_screen.dart b/lib/presentation/settings/screens/edit_password_screen.dart
@@ -120,17 +120,7 @@ class EditPasswordScreen extends HookConsumerWidget {
           Positioned(
             bottom: 16,
             left: 80,
-            child: FloatingActionButton(
-              backgroundColor: ColorUtils.main,
-              elevation: 4.0,
-              child: Icon(
-                Icons.arrow_back,
-                color: ColorUtils.white,
-              ),
-              onPressed: () {
-                Navigator.pop(context);
-              },
-            ),
+            child: UIUtils.createBackButton(context),
           ),
         ],
       ),
diff --git a/lib/presentation/settings/screens/edit_profile_screen.dart b/lib/presentation/settings/screens/edit_profile_screen.dart
@@ -134,16 +134,7 @@ class EditProfileScreen extends HookConsumerWidget {
               Positioned(
                 bottom: 16,
                 left: 80,
-                child: FloatingActionButton(
-                  backgroundColor: ColorUtils.main,
-                  child: Icon(
-                    Icons.arrow_back,
-                    color: ColorUtils.white,
-                  ),
-                  onPressed: () {
-                    Navigator.pop(context);
-                  },
-                ),
+                child: UIUtils.createBackButton(context),
               ),
             ],
           ),
diff --git a/lib/presentation/settings/screens/settings_screen.dart b/lib/presentation/settings/screens/settings_screen.dart
diff --git a/lib/presentation/settings/view_model/settings_view_model.dart b/lib/presentation/settings/view_model/settings_view_model.dart
