Skip to content

Commit e2557bd

Browse files
D-extremityD-extremity
committed
reduced duplication and improving maintainability using ThemeData
1 parent 7d42718 commit e2557bd

File tree

8 files changed

+39
-44
lines changed

8 files changed

+39
-44
lines changed

‎lib/app/modules/detailRoute/views/tags_widget.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'package:taskwarrior/app/utils/constants/constants.dart';
1212
import 'package:taskwarrior/app/utils/constants/utilites.dart';
1313
import 'package:taskwarrior/app/utils/taskfunctions/validate.dart';
1414
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
15+
import 'package:taskwarrior/app/utils/themes/themes.dart';
1516

1617
class TagsWidget extends StatelessWidget {
1718
const TagsWidget({
@@ -127,9 +128,7 @@ class TagsRouteState extends State<TagsRoute> {
127128
color: TaskWarriorColors.white,
128129
),
129130
),
130-
backgroundColor: AppSettings.isDarkMode
131-
? TaskWarriorColors.kprimaryBackgroundColor
132-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
131+
backgroundColor: AppColor.currentAppThemeColor,
133132
body: SafeArea(
134133
child: Padding(
135134
padding: const EdgeInsets.all(4),

‎lib/app/modules/home/views/filter_drawer_home_page.dart‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
1212
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
1313
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
1414
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
15+
import 'package:taskwarrior/app/utils/themes/themes.dart';
1516

1617
class FilterDrawer extends StatelessWidget {
1718
final Filters filters;
@@ -27,12 +28,8 @@ class FilterDrawer extends StatelessWidget {
2728
? TaskWarriorColors.ksecondaryBackgroundColor
2829
: TaskWarriorColors.kLightPrimaryBackgroundColor;
2930
return Drawer(
30-
backgroundColor: AppSettings.isDarkMode
31-
? TaskWarriorColors.kprimaryBackgroundColor
32-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
33-
surfaceTintColor: AppSettings.isDarkMode
34-
? TaskWarriorColors.kprimaryBackgroundColor
35-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
31+
backgroundColor: AppColor.currentAppThemeColor,
32+
surfaceTintColor: AppColor.currentAppThemeColor,
3633
child: SafeArea(
3734
child: Padding(
3835
padding: const EdgeInsets.all(8),

‎lib/app/modules/home/views/nav_drawer.dart‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
1313
import 'package:taskwarrior/app/utils/constants/utilites.dart';
1414
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
1515
import 'package:taskwarrior/app/utils/taskchampion/taskchampion.dart';
16+
import 'package:taskwarrior/app/utils/themes/themes.dart';
1617

1718
class NavDrawer extends StatelessWidget {
1819
final HomeController homeController;
@@ -21,12 +22,8 @@ class NavDrawer extends StatelessWidget {
2122
@override
2223
Widget build(BuildContext context) {
2324
return Drawer(
24-
backgroundColor: AppSettings.isDarkMode
25-
? TaskWarriorColors.kprimaryBackgroundColor
26-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
27-
surfaceTintColor: AppSettings.isDarkMode
28-
? TaskWarriorColors.kprimaryBackgroundColor
29-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
25+
backgroundColor: AppColor.currentAppThemeColor,
26+
surfaceTintColor: AppColor.currentAppThemeColor,
3027
child: Container(
3128
color: AppSettings.isDarkMode
3229
? TaskWarriorColors.kprimaryBackgroundColor

‎lib/app/modules/manageTaskServer/views/manage_task_server_view.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
// ignore_for_file: use_build_context_synchronously
22

3-
43
import 'package:flutter/material.dart';
54

65
import 'package:get/get.dart';
76
import 'package:taskwarrior/app/modules/manageTaskServer/views/manage_task_server_page_app_bar.dart';
87
import 'package:taskwarrior/app/modules/manageTaskServer/views/manage_task_server_page_body.dart';
9-
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
108

11-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
9+
import 'package:taskwarrior/app/utils/themes/themes.dart';
1210

1311
import '../controllers/manage_task_server_controller.dart';
1412

@@ -18,9 +16,7 @@ class ManageTaskServerView extends GetView<ManageTaskServerController> {
1816
Widget build(BuildContext context) {
1917
return Scaffold(
2018
appBar: ManageTaskServerPageAppBar(controller: controller),
21-
backgroundColor: AppSettings.isDarkMode
22-
? TaskWarriorColors.kprimaryBackgroundColor
23-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
19+
backgroundColor: AppColor.currentAppThemeColor,
2420
body: ManageTaskServerPageBody(controller: controller),
2521
);
2622
}

‎lib/app/modules/profile/views/profile_view.dart‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import 'package:taskwarrior/app/utils/constants/utilites.dart';
1414

1515
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
1616
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
17+
import 'package:taskwarrior/app/utils/themes/themes.dart';
1718

1819
import '../controllers/profile_controller.dart';
1920

@@ -54,9 +55,7 @@ class ProfileView extends GetView<ProfileController> {
5455
),
5556
),
5657
//primary: false,
57-
backgroundColor: AppSettings.isDarkMode
58-
? TaskWarriorColors.kprimaryBackgroundColor
59-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
58+
backgroundColor: AppColor.currentAppThemeColor,
6059
body: SingleChildScrollView(
6160
child: Column(
6261
children: [
@@ -104,9 +103,9 @@ class ProfileView extends GetView<ProfileController> {
104103
return Utils.showAlertDialog(
105104
title: Text(
106105
SentenceManager(
107-
currentLanguage: AppSettings.selectedLanguage)
108-
.sentences
109-
.profilePageExportTasksDialogueTitle,
106+
currentLanguage: AppSettings.selectedLanguage)
107+
.sentences
108+
.profilePageExportTasksDialogueTitle,
110109
style: TextStyle(
111110
color: AppSettings.isDarkMode
112111
? TaskWarriorColors.white
@@ -115,9 +114,9 @@ class ProfileView extends GetView<ProfileController> {
115114
),
116115
content: Text(
117116
SentenceManager(
118-
currentLanguage: AppSettings.selectedLanguage)
119-
.sentences
120-
.profilePageExportTasksDialogueSubtitle,
117+
currentLanguage: AppSettings.selectedLanguage)
118+
.sentences
119+
.profilePageExportTasksDialogueSubtitle,
121120
style: TextStyle(
122121
color: AppSettings.isDarkMode
123122
? TaskWarriorColors.white
@@ -325,11 +324,9 @@ class ProfilesColumn extends StatelessWidget {
325324
? TaskWarriorColors.deepPurpleAccent
326325
: TaskWarriorColors.deepPurple),
327326
label: Text(
328-
SentenceManager(
329-
currentLanguage: AppSettings.selectedLanguage)
330-
.sentences
331-
.profilePageAddNewProfile,
332-
327+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
328+
.sentences
329+
.profilePageAddNewProfile,
333330
style: TextStyle(
334331
color: AppSettings.isDarkMode
335332
? TaskWarriorColors.white

‎lib/app/modules/settings/views/settings_view.dart‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import 'package:flutter/material.dart';
55
import 'package:get/get.dart';
66
import 'package:taskwarrior/app/modules/settings/views/settings_page_app_bar.dart';
77
import 'package:taskwarrior/app/modules/settings/views/settings_page_body.dart';
8-
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
9-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
8+
import 'package:taskwarrior/app/utils/themes/themes.dart';
109

1110
import '../controllers/settings_controller.dart';
1211

@@ -18,9 +17,7 @@ class SettingsView extends GetView<SettingsController> {
1817
appBar: SettingsPageAppBar(
1918
controller: controller,
2019
),
21-
backgroundColor: AppSettings.isDarkMode
22-
? TaskWarriorColors.kprimaryBackgroundColor
23-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
20+
backgroundColor: AppColor.currentAppThemeColor,
2421
body: SettingsPageBody(
2522
controller: controller,
2623
),

‎lib/app/utils/taskchampion/taskchampion.dart‎

Lines changed: 2 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:taskwarrior/app/utils/app_settings/app_settings.dart';
77
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
88
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
9+
import 'package:taskwarrior/app/utils/themes/themes.dart';
910

1011
import 'package:url_launcher/url_launcher.dart';
1112

@@ -70,9 +71,7 @@ class ManageTaskChampionCreds extends StatelessWidget {
7071
color: TaskWarriorColors.white,
7172
),
7273
),
73-
backgroundColor: AppSettings.isDarkMode
74-
? TaskWarriorColors.kprimaryBackgroundColor
75-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
74+
backgroundColor: AppColor.currentAppThemeColor,
7675
body: Padding(
7776
padding: const EdgeInsets.only(left: 20, right: 20),
7877
child: ListView(

‎lib/app/utils/themes/themes.dart‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,15 @@
1+
import 'dart:ui';
2+
3+
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
4+
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
5+
16
export 'dark_theme.dart';
2-
export 'light_theme.dart';
7+
export 'light_theme.dart';
8+
9+
class AppColor {
10+
static Color currentAppThemeColor=
11+
AppSettings.isDarkMode
12+
?TaskWarriorColors.kprimaryBackgroundColor
13+
: TaskWarriorColors.kLightPrimaryBackgroundColor;
14+
15+
}

0 commit comments

Comments
 (0)