Skip to content

Commit 73b7c01

Browse files
Pavel401Pavel401
authored
Merge pull request #303 from its-me-abhishek/main
Added a global class to manage Font weights and Font sizes
2 parents 35f58f4 + efca87c commit 73b7c01

27 files changed

+182
-126
lines changed

‎lib/config/taskwarriorfonts.dart‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import 'package:flutter/material.dart';
2+
3+
class TaskWarriorFonts {
4+
// Font weights
5+
static const FontWeight thin = FontWeight.w100;
6+
static const FontWeight extraLight = FontWeight.w200;
7+
static const FontWeight light = FontWeight.w300;
8+
static const FontWeight regular = FontWeight.w400;
9+
static const FontWeight medium = FontWeight.w500;
10+
static const FontWeight semiBold = FontWeight.w600;
11+
static const FontWeight bold = FontWeight.w700;
12+
static const FontWeight extraBold = FontWeight.w800;
13+
static const FontWeight black = FontWeight.w900;
14+
15+
// Font sizes
16+
static const double fontSizeSmall = 12.0;
17+
static const double fontSizeMedium = 16.0;
18+
static const double fontSizeLarge = 20.0;
19+
static const double fontSizeExtraLarge = 24.0;
20+
}

‎lib/drawer/filter_drawer.dart‎

