Skip to content

Commit 6431d80

Browse files
SGI-CAPP-AT2SGI-CAPP-AT2
committed
refactor: All themechecks replaced with global theme data and extensions
1 parent d1d4ca2 commit 6431d80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+677
-1249
lines changed

‎.fvmrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"flutter": "3.22.2"
3+
}

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ app.*.map.json
4444
/android/app/debug
4545
/android/app/profile
4646
/android/app/release
47+
48+
# FVM Version Cache
49+
.fvm/

‎.vscode/settings.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
// "editor.minimap.enabled": false,
3-
"html.format.wrapAttributesIndentSize": 4,
4-
"[dart]": {
5-
"editor.tabSize": 4,
6-
"editor.insertSpaces": false,
7-
"editor.detectIndentation": true,
8-
"editor.suggest.insertMode": "replace",
9-
"editor.formatOnSave": true
10-
},
11-
"editor.formatOnSave": true,
12-
"editor.insertSpaces": false,
13-
"editor.detectIndentation": false,
14-
"editor.tabSize": 4,
15-
"editor.codeActionsOnSave": {
16-
"source.fixAll": "explicit"
17-
}
2+
"html.format.wrapAttributesIndentSize": 4,
3+
"[dart]": {
4+
"editor.tabSize": 4,
5+
"editor.insertSpaces": false,
6+
"editor.detectIndentation": true,
7+
"editor.suggest.insertMode": "replace",
8+
"editor.formatOnSave": true
9+
},
10+
"editor.formatOnSave": true,
11+
"editor.insertSpaces": false,
12+
"editor.detectIndentation": false,
13+
"editor.tabSize": 4,
14+
"editor.codeActionsOnSave": {
15+
"source.fixAll": "explicit"
16+
},
17+
"dart.flutterSdkPath": ".fvm/versions/3.22.2"
1818
}

‎lib/app/modules/about/views/about_page_app_bar.dart

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:taskwarrior/app/modules/about/controllers/about_controller.dart';
3-
4-
53
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
64
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
75
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';

‎lib/app/modules/about/views/about_page_body.dart

+18-42
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import 'package:taskwarrior/app/modules/about/controllers/about_controller.dart'
77
import 'package:taskwarrior/app/utils/gen/assets.gen.dart';
88
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
99
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
10+
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
1011
import 'package:url_launcher/url_launcher.dart';
1112

12-
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
1313
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
14-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
1514

