From 2ef73e06ed03a12f0ae882a929dd79214d4af02f Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 21 Feb 2024 00:20:12 +0530 Subject: [PATCH 1/3] add global font weights and sizes --- lib/config/taskwarriorfonts.dart | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lib/config/taskwarriorfonts.dart diff --git a/lib/config/taskwarriorfonts.dart b/lib/config/taskwarriorfonts.dart new file mode 100644 index 00000000..1ce29ef2 --- /dev/null +++ b/lib/config/taskwarriorfonts.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; + +class TaskWarriorFonts { + // Font weights + static const FontWeight thin = FontWeight.w100; + static const FontWeight extraLight = FontWeight.w200; + static const FontWeight light = FontWeight.w300; + static const FontWeight regular = FontWeight.w400; + static const FontWeight medium = FontWeight.w500; + static const FontWeight semiBold = FontWeight.w600; + static const FontWeight bold = FontWeight.w700; + static const FontWeight extraBold = FontWeight.w800; + static const FontWeight black = FontWeight.w900; + + // Font sizes + static const double fontSizeSmall = 12.0; + static const double fontSizeMedium = 16.0; + static const double fontSizeLarge = 20.0; + static const double fontSizeExtraLarge = 24.0; +} From b93ae9c0d646f24cbfecb4bea0c34ecacffdbadb Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 21 Feb 2024 18:23:16 +0530 Subject: [PATCH 2/3] update fontweights --- lib/drawer/filter_drawer.dart | 5 +++-- lib/drawer/nav_drawer.dart | 3 ++- lib/model/storage/storage_widget.dart | 5 +++-- lib/services/task_details.dart | 3 ++- lib/taskserver/ntaskserver.dart | 3 ++- lib/views/Onboarding/onboarding_screen.dart | 13 +++++++------ lib/views/about/about.dart | 15 ++++++++------- lib/views/reports/pages/burndown_daily.dart | 7 ++++--- lib/views/reports/pages/burndown_monthly.dart | 7 ++++--- lib/views/reports/pages/burndown_weekly.dart | 7 ++++--- lib/views/reports/reports_home.dart | 9 +++++---- .../reports/widgets/commonChartIndicator.dart | 7 ++++--- lib/views/settings/settings.dart | 15 ++++++++------- lib/widgets/add_Task.dart | 5 +++-- lib/widgets/app_placeholder.dart | 3 ++- lib/widgets/createDrawerHeader.dart | 6 +++++- lib/widgets/profilefunctions/manageprofile.dart | 3 ++- lib/widgets/profilefunctions/selectprofile.dart | 5 +++-- lib/widgets/project_filter.dart | 5 +++-- lib/widgets/tag_filter.dart | 4 +++- lib/widgets/taskdetails/dateTimePicker.dart | 5 +++-- lib/widgets/taskdetails/description_widget.dart | 5 +++-- lib/widgets/taskdetails/priority_widget.dart | 3 ++- lib/widgets/taskdetails/status_widget.dart | 3 ++- 24 files changed, 87 insertions(+), 59 deletions(-) diff --git a/lib/drawer/filter_drawer.dart b/lib/drawer/filter_drawer.dart index ba0277ce..206267ad 100644 --- a/lib/drawer/filter_drawer.dart +++ b/lib/drawer/filter_drawer.dart @@ -5,6 +5,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/controller/filter_drawer_tour_controller.dart'; import 'package:taskwarrior/drawer/filter_drawer_tour.dart'; import 'package:taskwarrior/model/storage/storage_widget.dart'; @@ -107,7 +108,7 @@ class _FilterDrawerState extends State { child: Text( 'Apply Filters', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: (AppSettings.isDarkMode ? TaskWarriorColors.kprimaryTextColor : TaskWarriorColors.kLightPrimaryTextColor), @@ -138,7 +139,7 @@ class _FilterDrawerState extends State { TextSpan( text: 'Status : ', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/drawer/nav_drawer.dart b/lib/drawer/nav_drawer.dart index c29e1c14..151bcdb2 100644 --- a/lib/drawer/nav_drawer.dart +++ b/lib/drawer/nav_drawer.dart @@ -6,6 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:sizer/sizer.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/storage/storage_widget.dart'; import 'package:taskwarrior/views/about/about.dart'; import 'package:taskwarrior/views/profile/profile.dart'; @@ -56,7 +57,7 @@ class _NavDrawerState extends State { 'Menu', style: TextStyle( fontSize: 25, - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/model/storage/storage_widget.dart b/lib/model/storage/storage_widget.dart index 5660088b..f7def0ae 100644 --- a/lib/model/storage/storage_widget.dart +++ b/lib/model/storage/storage_widget.dart @@ -11,6 +11,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:loggy/loggy.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/json.dart'; import 'package:taskwarrior/model/storage.dart'; @@ -287,7 +288,7 @@ class _StorageWidgetState extends State { "Syncing", style: GoogleFonts.poppins( fontSize: 18.0, - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, ), ), const SizedBox(height: 8.0), @@ -295,7 +296,7 @@ class _StorageWidgetState extends State { "Please wait...", style: GoogleFonts.poppins( fontSize: 12.0, - fontWeight: FontWeight.normal, + fontWeight: TaskWarriorFonts.regular, ), ), ], diff --git a/lib/services/task_details.dart b/lib/services/task_details.dart index 26c27220..0eb67e66 100644 --- a/lib/services/task_details.dart +++ b/lib/services/task_details.dart @@ -8,6 +8,7 @@ import 'package:intl/intl.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/storage/storage_widget.dart'; import 'package:taskwarrior/views/home/home.dart'; import 'package:taskwarrior/widgets/pallete.dart'; @@ -440,7 +441,7 @@ class TagsWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/taskserver/ntaskserver.dart b/lib/taskserver/ntaskserver.dart index 580555b5..75a64d82 100644 --- a/lib/taskserver/ntaskserver.dart +++ b/lib/taskserver/ntaskserver.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:loggy/loggy.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/widgets/taskdetails/profiles_widget.dart'; // ignore_for_file: use_build_context_synchronously @@ -425,7 +426,7 @@ class _ManageTaskServerState extends State { Text( 'Configure TaskRc', style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/views/Onboarding/onboarding_screen.dart b/lib/views/Onboarding/onboarding_screen.dart index 3494fdc9..9f539e84 100644 --- a/lib/views/Onboarding/onboarding_screen.dart +++ b/lib/views/Onboarding/onboarding_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/controller/onboarding_controller.dart'; import 'package:taskwarrior/views/Onboarding/Model/onboarding_contents.dart'; import 'package:taskwarrior/views/Onboarding/Components/size_config.dart'; @@ -93,7 +94,7 @@ class _OnboardingScreenState extends State { content.title, textAlign: TextAlign.center, style: GoogleFonts.poppins( - fontWeight: FontWeight.w600, + fontWeight: TaskWarriorFonts.semiBold, fontSize: (width <= 550) ? 30 : 35, ), ), @@ -104,7 +105,7 @@ class _OnboardingScreenState extends State { Text( content.desc, style: GoogleFonts.poppins( - fontWeight: FontWeight.w300, + fontWeight: TaskWarriorFonts.light, fontSize: (width <= 550) ? 17 : 17, ), textAlign: TextAlign.center, @@ -162,7 +163,7 @@ class _OnboardingScreenState extends State { child: Text( "Start", style: GoogleFonts.poppins( - fontWeight: FontWeight.w300, + fontWeight: TaskWarriorFonts.light, color: TaskWarriorColors.white, fontSize: (width <= 550) ? 17 : 17, ), @@ -184,14 +185,14 @@ class _OnboardingScreenState extends State { style: TextButton.styleFrom( elevation: 0, textStyle: TextStyle( - fontWeight: FontWeight.w600, + fontWeight: TaskWarriorFonts.semiBold, fontSize: (width <= 550) ? 13 : 17, ), ), child: Text( "Skip", style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: TaskWarriorColors.black, fontSize: (width <= 550) ? 12 : 12, ), @@ -218,7 +219,7 @@ class _OnboardingScreenState extends State { child: Text( "Next", style: GoogleFonts.poppins( - fontWeight: FontWeight.w300, + fontWeight: TaskWarriorFonts.light, color: TaskWarriorColors.white, fontSize: (width <= 550) ? 12 : 12, ), diff --git a/lib/views/about/about.dart b/lib/views/about/about.dart index 7ae62ac5..66e22a42 100644 --- a/lib/views/about/about.dart +++ b/lib/views/about/about.dart @@ -5,6 +5,7 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:sizer/sizer.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:url_launcher/url_launcher.dart'; class AboutPage extends StatefulWidget { @@ -59,7 +60,7 @@ class _AboutPageState extends State { Text( "Taskwarrior", style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 18, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -91,7 +92,7 @@ class _AboutPageState extends State { TextSpan( text: 'Version: ', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -116,7 +117,7 @@ class _AboutPageState extends State { TextSpan( text: 'Package: ', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -149,7 +150,7 @@ class _AboutPageState extends State { introduction, textAlign: TextAlign.center, style: GoogleFonts.poppins( - fontWeight: FontWeight.w500, + fontWeight: TaskWarriorFonts.medium, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -194,7 +195,7 @@ class _AboutPageState extends State { label: Text( "GitHub", style: GoogleFonts.poppins( - fontWeight: FontWeight.w500, + fontWeight: TaskWarriorFonts.medium, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.black @@ -232,7 +233,7 @@ class _AboutPageState extends State { label: Text( "CCExtractor", style: GoogleFonts.poppins( - fontWeight: FontWeight.w500, + fontWeight: TaskWarriorFonts.medium, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.black @@ -250,7 +251,7 @@ class _AboutPageState extends State { "Eager to enhance this project? Visit our GitHub repository.", textAlign: TextAlign.center, style: GoogleFonts.poppins( - fontWeight: FontWeight.w600, + fontWeight: TaskWarriorFonts.semiBold, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/views/reports/pages/burndown_daily.dart b/lib/views/reports/pages/burndown_daily.dart index c5e80c67..beca388a 100644 --- a/lib/views/reports/pages/burndown_daily.dart +++ b/lib/views/reports/pages/burndown_daily.dart @@ -7,6 +7,7 @@ import 'package:taskwarrior/config/taskwarriorcolors.dart'; import 'dart:io'; import 'package:syncfusion_flutter_charts/charts.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/chart.dart'; import 'package:taskwarrior/model/json/task.dart'; import 'package:taskwarrior/model/storage.dart'; @@ -62,7 +63,7 @@ class _BurnDownDailyState extends State Text( 'Date: $date', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, ), ), Text( @@ -158,7 +159,7 @@ class _BurnDownDailyState extends State title: AxisTitle( text: 'Day - Month', textStyle: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? Colors.white : Colors.black, fontSize: 12, ), @@ -168,7 +169,7 @@ class _BurnDownDailyState extends State title: AxisTitle( text: 'Tasks', textStyle: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 12, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), diff --git a/lib/views/reports/pages/burndown_monthly.dart b/lib/views/reports/pages/burndown_monthly.dart index 4888ff13..ec5fa2cf 100644 --- a/lib/views/reports/pages/burndown_monthly.dart +++ b/lib/views/reports/pages/burndown_monthly.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; import 'package:taskwarrior/config/app_settings.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/chart.dart'; import 'dart:io'; @@ -60,7 +61,7 @@ class _BurnDownMonthltState extends State Text( 'Month-Year: $monthYear', style: const TextStyle( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, ), ), Text( @@ -142,7 +143,7 @@ class _BurnDownMonthltState extends State title: AxisTitle( text: 'Month - Year', textStyle: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 12, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), @@ -152,7 +153,7 @@ class _BurnDownMonthltState extends State title: AxisTitle( text: 'Tasks', textStyle: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 12, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), diff --git a/lib/views/reports/pages/burndown_weekly.dart b/lib/views/reports/pages/burndown_weekly.dart index d5e5fda4..79944bc9 100644 --- a/lib/views/reports/pages/burndown_weekly.dart +++ b/lib/views/reports/pages/burndown_weekly.dart @@ -7,6 +7,7 @@ import 'package:taskwarrior/config/taskwarriorcolors.dart'; import 'dart:io'; import 'package:syncfusion_flutter_charts/charts.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/chart.dart'; import 'package:taskwarrior/model/json/task.dart'; import 'package:taskwarrior/model/storage.dart'; @@ -61,7 +62,7 @@ class _BurnDownWeeklyState extends State Text( weekNumber, style: const TextStyle( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, ), ), Text( @@ -158,7 +159,7 @@ class _BurnDownWeeklyState extends State title: AxisTitle( text: 'Weeks - Year', textStyle: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 12, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), @@ -168,7 +169,7 @@ class _BurnDownWeeklyState extends State title: AxisTitle( text: 'Tasks', textStyle: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? Colors.white : Colors.black, fontSize: 12, ), diff --git a/lib/views/reports/reports_home.dart b/lib/views/reports/reports_home.dart index fbc292b8..eee24c18 100644 --- a/lib/views/reports/reports_home.dart +++ b/lib/views/reports/reports_home.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/controller/reports_tour_controller.dart'; import 'package:taskwarrior/model/json/task.dart'; import 'package:taskwarrior/model/storage.dart'; @@ -134,11 +135,11 @@ class _ReportsHomeState extends State controller: _tabController, labelColor: TaskWarriorColors.white, labelStyle: GoogleFonts.poppins( - fontWeight: FontWeight.w500, + fontWeight: TaskWarriorFonts.medium, fontSize: 12, ), unselectedLabelStyle: GoogleFonts.poppins( - fontWeight: FontWeight.w300, + fontWeight: TaskWarriorFonts.light, ), onTap: (value) { setState(() { @@ -188,7 +189,7 @@ class _ReportsHomeState extends State Text( 'No Task found', style: GoogleFonts.poppins( - fontWeight: FontWeight.w500, + fontWeight: TaskWarriorFonts.medium, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -203,7 +204,7 @@ class _ReportsHomeState extends State Text( 'Add a task to see reports', style: GoogleFonts.poppins( - fontWeight: FontWeight.w500, + fontWeight: TaskWarriorFonts.light, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/views/reports/widgets/commonChartIndicator.dart b/lib/views/reports/widgets/commonChartIndicator.dart index 908dc065..f57eea83 100644 --- a/lib/views/reports/widgets/commonChartIndicator.dart +++ b/lib/views/reports/widgets/commonChartIndicator.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; ///Common widget for Report chart indicator class CommonChartIndicator extends StatelessWidget { @@ -20,7 +21,7 @@ class CommonChartIndicator extends StatelessWidget { Text( title, style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -45,7 +46,7 @@ class CommonChartIndicator extends StatelessWidget { Text( "Completed", style: GoogleFonts.poppins( - fontWeight: FontWeight.w400, + fontWeight: TaskWarriorFonts.regular, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -64,7 +65,7 @@ class CommonChartIndicator extends StatelessWidget { Text( "Pending", style: GoogleFonts.poppins( - fontWeight: FontWeight.w400, + fontWeight: TaskWarriorFonts.regular, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/views/settings/settings.dart b/lib/views/settings/settings.dart index f5dcc5e6..f2a08278 100644 --- a/lib/views/settings/settings.dart +++ b/lib/views/settings/settings.dart @@ -9,6 +9,7 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:file_picker/file_picker.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/widgets/pallete.dart'; import 'package:taskwarrior/widgets/taskdetails/profiles_widget.dart'; @@ -92,7 +93,7 @@ class _SettingsPageState extends State { Text( 'Moving data to new directory', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -107,7 +108,7 @@ class _SettingsPageState extends State { title: Text( 'Sync on Start', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 18, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -139,7 +140,7 @@ class _SettingsPageState extends State { title: Text( 'Sync on Task Create', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -171,7 +172,7 @@ class _SettingsPageState extends State { title: Text( 'Highlight the task', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -203,7 +204,7 @@ class _SettingsPageState extends State { title: Text( 'Select directory', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -278,7 +279,7 @@ class _SettingsPageState extends State { title: Text( 'Reset to default', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -424,7 +425,7 @@ class _SettingsPageState extends State { title: Text( 'Error', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 16, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/widgets/add_Task.dart b/lib/widgets/add_Task.dart index 6fc14541..9e13f361 100644 --- a/lib/widgets/add_Task.dart +++ b/lib/widgets/add_Task.dart @@ -9,6 +9,7 @@ import 'package:intl/intl.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/controller/WidgetController.dart'; import 'package:taskwarrior/model/storage/storage_widget.dart'; import 'package:taskwarrior/widgets/taskfunctions/taskparser.dart'; @@ -180,7 +181,7 @@ class _AddTaskBottomSheetState extends State { color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, height: 3.3, ), ), @@ -334,7 +335,7 @@ class _AddTaskBottomSheetState extends State { Text( 'Priority : ', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/widgets/app_placeholder.dart b/lib/widgets/app_placeholder.dart index e28df03a..92a3a0db 100644 --- a/lib/widgets/app_placeholder.dart +++ b/lib/widgets/app_placeholder.dart @@ -3,6 +3,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class AppSetupPlaceholder extends StatelessWidget { const AppSetupPlaceholder({super.key}); @@ -30,7 +31,7 @@ class AppSetupPlaceholder extends StatelessWidget { Text( "Setting up the app...", style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 18, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/widgets/createDrawerHeader.dart b/lib/widgets/createDrawerHeader.dart index f03f76ff..102a48ab 100644 --- a/lib/widgets/createDrawerHeader.dart +++ b/lib/widgets/createDrawerHeader.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; Widget createDrawerHeader() { return ListTile( @@ -11,7 +12,10 @@ Widget createDrawerHeader() { ), title: Text( 'Taskwarrior', - style: GoogleFonts.poppins(fontSize: 30.0, fontWeight: FontWeight.w500), + style: GoogleFonts.poppins( + fontSize: 30.0, + fontWeight: TaskWarriorFonts.medium, + ), ), ); } diff --git a/lib/widgets/profilefunctions/manageprofile.dart b/lib/widgets/profilefunctions/manageprofile.dart index f0483e93..13b93974 100644 --- a/lib/widgets/profilefunctions/manageprofile.dart +++ b/lib/widgets/profilefunctions/manageprofile.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:tuple/tuple.dart'; @@ -52,7 +53,7 @@ class ManageProfile extends StatelessWidget { title: Text( 'Manage selected profile', style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/widgets/profilefunctions/selectprofile.dart b/lib/widgets/profilefunctions/selectprofile.dart index 8049aedb..ef5b2f2d 100644 --- a/lib/widgets/profilefunctions/selectprofile.dart +++ b/lib/widgets/profilefunctions/selectprofile.dart @@ -5,6 +5,7 @@ import 'package:sizer/sizer.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class SelectProfile extends StatelessWidget { const SelectProfile( @@ -44,7 +45,7 @@ class SelectProfile extends StatelessWidget { 'Current Profile:', overflow: TextOverflow.fade, style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -75,7 +76,7 @@ class SelectProfile extends StatelessWidget { 'All Profiles:', overflow: TextOverflow.fade, style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/widgets/project_filter.dart b/lib/widgets/project_filter.dart index d5469fdd..efdf73c0 100644 --- a/lib/widgets/project_filter.dart +++ b/lib/widgets/project_filter.dart @@ -5,6 +5,7 @@ import 'package:sizer/sizer.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/widgets/taskw.dart'; class InheritedProjects extends InheritedWidget { @@ -57,7 +58,7 @@ class ProjectsColumn extends StatelessWidget { Text( "Project : ", style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -97,7 +98,7 @@ class ProjectsColumn extends StatelessWidget { Text( "All Projects", style: GoogleFonts.poppins( - fontWeight: FontWeight.w600, + fontWeight: TaskWarriorFonts.semiBold, fontSize: 12, color: AppSettings.isDarkMode ? TaskWarriorColors.white diff --git a/lib/widgets/tag_filter.dart b/lib/widgets/tag_filter.dart index 9dd9dc3f..2402fe18 100644 --- a/lib/widgets/tag_filter.dart +++ b/lib/widgets/tag_filter.dart @@ -4,6 +4,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class TagFilterMetadata { const TagFilterMetadata({ @@ -56,7 +57,8 @@ class TagFiltersWrap extends StatelessWidget { label: Text( entry.value.display, style: GoogleFonts.poppins( - fontWeight: entry.value.selected ? FontWeight.w700 : null, + fontWeight: + entry.value.selected ? TaskWarriorFonts.bold : null, color: AppSettings.isDarkMode ? TaskWarriorColors.black : TaskWarriorColors.white), diff --git a/lib/widgets/taskdetails/dateTimePicker.dart b/lib/widgets/taskdetails/dateTimePicker.dart index 60739c48..5bc649de 100644 --- a/lib/widgets/taskdetails/dateTimePicker.dart +++ b/lib/widgets/taskdetails/dateTimePicker.dart @@ -7,6 +7,7 @@ import 'package:intl/intl.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class DateTimeWidget extends StatelessWidget { const DateTimeWidget({ @@ -40,7 +41,7 @@ class DateTimeWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? Colors.white @@ -152,7 +153,7 @@ class StartWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? Colors.white diff --git a/lib/widgets/taskdetails/description_widget.dart b/lib/widgets/taskdetails/description_widget.dart index b6154532..a41bc4ea 100644 --- a/lib/widgets/taskdetails/description_widget.dart +++ b/lib/widgets/taskdetails/description_widget.dart @@ -5,6 +5,7 @@ import 'package:loggy/loggy.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class DescriptionWidget extends StatelessWidget { const DescriptionWidget( @@ -37,7 +38,7 @@ class DescriptionWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? Colors.white @@ -166,7 +167,7 @@ class ProjectWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? Colors.white diff --git a/lib/widgets/taskdetails/priority_widget.dart b/lib/widgets/taskdetails/priority_widget.dart index 21a70378..18796d02 100644 --- a/lib/widgets/taskdetails/priority_widget.dart +++ b/lib/widgets/taskdetails/priority_widget.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class PriorityWidget extends StatelessWidget { const PriorityWidget( @@ -34,7 +35,7 @@ class PriorityWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? Colors.white diff --git a/lib/widgets/taskdetails/status_widget.dart b/lib/widgets/taskdetails/status_widget.dart index 65af70a9..4e478177 100644 --- a/lib/widgets/taskdetails/status_widget.dart +++ b/lib/widgets/taskdetails/status_widget.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; class StatusWidget extends StatelessWidget { const StatusWidget( @@ -37,7 +38,7 @@ class StatusWidget extends StatelessWidget { TextSpan( text: '$name:'.padRight(13), style: GoogleFonts.poppins( - fontWeight: FontWeight.bold, + fontWeight: TaskWarriorFonts.bold, fontSize: 15, color: AppSettings.isDarkMode ? Colors.white From 81f335985d4319ac992b222a7aa7eeb5256fa9d5 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 21 Feb 2024 19:03:59 +0530 Subject: [PATCH 3/3] update font sizes --- lib/drawer/filter_drawer.dart | 12 ++--- lib/drawer/nav_drawer.dart | 4 +- lib/model/storage/storage_widget.dart | 4 +- lib/services/task_details.dart | 2 +- lib/services/task_list_tem.dart | 5 +- lib/taskserver/ntaskserver.dart | 8 +++- lib/views/about/about.dart | 18 +++---- lib/views/reports/pages/burndown_daily.dart | 4 +- lib/views/reports/pages/burndown_monthly.dart | 4 +- lib/views/reports/pages/burndown_weekly.dart | 4 +- lib/views/reports/reports_home.dart | 6 +-- .../reports/widgets/commonChartIndicator.dart | 6 +-- lib/views/settings/settings.dart | 48 ++++++++++--------- lib/widgets/app_placeholder.dart | 2 +- lib/widgets/buildTasks.dart | 3 +- .../profilefunctions/manageprofile.dart | 2 +- .../profilefunctions/selectprofile.dart | 6 +-- lib/widgets/project_filter.dart | 8 ++-- lib/widgets/taskdetails/dateTimePicker.dart | 8 ++-- .../taskdetails/description_widget.dart | 8 ++-- lib/widgets/taskdetails/priority_widget.dart | 4 +- lib/widgets/taskdetails/status_widget.dart | 4 +- 22 files changed, 89 insertions(+), 81 deletions(-) diff --git a/lib/drawer/filter_drawer.dart b/lib/drawer/filter_drawer.dart index 206267ad..a99e9ba8 100644 --- a/lib/drawer/filter_drawer.dart +++ b/lib/drawer/filter_drawer.dart @@ -112,7 +112,7 @@ class _FilterDrawerState extends State { color: (AppSettings.isDarkMode ? TaskWarriorColors.kprimaryTextColor : TaskWarriorColors.kLightPrimaryTextColor), - fontSize: 25), + fontSize: TaskWarriorFonts.fontSizeExtraLarge), ), ), ), @@ -140,7 +140,7 @@ class _FilterDrawerState extends State { text: 'Status : ', style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -151,7 +151,7 @@ class _FilterDrawerState extends State { ? 'pending' : 'completed', style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -211,7 +211,7 @@ class _FilterDrawerState extends State { ? TaskWarriorColors.kprimaryTextColor : TaskWarriorColors.kLightSecondaryTextColor), // - fontSize: 18), + fontSize: TaskWarriorFonts.fontSizeLarge), //textAlign: TextAlign.right, ), ), @@ -254,7 +254,7 @@ class _FilterDrawerState extends State { color: (AppSettings.isDarkMode ? TaskWarriorColors.kprimaryTextColor : TaskWarriorColors.kLightPrimaryTextColor), - fontSize: 18), + fontSize: TaskWarriorFonts.fontSizeLarge), // textAlign: TextAlign.right, ), ), @@ -329,7 +329,7 @@ class _FilterDrawerState extends State { child: Text( 'Reset Sort', style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.kLightSecondaryTextColor : TaskWarriorColors.ksecondaryTextColor), diff --git a/lib/drawer/nav_drawer.dart b/lib/drawer/nav_drawer.dart index 151bcdb2..ba5cfdba 100644 --- a/lib/drawer/nav_drawer.dart +++ b/lib/drawer/nav_drawer.dart @@ -56,7 +56,7 @@ class _NavDrawerState extends State { Text( 'Menu', style: TextStyle( - fontSize: 25, + fontSize: TaskWarriorFonts.fontSizeExtraLarge, fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? TaskWarriorColors.white @@ -196,7 +196,7 @@ class _NavDrawerState extends State { color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, - fontSize: 18, + fontSize: TaskWarriorFonts.fontSizeMedium, ), ), ], diff --git a/lib/model/storage/storage_widget.dart b/lib/model/storage/storage_widget.dart index f7def0ae..0e80d7cd 100644 --- a/lib/model/storage/storage_widget.dart +++ b/lib/model/storage/storage_widget.dart @@ -287,7 +287,7 @@ class _StorageWidgetState extends State { Text( "Syncing", style: GoogleFonts.poppins( - fontSize: 18.0, + fontSize: TaskWarriorFonts.fontSizeLarge, fontWeight: TaskWarriorFonts.bold, ), ), @@ -295,7 +295,7 @@ class _StorageWidgetState extends State { Text( "Please wait...", style: GoogleFonts.poppins( - fontSize: 12.0, + fontSize: TaskWarriorFonts.fontSizeSmall, fontWeight: TaskWarriorFonts.regular, ), ), diff --git a/lib/services/task_details.dart b/lib/services/task_details.dart index 0eb67e66..5b89c268 100644 --- a/lib/services/task_details.dart +++ b/lib/services/task_details.dart @@ -442,7 +442,7 @@ class TagsWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/services/task_list_tem.dart b/lib/services/task_list_tem.dart index cbe58760..199da67b 100644 --- a/lib/services/task_list_tem.dart +++ b/lib/services/task_list_tem.dart @@ -3,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/json.dart'; import 'package:taskwarrior/widgets/taskw.dart'; @@ -141,7 +142,7 @@ class _TaskListItemState extends State { overflow: TextOverflow.ellipsis, style: GoogleFonts.poppins( color: dimColor, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), ), @@ -198,7 +199,7 @@ class _TaskListItemState extends State { overflow: TextOverflow.ellipsis, style: GoogleFonts.poppins( color: dimColor, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), ), diff --git a/lib/taskserver/ntaskserver.dart b/lib/taskserver/ntaskserver.dart index 75a64d82..190d3155 100644 --- a/lib/taskserver/ntaskserver.dart +++ b/lib/taskserver/ntaskserver.dart @@ -322,12 +322,16 @@ class _ManageTaskServerState extends State { Text( "Configure TaskServer", style: GoogleFonts.poppins( - color: TaskWarriorColors.white, fontSize: 18), + color: TaskWarriorColors.white, + fontSize: TaskWarriorFonts.fontSizeLarge, + ), ), Text( alias ?? profile, style: GoogleFonts.poppins( - color: TaskWarriorColors.white, fontSize: 12), + color: TaskWarriorColors.white, + fontSize: TaskWarriorFonts.fontSizeSmall, + ), ), ], ), diff --git a/lib/views/about/about.dart b/lib/views/about/about.dart index 66e22a42..a92c6ea3 100644 --- a/lib/views/about/about.dart +++ b/lib/views/about/about.dart @@ -61,7 +61,7 @@ class _AboutPageState extends State { "Taskwarrior", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 18, + fontSize: TaskWarriorFonts.fontSizeLarge, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -93,7 +93,7 @@ class _AboutPageState extends State { text: 'Version: ', style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -102,7 +102,7 @@ class _AboutPageState extends State { TextSpan( text: appInfoLines[1], style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -118,7 +118,7 @@ class _AboutPageState extends State { text: 'Package: ', style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -127,7 +127,7 @@ class _AboutPageState extends State { TextSpan( text: appInfoLines[0], style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -151,7 +151,7 @@ class _AboutPageState extends State { textAlign: TextAlign.center, style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.medium, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -196,7 +196,7 @@ class _AboutPageState extends State { "GitHub", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.medium, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.black : TaskWarriorColors.white, @@ -234,7 +234,7 @@ class _AboutPageState extends State { "CCExtractor", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.medium, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.black : TaskWarriorColors.white, @@ -252,7 +252,7 @@ class _AboutPageState extends State { textAlign: TextAlign.center, style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.semiBold, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/views/reports/pages/burndown_daily.dart b/lib/views/reports/pages/burndown_daily.dart index beca388a..61f85045 100644 --- a/lib/views/reports/pages/burndown_daily.dart +++ b/lib/views/reports/pages/burndown_daily.dart @@ -161,7 +161,7 @@ class _BurnDownDailyState extends State textStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? Colors.white : Colors.black, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), ), @@ -170,7 +170,7 @@ class _BurnDownDailyState extends State text: 'Tasks', textStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), ), diff --git a/lib/views/reports/pages/burndown_monthly.dart b/lib/views/reports/pages/burndown_monthly.dart index ec5fa2cf..4d5eed7b 100644 --- a/lib/views/reports/pages/burndown_monthly.dart +++ b/lib/views/reports/pages/burndown_monthly.dart @@ -144,7 +144,7 @@ class _BurnDownMonthltState extends State text: 'Month - Year', textStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), ), @@ -154,7 +154,7 @@ class _BurnDownMonthltState extends State text: 'Tasks', textStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), ), diff --git a/lib/views/reports/pages/burndown_weekly.dart b/lib/views/reports/pages/burndown_weekly.dart index 79944bc9..f88d5767 100644 --- a/lib/views/reports/pages/burndown_weekly.dart +++ b/lib/views/reports/pages/burndown_weekly.dart @@ -160,7 +160,7 @@ class _BurnDownWeeklyState extends State text: 'Weeks - Year', textStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? Colors.white : Colors.black, ), ), @@ -171,7 +171,7 @@ class _BurnDownWeeklyState extends State textStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, color: AppSettings.isDarkMode ? Colors.white : Colors.black, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), ), diff --git a/lib/views/reports/reports_home.dart b/lib/views/reports/reports_home.dart index eee24c18..0cd428a6 100644 --- a/lib/views/reports/reports_home.dart +++ b/lib/views/reports/reports_home.dart @@ -136,7 +136,7 @@ class _ReportsHomeState extends State labelColor: TaskWarriorColors.white, labelStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.medium, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, ), unselectedLabelStyle: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.light, @@ -190,7 +190,7 @@ class _ReportsHomeState extends State 'No Task found', style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.medium, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -205,7 +205,7 @@ class _ReportsHomeState extends State 'Add a task to see reports', style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.light, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/views/reports/widgets/commonChartIndicator.dart b/lib/views/reports/widgets/commonChartIndicator.dart index f57eea83..021ba92d 100644 --- a/lib/views/reports/widgets/commonChartIndicator.dart +++ b/lib/views/reports/widgets/commonChartIndicator.dart @@ -22,7 +22,7 @@ class CommonChartIndicator extends StatelessWidget { title, style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -47,7 +47,7 @@ class CommonChartIndicator extends StatelessWidget { "Completed", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.regular, - fontSize: 16, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -66,7 +66,7 @@ class CommonChartIndicator extends StatelessWidget { "Pending", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.regular, - fontSize: 16, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/views/settings/settings.dart b/lib/views/settings/settings.dart index f2a08278..fb74b6d6 100644 --- a/lib/views/settings/settings.dart +++ b/lib/views/settings/settings.dart @@ -56,14 +56,14 @@ class _SettingsPageState extends State { 'Settings', style: GoogleFonts.poppins( color: TaskWarriorColors.white, - fontSize: 20, + fontSize: TaskWarriorFonts.fontSizeLarge, ), ), Text( 'Configure your preferences', style: GoogleFonts.poppins( color: TaskWarriorColors.white, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), ], @@ -93,8 +93,8 @@ class _SettingsPageState extends State { Text( 'Moving data to new directory', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontWeight: FontWeight.bold, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -108,8 +108,8 @@ class _SettingsPageState extends State { title: Text( 'Sync on Start', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 18, + fontWeight: FontWeight.bold, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -119,7 +119,7 @@ class _SettingsPageState extends State { 'Automatically sync data on app startup', style: GoogleFonts.poppins( color: TaskWarriorColors.grey, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), trailing: Switch( @@ -140,8 +140,8 @@ class _SettingsPageState extends State { title: Text( 'Sync on Task Create', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontWeight: FontWeight.bold, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -151,7 +151,7 @@ class _SettingsPageState extends State { 'Enable automatic syncing when creating a new task', style: GoogleFonts.poppins( color: TaskWarriorColors.grey, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), trailing: Switch( @@ -172,8 +172,8 @@ class _SettingsPageState extends State { title: Text( 'Highlight the task', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontWeight: FontWeight.bold, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -183,7 +183,7 @@ class _SettingsPageState extends State { 'Make the border of task if only one day left', style: GoogleFonts.poppins( color: TaskWarriorColors.grey, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), trailing: Switch( @@ -204,8 +204,8 @@ class _SettingsPageState extends State { title: Text( 'Select directory', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontWeight: FontWeight.bold, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -214,10 +214,10 @@ class _SettingsPageState extends State { subtitle: Column( children: [ Text( - 'Select the directory where the TaskWarrior data is stored\nCurrent: ${getBaseDirectory()}', + 'Select the directory where the TaskWarrior data is stored\nCurrent directory: ${getBaseDirectory()}', style: GoogleFonts.poppins( color: TaskWarriorColors.grey, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), const SizedBox( @@ -279,8 +279,9 @@ class _SettingsPageState extends State { title: Text( 'Reset to default', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontWeight: FontWeight.bold, + fontSize: + TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -290,7 +291,8 @@ class _SettingsPageState extends State { "Are you sure you want to reset the directory to the default?", style: GoogleFonts.poppins( color: TaskWarriorColors.grey, - fontSize: 14, + fontSize: + TaskWarriorFonts.fontSizeMedium, ), ), actions: [ @@ -425,8 +427,8 @@ class _SettingsPageState extends State { title: Text( 'Error', style: GoogleFonts.poppins( - fontWeight: TaskWarriorFonts.bold, - fontSize: 16, + fontWeight: FontWeight.bold, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -440,7 +442,7 @@ class _SettingsPageState extends State { : "An error occurred", style: GoogleFonts.poppins( color: TaskWarriorColors.grey, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), actions: [ diff --git a/lib/widgets/app_placeholder.dart b/lib/widgets/app_placeholder.dart index 92a3a0db..2541e809 100644 --- a/lib/widgets/app_placeholder.dart +++ b/lib/widgets/app_placeholder.dart @@ -32,7 +32,7 @@ class AppSetupPlaceholder extends StatelessWidget { "Setting up the app...", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 18, + fontSize: TaskWarriorFonts.fontSizeLarge, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/widgets/buildTasks.dart b/lib/widgets/buildTasks.dart index e7ce6cbd..f10e19ac 100644 --- a/lib/widgets/buildTasks.dart +++ b/lib/widgets/buildTasks.dart @@ -9,6 +9,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:taskwarrior/config/app_settings.dart'; import 'package:taskwarrior/config/taskwarriorcolors.dart'; +import 'package:taskwarrior/config/taskwarriorfonts.dart'; import 'package:taskwarrior/model/json.dart'; import 'package:taskwarrior/model/storage/storage_widget.dart'; import 'package:taskwarrior/services/task_details.dart'; @@ -163,7 +164,7 @@ class _TasksBuilderState extends State { : 'Click on the bottom right button to start adding tasks', textAlign: TextAlign.center, style: GoogleFonts.poppins( - fontSize: 20, + fontSize: TaskWarriorFonts.fontSizeLarge, color: AppSettings.isDarkMode ? TaskWarriorColors.kLightPrimaryBackgroundColor : TaskWarriorColors.kprimaryBackgroundColor, diff --git a/lib/widgets/profilefunctions/manageprofile.dart b/lib/widgets/profilefunctions/manageprofile.dart index 13b93974..829ed1c8 100644 --- a/lib/widgets/profilefunctions/manageprofile.dart +++ b/lib/widgets/profilefunctions/manageprofile.dart @@ -54,7 +54,7 @@ class ManageProfile extends StatelessWidget { 'Manage selected profile', style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/widgets/profilefunctions/selectprofile.dart b/lib/widgets/profilefunctions/selectprofile.dart index ef5b2f2d..1d446e10 100644 --- a/lib/widgets/profilefunctions/selectprofile.dart +++ b/lib/widgets/profilefunctions/selectprofile.dart @@ -46,7 +46,7 @@ class SelectProfile extends StatelessWidget { overflow: TextOverflow.fade, style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -57,7 +57,7 @@ class SelectProfile extends StatelessWidget { ), Text(currentProfile, style: GoogleFonts.poppins( - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.grey : TaskWarriorColors.lightGrey, @@ -77,7 +77,7 @@ class SelectProfile extends StatelessWidget { overflow: TextOverflow.fade, style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, diff --git a/lib/widgets/project_filter.dart b/lib/widgets/project_filter.dart index efdf73c0..a5b04610 100644 --- a/lib/widgets/project_filter.dart +++ b/lib/widgets/project_filter.dart @@ -59,7 +59,7 @@ class ProjectsColumn extends StatelessWidget { "Project : ", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -77,7 +77,7 @@ class ProjectsColumn extends StatelessWidget { ? "Not selected" : projectFilter, style: GoogleFonts.poppins( - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -99,7 +99,7 @@ class ProjectsColumn extends StatelessWidget { "All Projects", style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.semiBold, - fontSize: 12, + fontSize: TaskWarriorFonts.fontSizeSmall, color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, @@ -121,7 +121,7 @@ class ProjectsColumn extends StatelessWidget { color: AppSettings.isDarkMode ? TaskWarriorColors.white : TaskWarriorColors.black, - fontSize: 14, + fontSize: TaskWarriorFonts.fontSizeSmall, ), ), SizedBox( diff --git a/lib/widgets/taskdetails/dateTimePicker.dart b/lib/widgets/taskdetails/dateTimePicker.dart index 5bc649de..ad31f9a2 100644 --- a/lib/widgets/taskdetails/dateTimePicker.dart +++ b/lib/widgets/taskdetails/dateTimePicker.dart @@ -42,7 +42,7 @@ class DateTimeWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -51,7 +51,7 @@ class DateTimeWidget extends StatelessWidget { TextSpan( text: value ?? "not selected", style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -154,7 +154,7 @@ class StartWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -163,7 +163,7 @@ class StartWidget extends StatelessWidget { TextSpan( text: value ?? "not selected", style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, diff --git a/lib/widgets/taskdetails/description_widget.dart b/lib/widgets/taskdetails/description_widget.dart index a41bc4ea..6a3ace24 100644 --- a/lib/widgets/taskdetails/description_widget.dart +++ b/lib/widgets/taskdetails/description_widget.dart @@ -39,7 +39,7 @@ class DescriptionWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -48,7 +48,7 @@ class DescriptionWidget extends StatelessWidget { TextSpan( text: value ?? "not selected", style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -168,7 +168,7 @@ class ProjectWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -177,7 +177,7 @@ class ProjectWidget extends StatelessWidget { TextSpan( text: value ?? "not selected", style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, diff --git a/lib/widgets/taskdetails/priority_widget.dart b/lib/widgets/taskdetails/priority_widget.dart index 18796d02..7dab467c 100644 --- a/lib/widgets/taskdetails/priority_widget.dart +++ b/lib/widgets/taskdetails/priority_widget.dart @@ -36,7 +36,7 @@ class PriorityWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -45,7 +45,7 @@ class PriorityWidget extends StatelessWidget { TextSpan( text: value ?? "not selected", style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, diff --git a/lib/widgets/taskdetails/status_widget.dart b/lib/widgets/taskdetails/status_widget.dart index 4e478177..8ceb725a 100644 --- a/lib/widgets/taskdetails/status_widget.dart +++ b/lib/widgets/taskdetails/status_widget.dart @@ -39,7 +39,7 @@ class StatusWidget extends StatelessWidget { text: '$name:'.padRight(13), style: GoogleFonts.poppins( fontWeight: TaskWarriorFonts.bold, - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black, @@ -48,7 +48,7 @@ class StatusWidget extends StatelessWidget { TextSpan( text: value ?? "not selected", style: GoogleFonts.poppins( - fontSize: 15, + fontSize: TaskWarriorFonts.fontSizeMedium, color: AppSettings.isDarkMode ? Colors.white : Colors.black,