Skip to content

Commit fc00830

Browse files
authored
Merge pull request #294 from codesage01/24-issue
Added 24 hr format feature
2 parents 3a78dd9 + 2e9c5f4 commit fc00830

File tree

3 files changed

+56
-4
lines changed

3 files changed

+56
-4
lines changed

lib/drawer/nav_drawer.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class _NavDrawerState extends State<NavDrawer> {
135135
bool syncOnStart = false;
136136
bool syncOnTaskCreate = false;
137137
bool delaytask = false;
138+
bool change24hr = false;
138139

139140
///check if auto sync is on or off
140141
final SharedPreferences prefs =
@@ -144,6 +145,7 @@ class _NavDrawerState extends State<NavDrawer> {
144145
syncOnTaskCreate =
145146
prefs.getBool('sync-OnTaskCreate') ?? false;
146147
delaytask = prefs.getBool('delaytask') ?? false;
148+
change24hr = prefs.getBool('24hourformate') ?? false;
147149
});
148150
// print(syncOnStart);
149151
// print(syncOnTaskCreate);
@@ -153,6 +155,7 @@ class _NavDrawerState extends State<NavDrawer> {
153155
isSyncOnStartActivel: syncOnStart,
154156
isSyncOnTaskCreateActivel: syncOnTaskCreate,
155157
delaytask: delaytask,
158+
change24hr: change24hr,
156159
),
157160
),
158161
);

lib/views/settings/settings.dart

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
66
import 'package:google_fonts/google_fonts.dart';
77
import 'package:path/path.dart' as path;
88
import 'package:shared_preferences/shared_preferences.dart';
9-
import 'package:file_picker/file_picker.dart';
9+
import "package:file_picker/file_picker.dart";
1010
import 'package:taskwarrior/config/app_settings.dart';
1111
import 'package:taskwarrior/config/taskwarriorcolors.dart';
1212
import 'package:taskwarrior/config/taskwarriorfonts.dart';
@@ -20,10 +20,12 @@ class SettingsPage extends StatefulWidget {
2020
required this.isSyncOnStartActivel,
2121
required this.isSyncOnTaskCreateActivel,
2222
required this.delaytask,
23+
required this.change24hr,
2324
});
2425
bool isSyncOnStartActivel;
2526
bool isSyncOnTaskCreateActivel;
2627
bool delaytask;
28+
bool change24hr;
2729

2830
@override
2931
_SettingsPageState createState() => _SettingsPageState();
@@ -373,7 +375,39 @@ class _SettingsPageState extends State<SettingsPage> {
373375
),
374376
],
375377
),
376-
)
378+
),
379+
const Divider(),
380+
ListTile(
381+
title: Text(
382+
'Enable 24HR formte',
383+
style: GoogleFonts.poppins(
384+
fontWeight: FontWeight.bold,
385+
fontSize: TaskWarriorFonts.fontSizeMedium,
386+
color: AppSettings.isDarkMode
387+
? TaskWarriorColors.white
388+
: TaskWarriorColors.black,
389+
),
390+
),
391+
subtitle: Text(
392+
'Switch to Right to convert in 24hr formate',
393+
style: GoogleFonts.poppins(
394+
color: TaskWarriorColors.grey,
395+
fontSize: TaskWarriorFonts.fontSizeSmall,
396+
),
397+
),
398+
trailing: Switch(
399+
value: widget.change24hr,
400+
onChanged: (bool value) async {
401+
setState(() {
402+
widget.change24hr = value;
403+
});
404+
405+
final SharedPreferences prefs =
406+
await SharedPreferences.getInstance();
407+
await prefs.setBool('24hourformate', value);
408+
},
409+
),
410+
),
377411
],
378412
),
379413
);

lib/widgets/add_Task.dart

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,21 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
3030
final tagcontroller = TextEditingController();
3131
List<String> tags = [];
3232
bool inThePast = false;
33-
33+
bool change24hr = false;
3434
@override
3535
void initState() {
3636
super.initState();
37+
checkto24hr();
38+
}
39+
40+
Future<void> checkto24hr() async {
41+
final SharedPreferences prefs = await SharedPreferences.getInstance();
42+
setState(() {
43+
change24hr = prefs.getBool(
44+
'24hourformate',
45+
) ??
46+
false;
47+
});
3748
}
3849

3950
@override
@@ -287,7 +298,11 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
287298
onSurface: TaskWarriorColors.black,
288299
),
289300
),
290-
child: child!,
301+
child: MediaQuery(
302+
data: MediaQuery.of(context).copyWith(
303+
alwaysUse24HourFormat: change24hr,
304+
),
305+
child: child!),
291306
);
292307
},
293308
context: context,

0 commit comments

Comments
 (0)