1615
class AboutPageBody extends StatelessWidget {
1716
final AboutController aboutController;
1817
const AboutPageBody({required this.aboutController, super.key});
1918

2019
@override
2120
Widget build(BuildContext context) {
21+
TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
2222
String introduction =
2323
SentenceManager(currentLanguage: aboutController.selectedLanguage.value)
2424
.sentences
@@ -51,9 +51,7 @@ class AboutPageBody extends StatelessWidget {
5151
fontFamily: FontFamily.poppins,
5252
fontWeight: TaskWarriorFonts.bold,
5353
fontSize: TaskWarriorFonts.fontSizeExtraLarge,
54-
color: AppSettings.isDarkMode
55-
? TaskWarriorColors.white
56-
: TaskWarriorColors.black,
54+
color: tColors.primaryTextColor,
5755
),
5856
),
5957
SizedBox(
@@ -84,19 +82,15 @@ class AboutPageBody extends StatelessWidget {
8482
fontFamily: FontFamily.poppins,
8583
fontWeight: TaskWarriorFonts.bold,
8684
fontSize: TaskWarriorFonts.fontSizeMedium,
87-
color: AppSettings.isDarkMode
88-
? TaskWarriorColors.white
89-
: TaskWarriorColors.black,
85+
color: tColors.primaryTextColor,
9086
),
9187
),
9288
TextSpan(
9389
text: appInfoLines[1],
9490
style: TextStyle(
9591
fontFamily: FontFamily.poppins,
9692
fontSize: TaskWarriorFonts.fontSizeMedium,
97-
color: AppSettings.isDarkMode
98-
? TaskWarriorColors.white
99-
: TaskWarriorColors.black,
93+
color: tColors.primaryTextColor,
10094
),
10195
),
10296
],
@@ -116,9 +110,7 @@ class AboutPageBody extends StatelessWidget {
116110
fontWeight: TaskWarriorFonts.bold,
117111
fontSize:
118112
TaskWarriorFonts.fontSizeMedium,
119-
color: AppSettings.isDarkMode
120-
? TaskWarriorColors.white
121-
: TaskWarriorColors.black,
113+
color: tColors.primaryTextColor,
122114
),
123115
),
124116
TextSpan(
@@ -127,9 +119,7 @@ class AboutPageBody extends StatelessWidget {
127119
fontFamily: FontFamily.poppins,
128120
fontSize:
129121
TaskWarriorFonts.fontSizeMedium,
130-
color: AppSettings.isDarkMode
131-
? TaskWarriorColors.white
132-
: TaskWarriorColors.black,
122+
color: tColors.primaryTextColor,
133123
),
134124
),
135125
],
@@ -154,9 +144,7 @@ class AboutPageBody extends StatelessWidget {
154144
fontFamily: FontFamily.poppins,
155145
fontWeight: TaskWarriorFonts.medium,
156146
fontSize: TaskWarriorFonts.fontSizeSmall,
157-
color: AppSettings.isDarkMode
158-
? TaskWarriorColors.white
159-
: TaskWarriorColors.black,
147+
color: tColors.primaryTextColor,
160148
),
161149
),
162150
SizedBox(
@@ -170,9 +158,7 @@ class AboutPageBody extends StatelessWidget {
170158
height: Get.height * 0.05,
171159
child: ElevatedButton.icon(
172160
style: ElevatedButton.styleFrom(
173-
backgroundColor: AppSettings.isDarkMode
174-
? TaskWarriorColors.kLightSecondaryBackgroundColor
175-
: TaskWarriorColors.ksecondaryBackgroundColor,
161+
backgroundColor: tColors.secondaryTextColor,
176162
shape: RoundedRectangleBorder(
177163
borderRadius: BorderRadius.circular(10),
178164
),
@@ -190,19 +176,15 @@ class AboutPageBody extends StatelessWidget {
190176
width: 20,
191177
height: 20,
192178
colorFilter: ColorFilter.mode(
193-
AppSettings.isDarkMode
194-
? TaskWarriorColors.black
195-
: TaskWarriorColors.white,
179+
tColors.secondaryBackgroundColor!,
196180
BlendMode.srcIn)),
197181
label: Text(
198182
"GitHub",
199183
style: TextStyle(
200184
fontFamily: FontFamily.poppins,
201185
fontWeight: TaskWarriorFonts.medium,
202186
fontSize: TaskWarriorFonts.fontSizeSmall,
203-
color: AppSettings.isDarkMode
204-
? TaskWarriorColors.black
205-
: TaskWarriorColors.white,
187+
color: tColors.secondaryBackgroundColor,
206188
),
207189
),
208190
),
@@ -212,9 +194,7 @@ class AboutPageBody extends StatelessWidget {
212194
height: Get.height * 0.05,
213195
child: ElevatedButton.icon(
214196
style: ElevatedButton.styleFrom(
215-
backgroundColor: AppSettings.isDarkMode
216-
? TaskWarriorColors.kLightSecondaryBackgroundColor
217-
: TaskWarriorColors.ksecondaryBackgroundColor,
197+
backgroundColor: tColors.secondaryTextColor,
218198
shape: RoundedRectangleBorder(
219199
borderRadius: BorderRadius.circular(10),
220200
),
@@ -229,19 +209,17 @@ class AboutPageBody extends StatelessWidget {
229209
width: 20,
230210
height: 20,
231211
colorFilter: ColorFilter.mode(
232-
AppSettings.isDarkMode
233-
? TaskWarriorColors.black
234-
: TaskWarriorColors.white,
235-
BlendMode.srcIn)),
212+
tColors.secondaryBackgroundColor!,
213+
BlendMode.srcIn
214+
)
215+
),
236216
label: Text(
237217
"CCExtractor",
238218
style: TextStyle(
239219
fontFamily: FontFamily.poppins,
240220
fontWeight: TaskWarriorFonts.medium,
241221
fontSize: TaskWarriorFonts.fontSizeSmall,
242-
color: AppSettings.isDarkMode
243-
? TaskWarriorColors.black
244-
: TaskWarriorColors.white,
222+
color: tColors.secondaryBackgroundColor,
245223
),
246224
),
247225
),
@@ -261,9 +239,7 @@ class AboutPageBody extends StatelessWidget {
261239
fontFamily: FontFamily.poppins,
262240
fontWeight: TaskWarriorFonts.semiBold,
263241
fontSize: TaskWarriorFonts.fontSizeMedium,
264-
color: AppSettings.isDarkMode
265-
? TaskWarriorColors.white
266-
: TaskWarriorColors.black,
242+
color: tColors.primaryTextColor,
267243
),
268244
),
269245
SizedBox(

‎lib/app/modules/about/views/about_view.dart

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@ import 'package:get/get.dart';
44

55
import 'package:taskwarrior/app/modules/about/views/about_page_app_bar.dart';
66
import 'package:taskwarrior/app/modules/about/views/about_page_body.dart';
7+
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
78

89
import '../controllers/about_controller.dart';
9-
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
10-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
1110

1211
class AboutView extends GetView<AboutController> {
1312
const AboutView({super.key});
1413
@override
1514
Widget build(BuildContext context) {
15+
TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
1616
return Scaffold(
1717
appBar: AboutPageAppBar(aboutController: controller,),
18-
backgroundColor: AppSettings.isDarkMode
19-
? TaskWarriorColors.kprimaryBackgroundColor
20-
: TaskWarriorColors.white,
18+
backgroundColor: tColors.primaryBackgroundColor,
2119
body: AboutPageBody(
2220
aboutController: controller,
2321
),

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

+13-31
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:intl/intl.dart';
66

77
import 'package:taskwarrior/app/utils/constants/constants.dart';
88
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
9-
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
9+
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
1010

1111
class DateTimeWidget extends StatelessWidget {
1212
const DateTimeWidget({
@@ -25,15 +25,12 @@ class DateTimeWidget extends StatelessWidget {
2525

2626
@override
2727
Widget build(BuildContext context) {
28+
TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
2829
return Card(
2930
key: globalKey,
30-
color: AppSettings.isDarkMode
31-
? const Color.fromARGB(255, 57, 57, 57)
32-
: Colors.white,
31+
color: tColors.secondaryBackgroundColor,
3332
child: ListTile(
34-
textColor: AppSettings.isDarkMode
35-
? Colors.white
36-
: const Color.fromARGB(255, 48, 46, 46),
33+
textColor: tColors.primaryTextColor,
3734
title: SingleChildScrollView(
3835
scrollDirection: Axis.horizontal,
3936
child: Row(
@@ -54,9 +51,7 @@ class DateTimeWidget extends StatelessWidget {
5451
fontFamily: FontFamily.poppins,
5552
fontWeight: TaskWarriorFonts.bold,
5653
fontSize: TaskWarriorFonts.fontSizeMedium,
57-
color: AppSettings.isDarkMode
58-
? TaskWarriorColors.white
59-
: TaskWarriorColors.black,
54+
color: tColors.primaryTextColor,
6055
),
6156
),
6257
TextSpan(
@@ -70,9 +65,7 @@ class DateTimeWidget extends StatelessWidget {
7065
style: TextStyle(
7166
fontFamily: FontFamily.poppins,
7267
fontSize: TaskWarriorFonts.fontSizeMedium,
73-
color: AppSettings.isDarkMode
74-
? TaskWarriorColors.white
75-
: TaskWarriorColors.black,
68+
color: tColors.primaryTextColor,
7669
),
7770
),
7871
],
@@ -170,14 +163,10 @@ class DateTimeWidget extends StatelessWidget {
170163
content: Text(
171164
"Can't set times in the past",
172165
style: TextStyle(
173-
color: AppSettings.isDarkMode
174-
? TaskWarriorColors.kprimaryTextColor
175-
: TaskWarriorColors.kLightPrimaryTextColor,
166+
color: tColors.primaryTextColor,
176167
),
177168
),
178-
backgroundColor: AppSettings.isDarkMode
179-
? TaskWarriorColors.ksecondaryBackgroundColor
180-
: TaskWarriorColors.kLightSecondaryBackgroundColor,
169+
backgroundColor: tColors.primaryTextColor,
181170
duration: const Duration(seconds: 2),
182171
),
183172
);
@@ -208,14 +197,11 @@ class StartWidget extends StatelessWidget {
208197

209198
@override
210199
Widget build(BuildContext context) {
200+
TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
211201
return Card(
212-
color: AppSettings.isDarkMode
213-
? const Color.fromARGB(255, 57, 57, 57)
214-
: Colors.white,
202+
color: tColors.secondaryBackgroundColor,
215203
child: ListTile(
216-
textColor: AppSettings.isDarkMode
217-
? Colors.white
218-
: const Color.fromARGB(255, 48, 46, 46),
204+
textColor: tColors.secondaryBackgroundColor,
219205
title: SingleChildScrollView(
220206
scrollDirection: Axis.horizontal,
221207
child: Row(
@@ -236,9 +222,7 @@ class StartWidget extends StatelessWidget {
236222
fontFamily: FontFamily.poppins,
237223
fontWeight: TaskWarriorFonts.bold,
238224
fontSize: TaskWarriorFonts.fontSizeMedium,
239-
color: AppSettings.isDarkMode
240-
? TaskWarriorColors.white
241-
: TaskWarriorColors.black,
225+
color: tColors.primaryTextColor,
242226
),
243227
),
244228
TextSpan(
@@ -252,9 +236,7 @@ class StartWidget extends StatelessWidget {
252236
style: TextStyle(
253237
fontFamily: FontFamily.poppins,
254238
fontSize: TaskWarriorFonts.fontSizeMedium,
255-
color: AppSettings.isDarkMode
256-
? TaskWarriorColors.white
257-
: TaskWarriorColors.black,
239+
color: tColors.primaryTextColor,
258240
),
259241
),
260242
],

0 commit comments

Comments
 (0)