Skip to content

Commit f370627

Browse files
BenjaminCanapeBenjaminCanape
authored
Refactor Colors (#33)
* refactor colors and navigation to profile * fix imports
1 parent 1e3b3c9 commit f370627

47 files changed

Lines changed: 326 additions & 294 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/data/api/activity_api.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:dio/dio.dart';
2-
import 'package:run_flutter_run/data/model/response/activity_comment_response.dart';
2+
import '../model/response/activity_comment_response.dart';
33

44
import '../model/request/activity_request.dart';
55
import '../model/response/activity_response.dart';

‎lib/data/api/helpers/api_helper.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'dart:convert';
2+
23
import 'package:dio/dio.dart';
3-
import '../../../core/utils/storage_utils.dart';
44
import 'package:shared_preferences/shared_preferences.dart';
55

66
import '../../../core/error.dart';
7+
import '../../../core/utils/storage_utils.dart';
78
import '../../../main.dart';
89
import '../user_api.dart';
910

‎lib/data/repositories/activity_repository_impl.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:hooks_riverpod/hooks_riverpod.dart';
2-
import 'package:run_flutter_run/domain/entities/activity_comment.dart';
2+
import '../../domain/entities/activity_comment.dart';
33

44
import '../../domain/entities/activity.dart';
55
import '../../domain/repositories/activity_repository.dart';

‎lib/domain/entities/activity.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:equatable/equatable.dart';
2-
import 'package:run_flutter_run/domain/entities/activity_comment.dart';
2+
import 'activity_comment.dart';
33

44
import 'enum/activity_type.dart';
55
import 'location.dart';

‎lib/domain/repositories/activity_repository.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:run_flutter_run/domain/entities/activity_comment.dart';
1+
import '../entities/activity_comment.dart';
22

33
import '../../data/model/request/activity_request.dart';
44
import '../entities/activity.dart';

‎lib/main.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
55
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
66
import 'package:flutter_localizations/flutter_localizations.dart';
77
import 'package:hooks_riverpod/hooks_riverpod.dart';
8+
import 'presentation/common/core/utils/color_utils.dart';
89
import 'package:stack_trace/stack_trace.dart' as stack_trace;
910

1011
import 'core/utils/storage_utils.dart';
@@ -85,13 +86,13 @@ class MyApp extends HookConsumerWidget {
8586
debugShowCheckedModeBanner: false,
8687
theme: ThemeData(
8788
textSelectionTheme: TextSelectionThemeData(
88-
cursorColor: Colors.teal.shade800,
89-
selectionColor: Colors.teal.shade800,
90-
selectionHandleColor: Colors.teal.shade800,
89+
cursorColor: ColorUtils.main,
90+
selectionColor: ColorUtils.main,
91+
selectionHandleColor: ColorUtils.main,
9192
),
92-
primaryColor: Colors.teal.shade800,
93+
primaryColor: ColorUtils.main,
9394
bottomSheetTheme:
94-
const BottomSheetThemeData(backgroundColor: Colors.transparent),
95+
BottomSheetThemeData(backgroundColor: ColorUtils.transparent),
9596
),
9697
localizationsDelegates: const [
9798
AppLocalizations.delegate,

‎lib/presentation/common/activity/view_model/activity_item_view_model.dart‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ import 'dart:typed_data';
22

33
import 'package:flutter/material.dart';
44
import 'package:hooks_riverpod/hooks_riverpod.dart';
5-
import 'package:run_flutter_run/data/repositories/activity_repository_impl.dart';
6-
import 'package:run_flutter_run/domain/entities/activity.dart';
7-
import 'package:run_flutter_run/domain/entities/activity_comment.dart';
5+
import '../../../../data/repositories/activity_repository_impl.dart';
6+
import '../../../../domain/entities/activity.dart';
7+
import '../../../../domain/entities/activity_comment.dart';
88
import '../../../../data/repositories/user_repository_impl.dart';
9-
import '../../../../domain/entities/user.dart';
109
import '../../../../main.dart';
1110
import '../../../my_activities/screens/activity_details_screen.dart';
12-
import '../../user/screens/profile_screen.dart';
1311
import 'state/activity_item_state.dart';
1412

1513
/// Provider for the activity item view model.
@@ -103,21 +101,4 @@ class ActivityItemViewModel extends StateNotifier<ActivityItemState> {
103101
),
104102
);
105103
}
106-
107-
/// Go to user profile
108-
void goToProfile(User user) {
109-
navigatorKey.currentState?.push(
110-
PageRouteBuilder(
111-
transitionDuration: const Duration(milliseconds: 500),
112-
pageBuilder: (context, animation, secondaryAnimation) =>
113-
SlideTransition(
114-
position: Tween<Offset>(
115-
begin: const Offset(1.0, 0.0),
116-
end: Offset.zero,
117-
).animate(animation),
118-
child: ProfileScreen(user: user),
119-
),
120-
),
121-
);
122-
}
123104
}

