Skip to content

Commit b93ae9c

Browse files
its-me-abhishekits-me-abhishek
committed
update fontweights
1 parent 2ef73e0 commit b93ae9c

24 files changed

+87
-59
lines changed

‎lib/drawer/filter_drawer.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:google_fonts/google_fonts.dart';
55

66
import 'package:taskwarrior/config/app_settings.dart';
77
import 'package:taskwarrior/config/taskwarriorcolors.dart';
8+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
89
import 'package:taskwarrior/controller/filter_drawer_tour_controller.dart';
910
import 'package:taskwarrior/drawer/filter_drawer_tour.dart';
1011
import 'package:taskwarrior/model/storage/storage_widget.dart';
@@ -107,7 +108,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
107108
child: Text(
108109
'Apply Filters',
109110
style: GoogleFonts.poppins(
110-
fontWeight: FontWeight.bold,
111+
fontWeight: TaskWarriorFonts.bold,
111112
color: (AppSettings.isDarkMode
112113
? TaskWarriorColors.kprimaryTextColor
113114
: TaskWarriorColors.kLightPrimaryTextColor),
@@ -138,7 +139,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
138139
TextSpan(
139140
text: 'Status : ',
140141
style: GoogleFonts.poppins(
141-
fontWeight: FontWeight.bold,
142+
fontWeight: TaskWarriorFonts.bold,
142143
fontSize: 15,
143144
color: AppSettings.isDarkMode
144145
? TaskWarriorColors.white

‎lib/drawer/nav_drawer.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart';
66
import 'package:sizer/sizer.dart';
77
import 'package:taskwarrior/config/app_settings.dart';
88
import 'package:taskwarrior/config/taskwarriorcolors.dart';
9+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
910
import 'package:taskwarrior/model/storage/storage_widget.dart';
1011
import 'package:taskwarrior/views/about/about.dart';
1112
import 'package:taskwarrior/views/profile/profile.dart';
@@ -56,7 +57,7 @@ class _NavDrawerState extends State<NavDrawer> {
5657
'Menu',
5758
style: TextStyle(
5859
fontSize: 25,
59-
fontWeight: FontWeight.bold,
60+
fontWeight: TaskWarriorFonts.bold,
6061
color: AppSettings.isDarkMode
6162
? TaskWarriorColors.white
6263
: TaskWarriorColors.black,

‎lib/model/storage/storage_widget.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import 'package:google_fonts/google_fonts.dart';
1111
import 'package:loggy/loggy.dart';
1212
import 'package:taskwarrior/config/app_settings.dart';
1313
import 'package:taskwarrior/config/taskwarriorcolors.dart';
14+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
1415

1516
import 'package:taskwarrior/model/json.dart';
1617
import 'package:taskwarrior/model/storage.dart';
@@ -287,15 +288,15 @@ class _StorageWidgetState extends State<StorageWidget> {
287288
"Syncing",
288289
style: GoogleFonts.poppins(
289290
fontSize: 18.0,
290-
fontWeight: FontWeight.bold,
291+
fontWeight: TaskWarriorFonts.bold,
291292
),
292293
),
293294
const SizedBox(height: 8.0),
294295
Text(
295296
"Please wait...",
296297
style: GoogleFonts.poppins(
297298
fontSize: 12.0,
298-
fontWeight: FontWeight.normal,
299+
fontWeight: TaskWarriorFonts.regular,
299300
),
300301
),
301302
],

‎lib/services/task_details.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:intl/intl.dart';
88

99
import 'package:taskwarrior/config/app_settings.dart';
1010
import 'package:taskwarrior/config/taskwarriorcolors.dart';
11+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
1112
import 'package:taskwarrior/model/storage/storage_widget.dart';
1213
import 'package:taskwarrior/views/home/home.dart';
1314
import 'package:taskwarrior/widgets/pallete.dart';
@@ -440,7 +441,7 @@ class TagsWidget extends StatelessWidget {
440441
TextSpan(
441442
text: '$name:'.padRight(13),
442443
style: GoogleFonts.poppins(
443-
fontWeight: FontWeight.bold,
444+
fontWeight: TaskWarriorFonts.bold,
444445
fontSize: 15,
445446
color: AppSettings.isDarkMode
446447
? TaskWarriorColors.white

‎lib/taskserver/ntaskserver.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:get/get.dart';
33
import 'package:loggy/loggy.dart';
44
import 'package:taskwarrior/config/taskwarriorcolors.dart';
5+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
56
import 'package:taskwarrior/widgets/taskdetails/profiles_widget.dart';
67
// ignore_for_file: use_build_context_synchronously
78

@@ -425,7 +426,7 @@ class _ManageTaskServerState extends State<ManageTaskServer> {
425426
Text(
426427
'Configure TaskRc',
427428
style: TextStyle(
428-
fontWeight: FontWeight.bold,
429+
fontWeight: TaskWarriorFonts.bold,
429430
color: AppSettings.isDarkMode
430431
? TaskWarriorColors.white
431432
: TaskWarriorColors.black,

‎lib/views/Onboarding/onboarding_screen.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_svg/svg.dart';
33
import 'package:google_fonts/google_fonts.dart';
44
import 'package:taskwarrior/config/taskwarriorcolors.dart';
5+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
56
import 'package:taskwarrior/controller/onboarding_controller.dart';
67
import 'package:taskwarrior/views/Onboarding/Model/onboarding_contents.dart';
78
import 'package:taskwarrior/views/Onboarding/Components/size_config.dart';
@@ -93,7 +94,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
9394
content.title,
9495
textAlign: TextAlign.center,
9596
style: GoogleFonts.poppins(
96-
fontWeight: FontWeight.w600,
97+
fontWeight: TaskWarriorFonts.semiBold,
9798
fontSize: (width <= 550) ? 30 : 35,
9899
),
99100
),
@@ -104,7 +105,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
104105
Text(
105106
content.desc,
106107
style: GoogleFonts.poppins(
107-
fontWeight: FontWeight.w300,
108+
fontWeight: TaskWarriorFonts.light,
108109
fontSize: (width <= 550) ? 17 : 17,
109110
),
110111
textAlign: TextAlign.center,
@@ -162,7 +163,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
162163
child: Text(
163164
"Start",
164165
style: GoogleFonts.poppins(
165-
fontWeight: FontWeight.w300,
166+
fontWeight: TaskWarriorFonts.light,
166167
color: TaskWarriorColors.white,
167168
fontSize: (width <= 550) ? 17 : 17,
168169
),
@@ -184,14 +185,14 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
184185
style: TextButton.styleFrom(
185186
elevation: 0,
186187
textStyle: TextStyle(
187-
fontWeight: FontWeight.w600,
188+
fontWeight: TaskWarriorFonts.semiBold,
188189
fontSize: (width <= 550) ? 13 : 17,
189190
),
190191
),
191192
child: Text(
192193
"Skip",
193194
style: GoogleFonts.poppins(
194-
fontWeight: FontWeight.bold,
195+
fontWeight: TaskWarriorFonts.bold,
195196
color: TaskWarriorColors.black,
196197
fontSize: (width <= 550) ? 12 : 12,
197198
),
@@ -218,7 +219,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
218219
child: Text(
219220
"Next",
220221
style: GoogleFonts.poppins(
221-
fontWeight: FontWeight.w300,
222+
fontWeight: TaskWarriorFonts.light,
222223
color: TaskWarriorColors.white,
223224
fontSize: (width <= 550) ? 12 : 12,
224225
),

‎lib/views/about/about.dart‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:package_info_plus/package_info_plus.dart';
55
import 'package:sizer/sizer.dart';
66
import 'package:taskwarrior/config/app_settings.dart';
77
import 'package:taskwarrior/config/taskwarriorcolors.dart';
8+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
89
import 'package:url_launcher/url_launcher.dart';
910

1011
class AboutPage extends StatefulWidget {
@@ -59,7 +60,7 @@ class _AboutPageState extends State<AboutPage> {
5960
Text(
6061
"Taskwarrior",
6162
style: GoogleFonts.poppins(
62-
fontWeight: FontWeight.bold,
63+
fontWeight: TaskWarriorFonts.bold,
6364
fontSize: 18,
6465
color: AppSettings.isDarkMode
6566
? TaskWarriorColors.white
@@ -91,7 +92,7 @@ class _AboutPageState extends State<AboutPage> {
9192
TextSpan(
9293
text: 'Version: ',
9394
style: GoogleFonts.poppins(
94-
fontWeight: FontWeight.bold,
95+
fontWeight: TaskWarriorFonts.bold,
9596
fontSize: 15,
9697
color: AppSettings.isDarkMode
9798
? TaskWarriorColors.white
@@ -116,7 +117,7 @@ class _AboutPageState extends State<AboutPage> {
116117
TextSpan(
117118
text: 'Package: ',
118119
style: GoogleFonts.poppins(
119-
fontWeight: FontWeight.bold,
120+
fontWeight: TaskWarriorFonts.bold,
120121
fontSize: 15,
121122
color: AppSettings.isDarkMode
122123
? TaskWarriorColors.white
@@ -149,7 +150,7 @@ class _AboutPageState extends State<AboutPage> {
149150
introduction,
150151
textAlign: TextAlign.center,
151152
style: GoogleFonts.poppins(
152-
fontWeight: FontWeight.w500,
153+
fontWeight: TaskWarriorFonts.medium,
153154
fontSize: 12,
154155
color: AppSettings.isDarkMode
155156
? TaskWarriorColors.white
@@ -194,7 +195,7 @@ class _AboutPageState extends State<AboutPage> {
194195
label: Text(
195196
"GitHub",
196197
style: GoogleFonts.poppins(
197-
fontWeight: FontWeight.w500,
198+
fontWeight: TaskWarriorFonts.medium,
198199
fontSize: 12,
199200
color: AppSettings.isDarkMode
200201
? TaskWarriorColors.black
@@ -232,7 +233,7 @@ class _AboutPageState extends State<AboutPage> {
232233
label: Text(
233234
"CCExtractor",
234235
style: GoogleFonts.poppins(
235-
fontWeight: FontWeight.w500,
236+
fontWeight: TaskWarriorFonts.medium,
236237
fontSize: 12,
237238
color: AppSettings.isDarkMode
238239
? TaskWarriorColors.black
@@ -250,7 +251,7 @@ class _AboutPageState extends State<AboutPage> {
250251
"Eager to enhance this project? Visit our GitHub repository.",
251252
textAlign: TextAlign.center,
252253
style: GoogleFonts.poppins(
253-
fontWeight: FontWeight.w600,
254+
fontWeight: TaskWarriorFonts.semiBold,
254255
fontSize: 12,
255256
color: AppSettings.isDarkMode
256257
? TaskWarriorColors.white

‎lib/views/reports/pages/burndown_daily.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:taskwarrior/config/taskwarriorcolors.dart';
77
import 'dart:io';
88

99
import 'package:syncfusion_flutter_charts/charts.dart';
10+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
1011
import 'package:taskwarrior/model/chart.dart';
1112
import 'package:taskwarrior/model/json/task.dart';
1213
import 'package:taskwarrior/model/storage.dart';
@@ -62,7 +63,7 @@ class _BurnDownDailyState extends State<BurnDownDaily>
6263
Text(
6364
'Date: $date',
6465
style: GoogleFonts.poppins(
65-
fontWeight: FontWeight.bold,
66+
fontWeight: TaskWarriorFonts.bold,
6667
),
6768
),
6869
Text(
@@ -158,7 +159,7 @@ class _BurnDownDailyState extends State<BurnDownDaily>
158159
title: AxisTitle(
159160
text: 'Day - Month',
160161
textStyle: GoogleFonts.poppins(
161-
fontWeight: FontWeight.bold,
162+
fontWeight: TaskWarriorFonts.bold,
162163
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
163164
fontSize: 12,
164165
),
@@ -168,7 +169,7 @@ class _BurnDownDailyState extends State<BurnDownDaily>
168169
title: AxisTitle(
169170
text: 'Tasks',
170171
textStyle: GoogleFonts.poppins(
171-
fontWeight: FontWeight.bold,
172+
fontWeight: TaskWarriorFonts.bold,
172173
fontSize: 12,
173174
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
174175
),

‎lib/views/reports/pages/burndown_monthly.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
44
import 'package:google_fonts/google_fonts.dart';
55
import 'package:syncfusion_flutter_charts/charts.dart';
66
import 'package:taskwarrior/config/app_settings.dart';
7+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
78
import 'package:taskwarrior/model/chart.dart';
89
import 'dart:io';
910

@@ -60,7 +61,7 @@ class _BurnDownMonthltState extends State<BurnDownMonthlt>
6061
Text(
6162
'Month-Year: $monthYear',
6263
style: const TextStyle(
63-
fontWeight: FontWeight.bold,
64+
fontWeight: TaskWarriorFonts.bold,
6465
),
6566
),
6667
Text(
@@ -142,7 +143,7 @@ class _BurnDownMonthltState extends State<BurnDownMonthlt>
142143
title: AxisTitle(
143144
text: 'Month - Year',
144145
textStyle: GoogleFonts.poppins(
145-
fontWeight: FontWeight.bold,
146+
fontWeight: TaskWarriorFonts.bold,
146147
fontSize: 12,
147148
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
148149
),
@@ -152,7 +153,7 @@ class _BurnDownMonthltState extends State<BurnDownMonthlt>
152153
title: AxisTitle(
153154
text: 'Tasks',
154155
textStyle: GoogleFonts.poppins(
155-
fontWeight: FontWeight.bold,
156+
fontWeight: TaskWarriorFonts.bold,
156157
fontSize: 12,
157158
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
158159
),

‎lib/views/reports/pages/burndown_weekly.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:taskwarrior/config/taskwarriorcolors.dart';
77
import 'dart:io';
88

99
import 'package:syncfusion_flutter_charts/charts.dart';
10+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
1011
import 'package:taskwarrior/model/chart.dart';
1112
import 'package:taskwarrior/model/json/task.dart';
1213
import 'package:taskwarrior/model/storage.dart';
@@ -61,7 +62,7 @@ class _BurnDownWeeklyState extends State<BurnDownWeekly>
6162
Text(
6263
weekNumber,
6364
style: const TextStyle(
64-
fontWeight: FontWeight.bold,
65+
fontWeight: TaskWarriorFonts.bold,
6566
),
6667
),
6768
Text(
@@ -158,7 +159,7 @@ class _BurnDownWeeklyState extends State<BurnDownWeekly>
158159
title: AxisTitle(
159160
text: 'Weeks - Year',
160161
textStyle: GoogleFonts.poppins(
161-
fontWeight: FontWeight.bold,
162+
fontWeight: TaskWarriorFonts.bold,
162163
fontSize: 12,
163164
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
164165
),
@@ -168,7 +169,7 @@ class _BurnDownWeeklyState extends State<BurnDownWeekly>
168169
title: AxisTitle(
169170
text: 'Tasks',
170171
textStyle: GoogleFonts.poppins(
171-
fontWeight: FontWeight.bold,
172+
fontWeight: TaskWarriorFonts.bold,
172173
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
173174
fontSize: 12,
174175
),

0 commit comments

Comments
 (0)