Skip to content

Commit d31e681

Browse files
SGI-CAPP-AT2SGI-CAPP-AT2
committed
replaced newly added checks by new commits
1 parent 2790205 commit d31e681

File tree

5 files changed

+38
-67
lines changed

5 files changed

+38
-67
lines changed

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
32
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
43
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
5-
6-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
4+
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
75

86
class ProjectColumnTaskc extends StatelessWidget {
97
const ProjectColumnTaskc({
@@ -19,6 +17,8 @@ class ProjectColumnTaskc extends StatelessWidget {
1917

2018
@override
2119
Widget build(BuildContext context) {
20+
TaskwarriorColorTheme tColors =
21+
Theme.of(context).extension<TaskwarriorColorTheme>()!;
2222
return Column(
2323
children: [
2424
Padding(
@@ -33,9 +33,7 @@ class ProjectColumnTaskc extends StatelessWidget {
3333
fontFamily: FontFamily.poppins,
3434
fontWeight: TaskWarriorFonts.bold,
3535
fontSize: TaskWarriorFonts.fontSizeSmall,
36-
color: AppSettings.isDarkMode
37-
? TaskWarriorColors.white
38-
: TaskWarriorColors.black,
36+
color: tColors.primaryTextColor,
3937
),
4038
),
4139
const SizedBox(
@@ -49,9 +47,7 @@ class ProjectColumnTaskc extends StatelessWidget {
4947
style: TextStyle(
5048
fontFamily: FontFamily.poppins,
5149
fontSize: TaskWarriorFonts.fontSizeSmall,
52-
color: AppSettings.isDarkMode
53-
? TaskWarriorColors.white
54-
: TaskWarriorColors.black,
50+
color: tColors.primaryTextColor,
5551
),
5652
),
5753
),
@@ -77,9 +73,7 @@ class ProjectColumnTaskc extends StatelessWidget {
7773
style: TextStyle(
7874
fontFamily: FontFamily.poppins,
7975
fontSize: TaskWarriorFonts.fontSizeSmall,
80-
color: AppSettings.isDarkMode
81-
? TaskWarriorColors.white
82-
: TaskWarriorColors.black,
76+
color: tColors.primaryTextColor,
8377
),
8478
),
8579
const SizedBox(
@@ -106,6 +100,8 @@ class ProjectTileTaskc extends StatelessWidget {
106100

107101
@override
108102
Widget build(BuildContext context) {
103+
TaskwarriorColorTheme tColors =
104+
Theme.of(context).extension<TaskwarriorColorTheme>()!;
109105
return GestureDetector(
110106
onTap: () => callback(project),
111107
child: Row(
@@ -119,9 +115,7 @@ class ProjectTileTaskc extends StatelessWidget {
119115
Text(
120116
project,
121117
style: TextStyle(
122-
color: AppSettings.isDarkMode
123-
? TaskWarriorColors.white
124-
: TaskWarriorColors.black,
118+
color: tColors.primaryTextColor,
125119
),
126120
),
127121
const Spacer(),

‎lib/app/modules/manageTaskServer/controllers/manage_task_server_controller.dart‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
1313
import 'package:taskwarrior/app/utils/home_path/home_path.dart' as rc;
1414
import 'package:taskwarrior/app/utils/taskserver/taskserver.dart';
1515
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
16+
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
1617
import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
1718

1819
class ManageTaskServerController extends GetxController {
@@ -75,6 +76,8 @@ class ManageTaskServerController extends GetxController {
7576

7677
/// The [setConfig] function is used to set the configuration of the TaskServer from the clipboard
7778
void setContent(BuildContext context) async {
79+
TaskwarriorColorTheme tColors =
80+
Theme.of(context).extension<TaskwarriorColorTheme>()!;
7881
final clipboardData = await Clipboard.getData(Clipboard.kTextPlain);
7982
taskrcContentController.text = clipboardData?.text ?? '';
8083

@@ -106,14 +109,10 @@ class ManageTaskServerController extends GetxController {
106109
content: Text(
107110
'Success: Server or credentials are verified in taskrc file',
108111
style: TextStyle(
109-
color: AppSettings.isDarkMode
110-
? TaskWarriorColors.white
111-
: TaskWarriorColors.black,
112+
color: tColors.primaryTextColor,
112113
),
113114
),
114-
backgroundColor: AppSettings.isDarkMode
115-
? TaskWarriorColors.ksecondaryBackgroundColor
116-
: TaskWarriorColors.kLightSecondaryBackgroundColor,
115+
backgroundColor: tColors.secondaryBackgroundColor,
117116
duration: const Duration(seconds: 2)));
118117
} else {
119118
Navigator.pop(context);
@@ -122,14 +121,10 @@ class ManageTaskServerController extends GetxController {
122121
content: Text(
123122
'Error: Server or credentials are missing in taskrc file',
124123
style: TextStyle(
125-
color: AppSettings.isDarkMode
126-
? TaskWarriorColors.white
127-
: TaskWarriorColors.black,
124+
color: tColors.primaryTextColor,
128125
),
129126
),
130-
backgroundColor: AppSettings.isDarkMode
131-
? TaskWarriorColors.ksecondaryBackgroundColor
132-
: TaskWarriorColors.kLightSecondaryBackgroundColor,
127+
backgroundColor: tColors.secondaryBackgroundColor,
133128
duration: const Duration(seconds: 2)));
134129
}
135130
} else {
@@ -140,9 +135,7 @@ class ManageTaskServerController extends GetxController {
140135
content: Text(
141136
'Error: Failed to read taskrc file',
142137
style: TextStyle(
143-
color: AppSettings.isDarkMode
144-
? TaskWarriorColors.white
145-
: TaskWarriorColors.black,
138+
color: tColors.primaryTextColor,
146139
),
147140
),
148141
// backgroundColor: AppSettings.isDarkMode

‎lib/app/modules/reports/views/burn_down_daily.dart‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class BurnDownDaily extends StatelessWidget {
1717

1818
@override
1919
Widget build(BuildContext context) {
20+
TaskwarriorColorTheme tColors =
21+
Theme.of(context).extension<TaskwarriorColorTheme>()!;
2022
double height = MediaQuery.of(context).size.height;
2123
return Stack(
2224
children: [
@@ -40,9 +42,7 @@ class BurnDownDaily extends StatelessWidget {
4042
textStyle: TextStyle(
4143
fontFamily: FontFamily.poppins,
4244
fontWeight: TaskWarriorFonts.bold,
43-
color: AppSettings.isDarkMode
44-
? Colors.white
45-
: Colors.black,
45+
color: tColors.primaryTextColor,
4646
fontSize: TaskWarriorFonts.fontSizeSmall,
4747
),
4848
),
@@ -56,9 +56,7 @@ class BurnDownDaily extends StatelessWidget {
5656
textStyle: TextStyle(
5757
fontFamily: FontFamily.poppins,
5858
fontWeight: TaskWarriorFonts.bold,
59-
color: AppSettings.isDarkMode
60-
? Colors.white
61-
: Colors.black,
59+
color: tColors.primaryTextColor,
6260
fontSize: TaskWarriorFonts.fontSizeSmall,
6361
),
6462
),

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ 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/theme_extension.dart';
109

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

1312
class SettingsView extends GetView<SettingsController> {
1413
const SettingsView({super.key});
1514
@override
1615
Widget build(BuildContext context) {
16+
TaskwarriorColorTheme tColors =
17+
Theme.of(context).extension<TaskwarriorColorTheme>()!;
1718
return Scaffold(
1819
appBar: SettingsPageAppBar(
1920
controller: controller,
2021
),
21-
backgroundColor: AppSettings.isDarkMode
22-
? TaskWarriorColors.kprimaryBackgroundColor
23-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
22+
backgroundColor: tColors.primaryBackgroundColor,
2423
body: SettingsPageBody(
2524
controller: controller,
2625
),

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

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
import 'package:flutter/material.dart';
44
import 'package:google_fonts/google_fonts.dart';
55
import 'package:shared_preferences/shared_preferences.dart';
6-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
76
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
87
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
8+
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
99

1010
import 'package:url_launcher/url_launcher.dart';
1111

1212
class ManageTaskChampionCreds extends StatelessWidget {
1313
final TextEditingController _encryptionSecretController =
1414
TextEditingController();
1515
final TextEditingController _clientIdController = TextEditingController();
16-
final TextEditingController _ccsyncBackendUrlController = TextEditingController();
16+
final TextEditingController _ccsyncBackendUrlController =
17+
TextEditingController();
1718

1819
ManageTaskChampionCreds({super.key}) {
1920
_loadCredentials();
@@ -39,6 +40,8 @@ class ManageTaskChampionCreds extends StatelessWidget {
3940

4041
@override
4142
Widget build(BuildContext context) {
43+
TaskwarriorColorTheme tColors =
44+
Theme.of(context).extension<TaskwarriorColorTheme>()!;
4245
return Scaffold(
4346
appBar: AppBar(
4447
backgroundColor: TaskWarriorColors.kprimaryBackgroundColor,
@@ -73,9 +76,7 @@ class ManageTaskChampionCreds extends StatelessWidget {
7376
color: TaskWarriorColors.white,
7477
),
7578
),
76-
backgroundColor: AppSettings.isDarkMode
77-
? TaskWarriorColors.kprimaryBackgroundColor
78-
: TaskWarriorColors.kLightPrimaryBackgroundColor,
79+
backgroundColor: tColors.primaryBackgroundColor,
7980
body: Padding(
8081
padding: const EdgeInsets.only(left: 20, right: 20),
8182
child: ListView(
@@ -87,53 +88,41 @@ class ManageTaskChampionCreds extends StatelessWidget {
8788
children: [
8889
TextField(
8990
style: TextStyle(
90-
color: AppSettings.isDarkMode
91-
? TaskWarriorColors.white
92-
: TaskWarriorColors.black,
91+
color: tColors.primaryTextColor,
9392
),
9493
controller: _encryptionSecretController,
9594
decoration: InputDecoration(
9695
labelText: 'Encryption Secret',
9796
labelStyle: TextStyle(
98-
color: AppSettings.isDarkMode
99-
? TaskWarriorColors.white
100-
: TaskWarriorColors.black,
97+
color: tColors.primaryTextColor,
10198
),
10299
border: const OutlineInputBorder(),
103100
),
104101
),
105102
const SizedBox(height: 10),
106103
TextField(
107104
style: TextStyle(
108-
color: AppSettings.isDarkMode
109-
? TaskWarriorColors.white
110-
: TaskWarriorColors.black,
105+
color: tColors.primaryTextColor,
111106
),
112107
controller: _clientIdController,
113108
decoration: InputDecoration(
114109
labelText: 'Client ID',
115110
labelStyle: TextStyle(
116-
color: AppSettings.isDarkMode
117-
? TaskWarriorColors.white
118-
: TaskWarriorColors.black,
111+
color: tColors.primaryTextColor,
119112
),
120113
border: const OutlineInputBorder(),
121114
),
122115
),
123116
const SizedBox(height: 10),
124117
TextField(
125118
style: TextStyle(
126-
color: AppSettings.isDarkMode
127-
? TaskWarriorColors.white
128-
: TaskWarriorColors.black,
119+
color: tColors.primaryTextColor,
129120
),
130121
controller: _ccsyncBackendUrlController,
131122
decoration: InputDecoration(
132123
labelText: 'CCSync Backend URL',
133124
labelStyle: TextStyle(
134-
color: AppSettings.isDarkMode
135-
? TaskWarriorColors.white
136-
: TaskWarriorColors.black,
125+
color: tColors.primaryTextColor,
137126
),
138127
border: const OutlineInputBorder(),
139128
),
@@ -148,9 +137,7 @@ class ManageTaskChampionCreds extends StatelessWidget {
148137
'Tip: Click on the info icon in the top right corner to get your credentials',
149138
style: TextStyle(
150139
fontSize: 15,
151-
color: AppSettings.isDarkMode
152-
? TaskWarriorColors.white
153-
: TaskWarriorColors.black,
140+
color: tColors.primaryTextColor,
154141
),
155142
),
156143
],

0 commit comments

Comments
 (0)