Skip to content

Commit bdbbf70

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

File tree

102 files changed

+657
-789
lines changed

Some content is hidden

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

102 files changed

+657
-789
lines changed

‎lib/app_services/theme_controller.dart‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,17 @@ class AppThemeController extends GetxController {
8787
iconTheme: const IconThemeData(color: ColorValues.lightGrayColor),
8888
scaffoldBackgroundColor: ColorValues.lightBgColor,
8989
appBarTheme: const AppBarTheme(backgroundColor: ColorValues.lightBgColor),
90-
bottomAppBarColor: ColorValues.lightDialogColor,
90+
cardColor: ColorValues.lightDialogColor,
9191
shadowColor: ColorValues.shadowColor.withAlpha(12),
9292
cardTheme: const CardTheme(color: ColorValues.lightDialogColor),
9393
dialogTheme:
9494
const DialogTheme(backgroundColor: ColorValues.lightDialogColor),
9595
dialogBackgroundColor: ColorValues.lightDialogColor,
96-
errorColor: ColorValues.errorColor,
9796
bottomSheetTheme: const BottomSheetThemeData().copyWith(
9897
backgroundColor: ColorValues.lightDialogColor,
98+
surfaceTintColor: ColorValues.lightDialogColor,
99+
modalBackgroundColor: ColorValues.lightDialogColor,
100+
modalBarrierColor: ColorValues.blackColor.withOpacity(0.5),
99101
),
100102
dividerColor: ColorValues.lightDividerColor,
101103
disabledColor: ColorValues.lightGrayColor,
@@ -113,7 +115,6 @@ class AppThemeController extends GetxController {
113115
elevation: MaterialStateProperty.all(0.0),
114116
),
115117
),
116-
fontFamily: kDefaultFontFamily,
117118
inputDecorationTheme: InputDecorationTheme(
118119
filled: true,
119120
fillColor: ColorValues.lightDialogColor,
@@ -176,17 +177,21 @@ class AppThemeController extends GetxController {
176177
borderRadius: BorderRadius.circular(Dimens.four),
177178
),
178179
),
180+
fontFamily: kDefaultFontFamily,
179181
textTheme: const TextTheme().copyWith(
180-
bodyText1: const TextStyle(
182+
bodyLarge: const TextStyle(
183+
color: ColorValues.lightBodyTextColor,
184+
),
185+
bodyMedium: const TextStyle(
181186
color: ColorValues.lightBodyTextColor,
182187
),
183-
bodyText2: const TextStyle(
188+
bodySmall: const TextStyle(
184189
color: ColorValues.lightBodyTextColor,
185190
),
186-
subtitle1: TextStyle(
191+
titleMedium: TextStyle(
187192
color: ColorValues.lightBodyTextColor.withAlpha(180),
188193
),
189-
subtitle2: TextStyle(
194+
titleSmall: TextStyle(
190195
color: ColorValues.lightBodyTextColor.withAlpha(140),
191196
),
192197
),
@@ -204,14 +209,16 @@ class AppThemeController extends GetxController {
204209
scaffoldBackgroundColor: ColorValues.darkBgColor,
205210
shadowColor: ColorValues.shadowColor.withAlpha(12),
206211
appBarTheme: const AppBarTheme(backgroundColor: ColorValues.darkBgColor),
207-
bottomAppBarColor: ColorValues.darkDialogColor,
212+
cardColor: ColorValues.darkDialogColor,
208213
cardTheme: const CardTheme(color: ColorValues.darkDialogColor),
209214
dialogTheme:
210215
const DialogTheme(backgroundColor: ColorValues.darkDialogColor),
211216
dialogBackgroundColor: ColorValues.darkDialogColor,
212-
errorColor: ColorValues.errorColor,
213217
bottomSheetTheme: const BottomSheetThemeData().copyWith(
214218
backgroundColor: ColorValues.darkDialogColor,
219+
surfaceTintColor: ColorValues.darkDialogColor,
220+
modalBackgroundColor: ColorValues.darkDialogColor,
221+
modalBarrierColor: ColorValues.blackColor.withOpacity(0.5),
215222
),
216223
dividerColor: ColorValues.darkDividerColor,
217224
disabledColor: ColorValues.darkGrayColor,
@@ -229,7 +236,6 @@ class AppThemeController extends GetxController {
229236
elevation: MaterialStateProperty.all(0.0),
230237
),
231238
),
232-
fontFamily: kDefaultFontFamily,
233239
inputDecorationTheme: InputDecorationTheme(
234240
filled: true,
235241
fillColor: ColorValues.darkDialogColor,
@@ -292,17 +298,21 @@ class AppThemeController extends GetxController {
292298
borderRadius: BorderRadius.circular(Dimens.four),
293299
),
294300
),
301+
fontFamily: kDefaultFontFamily,
295302
textTheme: const TextTheme().copyWith(
296-
bodyText1: const TextStyle(
303+
bodyLarge: const TextStyle(
304+
color: ColorValues.darkBodyTextColor,
305+
),
306+
bodyMedium: const TextStyle(
297307
color: ColorValues.darkBodyTextColor,
298308
),
299-
bodyText2: const TextStyle(
309+
bodySmall: const TextStyle(
300310
color: ColorValues.darkBodyTextColor,
301311
),
302-
subtitle1: TextStyle(
312+
titleMedium: TextStyle(
303313
color: ColorValues.darkBodyTextColor.withAlpha(180),
304314
),
305-
subtitle2: TextStyle(
315+
titleSmall: TextStyle(
306316
color: ColorValues.darkBodyTextColor.withAlpha(140),
307317
),
308318
),

‎lib/constants/colors.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ abstract class ColorValues {
55
static const Color darkBgColor = Color.fromARGB(255, 10, 10, 16);
66
static const Color darkBodyTextColor = Color.fromARGB(255, 240, 240, 240);
77
static const Color darkChatBubbleColor = Color.fromARGB(255, 18, 66, 148);
8-
static const Color darkDialogColor = Color.fromARGB(255, 36, 36, 50);
8+
static const Color darkDialogColor = Color.fromARGB(255, 36, 36, 56);
99
static const Color darkDividerColor = Color.fromARGB(255, 70, 70, 70);
1010
static const Color darkGrayColor = Color.fromARGB(255, 120, 120, 120);
11-
static const Color darkSubtitle2TextColor =
11+
static const Color darktitleSmallTextColor =
1212
Color.fromARGB(255, 100, 100, 100);
1313

1414
static const Color darkSubtitleTextColor = Color.fromARGB(255, 160, 160, 160);
@@ -21,7 +21,7 @@ abstract class ColorValues {
2121
static const Color lightDialogColor = Color.fromARGB(255, 252, 252, 252);
2222
static const Color lightDividerColor = Color.fromARGB(255, 200, 200, 200);
2323
static const Color lightGrayColor = Color.fromARGB(255, 210, 210, 210);
24-
static const Color lightSubtitle2TextColor =
24+
static const Color lighttitleSmallTextColor =
2525
Color.fromARGB(255, 140, 140, 140);
2626

2727
static const Color lightSubtitleTextColor =

‎lib/global_widgets/avatar_widget.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AvatarWidget extends StatelessWidget {
2828
);
2929
}
3030
return CircleAvatar(
31-
backgroundColor: Theme.of(context).textTheme.subtitle2!.color,
31+
backgroundColor: Theme.of(context).textTheme.titleSmall!.color,
3232
radius: size,
3333
child: SvgPicture.asset(
3434
SvgAssets.maleAvatar,

‎lib/global_widgets/count_widget.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ class NxCountWidget extends StatelessWidget {
4343
value,
4444
style: valueStyle ??
4545
AppStyles.style16Bold.copyWith(
46-
color: Theme.of(context).textTheme.bodyText1!.color,
46+
color: Theme.of(context).textTheme.bodyLarge!.color,
4747
),
4848
),
4949
Dimens.boxHeight4,
5050
Text(
5151
title,
5252
style: titleStyle ??
5353
AppStyles.style13Normal.copyWith(
54-
color: Theme.of(context).textTheme.subtitle2!.color,
54+
color: Theme.of(context).textTheme.titleSmall!.color,
5555
),
5656
),
5757
],

‎lib/global_widgets/custom_app_bar.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class NxAppBar extends StatelessWidget {
4343
child: Icon(
4444
CupertinoIcons.arrow_left,
4545
color: backBtnColor ??
46-
Theme.of(context).textTheme.bodyText1!.color,
46+
Theme.of(context).textTheme.bodyLarge!.color,
4747
size: Dimens.twentyFour,
4848
),
4949
),
@@ -60,7 +60,7 @@ class NxAppBar extends StatelessWidget {
6060
title!,
6161
style: titleStyle ??
6262
AppStyles.style20Bold.copyWith(
63-
color: Theme.of(context).textTheme.bodyText1!.color,
63+
color: Theme.of(context).textTheme.bodyLarge!.color,
6464
),
6565
)
6666
],

‎lib/global_widgets/expandable_text_widget.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class NxExpandableTextState extends State<NxExpandableText> {
6161
],
6262
style: widget.textStyle ??
6363
AppStyles.style13Normal.copyWith(
64-
color: Theme.of(context).textTheme.bodyText1!.color,
64+
color: Theme.of(context).textTheme.bodyLarge!.color,
6565
decoration: TextDecoration.none,
6666
),
6767
linkStyle: widget.linkStyle ??

‎lib/global_widgets/post_thumb_widget.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class PostThumbnailWidget extends StatelessWidget {
4646
Icon(
4747
Icons.poll_outlined,
4848
size: Dimens.thirtyTwo,
49-
color: Theme.of(context).textTheme.bodyText1!.color,
49+
color: Theme.of(context).textTheme.bodyLarge!.color,
5050
),
5151
Dimens.boxHeight4,
5252
Text(
@@ -100,41 +100,41 @@ class PostThumbnailWidget extends StatelessWidget {
100100
},
101101
leading: Icon(
102102
Icons.delete,
103-
color: Theme.of(context).textTheme.bodyText1!.color,
103+
color: Theme.of(context).textTheme.bodyLarge!.color,
104104
size: Dimens.twentyFour,
105105
),
106106
title: Text(
107107
StringValues.delete,
108108
style: AppStyles.style16Bold.copyWith(
109-
color: Theme.of(context).textTheme.bodyText1!.color,
109+
color: Theme.of(context).textTheme.bodyLarge!.color,
110110
),
111111
),
112112
),
113113
ListTile(
114114
onTap: AppUtility.closeBottomSheet,
115115
leading: Icon(
116116
Icons.share,
117-
color: Theme.of(context).textTheme.bodyText1!.color,
117+
color: Theme.of(context).textTheme.bodyLarge!.color,
118118
size: Dimens.twentyFour,
119119
),
120120
title: Text(
121121
StringValues.share,
122122
style: AppStyles.style16Bold.copyWith(
123-
color: Theme.of(context).textTheme.bodyText1!.color,
123+
color: Theme.of(context).textTheme.bodyLarge!.color,
124124
),
125125
),
126126
),
127127
ListTile(
128128
onTap: AppUtility.closeBottomSheet,
129129
leading: Icon(
130130
Icons.report,
131-
color: Theme.of(context).textTheme.bodyText1!.color,
131+
color: Theme.of(context).textTheme.bodyLarge!.color,
132132
size: Dimens.twentyFour,
133133
),
134134
title: Text(
135135
StringValues.report,
136136
style: AppStyles.style16Bold.copyWith(
137-
color: Theme.of(context).textTheme.bodyText1!.color,
137+
color: Theme.of(context).textTheme.bodyLarge!.color,
138138
),
139139
),
140140
),

‎lib/global_widgets/primary_filled_btn.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class NxFilledButton extends StatelessWidget {
5858
style: labelStyle ??
5959
AppStyles.style16Bold.copyWith(
6060
color: labelColor ??
61-
Theme.of(context).textTheme.bodyText1!.color,
61+
Theme.of(context).textTheme.bodyLarge!.color,
6262
fontSize: fontSize ?? Dimens.sixTeen,
6363
),
6464
),

‎lib/global_widgets/primary_outlined_btn.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ class NxOutlinedButton extends StatelessWidget {
5454
),
5555
decoration: BoxDecoration(
5656
border: Border.all(
57-
color: borderColor ?? Theme.of(context).textTheme.subtitle1!.color!,
57+
color:
58+
borderColor ?? Theme.of(context).textTheme.titleMedium!.color!,
5859
width: borderWidth ?? Dimens.pointEight,
5960
style: borderStyle ?? BorderStyle.solid,
6061
),
@@ -73,7 +74,7 @@ class NxOutlinedButton extends StatelessWidget {
7374
style: labelStyle ??
7475
AppStyles.style16Bold.copyWith(
7576
color: labelColor ??
76-
Theme.of(context).textTheme.bodyText1!.color,
77+
Theme.of(context).textTheme.bodyLarge!.color,
7778
fontSize: fontSize ?? Dimens.sixTeen,
7879
),
7980
),

‎lib/global_widgets/primary_text_btn.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class NxTextButton extends StatelessWidget {
3636
? ColorValues.linkColor
3737
: Theme.of(context)
3838
.textTheme
39-
.bodyText1!
39+
.bodyLarge!
4040
.color!
4141
.withAlpha(50),
4242
),

0 commit comments

Comments
 (0)