Skip to content

Commit 51de1d7

Browse files
nixrajputnixrajput
committed
bumped to version 1.0.1+31
1 parent bdbbf70 commit 51de1d7

File tree

12 files changed

+329
-275
lines changed

12 files changed

+329
-275
lines changed

‎lib/constants/enums.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@ enum BubbleType {
1414
sendBubble,
1515
receiverBubble,
1616
}
17+
18+
enum ReportType {
19+
user,
20+
post,
21+
comment,
22+
}

‎lib/constants/strings.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ abstract class StringValues {
364364
static const public = 'public';
365365
static const publicPrivacyDesc = 'Anyone can see your posts.';
366366
static const publish = 'Publish';
367+
static const pleaseSelectReason = 'Please select a reason';
367368
static const reactivate = 'Reactivate';
368369
static const reactivateAccount = 'Reactivate Account';
369370
static const reactivateAccountHelp =

‎lib/modules/home/views/widgets/post_widget.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:get_time_ago/get_time_ago.dart';
66
import 'package:social_media_app/apis/models/entities/post.dart';
77
import 'package:social_media_app/constants/colors.dart';
88
import 'package:social_media_app/constants/dimens.dart';
9+
import 'package:social_media_app/constants/enums.dart';
910
import 'package:social_media_app/constants/strings.dart';
1011
import 'package:social_media_app/constants/styles.dart';
1112
import 'package:social_media_app/extensions/date_extensions.dart';
@@ -430,7 +431,7 @@ class PostWidget extends StatelessWidget {
430431
leading: Icon(
431432
Icons.visibility,
432433
color: Theme.of(context).textTheme.bodyLarge!.color,
433-
size: Dimens.twenty,
434+
size: Dimens.twentyFour,
434435
),
435436
title: Text(
436437
StringValues.view,
@@ -460,7 +461,7 @@ class PostWidget extends StatelessWidget {
460461
leading: Icon(
461462
Icons.delete,
462463
color: Theme.of(context).textTheme.bodyLarge!.color,
463-
size: Dimens.twenty,
464+
size: Dimens.twentyFour,
464465
),
465466
title: Text(
466467
StringValues.delete,
@@ -485,7 +486,7 @@ class PostWidget extends StatelessWidget {
485486
leading: Icon(
486487
Icons.edit,
487488
color: Theme.of(context).textTheme.bodyLarge!.color,
488-
size: Dimens.twenty,
489+
size: Dimens.twentyFour,
489490
),
490491
title: Text(
491492
StringValues.edit,
@@ -511,7 +512,7 @@ class PostWidget extends StatelessWidget {
511512
leading: Icon(
512513
Icons.share,
513514
color: Theme.of(context).textTheme.bodyLarge!.color,
514-
size: Dimens.twenty,
515+
size: Dimens.twentyFour,
515516
),
516517
title: Text(
517518
StringValues.share,
@@ -529,12 +530,12 @@ class PostWidget extends StatelessWidget {
529530
showBorder: false,
530531
onTap: () {
531532
AppUtility.closeBottomSheet();
532-
RouteManagement.goToReportIssueView(post.id!);
533+
RouteManagement.goToReportIssueView(post.id!, ReportType.post);
533534
},
534535
leading: Icon(
535536
Icons.report,
536537
color: Theme.of(context).textTheme.bodyLarge!.color,
537-
size: Dimens.twenty,
538+
size: Dimens.twentyFour,
538539
),
539540
title: Text(
540541
StringValues.report,

‎lib/modules/home/views/widgets/user_widget.dart‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -25,71 +25,44 @@ class UserWidget extends StatelessWidget {
2525
this.onActionTap,
2626
}) : super(key: key);
2727

28-
final User user;
29-
final int totalLength;
30-
final int index;
31-
final double? bottomMargin;
32-
final VoidCallback? onTap;
33-
final VoidCallback? onActionTap;
3428
final double? avatarSize;
35-
final EdgeInsets? padding;
3629
final Color? bgColor;
3730
final BorderRadius? borderRadius;
31+
final double? bottomMargin;
3832
final Widget? extraActions;
33+
final int index;
34+
final VoidCallback? onActionTap;
35+
final VoidCallback? onTap;
36+
final EdgeInsets? padding;
37+
final int totalLength;
38+
final User user;
3939

40-
@override
41-
Widget build(BuildContext context) {
42-
final profile = ProfileController.find;
43-
return GestureDetector(
44-
onTap: onTap,
45-
child: Container(
46-
margin: Dimens.edgeInsets8_0,
47-
padding: padding ?? Dimens.edgeInsets8,
48-
constraints: BoxConstraints(
49-
maxWidth: Dimens.screenWidth,
50-
),
51-
decoration: BoxDecoration(
52-
color: Theme.of(context).cardColor,
53-
borderRadius: BorderRadius.circular(Dimens.four),
54-
boxShadow: AppStyles.defaultShadow,
55-
),
56-
child: Row(
57-
crossAxisAlignment: CrossAxisAlignment.center,
58-
children: [
59-
Expanded(
60-
child: Row(
61-
mainAxisAlignment: MainAxisAlignment.start,
62-
crossAxisAlignment: CrossAxisAlignment.center,
63-
mainAxisSize: MainAxisSize.min,
64-
children: [
65-
Hero(
66-
tag: user.id,
67-
child: AvatarWidget(
68-
avatar: user.avatar,
69-
size: avatarSize ?? Dimens.twentyFour,
70-
),
71-
),
72-
Dimens.boxWidth8,
73-
Expanded(
74-
child: Column(
75-
mainAxisAlignment: MainAxisAlignment.start,
76-
crossAxisAlignment: CrossAxisAlignment.start,
77-
mainAxisSize: MainAxisSize.min,
78-
children: [
79-
_buildUserUsername(context),
80-
_buildUserFullName(context),
81-
],
82-
),
83-
),
84-
],
85-
),
86-
),
87-
if (user.id != profile.profileDetails!.user!.id)
88-
_buildFollowAction(context),
89-
],
90-
),
91-
),
92-
);
40+
String getFollowStatus(String status, BuildContext context) {
41+
if (status == "following") {
42+
return StringValues.following;
43+
}
44+
45+
if (status == "requested") {
46+
return StringValues.requested;
47+
}
48+
49+
return StringValues.follow;
50+
}
51+
52+
Color getButtonColor(String status, BuildContext context) {
53+
if (status == "following" || status == "requested") {
54+
return Theme.of(context).dividerColor;
55+
}
56+
57+
return ColorValues.primaryColor;
58+
}
59+
60+
Color getLabelColor(String status, BuildContext context) {
61+
if (status == "following" || status == "requested") {
62+
return Theme.of(context).textTheme.bodyLarge!.color!;
63+
}
64+
65+
return ColorValues.whiteColor;
9366
}
9467

9568
Widget _buildUserUsername(BuildContext context) => Row(
@@ -151,31 +124,58 @@ class UserWidget extends StatelessWidget {
151124
),
152125
);
153126

154-
String getFollowStatus(String status, BuildContext context) {
155-
if (status == "following") {
156-
return StringValues.following;
157-
}
158-
159-
if (status == "requested") {
160-
return StringValues.requested;
161-
}
162-
163-
return StringValues.follow;
164-
}
165-
166-
Color getButtonColor(String status, BuildContext context) {
167-
if (status == "following" || status == "requested") {
168-
return Theme.of(context).dividerColor;
169-
}
170-
171-
return ColorValues.primaryColor;
172-
}
173-
174-
Color getLabelColor(String status, BuildContext context) {
175-
if (status == "following" || status == "requested") {
176-
return Theme.of(context).textTheme.bodyLarge!.color!;
177-
}
178-
179-
return ColorValues.whiteColor;
127+
@override
128+
Widget build(BuildContext context) {
129+
final profile = ProfileController.find;
130+
return GestureDetector(
131+
onTap: onTap,
132+
child: Container(
133+
margin: Dimens.edgeInsets8_0,
134+
padding: padding ?? Dimens.edgeInsets8,
135+
constraints: BoxConstraints(
136+
maxWidth: Dimens.screenWidth,
137+
),
138+
decoration: BoxDecoration(
139+
color: Theme.of(context).cardColor,
140+
borderRadius: BorderRadius.circular(Dimens.four),
141+
boxShadow: AppStyles.defaultShadow,
142+
),
143+
child: Row(
144+
crossAxisAlignment: CrossAxisAlignment.center,
145+
children: [
146+
Expanded(
147+
child: Row(
148+
mainAxisAlignment: MainAxisAlignment.start,
149+
crossAxisAlignment: CrossAxisAlignment.center,
150+
mainAxisSize: MainAxisSize.min,
151+
children: [
152+
Hero(
153+
tag: user.id,
154+
child: AvatarWidget(
155+
avatar: user.avatar,
156+
size: avatarSize ?? Dimens.twentyFour,
157+
),
158+
),
159+
Dimens.boxWidth8,
160+
Expanded(
161+
child: Column(
162+
mainAxisAlignment: MainAxisAlignment.start,
163+
crossAxisAlignment: CrossAxisAlignment.start,
164+
mainAxisSize: MainAxisSize.min,
165+
children: [
166+
_buildUserUsername(context),
167+
_buildUserFullName(context),
168+
],
169+
),
170+
),
171+
],
172+
),
173+
),
174+
if (user.id != profile.profileDetails!.user!.id)
175+
_buildFollowAction(context),
176+
],
177+
),
178+
),
179+
);
180180
}
181181
}

‎lib/modules/post/views/widgets/post_details_widget.dart‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -193,42 +193,31 @@ class PostDetailsWidget extends StatelessWidget {
193193
.toList(),
194194
),
195195
Dimens.boxHeight4,
196-
Flexible(
197-
child: Padding(
198-
padding: Dimens.edgeInsets0_8,
199-
child: Row(
200-
mainAxisAlignment: MainAxisAlignment.start,
201-
crossAxisAlignment: CrossAxisAlignment.center,
202-
mainAxisSize: MainAxisSize.min,
203-
children: [
204-
Text(
205-
'${post.totalVotes!.toString().toCountingFormat()} votes',
206-
style: AppStyles.style12Normal.copyWith(
207-
color: Theme.of(context).textTheme.titleMedium!.color,
208-
),
196+
Padding(
197+
padding: Dimens.edgeInsets0_8,
198+
child: Column(
199+
mainAxisAlignment: MainAxisAlignment.start,
200+
crossAxisAlignment: CrossAxisAlignment.start,
201+
mainAxisSize: MainAxisSize.min,
202+
children: [
203+
Text(
204+
'${post.totalVotes!.toString().toCountingFormat()} votes',
205+
style: AppStyles.style13Normal.copyWith(
206+
color: Theme.of(context).textTheme.titleMedium!.color,
209207
),
210-
Dimens.boxWidth4,
211-
Container(
212-
width: Dimens.four,
213-
height: Dimens.four,
214-
decoration: BoxDecoration(
215-
color: Theme.of(context).disabledColor,
216-
shape: BoxShape.circle,
217-
),
218-
),
219-
Dimens.boxWidth4,
220-
Flexible(
221-
child: Text(
222-
'${post.pollEndsAt!.getPollDurationLeft()}',
223-
style: AppStyles.style12Normal.copyWith(
224-
color: isExpired
225-
? Theme.of(context).textTheme.titleMedium!.color
226-
: ColorValues.linkColor,
227-
),
208+
),
209+
Dimens.boxHeight8,
210+
Flexible(
211+
child: Text(
212+
'${post.pollEndsAt!.getPollDurationLeft()}',
213+
style: AppStyles.style13Normal.copyWith(
214+
color: isExpired
215+
? Theme.of(context).textTheme.titleMedium!.color
216+
: ColorValues.linkColor,
228217
),
229218
),
230-
],
231-
),
219+
),
220+
],
232221
),
233222
),
234223
],
@@ -429,7 +418,7 @@ class PostDetailsWidget extends StatelessWidget {
429418

430419
Widget _buildPostTime(BuildContext context) {
431420
return Text(
432-
DateFormat('dd MMM yyyy ∙ hh:mm a').format(post.createdAt!.toLocal()),
421+
DateFormat('dd MMM yyyy hh:mm a').format(post.createdAt!.toLocal()),
433422
style: AppStyles.style13Normal.copyWith(
434423
color: Theme.of(context).textTheme.titleMedium!.color,
435424
),

‎lib/modules/report/report_binding.dart‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import 'package:get/get.dart';
2+
import 'package:social_media_app/modules/report/report_controller.dart';
3+
4+
class ReportBinding extends Bindings {
5+
@override
6+
void dependencies() {
7+
Get.lazyPut(ReportController.new);
8+
}
9+
}

0 commit comments

Comments
 (0)