Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/app/models/data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:taskwarrior/app/models/json/task.dart';
import 'package:taskwarrior/app/services/notification_services.dart';
import 'package:taskwarrior/app/utils/taskc/payload.dart';
import 'package:taskwarrior/app/utils/taskfunctions/urgency.dart';

class Data {
Data(this.home);

Expand Down Expand Up @@ -176,6 +177,11 @@ class Data {
task.due!, task.description, false, task.entry);

notificationService.cancelNotification(notificationid);
if (task.wait != null) {
int waitNotificationId = notificationService.calculateNotificationId(
task.wait!, task.description, true, task.entry);
notificationService.cancelNotification(waitNotificationId);
}
}
_mergeTasks([task]);
File('${home.path}/.task/backlog.data').writeAsStringSync(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ class DetailRouteController extends GetxController {
late Rx<DateTime?> dueValue = Rx<DateTime?>(null);
late Rx<DateTime?> waitValue = Rx<DateTime?>(null);
late Rx<DateTime?> untilValue = Rx<DateTime?>(null);
late RxString recurValue = ''.obs;
late Rxn<String>? priorityValue = Rxn<String>(null);
late Rxn<String>? projectValue = Rxn<String>(null);
late Rxn<BuiltList<String>>? tagsValue = Rxn<BuiltList<String>>(null);
Expand Down Expand Up @@ -155,6 +156,7 @@ class DetailRouteController extends GetxController {
dueValue.value = modify.draft.due;
waitValue.value = modify.draft.wait;
untilValue.value = modify.draft.until;
recurValue.value = modify.draft.recur ?? '';
priorityValue?.value = modify.draft.priority;
projectValue?.value = modify.draft.project;
tagsValue?.value = modify.draft.tags;
Expand Down
92 changes: 92 additions & 0 deletions lib/app/modules/detailRoute/views/detail_route_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ class DetailRouteView extends GetView<DetailRouteController> {
'due': controller.dueValue.value,
'wait': controller.waitValue.value,
'until': controller.untilValue.value,
'recur': controller.recurValue.value,
'priority': controller.priorityValue?.value,
'project': controller.projectValue?.value,
'tags': controller.tagsValue?.value,
Expand Down Expand Up @@ -328,6 +329,97 @@ class AttributeWidget extends StatelessWidget {
globalKey: priorityKey,
isEditable: isEditable,
);
case 'recur':
final currentRecur =
(localValue == null || localValue.toString().trim().isEmpty)
? 'None'
: localValue.toString();
return Card(
color: tColors.secondaryBackgroundColor,
child: ListTile(
enabled: isEditable,
textColor: isEditable
? tColors.primaryTextColor
: tColors.primaryDisabledTextColor,
title: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: [
Text(
'recurrence:'.padRight(13),
style: TextStyle(
fontFamily: FontFamily.poppins,
fontWeight: TaskWarriorFonts.bold,
fontSize: TaskWarriorFonts.fontSizeMedium,
color: isEditable
? tColors.primaryTextColor
: tColors.primaryDisabledTextColor,
),
),
Text(
currentRecur,
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
color: isEditable
? tColors.primaryTextColor
: tColors.primaryDisabledTextColor,
),
),
],
),
),
onTap: !isEditable
? null
: () async {
final options = [
'None',
'daily',
'weekdays',
'weekly',
'biweekly',
'monthly',
'bimonthly',
'quarterly',
'semiannual',
'yearly',
];
final selected = await showDialog<String>(
context: context,
builder: (dialogContext) {
return AlertDialog(
title: Text(
'Select recurrence',
style: TextStyle(color: tColors.primaryTextColor),
),
backgroundColor: tColors.dialogBackgroundColor,
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: options
.map(
(option) => ListTile(
title: Text(
option,
style: TextStyle(
color: tColors.primaryTextColor),
),
onTap: () => Navigator.of(dialogContext)
.pop(option),
),
)
.toList(),
),
),
);
},
);
if (selected != null) {
callback(selected == 'None' ? null : selected);
}
},
),
);
case 'project':
return ProjectWidget(
name: name,
Expand Down
5 changes: 3 additions & 2 deletions lib/app/modules/home/controllers/home_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,7 @@ class HomeController extends GetxController {
await synchronize(context, false);
}
if (context.mounted) {
final tColors =
Theme.of(context).extension<TaskwarriorColorTheme>()!;
final tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
Expand Down Expand Up @@ -622,6 +621,8 @@ class HomeController extends GetxController {

final tagcontroller = TextEditingController();
RxList<String> tags = <String>[].obs;
RxString recur = ''.obs;
RxBool dueAutoFromRecurrence = false.obs;
RxBool inThePast = false.obs;

Filters getFilters() {
Expand Down
Loading