‎lib/presentation/common/activity/widgets/activity_comments.dart‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import 'dart:typed_data';
22
import 'package:flutter/material.dart';
33
import 'package:comment_box/comment/comment.dart';
44
import 'package:hooks_riverpod/hooks_riverpod.dart';
5-
import 'package:run_flutter_run/domain/entities/activity.dart';
6-
import 'package:run_flutter_run/domain/entities/activity_comment.dart';
5+
import '../../../../domain/entities/activity.dart';
6+
import '../../../../domain/entities/activity_comment.dart';
77

88
import '../../../../core/utils/storage_utils.dart';
99
import '../../../../domain/entities/user.dart';
10+
import '../../core/utils/color_utils.dart';
1011
import '../view_model/activity_item_view_model.dart';
1112
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
1213

@@ -55,33 +56,33 @@ class ActivityComments extends HookConsumerWidget {
5556
child: Container(
5657
height: 50.0,
5758
width: 50.0,
58-
decoration: const BoxDecoration(
59-
color: Colors.white,
60-
borderRadius: BorderRadius.all(Radius.circular(50)),
59+
decoration: BoxDecoration(
60+
color: ColorUtils.white,
61+
borderRadius: const BorderRadius.all(Radius.circular(50)),
6162
),
6263
child: ref.watch(commentUserPictureDataProvider(comment.user)).when(
6364
data: (pic) {
6465
return pic != null
6566
? CircleAvatar(
6667
radius: 50, backgroundImage: MemoryImage(pic))
67-
: const Icon(
68+
: Icon(
6869
Icons.person,
6970
size: 50,
70-
color: Colors.black,
71+
color: ColorUtils.black,
7172
);
7273
},
7374
loading: () {
74-
return const Icon(
75+
return Icon(
7576
Icons.person,
7677
size: 50,
77-
color: Colors.black,
78+
color: ColorUtils.black,
7879
);
7980
},
8081
error: (error, stackTrace) {
81-
return const Icon(
82+
return Icon(
8283
Icons.person,
8384
size: 50,
84-
color: Colors.black,
85+
color: ColorUtils.black,
8586
);
8687
},
8788
),
@@ -121,7 +122,7 @@ class ActivityComments extends HookConsumerWidget {
121122
comments.length - 1,
122123
),
123124
style: TextStyle(
124-
color: Colors.teal.shade700,
125+
color: ColorUtils.mainMedium,
125126
fontWeight: FontWeight.bold,
126127
),
127128
),
@@ -144,7 +145,7 @@ class ActivityComments extends HookConsumerWidget {
144145

145146
final appLocalizations = AppLocalizations.of(context)!;
146147

147-
return Container(
148+
return SizedBox(
148149
height: currentActivity.comments.isNotEmpty ? 210 : 80,
149150
child: CommentBox(
150151
userImage: currentUserPictureProvider.when(
@@ -161,10 +162,9 @@ class ActivityComments extends HookConsumerWidget {
161162
sendButtonMethod: () => provider.comment(currentActivity),
162163
formKey: formKey,
163164
commentController: provider.commentController,
164-
backgroundColor: Colors.white,
165-
textColor: Colors.teal.shade700,
166-
sendWidget:
167-
Icon(Icons.send_sharp, size: 30, color: Colors.teal.shade800),
165+
backgroundColor: ColorUtils.white,
166+
textColor: ColorUtils.mainMedium,
167+
sendWidget: Icon(Icons.send_sharp, size: 30, color: ColorUtils.main),
168168
child: buildCommentChild(ref, appLocalizations, provider,
169169
currentActivity.comments.toList(), state.displayPreviousComments),
170170
),

‎lib/presentation/common/activity/widgets/activity_item.dart‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ import 'package:flutter/material.dart';
44
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
55
import 'package:hooks_riverpod/hooks_riverpod.dart';
66
import 'package:intl/intl.dart';
7-
import 'package:run_flutter_run/presentation/common/activity/widgets/activty_like.dart';
7+
import 'activty_like.dart';
88

99
import '../../../../domain/entities/activity.dart';
10-
import '../../../../main.dart';
1110
import '../../core/utils/activity_utils.dart';
1211
import '../../core/utils/color_utils.dart';
1312
import '../../core/utils/ui_utils.dart';
14-
import '../../user/screens/profile_screen.dart';
13+
import '../../core/utils/user_utils.dart';
1514
import '../view_model/activity_item_view_model.dart';
1615
import 'activity_comments.dart';
1716

@@ -99,7 +98,7 @@ class ActivityItem extends HookConsumerWidget {
9998
child: Center(
10099
child: Icon(
101100
ActivityUtils.getActivityTypeIcon(activity.type),
102-
color: Colors.white,
101+
color: ColorUtils.white,
103102
size: 40,
104103
),
105104
),
@@ -145,9 +144,9 @@ class ActivityItem extends HookConsumerWidget {
145144
),
146145
),
147146
if (canOpenActivity)
148-
const Icon(
147+
Icon(
149148
Icons.navigate_next,
150-
color: Colors.black,
149+
color: ColorUtils.black,
151150
size: 30,
152151
),
153152
],
@@ -169,26 +168,14 @@ class ActivityItem extends HookConsumerWidget {
169168
decoration: BoxDecoration(
170169
border: Border(
171170
bottom: BorderSide(
172-
color: Colors.grey.shade300,
171+
color: ColorUtils.greyLight,
173172
width: 0.5,
174173
),
175174
),
176175
),
177176
child: TextButton(
178177
onPressed: () {
179-
navigatorKey.currentState?.push(
180-
PageRouteBuilder(
181-
transitionDuration: const Duration(milliseconds: 500),
182-
pageBuilder: (context, animation, secondaryAnimation) =>
183-
SlideTransition(
184-
position: Tween<Offset>(
185-
begin: const Offset(1.0, 0.0),
186-
end: Offset.zero,
187-
).animate(animation),
188-
child: ProfileScreen(user: activity.user),
189-
),
190-
),
191-
);
178+
UserUtils.goToProfile(activity.user);
192179
},
193180
child: Row(
194181
children: [
@@ -205,22 +192,22 @@ class ActivityItem extends HookConsumerWidget {
205192
profilePicture,
206193
fit: BoxFit.cover,
207194
)
208-
: const Icon(
195+
: Icon(
209196
Icons.person,
210197
size: 50,
211-
color: Colors.black,
198+
color: ColorUtils.black,
212199
),
213200
),
214201
);
215202
},
216203
loading: () {
217-
return const Center(child: UIUtils.loader);
204+
return Center(child: UIUtils.loader);
218205
},
219206
error: (error, stackTrace) {
220-
return const Icon(
207+
return Icon(
221208
Icons.person,
222209
size: 50,
223-
color: Colors.black,
210+
color: ColorUtils.black,
224211
);
225212
},
226213
),
@@ -233,7 +220,7 @@ class ActivityItem extends HookConsumerWidget {
233220
activity.user.lastname != null
234221
? '${activity.user.firstname} ${activity.user.lastname}'
235222
: activity.user.username,
236-
style: const TextStyle(color: Colors.black),
223+
style: TextStyle(color: ColorUtils.black),
237224
overflow: TextOverflow.ellipsis,
238225
maxLines: 1,
239226
),
@@ -257,7 +244,7 @@ class ActivityItem extends HookConsumerWidget {
257244
Text(
258245
'${appLocalizations.date_pronoun} $formattedDate ${appLocalizations.hours_pronoun} $formattedTime',
259246
style: TextStyle(
260-
color: Colors.grey.shade700,
247+
color: ColorUtils.greyDarker,
261248
fontFamily: 'Avenir',
262249
),
263250
),
@@ -266,14 +253,14 @@ class ActivityItem extends HookConsumerWidget {
266253
children: [
267254
Icon(
268255
Icons.location_on,
269-
color: Colors.grey.shade600,
256+
color: ColorUtils.grey,
270257
size: 16,
271258
),
272259
const SizedBox(width: 8),
273260
Text(
274261
'${activity.distance.toStringAsFixed(2)} km',
275262
style: TextStyle(
276-
color: Colors.grey.shade600,
263+
color: ColorUtils.grey,
277264
fontFamily: 'Avenir',
278265
),
279266
),
@@ -283,14 +270,14 @@ class ActivityItem extends HookConsumerWidget {
283270
children: [
284271
Icon(
285272
Icons.speed,
286-
color: Colors.grey.shade600,
273+
color: ColorUtils.grey,
287274
size: 16,
288275
),
289276
const SizedBox(width: 8),
290277
Text(
291278
'${activity.speed.toStringAsFixed(2)} km/h',
292279
style: TextStyle(
293-
color: Colors.grey.shade600,
280+
color: ColorUtils.grey,
294281
fontFamily: 'Avenir',
295282
),
296283
),
@@ -315,9 +302,9 @@ class ActivityItem extends HookConsumerWidget {
315302
children: [
316303
Row(children: [
317304
IconButton(
318-
icon: const Icon(
305+
icon: Icon(
319306
Icons.comment_outlined,
320-
color: Colors.black,
307+
color: ColorUtils.black,
321308
size: 24,
322309
),
323310
onPressed: () {

‎lib/presentation/common/activity/widgets/activity_list.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
33
import 'package:flutter_hooks/flutter_hooks.dart';
44
import 'package:hooks_riverpod/hooks_riverpod.dart';
55
import 'package:intl/intl.dart';
6-
import 'package:run_flutter_run/presentation/common/activity/view_model/activity_item_view_model.dart';
7-
import 'package:run_flutter_run/presentation/common/core/utils/type_utils.dart';
6+
import '../view_model/activity_item_view_model.dart';
7+
import '../../core/utils/color_utils.dart';
8+
import '../../core/utils/type_utils.dart';
89
import '../../../../domain/entities/activity.dart';
910
import 'activity_item.dart';
1011

@@ -55,12 +56,12 @@ class ActivityList extends HookConsumerWidget {
5556
)
5657
: Theme(
5758
data: ThemeData(
58-
expansionTileTheme: const ExpansionTileThemeData(
59+
expansionTileTheme: ExpansionTileThemeData(
5960
tilePadding: EdgeInsets.zero,
60-
iconColor: Colors.black,
61-
textColor: Colors.black87,
61+
iconColor: ColorUtils.black,
62+
textColor: ColorUtils.black,
6263
childrenPadding: EdgeInsets.zero,
63-
shape: RoundedRectangleBorder(
64+
shape: const RoundedRectangleBorder(
6465
side: BorderSide.none,
6566
borderRadius: BorderRadius.zero,
6667
),

0 commit comments

Comments
 (0)