Fixed 24 hr, errors

Author: codesage01

lib/drawer/nav_drawer.dart

@@ -135,6 +135,7 @@ class _NavDrawerState extends State<NavDrawer> {
                 bool syncOnStart = false;
                 bool syncOnTaskCreate = false;
                 bool delaytask = false;
+                bool change24hr = false;
 
                 ///check if auto sync is on or off
                 final SharedPreferences prefs =
@@ -144,6 +145,7 @@ class _NavDrawerState extends State<NavDrawer> {
                   syncOnTaskCreate =
                       prefs.getBool('sync-OnTaskCreate') ?? false;
                   delaytask = prefs.getBool('delaytask') ?? false;
+                  change24hr = prefs.getBool('24hourformate') ?? false;
                 });
                 // print(syncOnStart);
                 // print(syncOnTaskCreate);
@@ -153,6 +155,7 @@ class _NavDrawerState extends State<NavDrawer> {
                       isSyncOnStartActivel: syncOnStart,
                       isSyncOnTaskCreateActivel: syncOnTaskCreate,
                       delaytask: delaytask,
+                      change24hr: change24hr,
                     ),
                   ),
                 );

lib/views/settings/settings.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:path/path.dart' as path;
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:file_picker/file_picker.dart';
+import "package:file_picker/file_picker.dart";
 import 'package:taskwarrior/config/app_settings.dart';
 import 'package:taskwarrior/config/taskwarriorcolors.dart';
 import 'package:taskwarrior/config/taskwarriorfonts.dart';
@@ -20,10 +20,12 @@ class SettingsPage extends StatefulWidget {
     required this.isSyncOnStartActivel,
     required this.isSyncOnTaskCreateActivel,
     required this.delaytask,
+    required this.change24hr,
   });
   bool isSyncOnStartActivel;
   bool isSyncOnTaskCreateActivel;
   bool delaytask;
+  bool change24hr;
 
   @override
   _SettingsPageState createState() => _SettingsPageState();
@@ -373,7 +375,39 @@ class _SettingsPageState extends State<SettingsPage> {
                       ),
                     ],
                   ),
-                )
+                ),
+                const Divider(),
+                ListTile(
+                  title: Text(
+                    'Enable 24HR formte',
+                    style: GoogleFonts.poppins(
+                      fontWeight: FontWeight.bold,
+                      fontSize: TaskWarriorFonts.fontSizeMedium,
+                      color: AppSettings.isDarkMode
+                          ? TaskWarriorColors.white
+                          : TaskWarriorColors.black,
+                    ),
+                  ),
+                  subtitle: Text(
+                    'Switch to Right to convert in 24hr formate',
+                    style: GoogleFonts.poppins(
+                      color: TaskWarriorColors.grey,
+                      fontSize: TaskWarriorFonts.fontSizeSmall,
+                    ),
+                  ),
+                  trailing: Switch(
+                    value: widget.change24hr,
+                    onChanged: (bool value) async {
+                      setState(() {
+                        widget.change24hr = value;
+                      });
+
+                      final SharedPreferences prefs =
+                          await SharedPreferences.getInstance();
+                      await prefs.setBool('24hourformate', value);
+                    },
+                  ),
+                ),
               ],
             ),
     );

lib/widgets/add_Task.dart

@@ -27,14 +27,24 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
   DateTime? due;
   String dueString = '';
   String priority = 'M';
-  bool use24hourFormate = false;
   final tagcontroller = TextEditingController();
   List<String> tags = [];
   bool inThePast = false;
-
+  bool change24hr = false;
   @override
   void initState() {
     super.initState();
+    checkto24hr();
+  }
+
+  Future<void> checkto24hr() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    setState(() {
+      change24hr = prefs.getBool(
+            '24hourformate',
+          ) ??
+          false;
+    });
   }
 
   @override
@@ -71,26 +81,6 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
                 ),
               ),
             ),
-          ),
-          content: Form(
-            key: formKey,
-            child: SizedBox(
-              width: MediaQuery.of(context).size.width * 0.8,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: <Widget>[
-                  const SizedBox(height: 8),
-                  buildName(),
-                  const SizedBox(height: 12),
-                  buildDueDate(context),
-                  const SizedBox(height: 8),
-                  buildPriority(),
-                  const SizedBox(
-                    height: 8,
-                  ),
-                  buildformate(),
-                  buildTags(),
-                ],
             content: Form(
               key: formKey,
               child: SizedBox(
@@ -265,12 +255,7 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
                                   onSurface: TaskWarriorColors.black,
                                 ),
                         ),
-                        child: MediaQuery(
-                          data: MediaQuery.of(context).copyWith(
-                            alwaysUse24HourFormat: use24hourFormate,
-                          ),
-                          child: child!),
-                        );
+                        child: child!,
                       );
                     },
                     fieldHintText: "Month/Date/Year",
@@ -313,7 +298,11 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
                                     onSurface: TaskWarriorColors.black,
                                   ),
                           ),
-                          child: child!,
+                          child: MediaQuery(
+                              data: MediaQuery.of(context).copyWith(
+                                alwaysUse24HourFormat: change24hr,
+                              ),
+                              child: child!),
                         );
                       },
                       context: context,
@@ -416,40 +405,6 @@ class _AddTaskBottomSheetState extends State<AddTaskBottomSheet> {
           ),
         ],
       );
-  Widget buildformate() {
-    return Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-      Text(
-        'Click to Choose:',
-        style: GoogleFonts.poppins(
-          fontWeight: FontWeight.bold,
-          color: AppSettings.isDarkMode ? Colors.white : Colors.black,
-        ),
-      ),
-      const SizedBox(
-        width: 5.0,
-      ),
-      Wrap(
-        spacing: 5.0,
-        children: List<Widget>.generate(
-          1,
-          (int index) {
-            return ChoiceChip(
-                label: const Text(
-                  '24hour',
-                ),
-                selected: use24hourFormate,
-                onSelected: (bool? selected) {
-                  if (selected != use24hourFormate) {
-                    setState(() {
-                      use24hourFormate = selected!;
-                    });
-                  }
-                });
-          },
-        ),
-      )
-    ]);
-  }
 
   Widget buildCancelButton(BuildContext context) => TextButton(
         child: Text(

lib/widgets/taskdetails/dateTimePicker.dart

@@ -79,13 +79,6 @@ class DateTimeWidget extends StatelessWidget {
             var time = await showTimePicker(
               context: context,
               initialTime: TimeOfDay.now(),
-              builder: (BuildContext context, Widget? child) {
-                return MediaQuery(
-                    data: MediaQuery.of(context).copyWith(
-                      alwaysUse24HourFormat: true,
-                    ),
-                    child: child!);
-              },
             );
             if (time != null) {
               var dateTime = date.add(
@@ -200,4 +193,4 @@ class StartWidget extends StatelessWidget {
       ),
     );
   }
-}
+}