Lines changed: 9 additions & 8 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,11 +108,11 @@ 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),
114-
fontSize: 25),
115+
fontSize: TaskWarriorFonts.fontSizeExtraLarge),
115116
),
116117
),
117118
),
@@ -138,8 +139,8 @@ class _FilterDrawerState extends State<FilterDrawer> {
138139
TextSpan(
139140
text: 'Status : ',
140141
style: GoogleFonts.poppins(
141-
fontWeight: FontWeight.bold,
142-
fontSize: 15,
142+
fontWeight: TaskWarriorFonts.bold,
143+
fontSize: TaskWarriorFonts.fontSizeMedium,
143144
color: AppSettings.isDarkMode
144145
? TaskWarriorColors.white
145146
: TaskWarriorColors.black,
@@ -150,7 +151,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
150151
? 'pending'
151152
: 'completed',
152153
style: GoogleFonts.poppins(
153-
fontSize: 15,
154+
fontSize: TaskWarriorFonts.fontSizeMedium,
154155
color: AppSettings.isDarkMode
155156
? TaskWarriorColors.white
156157
: TaskWarriorColors.black,
@@ -210,7 +211,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
210211
? TaskWarriorColors.kprimaryTextColor
211212
: TaskWarriorColors.kLightSecondaryTextColor),
212213
//
213-
fontSize: 18),
214+
fontSize: TaskWarriorFonts.fontSizeLarge),
214215
//textAlign: TextAlign.right,
215216
),
216217
),
@@ -253,7 +254,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
253254
color: (AppSettings.isDarkMode
254255
? TaskWarriorColors.kprimaryTextColor
255256
: TaskWarriorColors.kLightPrimaryTextColor),
256-
fontSize: 18),
257+
fontSize: TaskWarriorFonts.fontSizeLarge),
257258
// textAlign: TextAlign.right,
258259
),
259260
),
@@ -328,7 +329,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
328329
child: Text(
329330
'Reset Sort',
330331
style: GoogleFonts.poppins(
331-
fontSize: 15,
332+
fontSize: TaskWarriorFonts.fontSizeMedium,
332333
color: AppSettings.isDarkMode
333334
? TaskWarriorColors.kLightSecondaryTextColor
334335
: TaskWarriorColors.ksecondaryTextColor),

‎lib/drawer/nav_drawer.dart‎

Lines changed: 4 additions & 3 deletions
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';
@@ -55,8 +56,8 @@ class _NavDrawerState extends State<NavDrawer> {
5556
Text(
5657
'Menu',
5758
style: TextStyle(
58-
fontSize: 25,
59-
fontWeight: FontWeight.bold,
59+
fontSize: TaskWarriorFonts.fontSizeExtraLarge,
60+
fontWeight: TaskWarriorFonts.bold,
6061
color: AppSettings.isDarkMode
6162
? TaskWarriorColors.white
6263
: TaskWarriorColors.black,
@@ -195,7 +196,7 @@ class _NavDrawerState extends State<NavDrawer> {
195196
color: AppSettings.isDarkMode
196197
? TaskWarriorColors.white
197198
: TaskWarriorColors.black,
198-
fontSize: 18,
199+
fontSize: TaskWarriorFonts.fontSizeMedium,
199200
),
200201
),
201202
],

‎lib/model/storage/storage_widget.dart‎

Lines changed: 5 additions & 4 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';
@@ -286,16 +287,16 @@ class _StorageWidgetState extends State<StorageWidget> {
286287
Text(
287288
"Syncing",
288289
style: GoogleFonts.poppins(
289-
fontSize: 18.0,
290-
fontWeight: FontWeight.bold,
290+
fontSize: TaskWarriorFonts.fontSizeLarge,
291+
fontWeight: TaskWarriorFonts.bold,
291292
),
292293
),
293294
const SizedBox(height: 8.0),
294295
Text(
295296
"Please wait...",
296297
style: GoogleFonts.poppins(
297-
fontSize: 12.0,
298-
fontWeight: FontWeight.normal,
298+
fontSize: TaskWarriorFonts.fontSizeSmall,
299+
fontWeight: TaskWarriorFonts.regular,
299300
),
300301
),
301302
],

‎lib/services/task_details.dart‎

Lines changed: 3 additions & 2 deletions
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,8 +441,8 @@ class TagsWidget extends StatelessWidget {
440441
TextSpan(
441442
text: '$name:'.padRight(13),
442443
style: GoogleFonts.poppins(
443-
fontWeight: FontWeight.bold,
444-
fontSize: 15,
444+
fontWeight: TaskWarriorFonts.bold,
445+
fontSize: TaskWarriorFonts.fontSizeMedium,
445446
color: AppSettings.isDarkMode
446447
? TaskWarriorColors.white
447448
: TaskWarriorColors.black,

‎lib/services/task_list_tem.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart';
33
import 'package:shared_preferences/shared_preferences.dart';
44
import 'package:taskwarrior/config/app_settings.dart';
55
import 'package:taskwarrior/config/taskwarriorcolors.dart';
6+
import 'package:taskwarrior/config/taskwarriorfonts.dart';
67
import 'package:taskwarrior/model/json.dart';
78
import 'package:taskwarrior/widgets/taskw.dart';
89

@@ -141,7 +142,7 @@ class _TaskListItemState extends State<TaskListItem> {
141142
overflow: TextOverflow.ellipsis,
142143
style: GoogleFonts.poppins(
143144
color: dimColor,
144-
fontSize: 12,
145+
fontSize: TaskWarriorFonts.fontSizeSmall,
145146
),
146147
),
147148
),
@@ -198,7 +199,7 @@ class _TaskListItemState extends State<TaskListItem> {
198199
overflow: TextOverflow.ellipsis,
199200
style: GoogleFonts.poppins(
200201
color: dimColor,
201-
fontSize: 12,
202+
fontSize: TaskWarriorFonts.fontSizeSmall,
202203
),
203204
),
204205
),

‎lib/taskserver/ntaskserver.dart‎

Lines changed: 8 additions & 3 deletions
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

@@ -321,12 +322,16 @@ class _ManageTaskServerState extends State<ManageTaskServer> {
321322
Text(
322323
"Configure TaskServer",
323324
style: GoogleFonts.poppins(
324-
color: TaskWarriorColors.white, fontSize: 18),
325+
color: TaskWarriorColors.white,
326+
fontSize: TaskWarriorFonts.fontSizeLarge,
327+
),
325328
),
326329
Text(
327330
alias ?? profile,
328331
style: GoogleFonts.poppins(
329-
color: TaskWarriorColors.white, fontSize: 12),
332+
color: TaskWarriorColors.white,
333+
fontSize: TaskWarriorFonts.fontSizeSmall,
334+
),
330335
),
331336
],
332337
),
@@ -425,7 +430,7 @@ class _ManageTaskServerState extends State<ManageTaskServer> {
425430
Text(
426431
'Configure TaskRc',
427432
style: TextStyle(
428-
fontWeight: FontWeight.bold,
433+
fontWeight: TaskWarriorFonts.bold,
429434
color: AppSettings.isDarkMode
430435
? TaskWarriorColors.white
431436
: 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: 17 additions & 16 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,8 +60,8 @@ class _AboutPageState extends State<AboutPage> {
5960
Text(
6061
"Taskwarrior",
6162
style: GoogleFonts.poppins(
62-
fontWeight: FontWeight.bold,
63-
fontSize: 18,
63+
fontWeight: TaskWarriorFonts.bold,
64+
fontSize: TaskWarriorFonts.fontSizeLarge,
6465
color: AppSettings.isDarkMode
6566
? TaskWarriorColors.white
6667
: TaskWarriorColors.black,
@@ -91,8 +92,8 @@ class _AboutPageState extends State<AboutPage> {
9192
TextSpan(
9293
text: 'Version: ',
9394
style: GoogleFonts.poppins(
94-
fontWeight: FontWeight.bold,
95-
fontSize: 15,
95+
fontWeight: TaskWarriorFonts.bold,
96+
fontSize: TaskWarriorFonts.fontSizeMedium,
9697
color: AppSettings.isDarkMode
9798
? TaskWarriorColors.white
9899
: TaskWarriorColors.black,
@@ -101,7 +102,7 @@ class _AboutPageState extends State<AboutPage> {
101102
TextSpan(
102103
text: appInfoLines[1],
103104
style: GoogleFonts.poppins(
104-
fontSize: 15,
105+
fontSize: TaskWarriorFonts.fontSizeMedium,
105106
color: AppSettings.isDarkMode
106107
? TaskWarriorColors.white
107108
: TaskWarriorColors.black,
@@ -116,8 +117,8 @@ class _AboutPageState extends State<AboutPage> {
116117
TextSpan(
117118
text: 'Package: ',
118119
style: GoogleFonts.poppins(
119-
fontWeight: FontWeight.bold,
120-
fontSize: 15,
120+
fontWeight: TaskWarriorFonts.bold,
121+
fontSize: TaskWarriorFonts.fontSizeMedium,
121122
color: AppSettings.isDarkMode
122123
? TaskWarriorColors.white
123124
: TaskWarriorColors.black,
@@ -126,7 +127,7 @@ class _AboutPageState extends State<AboutPage> {
126127
TextSpan(
127128
text: appInfoLines[0],
128129
style: GoogleFonts.poppins(
129-
fontSize: 15,
130+
fontSize: TaskWarriorFonts.fontSizeMedium,
130131
color: AppSettings.isDarkMode
131132
? TaskWarriorColors.white
132133
: TaskWarriorColors.black,
@@ -149,8 +150,8 @@ class _AboutPageState extends State<AboutPage> {
149150
introduction,
150151
textAlign: TextAlign.center,
151152
style: GoogleFonts.poppins(
152-
fontWeight: FontWeight.w500,
153-
fontSize: 12,
153+
fontWeight: TaskWarriorFonts.medium,
154+
fontSize: TaskWarriorFonts.fontSizeSmall,
154155
color: AppSettings.isDarkMode
155156
? TaskWarriorColors.white
156157
: TaskWarriorColors.black,
@@ -194,8 +195,8 @@ class _AboutPageState extends State<AboutPage> {
194195
label: Text(
195196
"GitHub",
196197
style: GoogleFonts.poppins(
197-
fontWeight: FontWeight.w500,
198-
fontSize: 12,
198+
fontWeight: TaskWarriorFonts.medium,
199+
fontSize: TaskWarriorFonts.fontSizeSmall,
199200
color: AppSettings.isDarkMode
200201
? TaskWarriorColors.black
201202
: TaskWarriorColors.white,
@@ -232,8 +233,8 @@ class _AboutPageState extends State<AboutPage> {
232233
label: Text(
233234
"CCExtractor",
234235
style: GoogleFonts.poppins(
235-
fontWeight: FontWeight.w500,
236-
fontSize: 12,
236+
fontWeight: TaskWarriorFonts.medium,
237+
fontSize: TaskWarriorFonts.fontSizeSmall,
237238
color: AppSettings.isDarkMode
238239
? TaskWarriorColors.black
239240
: TaskWarriorColors.white,
@@ -250,8 +251,8 @@ 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-
fontSize: 12,
254+
fontWeight: TaskWarriorFonts.semiBold,
255+
fontSize: TaskWarriorFonts.fontSizeSmall,
255256
color: AppSettings.isDarkMode
256257
? TaskWarriorColors.white
257258
: TaskWarriorColors.black,

0 commit comments

Comments
 (0)