Skip to content

Commit 531c0cc

Browse files
nixrajputnixrajput
committed
updated to version 1.0.1+29
1 parent ae13f40 commit 531c0cc

File tree

10 files changed

+223
-192
lines changed

10 files changed

+223
-192
lines changed

‎lib/constants/colors.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ abstract class ColorValues {
5050
static const Color darkSubtitle2TextColor =
5151
Color.fromARGB(255, 124, 124, 124);
5252

53-
static const Color lightBgColor = Color.fromARGB(255, 250, 250, 250);
54-
static const Color lightDialogColor = Color.fromARGB(255, 236, 236, 236);
53+
static const Color lightBgColor = Color.fromARGB(255, 252, 252, 252);
54+
static const Color lightDialogColor = Color.fromARGB(255, 232, 232, 232);
5555
static const Color darkBgColor = Color.fromARGB(255, 18, 18, 30);
5656
static const Color darkDialogColor = Color.fromARGB(255, 40, 40, 50);
5757

5858
static const Color lightShadowColor = Color.fromARGB(255, 0, 0, 0);
59-
static const Color darkShadowColor = Color.fromARGB(255, 200, 200, 200);
59+
static const Color darkShadowColor = Color.fromARGB(255, 150, 150, 150);
6060

6161
static const primaryGrad = LinearGradient(
6262
colors: [primaryColor, primaryLightColor],

‎lib/global_widgets/count_widget.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:social_media_app/constants/colors.dart';
32
import 'package:social_media_app/constants/dimens.dart';
43
import 'package:social_media_app/constants/styles.dart';
54

@@ -42,14 +41,17 @@ class NxCountWidget extends StatelessWidget {
4241
children: [
4342
Text(
4443
value,
45-
style: valueStyle ?? AppStyles.style16Bold,
44+
style: valueStyle ??
45+
AppStyles.style16Bold.copyWith(
46+
color: Theme.of(context).textTheme.bodyText1!.color,
47+
),
4648
),
4749
Dimens.boxHeight4,
4850
Text(
4951
title,
5052
style: titleStyle ??
5153
AppStyles.style13Normal.copyWith(
52-
color: ColorValues.grayColor,
54+
color: Theme.of(context).textTheme.subtitle2!.color,
5355
),
5456
),
5557
],

‎lib/modules/home/controllers/profile_controller.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class ProfileController extends GetxController {
248248
final response = await _apiProvider.getUserPosts(
249249
_auth.token,
250250
_profileDetails.value.user!.id,
251-
limit: 16,
251+
limit: 12,
252252
);
253253

254254
if (response.isSuccessful) {
@@ -284,7 +284,7 @@ class ProfileController extends GetxController {
284284
_auth.token,
285285
_profileDetails.value.user!.id,
286286
page: page,
287-
limit: 16,
287+
limit: 12,
288288
);
289289

290290
if (response.isSuccessful) {

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

Lines changed: 13 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ import 'package:social_media_app/global_widgets/elevated_card.dart';
1616
import 'package:social_media_app/global_widgets/expandable_text_widget.dart';
1717
import 'package:social_media_app/global_widgets/get_time_ago_refresh_widget/get_time_ago_widget.dart';
1818
import 'package:social_media_app/global_widgets/primary_icon_btn.dart';
19-
import 'package:social_media_app/global_widgets/primary_text_btn.dart';
2019
import 'package:social_media_app/global_widgets/video_player_widget.dart';
2120
import 'package:social_media_app/helpers/get_time_ago_msg.dart';
21+
import 'package:social_media_app/modules/home/controllers/post_controller.dart';
2222
import 'package:social_media_app/modules/home/controllers/profile_controller.dart';
23+
import 'package:social_media_app/modules/home/controllers/trending_post_controller.dart';
2324
import 'package:social_media_app/modules/home/views/widgets/post_view_widget.dart';
25+
import 'package:social_media_app/modules/post/controllers/post_details_controller.dart';
2426
import 'package:social_media_app/modules/post/views/widgets/poll_option_widget.dart';
2527
import 'package:social_media_app/routes/route_management.dart';
2628
import 'package:social_media_app/utils/utility.dart';
@@ -37,6 +39,9 @@ class PostWidget extends StatelessWidget {
3739

3840
@override
3941
Widget build(BuildContext context) {
42+
assert(controller is PostDetailsController ||
43+
controller is PostController ||
44+
controller is TrendingPostController);
4045
return NxElevatedCard(
4146
margin: Dimens.edgeInsets8_0,
4247
borderRadius: Dimens.four,
@@ -440,7 +445,13 @@ class PostWidget extends StatelessWidget {
440445
ListTile(
441446
onTap: () {
442447
AppUtility.closeBottomSheet();
443-
_showDeletePostOptions();
448+
AppUtility.showDeleteDialog(
449+
context,
450+
() async {
451+
AppUtility.closeDialog();
452+
controller?.deletePost(post.id!);
453+
},
454+
);
444455
},
445456
leading: Icon(
446457
Icons.delete,
@@ -484,61 +495,4 @@ class PostWidget extends StatelessWidget {
484495
),
485496
],
486497
);
487-
488-
Future<void> _showDeletePostOptions() async {
489-
AppUtility.showSimpleDialog(
490-
Column(
491-
crossAxisAlignment: CrossAxisAlignment.start,
492-
mainAxisSize: MainAxisSize.min,
493-
children: [
494-
Dimens.boxHeight8,
495-
Padding(
496-
padding: Dimens.edgeInsets0_16,
497-
child: Text(
498-
StringValues.delete,
499-
style: AppStyles.style20Bold,
500-
),
501-
),
502-
Dimens.boxHeight8,
503-
Padding(
504-
padding: Dimens.edgeInsets0_16,
505-
child: Text(
506-
StringValues.deleteConfirmationText,
507-
style: AppStyles.style14Normal,
508-
),
509-
),
510-
Dimens.boxHeight8,
511-
Padding(
512-
padding: Dimens.edgeInsets0_16,
513-
child: Row(
514-
mainAxisAlignment: MainAxisAlignment.end,
515-
children: [
516-
NxTextButton(
517-
label: StringValues.no,
518-
labelStyle: AppStyles.style16Bold.copyWith(
519-
color: ColorValues.errorColor,
520-
),
521-
onTap: AppUtility.closeDialog,
522-
padding: Dimens.edgeInsets8,
523-
),
524-
Dimens.boxWidth16,
525-
NxTextButton(
526-
label: StringValues.yes,
527-
labelStyle: AppStyles.style16Bold.copyWith(
528-
color: ColorValues.successColor,
529-
),
530-
onTap: () async {
531-
AppUtility.closeDialog();
532-
controller?.deletePost(post.id!);
533-
},
534-
padding: Dimens.edgeInsets8,
535-
),
536-
],
537-
),
538-
),
539-
Dimens.boxHeight8,
540-
],
541-
),
542-
);
543-
}
544498
}

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

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ class CommentWidget extends StatelessWidget {
3636
children: [
3737
_buildCommentHead(context),
3838
_buildCommentBody(context),
39-
_buildCommentFooter(context),
39+
//_buildCommentFooter(context),
40+
Dimens.boxHeight8,
4041
],
4142
),
4243
);
@@ -164,36 +165,36 @@ class CommentWidget extends StatelessWidget {
164165
);
165166
}
166167

167-
Widget _buildCommentFooter(BuildContext context) => Row(
168-
crossAxisAlignment: CrossAxisAlignment.center,
169-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
170-
children: [
171-
/// Like Button
172-
GestureDetector(
173-
onTap: () => {},
174-
child: Padding(
175-
padding: Dimens.edgeInsets8,
176-
child: Row(
177-
mainAxisAlignment: MainAxisAlignment.start,
178-
crossAxisAlignment: CrossAxisAlignment.center,
179-
mainAxisSize: MainAxisSize.min,
180-
children: [
181-
Icon(Icons.favorite_outline,
182-
size: Dimens.twenty,
183-
color: Theme.of(context).textTheme.subtitle1!.color),
184-
Dimens.boxWidth2,
185-
Text(
186-
'${0}'.toCountingFormat(),
187-
style: AppStyles.style13Normal.copyWith(
188-
color: Theme.of(context).textTheme.subtitle1!.color,
189-
),
190-
),
191-
],
192-
),
193-
),
194-
),
195-
],
196-
);
168+
// Widget _buildCommentFooter(BuildContext context) => Row(
169+
// crossAxisAlignment: CrossAxisAlignment.center,
170+
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
171+
// children: [
172+
// /// Like Button
173+
// GestureDetector(
174+
// onTap: () => {},
175+
// child: Padding(
176+
// padding: Dimens.edgeInsets8,
177+
// child: Row(
178+
// mainAxisAlignment: MainAxisAlignment.start,
179+
// crossAxisAlignment: CrossAxisAlignment.center,
180+
// mainAxisSize: MainAxisSize.min,
181+
// children: [
182+
// Icon(Icons.favorite_outline,
183+
// size: Dimens.twenty,
184+
// color: Theme.of(context).textTheme.subtitle1!.color),
185+
// Dimens.boxWidth2,
186+
// Text(
187+
// '${0}'.toCountingFormat(),
188+
// style: AppStyles.style13Normal.copyWith(
189+
// color: Theme.of(context).textTheme.subtitle1!.color,
190+
// ),
191+
// ),
192+
// ],
193+
// ),
194+
// ),
195+
// ),
196+
// ],
197+
// );
197198

198199
void _showHeaderOptionBottomSheet(BuildContext context) =>
199200
AppUtility.showBottomSheet(

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

Lines changed: 13 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ import 'package:social_media_app/global_widgets/cached_network_image.dart';
1515
import 'package:social_media_app/global_widgets/elevated_card.dart';
1616
import 'package:social_media_app/global_widgets/expandable_text_widget.dart';
1717
import 'package:social_media_app/global_widgets/primary_icon_btn.dart';
18-
import 'package:social_media_app/global_widgets/primary_text_btn.dart';
1918
import 'package:social_media_app/global_widgets/video_player_widget.dart';
19+
import 'package:social_media_app/modules/home/controllers/post_controller.dart';
2020
import 'package:social_media_app/modules/home/controllers/profile_controller.dart';
21+
import 'package:social_media_app/modules/home/controllers/trending_post_controller.dart';
2122
import 'package:social_media_app/modules/home/views/widgets/post_view_widget.dart';
23+
import 'package:social_media_app/modules/post/controllers/post_details_controller.dart';
2224
import 'package:social_media_app/modules/post/views/widgets/poll_option_widget.dart';
2325
import 'package:social_media_app/routes/route_management.dart';
2426
import 'package:social_media_app/utils/utility.dart';
@@ -35,6 +37,9 @@ class PostDetailsWidget extends StatelessWidget {
3537

3638
@override
3739
Widget build(BuildContext context) {
40+
assert(controller is PostDetailsController ||
41+
controller is PostController ||
42+
controller is TrendingPostController);
3843
return NxElevatedCard(
3944
margin: Dimens.edgeInsets8_0,
4045
borderRadius: Dimens.four,
@@ -518,7 +523,13 @@ class PostDetailsWidget extends StatelessWidget {
518523
ListTile(
519524
onTap: () {
520525
AppUtility.closeBottomSheet();
521-
_showDeletePostOptions();
526+
AppUtility.showDeleteDialog(
527+
context,
528+
() async {
529+
AppUtility.closeDialog();
530+
controller?.deletePost(post.id!);
531+
},
532+
);
522533
},
523534
leading: Icon(
524535
Icons.delete,
@@ -562,61 +573,4 @@ class PostDetailsWidget extends StatelessWidget {
562573
),
563574
],
564575
);
565-
566-
Future<void> _showDeletePostOptions() async {
567-
AppUtility.showSimpleDialog(
568-
Column(
569-
crossAxisAlignment: CrossAxisAlignment.start,
570-
mainAxisSize: MainAxisSize.min,
571-
children: [
572-
Dimens.boxHeight8,
573-
Padding(
574-
padding: Dimens.edgeInsets0_16,
575-
child: Text(
576-
'Delete',
577-
style: AppStyles.style18Bold,
578-
),
579-
),
580-
Dimens.dividerWithHeight,
581-
Padding(
582-
padding: Dimens.edgeInsets0_16,
583-
child: Text(
584-
StringValues.deleteConfirmationText,
585-
style: AppStyles.style14Normal,
586-
),
587-
),
588-
Dimens.boxHeight8,
589-
Padding(
590-
padding: Dimens.edgeInsets0_16,
591-
child: Row(
592-
mainAxisAlignment: MainAxisAlignment.end,
593-
children: [
594-
NxTextButton(
595-
label: StringValues.no,
596-
labelStyle: AppStyles.style16Bold.copyWith(
597-
color: ColorValues.errorColor,
598-
),
599-
onTap: AppUtility.closeDialog,
600-
padding: Dimens.edgeInsets8,
601-
),
602-
Dimens.boxWidth16,
603-
NxTextButton(
604-
label: StringValues.yes,
605-
labelStyle: AppStyles.style16Bold.copyWith(
606-
color: ColorValues.successColor,
607-
),
608-
onTap: () async {
609-
AppUtility.closeDialog();
610-
controller?.deletePost(post.id!);
611-
},
612-
padding: Dimens.edgeInsets8,
613-
),
614-
],
615-
),
616-
),
617-
Dimens.boxHeight8,
618-
],
619-
),
620-
);
621-
}
622576
}

0 commit comments

Comments
 (0)