diff --git a/android/app/src/main/res/layout/taskwarrior_layout.xml b/android/app/src/main/res/layout/taskwarrior_layout.xml
index d18cca45..d6665cae 100644
--- a/android/app/src/main/res/layout/taskwarrior_layout.xml
+++ b/android/app/src/main/res/layout/taskwarrior_layout.xml
@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:text="TaskWarrior"
android:textSize="20sp"
- android:textStyle="bold"
+ android:GoogleFonts.poppins="bold"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="12dp"/>
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:text="Pending Tasks"
android:textSize="18sp"
- android:textStyle="bold"
+ android:GoogleFonts.poppins="bold"
android:layout_below="@id/taskWarriorText"
android:layout_centerHorizontal="true"
android:layout_marginTop="8dp"/>
@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:text="Title"
android:textSize="16sp"
- android:textStyle="bold" />
+ android:GoogleFonts.poppins="bold" />
+ android:GoogleFonts.poppins="bold" />
+ android:GoogleFonts.poppins="bold" />
[
TextSpan(
text: 'Status : ',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -78,7 +78,7 @@ class FilterDrawer extends StatelessWidget {
),
TextSpan(
text: filters.pendingFilter ? 'pending' : 'completed',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
@@ -132,11 +132,11 @@ class FilterDrawer extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 0.0),
child: Text(
'Filter Tag By:',
- style: TextStyle(
+ style: GoogleFonts.poppins(
color: (AppSettings.isDarkMode
? Colors.white
: Color.fromARGB(255, 48, 46, 46)),
- fontFamily: GoogleFonts.firaMono().fontFamily,
+ //
fontSize: 18),
//textAlign: TextAlign.right,
),
@@ -175,11 +175,10 @@ class FilterDrawer extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 0.0),
child: Text(
'Sort By',
- style: TextStyle(
+ style: GoogleFonts.poppins(
color: (AppSettings.isDarkMode
? Colors.white
: Color.fromARGB(255, 48, 46, 46)),
- fontFamily: GoogleFonts.firaMono().fontFamily,
fontSize: 18),
//textAlign: TextAlign.right,
),
@@ -221,7 +220,7 @@ class FilterDrawer extends StatelessWidget {
storageWidget.selectSort('$sort+');
}
},
- labelStyle: TextStyle(
+ labelStyle: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.black
: Colors.white),
@@ -254,7 +253,7 @@ class FilterDrawer extends StatelessWidget {
},
child: Text(
'Reset Sort',
- style: TextStyle(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Color.fromARGB(255, 48, 46, 46)
@@ -312,13 +311,13 @@ class FilterDrawer extends StatelessWidget {
// FilterChip(
// onSelected: (_) => filters.toggleTagUnion(),
// label: Text(filters.tagUnion ? 'OR' : 'AND',
-// style: GoogleFonts.firaMono())),
+// style: GoogleFonts.poppins())),
// for (var entry in filters.tags.entries)
// FilterChip(
// onSelected: (_) => filters.toggleTagFilter(entry.key),
// label: Text(
// entry.value.display,
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// fontWeight: entry.value.selected ? FontWeight.w700 : null,
// ),
// ),
diff --git a/lib/drawer/nav_drawer.dart b/lib/drawer/nav_drawer.dart
index f6b3e6e3..d65f435d 100644
--- a/lib/drawer/nav_drawer.dart
+++ b/lib/drawer/nav_drawer.dart
@@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'package:taskwarrior/config/app_settings.dart';
import 'package:taskwarrior/model/storage/storage_widget.dart';
import 'package:taskwarrior/routes/pageroute.dart';
import 'package:taskwarrior/views/about/about.dart';
import 'package:taskwarrior/views/reports/reports_home.dart';
+import 'package:taskwarrior/views/settings/settings.dart';
class NavDrawer extends StatefulWidget {
final InheritedStorage storageWidget;
@@ -33,9 +35,9 @@ class _NavDrawerState extends State {
tileColor: AppSettings.isDarkMode ? Colors.black : Colors.white,
textColor: AppSettings.isDarkMode ? Colors.white : Colors.black,
contentPadding: const EdgeInsets.only(top: 40, left: 10),
- title: const Text(
+ title: Text(
'Menu',
- style: TextStyle(
+ style: GoogleFonts.poppins(
fontSize: 25,
fontWeight: FontWeight.bold,
),
@@ -120,6 +122,19 @@ class _NavDrawerState extends State {
},
title: const Text("About"),
),
+ ListTile(
+ tileColor: AppSettings.isDarkMode ? Colors.black : Colors.white,
+ textColor: AppSettings.isDarkMode ? Colors.white : Colors.black,
+ leading: Icon(
+ Icons.settings,
+ color: AppSettings.isDarkMode ? Colors.white : Colors.black,
+ ),
+ onTap: () {
+ Navigator.of(context).push(MaterialPageRoute(
+ builder: (context) => const SettingsPage()));
+ },
+ title: const Text("Settings"),
+ ),
],
));
}
diff --git a/lib/model/storage/storage_widget.dart b/lib/model/storage/storage_widget.dart
index 69313ed8..68ba706e 100644
--- a/lib/model/storage/storage_widget.dart
+++ b/lib/model/storage/storage_widget.dart
@@ -5,6 +5,8 @@ import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'package:loggy/loggy.dart';
@@ -267,20 +269,26 @@ class _StorageWidgetState extends State {
),
child: Container(
padding: const EdgeInsets.all(16.0),
- child: const Column(
+ child: Column(
mainAxisSize: MainAxisSize.min,
children: [
- CircularProgressIndicator(),
- SizedBox(height: 16.0),
+ const CircularProgressIndicator(),
+ const SizedBox(height: 16.0),
Text(
"Syncing",
- style: TextStyle(
+ style: GoogleFonts.poppins(
fontSize: 18.0,
fontWeight: FontWeight.bold,
),
),
- SizedBox(height: 8.0),
- Text("Please wait..."),
+ const SizedBox(height: 8.0),
+ Text(
+ "Please wait...",
+ style: GoogleFonts.poppins(
+ fontSize: 12.0,
+ fontWeight: FontWeight.normal,
+ ),
+ ),
],
),
),
@@ -296,7 +304,7 @@ class _StorageWidgetState extends State {
setState(() {});
if (isDialogNeeded) {
- Navigator.pop(context);
+ Get.back();
}
ScaffoldMessenger.of(context).showSnackBar(
@@ -306,6 +314,9 @@ class _StorageWidgetState extends State {
);
}
} catch (e, trace) {
+ if (isDialogNeeded) {
+ Get.back();
+ }
logError(e, trace);
}
}
diff --git a/lib/services/task_details.dart b/lib/services/task_details.dart
index e5d003cf..cee98d02 100644
--- a/lib/services/task_details.dart
+++ b/lib/services/task_details.dart
@@ -70,7 +70,7 @@ class _DetailRouteState extends State {
backgroundColor: Palette.kToDark,
title: Text(
'id: ${(modify.id == 0) ? '-' : modify.id}',
- style: GoogleFonts.firaMono(color: Colors.white),
+ style: GoogleFonts.poppins(color: Colors.white),
),
),
body: Padding(
@@ -124,7 +124,7 @@ class _DetailRouteState extends State {
' new: ${entry.value['new']}')
.toList()
.join('\n'),
- style: GoogleFonts.firaMono(),
+ style: GoogleFonts.poppins(),
),
),
actions: [
@@ -291,7 +291,7 @@ class AttributeWidget extends StatelessWidget {
children: [
Text(
'$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color:
@@ -300,7 +300,7 @@ class AttributeWidget extends StatelessWidget {
),
Text(
localValue?.toString() ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color:
AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -345,7 +345,7 @@ class TagsWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -356,7 +356,7 @@ class TagsWidget extends StatelessWidget {
TextSpan(
text:
'${(value as ListBuilder?)?.build() ?? 'not selected'}',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
@@ -368,7 +368,7 @@ class TagsWidget extends StatelessWidget {
),
// Text(
// '${'$name: '}${(value as ListBuilder?)?.build()}',
- // style: GoogleFonts.firaMono(),
+ // style: GoogleFonts.poppins(),
// ),
],
),
@@ -410,7 +410,7 @@ class TagsWidget extends StatelessWidget {
// (value == null)
// ? '${'$name:'.padRight(13)}null'
// : '${'$name:'.padRight(13)}${(value as ListBuilder).length} annotation(s)',
-// style: GoogleFonts.firaMono(),
+// style: GoogleFonts.poppins(),
// ),
// ],
// ),
diff --git a/lib/services/task_list_tem.dart b/lib/services/task_list_tem.dart
index 28bb7bba..dd38a3f7 100644
--- a/lib/services/task_list_tem.dart
+++ b/lib/services/task_list_tem.dart
@@ -84,9 +84,9 @@ class _TaskListItemState extends State {
'${(widget.task.id == 0) ? '#' : widget.task.id}. ${widget.task.description}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
- style: TextStyle(
- color: colour,
- fontFamily: GoogleFonts.firaMono().fontFamily),
+ style: GoogleFonts.poppins(
+ color: colour,
+ ),
),
),
],
@@ -95,8 +95,9 @@ class _TaskListItemState extends State {
(widget.task.annotations != null)
? ' [${widget.task.annotations!.length}]'
: '',
- style: TextStyle(
- color: colour, fontFamily: GoogleFonts.firaMono().fontFamily),
+ style: GoogleFonts.poppins(
+ color: colour,
+ ),
),
],
),
@@ -112,18 +113,19 @@ class _TaskListItemState extends State {
'Due: ${(widget.task.due != null) ? when(widget.task.due!) : '-'}'
.replaceFirst(RegExp(r' \[\]$'), '')
.replaceAll(RegExp(r' +'), ' '),
- style: TextStyle(
- color: dimColor,
- fontFamily: GoogleFonts.firaMono().fontFamily,
- fontSize: 12,
- overflow: TextOverflow.ellipsis),
+ overflow: TextOverflow.ellipsis,
+ style: GoogleFonts.poppins(
+ color: dimColor,
+ fontSize: 12,
+ ),
),
),
),
Text(
formatUrgency(urgency(widget.task)),
- style: TextStyle(
- color: colour, fontFamily: GoogleFonts.firaMono().fontFamily),
+ style: GoogleFonts.poppins(
+ color: colour,
+ ),
),
],
),
@@ -158,9 +160,9 @@ class _TaskListItemState extends State {
'${(widget.task.id == 0) ? '#' : widget.task.id}. ${widget.task.description}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
- style: TextStyle(
- color: colour,
- fontFamily: GoogleFonts.firaMono().fontFamily),
+ style: GoogleFonts.poppins(
+ color: colour,
+ ),
),
),
],
@@ -179,18 +181,19 @@ class _TaskListItemState extends State {
'Due: ${(widget.task.due != null) ? when(widget.task.due!) : '-'}'
.replaceFirst(RegExp(r' \[\]$'), '')
.replaceAll(RegExp(r' +'), ' '),
- style: TextStyle(
- color: dimColor,
- fontFamily: GoogleFonts.firaMono().fontFamily,
- fontSize: 12,
- overflow: TextOverflow.ellipsis),
+ overflow: TextOverflow.ellipsis,
+ style: GoogleFonts.poppins(
+ color: dimColor,
+ fontSize: 12,
+ ),
),
),
),
Text(
formatUrgency(urgency(widget.task)),
- style: TextStyle(
- color: colour, fontFamily: GoogleFonts.firaMono().fontFamily),
+ style: GoogleFonts.poppins(
+ color: colour,
+ ),
),
],
),
diff --git a/lib/taskserver/configure_taskserver.dart b/lib/taskserver/configure_taskserver.dart
index 4b88ff15..7401b334 100644
--- a/lib/taskserver/configure_taskserver.dart
+++ b/lib/taskserver/configure_taskserver.dart
@@ -133,7 +133,7 @@
// for (var key in header.keys.toList())
// Text(
// '${'$key:'.padRight(maxKeyLength + 1)} ${header[key]}',
-// style: GoogleFonts.firaMono(),
+// style: GoogleFonts.poppins(),
// ),
// ],
// ),
@@ -186,11 +186,11 @@
// children: [
// const Text(
// "Configure TaskServer",
-// style: TextStyle(color: Colors.white, fontSize: 18),
+// style: GoogleFonts.poppins(color: Colors.white, fontSize: 18),
// ),
// Text(
// alias ?? profile,
-// style: const TextStyle(color: Colors.white, fontSize: 12),
+// style: const GoogleFonts.poppins(color: Colors.white, fontSize: 12),
// ),
// ],
// ),
@@ -246,7 +246,7 @@
// "I dont know how to configure the TaskServer",
// textAlign: TextAlign.center,
// maxLines: 2,
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// decoration: TextDecoration.underline,
// fontWeight: FontWeight.w500,
@@ -267,7 +267,7 @@
// 'TaskServer Sync Configuration',
// textAlign: TextAlign.center,
// maxLines: 2,
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// decoration: TextDecoration.underline,
// fontWeight: FontWeight.w800,
@@ -287,7 +287,7 @@
// "Auto Sync",
// textAlign: TextAlign.center,
// maxLines: 2,
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// decoration: TextDecoration.underline,
// fontWeight: FontWeight.w500,
@@ -383,7 +383,7 @@
// children: [
// TextSpan(
// text: widget.pem.padRight(17),
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w800,
// ),
@@ -391,14 +391,14 @@
// name == null
// ? TextSpan(
// text: " = Not Configured",
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
// )
// : TextSpan(
// text: (widget.pem == 'server.cert') ? '' : ' = $name',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
@@ -408,7 +408,7 @@
// ),
// // child: Text(
// // '${widget.pem.padRight(17)}${(widget.pem == 'server.cert') ? '' : ' = $name'}',
-// // style: GoogleFonts.firaMono(),
+// // style: GoogleFonts.poppins(),
// // ),
// ),
// subtitle: (key) {
@@ -420,7 +420,7 @@
// scrollDirection: Axis.horizontal,
// child: Text(
// 'SHA1: null',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w800,
// ),
@@ -436,14 +436,14 @@
// children: [
// TextSpan(
// text: 'SHA1 = ',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w800,
// ),
// ),
// TextSpan(
// text: identifier,
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
@@ -458,7 +458,7 @@
// scrollDirection: Axis.horizontal,
// child: Text(
// '${e.runtimeType}',
-// style: GoogleFonts.firaMono(),
+// style: GoogleFonts.poppins(),
// ),
// );
// }
@@ -581,7 +581,7 @@
// child: TextField(
// controller: _taskrcContentController,
// maxLines: 8,
-// style: const TextStyle(color: Colors.white),
+// style: const GoogleFonts.poppins(color: Colors.white),
// decoration: InputDecoration(
// suffixIconConstraints: const BoxConstraints(
// maxHeight: 24,
@@ -594,7 +594,7 @@
// },
// icon: const Icon(Icons.content_paste)),
// border: const OutlineInputBorder(),
-// labelStyle: GoogleFonts.firaMono(color: color),
+// labelStyle: GoogleFonts.poppins(color: color),
// labelText: 'Paste your taskrc contents here',
// ),
// ),
@@ -605,7 +605,7 @@
// children: [
// Text(
// "Or",
-// style: GoogleFonts.firaMono(color: color),
+// style: GoogleFonts.poppins(color: color),
// )
// ],
// ),
@@ -628,7 +628,7 @@
// scrollDirection: Axis.horizontal,
// child: Text(
// 'Selected TaskServer Configuration',
-// style: GoogleFonts.firaMono(fontWeight: FontWeight.w800),
+// style: GoogleFonts.poppins(fontWeight: FontWeight.w800),
// ),
// ),
// ),
@@ -641,7 +641,7 @@
// children: [
// TextSpan(
// text: 'taskd.server = ',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w800,
// ),
@@ -649,14 +649,14 @@
// server == null
// ? TextSpan(
// text: 'Not Configured',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
// )
// : TextSpan(
// text: '$server',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
@@ -691,7 +691,7 @@
// children: [
// TextSpan(
// text: 'taskd.credentials = ',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w800,
// ),
@@ -699,14 +699,14 @@
// credentialsString == null
// ? TextSpan(
// text: 'Not Configured',
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
// )
// : TextSpan(
// text: credentialsString,
-// style: GoogleFonts.firaMono(
+// style: GoogleFonts.poppins(
// color: color,
// fontWeight: FontWeight.w400,
// ),
diff --git a/lib/taskserver/ntaskserver.dart b/lib/taskserver/ntaskserver.dart
index ccd3c6db..86d34061 100644
--- a/lib/taskserver/ntaskserver.dart
+++ b/lib/taskserver/ntaskserver.dart
@@ -7,7 +7,6 @@ import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:google_fonts/google_fonts.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:taskwarrior/config/app_settings.dart';
import 'package:taskwarrior/model/storage.dart';
import 'package:taskwarrior/model/storage/client.dart';
@@ -31,21 +30,11 @@ class _ManageTaskServerState extends State {
late Storage storage;
Server? server;
Credentials? credentials;
- bool _value = false;
bool isTaskDServerActive = true;
@override
void initState() {
super.initState();
- checkAutoSync();
- }
-
- checkAutoSync() async {
- ///check if auto sync is on or off
- final SharedPreferences prefs = await SharedPreferences.getInstance();
- setState(() {
- _value = prefs.getBool('sync') ?? false;
- });
}
bool hideKey = true;
@@ -268,13 +257,13 @@ class _ManageTaskServerState extends State {
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- const Text(
+ Text(
"Configure TaskServer",
- style: TextStyle(color: Colors.white, fontSize: 18),
+ style: GoogleFonts.poppins(color: Colors.white, fontSize: 18),
),
Text(
alias ?? profile,
- style: const TextStyle(color: Colors.white, fontSize: 12),
+ style: GoogleFonts.poppins(color: Colors.white, fontSize: 12),
),
],
),
@@ -331,7 +320,7 @@ class _ManageTaskServerState extends State {
children: [
Text(
"Configure TASKRC",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500, color: color),
),
const SizedBox(height: 10),
@@ -368,14 +357,14 @@ class _ManageTaskServerState extends State {
children: [
Text(
'Configure TaskRc',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
color: color,
),
),
Text(
'Paste the taskrc content or select taskrc file',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
color: color,
fontSize: 10,
@@ -390,7 +379,7 @@ class _ManageTaskServerState extends State {
controller:
taskrcContentController,
maxLines: 8,
- style: const TextStyle(
+ style: GoogleFonts.poppins(
color: Colors.white),
decoration: InputDecoration(
suffixIconConstraints:
@@ -409,7 +398,7 @@ class _ManageTaskServerState extends State {
border:
const OutlineInputBorder(),
labelStyle:
- GoogleFonts.firaMono(
+ GoogleFonts.poppins(
color: color),
labelText:
'Paste your taskrc contents here',
@@ -419,7 +408,7 @@ class _ManageTaskServerState extends State {
),
Text(
"Or",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: color),
),
FilledButton.tonal(
@@ -460,7 +449,7 @@ class _ManageTaskServerState extends State {
taskrcContentController.text.isEmpty
? "Set TaskRc"
: "Taskrc file is verified",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400, color: color),
),
Container(
@@ -508,7 +497,7 @@ class _ManageTaskServerState extends State {
children: [
Text(
"TaskD Server Info",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500, color: color),
),
const SizedBox(height: 10),
@@ -530,13 +519,13 @@ class _ManageTaskServerState extends State {
server == null
? Text(
'Not Configured',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
color: color),
)
: Text(
'$server',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
color: color),
),
@@ -583,7 +572,7 @@ class _ManageTaskServerState extends State {
children: [
Text(
"TaskD Server Credentials",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500, color: color),
),
const SizedBox(height: 10),
@@ -605,7 +594,7 @@ class _ManageTaskServerState extends State {
credentialsString == null
? Text(
'Not Configured',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
color: color),
)
@@ -618,7 +607,7 @@ class _ManageTaskServerState extends State {
scrollDirection: Axis.horizontal,
child: Text(
credentialsString,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
color: color),
),
@@ -690,70 +679,6 @@ class _ManageTaskServerState extends State {
? "Select Certificate"
: "Select Certificate",
),
- Padding(
- padding: const EdgeInsets.only(
- top: 10,
- bottom: 10,
- ),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- "Configure AutoSync",
- style: GoogleFonts.firaMono(
- fontWeight: FontWeight.w500, color: color),
- ),
- const SizedBox(height: 10),
- GestureDetector(
- onTap: () {},
- child: Container(
- width: MediaQuery.of(context).size.width * 1,
- // height: MediaQuery.of(context).size.height * 0.05,
- padding: const EdgeInsets.all(12),
- decoration: BoxDecoration(
- color: tileColor,
- borderRadius: BorderRadius.circular(8),
- border: Border.all(color: Colors.grey.shade300),
- ),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(
- "Enable Sync",
- style: GoogleFonts.firaMono(
- fontWeight: FontWeight.w400, color: color),
- ),
- Switch(
- splashRadius: 24,
- thumbIcon: MaterialStateProperty.resolveWith(
- (Set states) {
- if (states.contains(MaterialState.selected)) {
- return const Icon(
- Icons.check,
- color: Colors.green,
- );
- }
- return null;
- },
- ),
- value: _value,
- onChanged: (bool value) async {
- setState(() {
- _value = !_value;
- });
-
- final SharedPreferences prefs =
- await SharedPreferences.getInstance();
- await prefs.setBool('sync', _value);
- }),
- ],
- ),
- ),
- ),
- ],
- ),
- ),
],
),
),
@@ -808,7 +733,7 @@ class _PemWidgetState extends State {
Text(
widget.optionString,
style:
- GoogleFonts.firaMono(fontWeight: FontWeight.w500, color: color),
+ GoogleFonts.poppins(fontWeight: FontWeight.w500, color: color),
),
const SizedBox(
height: 10,
@@ -862,7 +787,7 @@ class _PemWidgetState extends State {
: (widget.pem == 'server.cert')
? ''
: "$name = ",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400, color: color),
),
Text(
@@ -871,7 +796,7 @@ class _PemWidgetState extends State {
? "private.key.pem"
: ""
: identifier,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400, color: color),
),
],
diff --git a/lib/views/Onboarding/onboarding_screen.dart b/lib/views/Onboarding/onboarding_screen.dart
index 601e51d8..336db5a5 100644
--- a/lib/views/Onboarding/onboarding_screen.dart
+++ b/lib/views/Onboarding/onboarding_screen.dart
@@ -87,7 +87,7 @@ class _OnboardingScreenState extends State {
Text(
content.title,
textAlign: TextAlign.center,
- style: GoogleFonts.mulish(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w600,
fontSize: (width <= 550) ? 30 : 35,
),
@@ -95,7 +95,7 @@ class _OnboardingScreenState extends State {
const SizedBox(height: 15),
Text(
content.desc,
- style: GoogleFonts.mulish(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w300,
fontSize: (width <= 550) ? 17 : 17,
),
@@ -144,11 +144,11 @@ class _OnboardingScreenState extends State {
padding: (width <= 550)
? const EdgeInsets.symmetric(horizontal: 100, vertical: 20)
: EdgeInsets.symmetric(horizontal: width * 0.2, vertical: 25),
- textStyle: TextStyle(fontSize: (width <= 550) ? 13 : 17),
+ textStyle: GoogleFonts.poppins(fontSize: (width <= 550) ? 13 : 17),
),
child: Text(
"Start",
- style: GoogleFonts.mulish(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w300,
color: Colors.white,
fontSize: (width <= 550) ? 17 : 17,
@@ -177,7 +177,7 @@ class _OnboardingScreenState extends State {
),
child: Text(
"Skip",
- style: GoogleFonts.mulish(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: (width <= 550) ? 12 : 12,
@@ -204,7 +204,7 @@ class _OnboardingScreenState extends State {
),
child: Text(
"Next",
- style: GoogleFonts.mulish(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w300,
color: Colors.white,
fontSize: (width <= 550) ? 12 : 12,
diff --git a/lib/views/about/about.dart b/lib/views/about/about.dart
index a44c92ec..07191c98 100644
--- a/lib/views/about/about.dart
+++ b/lib/views/about/about.dart
@@ -25,9 +25,9 @@ class _AboutPageState extends State {
appBar: AppBar(
centerTitle: true,
backgroundColor: Palette.kToDark.shade200,
- title: const Text(
+ title: Text(
'About',
- style: TextStyle(color: Colors.white),
+ style: GoogleFonts.poppins(color: Colors.white),
),
leading: GestureDetector(
onTap: () {
@@ -58,7 +58,7 @@ class _AboutPageState extends State {
),
Text(
"Taskwarrior",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 18,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -88,7 +88,7 @@ class _AboutPageState extends State {
children: [
TextSpan(
text: 'Version: ',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -98,7 +98,7 @@ class _AboutPageState extends State {
),
TextSpan(
text: appInfoLines[1],
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
@@ -113,7 +113,7 @@ class _AboutPageState extends State {
children: [
TextSpan(
text: 'Package: ',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -123,7 +123,7 @@ class _AboutPageState extends State {
),
TextSpan(
text: appInfoLines[0],
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
@@ -146,7 +146,7 @@ class _AboutPageState extends State {
Text(
introduction,
textAlign: TextAlign.center,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500,
fontSize: 12,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -189,7 +189,7 @@ class _AboutPageState extends State {
BlendMode.srcIn)),
label: Text(
"GitHub",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500,
fontSize: 12,
color: AppSettings.isDarkMode
@@ -227,7 +227,7 @@ class _AboutPageState extends State {
BlendMode.srcIn)),
label: Text(
"CCExtractor",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500,
fontSize: 12,
color: AppSettings.isDarkMode
@@ -245,7 +245,7 @@ class _AboutPageState extends State {
Text(
"Eager to enhance this project? Visit our GitHub repository.",
textAlign: TextAlign.center,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w600,
fontSize: 12,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
diff --git a/lib/views/home/home.dart b/lib/views/home/home.dart
index 6b5a7f17..14502eed 100644
--- a/lib/views/home/home.dart
+++ b/lib/views/home/home.dart
@@ -3,6 +3,7 @@
import 'package:flutter/material.dart';
import 'package:double_back_to_close_app/double_back_to_close_app.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:taskwarrior/config/app_settings.dart';
@@ -69,15 +70,15 @@ class _HomePageState extends State {
if (!isSyncNeeded) {
///check if the data is synced or not
///if not then sync the data
- isNeededtoSync();
+ isNeededtoSyncOnStart();
isSyncNeeded = true;
}
}
- isNeededtoSync() async {
+ isNeededtoSyncOnStart() async {
final SharedPreferences prefs = await SharedPreferences.getInstance();
bool? value;
- value = prefs.getBool('sync') ?? false;
+ value = prefs.getBool('sync-onStart') ?? false;
if (value) {
storageWidget = StorageWidget.of(context);
@@ -143,7 +144,8 @@ class _HomePageState extends State {
return Scaffold(
appBar: AppBar(
backgroundColor: Palette.kToDark.shade200,
- title: const Text('Home Page', style: TextStyle(color: Colors.white)),
+ title:
+ Text('Home Page', style: GoogleFonts.poppins(color: Colors.white)),
actions: [
IconButton(
icon: (storageWidget.searchVisible)
@@ -270,7 +272,7 @@ class _HomePageState extends State {
if (value == "cancel") {
} else {
//else we can sync new tasks
- isNeededtoSync();
+ isNeededtoSyncOnStart();
}
}
}),
diff --git a/lib/views/profile/profile.dart b/lib/views/profile/profile.dart
index e0e67f6b..6b2c667b 100644
--- a/lib/views/profile/profile.dart
+++ b/lib/views/profile/profile.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'package:taskwarrior/config/app_settings.dart';
import 'package:taskwarrior/model/storage/savefile.dart';
@@ -30,7 +31,7 @@ class _ProfilePageState extends State {
backgroundColor: Palette.kToDark.shade200,
title: Text(
profilesMap.length == 1 ? 'Profile' : 'Profiles',
- style: const TextStyle(color: Colors.white),
+ style: GoogleFonts.poppins(color: Colors.white),
),
leading: IconButton(
onPressed: () {
diff --git a/lib/views/reports/pages/burndown_daily.dart b/lib/views/reports/pages/burndown_daily.dart
index 898640e5..e332f2f8 100644
--- a/lib/views/reports/pages/burndown_daily.dart
+++ b/lib/views/reports/pages/burndown_daily.dart
@@ -62,7 +62,7 @@ class _BurnDownDailyState extends State
children: [
Text(
'Date: $date',
- style: const TextStyle(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
),
),
@@ -160,7 +160,7 @@ class _BurnDownDailyState extends State
primaryXAxis: CategoryAxis(
title: AxisTitle(
text: 'Day - Month',
- textStyle: GoogleFonts.firaMono(
+ textStyle: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
fontSize: 12,
@@ -170,7 +170,7 @@ class _BurnDownDailyState extends State
primaryYAxis: NumericAxis(
title: AxisTitle(
text: 'Tasks',
- textStyle: GoogleFonts.firaMono(
+ textStyle: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 12,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
diff --git a/lib/views/reports/pages/burndown_monthly.dart b/lib/views/reports/pages/burndown_monthly.dart
index d5fcf42d..24413646 100644
--- a/lib/views/reports/pages/burndown_monthly.dart
+++ b/lib/views/reports/pages/burndown_monthly.dart
@@ -144,7 +144,7 @@ class _BurnDownMonthltState extends State
primaryXAxis: CategoryAxis(
title: AxisTitle(
text: 'Month - Year',
- textStyle: GoogleFonts.firaMono(
+ textStyle: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 12,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -154,7 +154,7 @@ class _BurnDownMonthltState extends State
primaryYAxis: NumericAxis(
title: AxisTitle(
text: 'Tasks',
- textStyle: GoogleFonts.firaMono(
+ textStyle: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 12,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
diff --git a/lib/views/reports/pages/burndown_weekly.dart b/lib/views/reports/pages/burndown_weekly.dart
index 0d185aa5..197bc296 100644
--- a/lib/views/reports/pages/burndown_weekly.dart
+++ b/lib/views/reports/pages/burndown_weekly.dart
@@ -160,7 +160,7 @@ class _BurnDownWeeklyState extends State
primaryXAxis: CategoryAxis(
title: AxisTitle(
text: 'Weeks - Year',
- textStyle: GoogleFonts.firaMono(
+ textStyle: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 12,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -170,7 +170,7 @@ class _BurnDownWeeklyState extends State
primaryYAxis: NumericAxis(
title: AxisTitle(
text: 'Tasks',
- textStyle: GoogleFonts.firaMono(
+ textStyle: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
fontSize: 12,
diff --git a/lib/views/reports/reports_home.dart b/lib/views/reports/reports_home.dart
index a65901d8..96b5dcc8 100644
--- a/lib/views/reports/reports_home.dart
+++ b/lib/views/reports/reports_home.dart
@@ -70,9 +70,9 @@ class _ReportsHomeState extends State
return Scaffold(
appBar: AppBar(
backgroundColor: Palette.kToDark.shade200,
- title: const Text(
+ title: Text(
'Reports',
- style: TextStyle(color: Colors.white),
+ style: GoogleFonts.poppins(color: Colors.white),
),
leading: GestureDetector(
onTap: () {
@@ -89,11 +89,11 @@ class _ReportsHomeState extends State
child: TabBar(
controller: _tabController,
labelColor: Appcolors.white,
- labelStyle: GoogleFonts.firaMono(
+ labelStyle: GoogleFonts.poppins(
fontWeight: FontWeight.w500,
fontSize: 12,
),
- unselectedLabelStyle: GoogleFonts.firaMono(
+ unselectedLabelStyle: GoogleFonts.poppins(
fontWeight: FontWeight.w300,
),
onTap: (value) {
@@ -137,7 +137,7 @@ class _ReportsHomeState extends State
children: [
Text(
'No Task found',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500,
fontSize: 12,
color: AppSettings.isDarkMode
@@ -152,7 +152,7 @@ class _ReportsHomeState extends State
children: [
Text(
'Add a task to see reports',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w500,
fontSize: 12,
color: AppSettings.isDarkMode
diff --git a/lib/views/reports/widgets/commonChartIndicator.dart b/lib/views/reports/widgets/commonChartIndicator.dart
index b11a9eeb..b6d19657 100644
--- a/lib/views/reports/widgets/commonChartIndicator.dart
+++ b/lib/views/reports/widgets/commonChartIndicator.dart
@@ -19,7 +19,7 @@ class CommonChartIndicator extends StatelessWidget {
children: [
Text(
title,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 16,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -42,7 +42,7 @@ class CommonChartIndicator extends StatelessWidget {
),
Text(
"Completed",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
fontSize: 16,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -59,7 +59,7 @@ class CommonChartIndicator extends StatelessWidget {
),
Text(
"Pending",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w400,
fontSize: 16,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
diff --git a/lib/views/settings/settings.dart b/lib/views/settings/settings.dart
new file mode 100644
index 00000000..c2b9dc51
--- /dev/null
+++ b/lib/views/settings/settings.dart
@@ -0,0 +1,138 @@
+// ignore_for_file: library_private_types_in_public_api
+
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:taskwarrior/config/app_settings.dart';
+import 'package:taskwarrior/config/taskwarriorcolors.dart';
+import 'package:taskwarrior/widgets/pallete.dart';
+
+class SettingsPage extends StatefulWidget {
+ const SettingsPage({Key? key}) : super(key: key);
+
+ @override
+ _SettingsPageState createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State {
+ bool syncOnStart = false;
+ bool syncOnTaskCreate = false;
+
+ checkAutoSync() async {
+ ///check if auto sync is on or off
+ final SharedPreferences prefs = await SharedPreferences.getInstance();
+ setState(() {
+ syncOnStart = prefs.getBool('sync-onStart') ?? false;
+ syncOnTaskCreate = prefs.getBool('sync-OnTaskCreate') ?? false;
+ });
+ }
+
+ @override
+ void initState() {
+ super.initState();
+ checkAutoSync();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(
+ centerTitle: false,
+ backgroundColor: Palette.kToDark.shade200,
+ title: Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ 'Settings',
+ style: GoogleFonts.poppins(
+ color: Colors.white,
+ fontSize: 20,
+ ),
+ ),
+ Text(
+ 'Configure your preferences',
+ style: GoogleFonts.poppins(
+ color: Colors.white70,
+ fontSize: 14,
+ ),
+ ),
+ ],
+ ),
+ leading: GestureDetector(
+ onTap: () {
+ Navigator.pop(context);
+ },
+ child: Icon(
+ Icons.chevron_left,
+ color: Appcolors.white,
+ ),
+ ),
+ ),
+ backgroundColor:
+ AppSettings.isDarkMode ? Palette.kToDark.shade200 : Colors.white,
+ body: ListView(
+ children: [
+ ListTile(
+ title: Text(
+ 'Sync on Start',
+ style: GoogleFonts.poppins(
+ fontWeight: FontWeight.bold,
+ fontSize: 18,
+ color: AppSettings.isDarkMode ? Colors.white : Colors.black,
+ ),
+ ),
+ subtitle: Text(
+ 'Automatically sync data on app startup',
+ style: GoogleFonts.poppins(
+ color: Colors.grey,
+ fontSize: 14,
+ ),
+ ),
+ trailing: Switch(
+ value: syncOnStart,
+ onChanged: (bool value) async {
+ setState(() {
+ syncOnStart = !syncOnStart;
+ });
+
+ final SharedPreferences prefs =
+ await SharedPreferences.getInstance();
+ await prefs.setBool('sync-onStart', syncOnStart);
+ }),
+ ),
+ const Divider(), // Add a divider between settings
+ ListTile(
+ title: Text(
+ 'Sync on Task Create',
+ style: GoogleFonts.poppins(
+ fontWeight: FontWeight.bold,
+ fontSize: 16,
+ color: AppSettings.isDarkMode ? Colors.white : Colors.black,
+ ),
+ ),
+ subtitle: Text(
+ 'Enable automatic syncing when creating a new task',
+ style: GoogleFonts.poppins(
+ color: Colors.grey,
+ fontSize: 14,
+ ),
+ ),
+ trailing: Switch(
+ value: syncOnTaskCreate,
+ onChanged: (bool value) async {
+ setState(() {
+ syncOnTaskCreate = !syncOnTaskCreate;
+ });
+
+ final SharedPreferences prefs =
+ await SharedPreferences.getInstance();
+ await prefs.setBool('sync-OnTaskCreate', syncOnTaskCreate);
+ }),
+ ),
+ // Add more settings here
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/widgets/addTask.dart b/lib/widgets/addTask.dart
index 67641f6e..64ddf0d8 100644
--- a/lib/widgets/addTask.dart
+++ b/lib/widgets/addTask.dart
@@ -4,8 +4,10 @@ import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'package:intl/intl.dart';
+import 'package:shared_preferences/shared_preferences.dart';
import 'package:taskwarrior/config/app_settings.dart';
import 'package:taskwarrior/controller/WidgetController.dart';
@@ -68,9 +70,9 @@ class _AddTaskBottomSheetState extends State {
Expanded(
child: Wrap(
children: [
- const Text(
+ Text(
"Due : ",
- style: TextStyle(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold, height: 3.3),
),
GestureDetector(
@@ -179,9 +181,9 @@ class _AddTaskBottomSheetState extends State {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
- const Text(
+ Text(
'Priority : ',
- style: TextStyle(fontWeight: FontWeight.bold),
+ style: GoogleFonts.poppins(fontWeight: FontWeight.bold),
textAlign: TextAlign.left,
),
DropdownButton(
@@ -190,7 +192,7 @@ class _AddTaskBottomSheetState extends State {
: Colors.white,
value: priority,
elevation: 16,
- style: const TextStyle(color: Colors.black),
+ style: GoogleFonts.poppins(color: Colors.black),
underline: Container(
height: 1.5,
color: Colors.black,
@@ -222,7 +224,7 @@ class _AddTaskBottomSheetState extends State {
int errCode = 0;
return TextButton(
child: const Text("Add"),
- onPressed: () {
+ onPressed: () async {
try {
if (formKey.currentState!.validate()) {
if (due == null) {
@@ -250,6 +252,16 @@ class _AddTaskBottomSheetState extends State {
? const Color.fromARGB(255, 61, 61, 61)
: const Color.fromARGB(255, 39, 39, 39),
duration: const Duration(seconds: 2)));
+
+ final SharedPreferences prefs =
+ await SharedPreferences.getInstance();
+ bool? value;
+ value = prefs.getBool('sync-OnTaskCreate') ?? false;
+ late InheritedStorage storageWidget;
+ storageWidget = StorageWidget.of(context);
+ if (value) {
+ storageWidget.synchronize(context, true);
+ }
}
} on FormatException catch (e) {
Navigator.of(context).pop();
diff --git a/lib/widgets/buildTasks.dart b/lib/widgets/buildTasks.dart
index 5e55a13d..f2914346 100644
--- a/lib/widgets/buildTasks.dart
+++ b/lib/widgets/buildTasks.dart
@@ -16,12 +16,12 @@ import 'package:taskwarrior/widgets/taskfunctions/modify.dart';
import 'pallete.dart';
class TasksBuilder extends StatefulWidget {
- const TasksBuilder({
- Key? key,
- required this.taskData,
- required this.pendingFilter,
- required this.searchVisible
- }) : super(key: key);
+ const TasksBuilder(
+ {Key? key,
+ required this.taskData,
+ required this.pendingFilter,
+ required this.searchVisible})
+ : super(key: key);
final List taskData;
final bool pendingFilter;
@@ -118,12 +118,11 @@ class _TasksBuilderState extends State {
padding: const EdgeInsets.all(16.0),
child: Center(
child: Text(
- (widget.searchVisible)?
- 'Search Not Found :('
- :'Click on the bottom right button to start adding tasks',
+ (widget.searchVisible)
+ ? 'Search Not Found :('
+ : 'Click on the bottom right button to start adding tasks',
textAlign: TextAlign.center,
- style: TextStyle(
- fontFamily: GoogleFonts.firaMono().fontFamily,
+ style: GoogleFonts.poppins(
fontSize: 20,
color: AppSettings.isDarkMode
? Colors.white
diff --git a/lib/widgets/createDrawerHeader.dart b/lib/widgets/createDrawerHeader.dart
index d8153ade..f03f76ff 100644
--- a/lib/widgets/createDrawerHeader.dart
+++ b/lib/widgets/createDrawerHeader.dart
@@ -1,6 +1,7 @@
// ignore_for_file: prefer_const_constructors, file_names
import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
Widget createDrawerHeader() {
return ListTile(
@@ -10,7 +11,7 @@ Widget createDrawerHeader() {
),
title: Text(
'Taskwarrior',
- style: TextStyle(fontSize: 30.0, fontWeight: FontWeight.w500),
+ style: GoogleFonts.poppins(fontSize: 30.0, fontWeight: FontWeight.w500),
),
);
}
diff --git a/lib/widgets/profilefunctions/manageprofile.dart b/lib/widgets/profilefunctions/manageprofile.dart
index 6a15f42f..c0806b8e 100644
--- a/lib/widgets/profilefunctions/manageprofile.dart
+++ b/lib/widgets/profilefunctions/manageprofile.dart
@@ -44,7 +44,7 @@ class ManageProfile extends StatelessWidget {
key: const PageStorageKey('manage-profile'),
title: Text(
'Manage selected profile',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
diff --git a/lib/widgets/profilefunctions/selectprofile.dart b/lib/widgets/profilefunctions/selectprofile.dart
index b22534cd..2fbdb999 100644
--- a/lib/widgets/profilefunctions/selectprofile.dart
+++ b/lib/widgets/profilefunctions/selectprofile.dart
@@ -36,7 +36,7 @@ class SelectProfile extends StatelessWidget {
Text(
'Current Profile:',
overflow: TextOverflow.fade,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -46,7 +46,8 @@ class SelectProfile extends StatelessWidget {
height: 1.h,
),
Text(currentProfile,
- style: TextStyle(
+ style: GoogleFonts.poppins(
+ fontSize: 14,
color: AppSettings.isDarkMode ? Colors.grey : Colors.grey[600],
))
],
@@ -62,7 +63,7 @@ class SelectProfile extends StatelessWidget {
Text(
'All Profiles:',
overflow: TextOverflow.fade,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode ? Colors.white : Colors.black,
@@ -132,7 +133,7 @@ class SelectProfileListTile extends StatelessWidget {
scrollDirection: Axis.horizontal,
child: Text(
alias!,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.white
: const Color.fromARGB(255, 48, 46, 46),
@@ -144,7 +145,7 @@ class SelectProfileListTile extends StatelessWidget {
scrollDirection: Axis.horizontal,
child: Text(
uuid,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.white
: const Color.fromARGB(255, 48, 46, 46),
diff --git a/lib/widgets/project_filter.dart b/lib/widgets/project_filter.dart
index 972ee493..c0438317 100644
--- a/lib/widgets/project_filter.dart
+++ b/lib/widgets/project_filter.dart
@@ -55,7 +55,7 @@ class ProjectsColumn extends StatelessWidget {
children: [
Text(
"Project : ",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color:
@@ -74,7 +74,7 @@ class ProjectsColumn extends StatelessWidget {
projectFilter == ""
? "Not selected"
: projectFilter,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 12,
color: AppSettings.isDarkMode
? Colors.white
@@ -95,7 +95,7 @@ class ProjectsColumn extends StatelessWidget {
children: [
Text(
"All Projecs",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.w600,
fontSize: 12,
color:
@@ -115,11 +115,10 @@ class ProjectsColumn extends StatelessWidget {
children: [
Text(
"No Projects Found",
- style: TextStyle(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.white
: const Color.fromARGB(255, 48, 46, 46),
- fontFamily: GoogleFonts.firaMono().fontFamily,
fontSize: 14,
),
),
@@ -151,14 +150,14 @@ class ProjectTile extends StatelessWidget {
children: [
Flexible(
child: Text(project,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color:
AppSettings.isDarkMode ? Colors.white : Colors.black))),
Text(
(node.children.isEmpty)
? '${node.subtasks}'
: '(${node.tasks}) ${node.subtasks}',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode ? Colors.white : Colors.black),
)
],
@@ -187,7 +186,7 @@ class ProjectTile extends StatelessWidget {
width: 45.w,
child: Text(project,
maxLines: 3,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.white
: Colors.black)),
@@ -207,7 +206,7 @@ class ProjectTile extends StatelessWidget {
? '${node.subtasks}'
: '(${node.tasks}) ${node.subtasks}',
maxLines: 1,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.black
: Colors.white),
diff --git a/lib/widgets/tag_filter.dart b/lib/widgets/tag_filter.dart
index e3137cb9..e9160013 100644
--- a/lib/widgets/tag_filter.dart
+++ b/lib/widgets/tag_filter.dart
@@ -41,7 +41,7 @@ class TagFiltersWrap extends StatelessWidget {
FilterChip(
onSelected: (_) => filters.toggleTagUnion(),
label: Text(filters.tagUnion ? 'OR' : 'AND',
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
color: AppSettings.isDarkMode ? Colors.black : Colors.white)),
backgroundColor: AppSettings.isDarkMode
? const Color.fromARGB(255, 220, 216, 216)
@@ -52,7 +52,7 @@ class TagFiltersWrap extends StatelessWidget {
onSelected: (_) => filters.toggleTagFilter(entry.key),
label: Text(
entry.value.display,
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: entry.value.selected ? FontWeight.w700 : null,
color: AppSettings.isDarkMode ? Colors.black : Colors.white),
),
diff --git a/lib/widgets/taskdetails/dateTimePicker.dart b/lib/widgets/taskdetails/dateTimePicker.dart
index b21ae189..6f3399f2 100644
--- a/lib/widgets/taskdetails/dateTimePicker.dart
+++ b/lib/widgets/taskdetails/dateTimePicker.dart
@@ -38,7 +38,7 @@ class DateTimeWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -48,7 +48,7 @@ class DateTimeWidget extends StatelessWidget {
),
TextSpan(
text: value ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
@@ -129,7 +129,7 @@ class StartWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -139,7 +139,7 @@ class StartWidget extends StatelessWidget {
),
TextSpan(
text: value ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
diff --git a/lib/widgets/taskdetails/description_widget.dart b/lib/widgets/taskdetails/description_widget.dart
index e8aa38e1..9a2180b3 100644
--- a/lib/widgets/taskdetails/description_widget.dart
+++ b/lib/widgets/taskdetails/description_widget.dart
@@ -36,7 +36,7 @@ class DescriptionWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -46,7 +46,7 @@ class DescriptionWidget extends StatelessWidget {
),
TextSpan(
text: value ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
@@ -131,7 +131,7 @@ class ProjectWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -141,7 +141,7 @@ class ProjectWidget extends StatelessWidget {
),
TextSpan(
text: value ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
diff --git a/lib/widgets/taskdetails/priority_widget.dart b/lib/widgets/taskdetails/priority_widget.dart
index 3401187b..e6d4f776 100644
--- a/lib/widgets/taskdetails/priority_widget.dart
+++ b/lib/widgets/taskdetails/priority_widget.dart
@@ -34,7 +34,7 @@ class PriorityWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -44,7 +44,7 @@ class PriorityWidget extends StatelessWidget {
),
TextSpan(
text: value ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
diff --git a/lib/widgets/taskdetails/status_widget.dart b/lib/widgets/taskdetails/status_widget.dart
index a4f8791c..d54a6dae 100644
--- a/lib/widgets/taskdetails/status_widget.dart
+++ b/lib/widgets/taskdetails/status_widget.dart
@@ -37,7 +37,7 @@ class StatusWidget extends StatelessWidget {
children: [
TextSpan(
text: '$name:'.padRight(13),
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontWeight: FontWeight.bold,
fontSize: 15,
color: AppSettings.isDarkMode
@@ -47,7 +47,7 @@ class StatusWidget extends StatelessWidget {
),
TextSpan(
text: value ?? "not selected",
- style: GoogleFonts.firaMono(
+ style: GoogleFonts.poppins(
fontSize: 15,
color: AppSettings.isDarkMode
? Colors.white
diff --git a/lib/widgets/taskdetails/tags_widget.dart b/lib/widgets/taskdetails/tags_widget.dart
index 54da67e1..2030181a 100644
--- a/lib/widgets/taskdetails/tags_widget.dart
+++ b/lib/widgets/taskdetails/tags_widget.dart
@@ -3,6 +3,7 @@
import 'package:flutter/material.dart';
import 'package:built_collection/built_collection.dart';
+import 'package:google_fonts/google_fonts.dart';
import 'package:loggy/loggy.dart';
import 'package:taskwarrior/config/app_settings.dart';
@@ -113,9 +114,9 @@ class TagsRouteState extends State {
return Scaffold(
appBar: AppBar(
backgroundColor: Palette.kToDark.shade200,
- title: const Text(
+ title: Text(
'Tags',
- style: TextStyle(color: Colors.white),
+ style: GoogleFonts.poppins(color: Colors.white),
),
leading: const BackButton(
color: Colors.white,
@@ -148,7 +149,7 @@ class TagsRouteState extends State {
padding: const EdgeInsets.fromLTRB(15, 18, 0, 10),
child: Text(
'Added tags will appear here',
- style: TextStyle(
+ style: GoogleFonts.poppins(
fontStyle: FontStyle.italic,
color: AppSettings.isDarkMode
? Colors.white