Skip to content

Commit 75c7579

Browse files
BrawlerXullBrawlerXull
authored
Merge branch 'main' into tour
2 parents 26d2b88 + 31e1904 commit 75c7579

24 files changed

+1505
-70
lines changed

‎.github/workflows/flutterci.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ jobs:
3434
# Step 5: Analyze the code using flutter analyze
3535
- run: flutter analyze
3636

37-
# Step 6: Format the code using flutter format
38-
# - run: flutter format -n --set-exit-if-changed .
37+
# Step 6: Format the code using flutter format (uncomment if needed)
38+
# - run: flutter format -n --set-exit-if-changed .
3939

4040
# Step 7: Run tests using flutter test
41-
# - run: flutter test
42-
41+
- run: flutter test
4342

4443
# Step 8: Build APK using flutter build apk
4544
- run: flutter build apk

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
1313
import 'package:taskwarrior/app/utils/constants/utilites.dart';
1414

1515
import 'package:taskwarrior/app/utils/gen/fonts.gen.dart';
16+
1617
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
18+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
19+
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
20+
1721
import 'package:url_launcher/url_launcher.dart';
1822

1923
import '../controllers/manage_task_server_controller.dart';
@@ -32,7 +36,9 @@ class ManageTaskServerPageAppBar extends StatelessWidget
3236
crossAxisAlignment: CrossAxisAlignment.start,
3337
children: [
3438
Text(
35-
"Configure TaskServer",
39+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
40+
.sentences
41+
.manageTaskServerPageConfigureTaskserver,
3642
style: TextStyle(
3743
fontFamily: FontFamily.poppins,
3844
color: TaskWarriorColors.white,

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

Lines changed: 109 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:taskwarrior/app/models/storage/set_config.dart';
88
import 'package:taskwarrior/app/modules/manageTaskServer/views/pem_widget.dart';
99
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
1010
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
11+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
1112

1213
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
1314

@@ -36,7 +37,9 @@ class ManageTaskServerPageBody extends StatelessWidget {
3637
crossAxisAlignment: CrossAxisAlignment.start,
3738
children: [
3839
Text(
39-
"Configure TASKRC",
40+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
41+
.sentences
42+
.manageTaskServerPageConfigureTASKRC,
4043
style: TextStyle(
4144
color: AppSettings.isDarkMode
4245
? TaskWarriorColors.white
@@ -79,7 +82,11 @@ class ManageTaskServerPageBody extends StatelessWidget {
7982
MainAxisAlignment.start,
8083
children: [
8184
Text(
82-
'Configure TaskRc',
85+
SentenceManager(
86+
currentLanguage: AppSettings
87+
.selectedLanguage)
88+
.sentences
89+
.manageTaskServerPageConfigureTaskRCDialogueBoxTitle,
8390
style: TextStyle(
8491
fontWeight: TaskWarriorFonts.bold,
8592
color: AppSettings.isDarkMode
@@ -88,7 +95,11 @@ class ManageTaskServerPageBody extends StatelessWidget {
8895
),
8996
),
9097
Text(
91-
'Paste the taskrc content or select taskrc file',
98+
SentenceManager(
99+
currentLanguage: AppSettings
100+
.selectedLanguage)
101+
.sentences
102+
.manageTaskServerPageConfigureTaskRCDialogueBoxSubtitle,
92103
style: TextStyle(
93104
color: AppSettings.isDarkMode
94105
? TaskWarriorColors.white
@@ -110,44 +121,52 @@ class ManageTaskServerPageBody extends StatelessWidget {
110121
.taskrcContentController,
111122
maxLines: 8,
112123
decoration: InputDecoration(
113-
counterStyle: TextStyle(
114-
color:
115-
AppSettings.isDarkMode
116-
? TaskWarriorColors
117-
.white
118-
: TaskWarriorColors
119-
.black),
120-
suffixIconConstraints:
121-
const BoxConstraints(
122-
maxHeight: 24,
123-
maxWidth: 24,
124-
),
125-
isDense: true,
126-
suffix: IconButton(
127-
onPressed: () async {
128-
controller
129-
.setContent(context);
130-
},
131-
icon: const Icon(
132-
Icons.content_paste),
133-
),
134-
border:
135-
const OutlineInputBorder(),
136-
labelStyle:
137-
GoogleFonts.poppins(
138-
color: AppSettings
139-
.isDarkMode
140-
? TaskWarriorColors
141-
.white
142-
: TaskWarriorColors
143-
.black),
144-
labelText:
145-
'Paste your taskrc contents here'),
124+
counterStyle: TextStyle(
125+
color:
126+
AppSettings.isDarkMode
127+
? TaskWarriorColors
128+
.white
129+
: TaskWarriorColors
130+
.black),
131+
suffixIconConstraints:
132+
const BoxConstraints(
133+
maxHeight: 24,
134+
maxWidth: 24,
135+
),
136+
isDense: true,
137+
suffix: IconButton(
138+
onPressed: () async {
139+
controller
140+
.setContent(context);
141+
},
142+
icon: const Icon(
143+
Icons.content_paste),
144+
),
145+
border:
146+
const OutlineInputBorder(),
147+
labelStyle: GoogleFonts.poppins(
148+
color:
149+
AppSettings.isDarkMode
150+
? TaskWarriorColors
151+
.white
152+
: TaskWarriorColors
153+
.black),
154+
labelText: SentenceManager(
155+
currentLanguage:
156+
AppSettings
157+
.selectedLanguage)
158+
.sentences
159+
.manageTaskServerPageConfigureTaskRCDialogueBoxInputFieldText,
160+
),
146161
),
147162
),
148163
),
149164
Text(
150-
"Or",
165+
SentenceManager(
166+
currentLanguage: AppSettings
167+
.selectedLanguage)
168+
.sentences
169+
.manageTaskServerPageConfigureTaskRCDialogueBoxOr,
151170
style: TextStyle(
152171
color: AppSettings.isDarkMode
153172
? TaskWarriorColors.white
@@ -173,7 +192,11 @@ class ManageTaskServerPageBody extends StatelessWidget {
173192
Get.back();
174193
},
175194
child: Text(
176-
'Select TASKRC file',
195+
SentenceManager(
196+
currentLanguage: AppSettings
197+
.selectedLanguage)
198+
.sentences
199+
.manageTaskServerPageConfigureTaskRCDialogueBoxSelectTaskRC,
177200
style: TextStyle(
178201
color: AppSettings.isDarkMode
179202
? TaskWarriorColors.white
@@ -206,8 +229,16 @@ class ManageTaskServerPageBody extends StatelessWidget {
206229
children: [
207230
Text(
208231
controller.taskrcContentController.text.isEmpty
209-
? "Set TaskRc"
210-
: "Taskrc file is verified",
232+
? SentenceManager(
233+
currentLanguage:
234+
AppSettings.selectedLanguage)
235+
.sentences
236+
.manageTaskServerPageSetTaskRC
237+
: SentenceManager(
238+
currentLanguage:
239+
AppSettings.selectedLanguage)
240+
.sentences
241+
.manageTaskServerPageTaskRCFileIsVerified,
211242
style: TextStyle(
212243
color: AppSettings.isDarkMode
213244
? TaskWarriorColors.white
@@ -448,19 +479,49 @@ class ManageTaskServerPageBody extends StatelessWidget {
448479
storage: controller.storage,
449480
pem: pem,
450481
optionString: pem == "taskd.certificate"
451-
? "Configure your certificate"
482+
? SentenceManager(
483+
currentLanguage: AppSettings.selectedLanguage)
484+
.sentences
485+
.manageTaskServerPageConfigureYourCertificate
452486
: pem == "taskd.key"
453-
? "Configure TaskServer key"
487+
? SentenceManager(
488+
currentLanguage:
489+
AppSettings.selectedLanguage)
490+
.sentences
491+
.manageTaskServerPageConfigureTaskserverKey
454492
: pem == "taskd.ca"
455-
? "Configure Server Certificate"
456-
: "Configure Server Certificate",
493+
? SentenceManager(
494+
currentLanguage:
495+
AppSettings.selectedLanguage)
496+
.sentences
497+
.manageTaskServerPageConfigureServerCertificate
498+
: SentenceManager(
499+
currentLanguage:
500+
AppSettings.selectedLanguage)
501+
.sentences
502+
.manageTaskServerPageConfigureServerCertificate,
457503
listTileTitle: pem == "taskd.certificate"
458-
? "Select Certificate"
504+
? SentenceManager(
505+
currentLanguage: AppSettings.selectedLanguage)
506+
.sentences
507+
.manageTaskServerPageSelectCertificate
459508
: pem == "taskd.key"
460-
? "Select key"
509+
? SentenceManager(
510+
currentLanguage:
511+
AppSettings.selectedLanguage)
512+
.sentences
513+
.manageTaskServerPageSelectKey
461514
: pem == "taskd.ca"
462-
? "Select Certificate"
463-
: "Select Certificate",
515+
? SentenceManager(
516+
currentLanguage:
517+
AppSettings.selectedLanguage)
518+
.sentences
519+
.manageTaskServerPageSelectCertificate
520+
: SentenceManager(
521+
currentLanguage:
522+
AppSettings.selectedLanguage)
523+
.sentences
524+
.manageTaskServerPageSelectCertificate,
464525
onTapCallBack: controller.onTapPEMWidget,
465526
onLongPressCallBack: controller.onLongPressPEMWidget,
466527
globalKey: controller.getGlobalKey(pem),

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import 'package:taskwarrior/app/modules/splash/controllers/splash_controller.dar
44
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
55
import 'package:taskwarrior/app/utils/constants/utilites.dart';
66
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
7+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
8+
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
79

810
class DeleteProfileDialog extends StatelessWidget {
911
const DeleteProfileDialog({
@@ -23,7 +25,10 @@ class DeleteProfileDialog extends StatelessWidget {
2325
child: Utils.showAlertDialog(
2426
scrollable: true,
2527
title: Text(
26-
'Delete Profile?',
28+
SentenceManager(
29+
currentLanguage: AppSettings.selectedLanguage)
30+
.sentences
31+
.profilePageDeleteProfile,
2732
style: TextStyle(
2833
color: AppSettings.isDarkMode
2934
? TaskWarriorColors.white

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

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import 'package:flutter/material.dart';
22
import 'package:google_fonts/google_fonts.dart';
33
import 'package:taskwarrior/app/utils/constants/taskwarrior_colors.dart';
44
import 'package:taskwarrior/app/utils/constants/taskwarrior_fonts.dart';
5+
56
import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
7+
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
8+
import 'package:taskwarrior/app/utils/theme/app_settings.dart';
69

710
import 'package:tuple/tuple.dart';
811

@@ -27,11 +30,41 @@ class ManageProfile extends StatelessWidget {
2730
@override
2831
Widget build(BuildContext context) {
2932
var triples = [
30-
Tuple3(Icons.edit, 'Rename Alias', rename),
31-
Tuple3(Icons.link, 'Configure Taskserver', configure),
32-
Tuple3(Icons.upload, 'Export tasks', export),
33-
Tuple3(Icons.copy, 'Copy config to new profile', copy),
34-
Tuple3(Icons.delete, 'Delete profile', delete),
33+
Tuple3(
34+
Icons.edit,
35+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
36+
.sentences
37+
.profilePageRenameAlias,
38+
rename,
39+
),
40+
Tuple3(
41+
Icons.link,
42+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
43+
.sentences
44+
.profilePageConfigureTaskserver,
45+
configure,
46+
),
47+
Tuple3(
48+
Icons.upload,
49+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
50+
.sentences
51+
.profilePageExportTasks,
52+
export,
53+
),
54+
Tuple3(
55+
Icons.copy,
56+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
57+
.sentences
58+
.profilePageCopyConfigToNewProfile,
59+
copy,
60+
),
61+
Tuple3(
62+
Icons.delete,
63+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
64+
.sentences
65+
.profilePageDeleteProfile,
66+
delete,
67+
),
3568
];
3669

3770
return ExpansionTile(
@@ -52,7 +85,9 @@ class ManageProfile extends StatelessWidget {
5285
? TaskWarriorColors.white
5386
: TaskWarriorColors.black,
5487
title: Text(
55-
'Manage selected profile',
88+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
89+
.sentences
90+
.profilePageManageSelectedProfile,
5691
style: GoogleFonts.poppins(
5792
fontWeight: TaskWarriorFonts.bold,
5893
fontSize: TaskWarriorFonts.fontSizeMedium,

0 commit comments

Comments
 (0)