Skip to content

Commit a868601

Browse files
committed
tags suggestions for tcv3 profiles enabled
1 parent 4a3605d commit a868601

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

lib/app/modules/home/controllers/home_controller.dart

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
88
import 'package:get/get.dart';
99
import 'package:home_widget/home_widget.dart';
1010
import 'package:loggy/loggy.dart';
11-
import 'package:path_provider/path_provider.dart';
1211
import 'package:shared_preferences/shared_preferences.dart';
1312
import 'package:taskwarrior/app/models/filters.dart';
1413

@@ -17,9 +16,7 @@ import 'package:taskwarrior/app/models/storage.dart';
1716
import 'package:taskwarrior/app/models/storage/client.dart';
1817
import 'package:taskwarrior/app/models/tag_meta_data.dart';
1918
import 'package:taskwarrior/app/modules/home/controllers/widget.controller.dart';
20-
import 'package:taskwarrior/app/modules/home/views/add_task_bottom_sheet_new.dart';
2119
import 'package:taskwarrior/app/modules/splash/controllers/splash_controller.dart';
22-
import 'package:taskwarrior/app/routes/app_pages.dart';
2320
import 'package:taskwarrior/app/services/deep_link_service.dart';
2421
import 'package:taskwarrior/app/services/tag_filter.dart';
2522
import 'package:taskwarrior/app/tour/filter_drawer_tour.dart';
@@ -39,7 +36,6 @@ import 'package:taskwarrior/app/v3/db/task_database.dart';
3936
import 'package:taskwarrior/app/v3/db/update.dart';
4037
import 'package:taskwarrior/app/v3/models/task.dart';
4138
import 'package:taskwarrior/app/v3/net/fetch.dart';
42-
import 'package:taskwarrior/rust_bridge/api.dart';
4339
import 'package:textfield_tags/textfield_tags.dart';
4440
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
4541
import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
@@ -785,8 +781,22 @@ class HomeController extends GetxController {
785781
});
786782
}
787783

788-
late RxString uuid = "".obs;
789-
late RxBool isHomeWidgetTaskTapped = false.obs;
784+
Iterable<String> get allTagsInCurrentTasks {
785+
if (taskReplica.value) {
786+
var tagSet = <String>{};
787+
for (var task in tasksFromReplica) {
788+
if (task.tags != null) {
789+
tagSet.addAll(task.tags!);
790+
}
791+
}
792+
var sortedTags = tagSet.toList()..sort();
793+
return sortedTags;
794+
}
795+
return tagSet(storage.data.allData());
796+
}
797+
798+
RxString uuid = "".obs;
799+
RxBool isHomeWidgetTaskTapped = false.obs;
790800

791801
// void handleHomeWidgetClicked() async {
792802
// Uri? uri = await HomeWidget.initiallyLaunchedFromHomeWidget();

lib/app/modules/home/views/add_task_bottom_sheet_new.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import 'package:taskwarrior/app/utils/app_settings/app_settings.dart';
1414
import 'package:taskwarrior/app/utils/constants/constants.dart';
1515
import 'package:taskwarrior/app/utils/language/sentence_manager.dart';
1616
import 'package:taskwarrior/app/utils/taskfunctions/add_task_dialog_utils.dart';
17-
import 'package:taskwarrior/app/utils/taskfunctions/tags.dart';
1817
import 'package:taskwarrior/app/utils/taskfunctions/taskparser.dart';
1918
import 'package:taskwarrior/app/utils/themes/theme_extension.dart';
2019
import 'package:taskwarrior/app/v3/champion/replica.dart';
@@ -216,7 +215,7 @@ class AddTaskBottomSheet extends StatelessWidget {
216215
}
217216

218217
Widget buildTagsInput(BuildContext context) => AddTaskTagsInput(
219-
suggestions: tagSet(homeController.storage.data.allData()),
218+
suggestions: homeController.allTagsInCurrentTasks,
220219
onTagsChanges: (p0) => homeController.tags.value = p0,
221220
);
222221

0 commit comments

Comments
 (0)