Merge pull request #1915 from matthiasn/feat/add_category_filter_in_l…

…ogbook_tab feat: add category filter in Logbook tab
matthiasn · Jan 23, 2025 · 890e6f2 · 890e6f2
2 parents 881783d + 6c2d747
commit 890e6f2
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 64 deletions.
diff --git a/lib/blocs/journal/journal_page_cubit.dart b/lib/blocs/journal/journal_page_cubit.dart
@@ -358,6 +358,8 @@ class JournalPageCubit extends Cubit<JournalPageState> {
         starredStatuses: starredEntriesOnly ? [true] : [true, false],
         privateStatuses: privateEntriesOnly ? [true] : [true, false],
         flaggedStatuses: flaggedEntriesOnly ? [1] : [1, 0],
+        categoryIds:
+            _selectedCategoryIds.isNotEmpty ? _selectedCategoryIds : null,
         limit: _pageSize,
         offset: pageKey,
       );

diff --git a/lib/database/database.dart b/lib/database/database.dart
@@ -251,6 +251,7 @@ class JournalDb extends _$JournalDb {
     required List<bool> privateStatuses,
     required List<int> flaggedStatuses,
     required List<String>? ids,
+    Set<String>? categoryIds,
     int limit = 500,
     int offset = 0,
   }) async {
@@ -259,6 +260,7 @@ class JournalDb extends _$JournalDb {
       starredStatuses: starredStatuses,
       privateStatuses: privateStatuses,
       flaggedStatuses: flaggedStatuses,
+      categoryIds: categoryIds?.toList(),
       ids: ids,
       limit: limit,
       offset: offset,
@@ -299,6 +301,7 @@ class JournalDb extends _$JournalDb {
     required List<bool> privateStatuses,
     required List<int> flaggedStatuses,
     required List<String>? ids,
+    required List<String>? categoryIds,
     int limit = 500,
     int offset = 0,
   }) {
@@ -312,6 +315,16 @@ class JournalDb extends _$JournalDb {
         limit,
         offset,
       );
+    } else if (categoryIds != null) {
+      return filteredJournalByCategories(
+        types,
+        starredStatuses,
+        privateStatuses,
+        flaggedStatuses,
+        categoryIds,
+        limit,
+        offset,
+      );
     } else {
       return filteredJournal(
         types,

diff --git a/lib/database/database.drift b/lib/database/database.drift
@@ -187,6 +187,19 @@ SELECT * FROM journal
   LIMIT :limit
   OFFSET :offset;
 
+filteredJournalByCategories:
+SELECT * FROM journal
+  WHERE type IN :types
+  AND deleted = false
+  AND private IN (0, (SELECT status FROM config_flags WHERE name = 'private'))
+  AND starred IN :starredStatuses
+  AND private IN :privateStatuses
+  AND flag IN :flaggedStatuses
+  AND category IN :categories
+  ORDER BY date_from DESC
+  LIMIT :limit
+  OFFSET :offset;
+
 filteredJournalIds:
 SELECT id FROM journal
   WHERE type IN :types

diff --git a/lib/database/database.g.dart b/lib/database/database.g.dart
diff --git a/lib/features/journal/ui/widgets/journal_card.dart b/lib/features/journal/ui/widgets/journal_card.dart
@@ -56,14 +56,27 @@ class JournalCardTitle extends StatelessWidget {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(
-                item is JournalEvent
-                    ? dfShort.format(item.meta.dateFrom)
-                    : dfShorter.format(item.meta.dateFrom),
-                style: monospaceTextStyle,
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    item is JournalEvent
+                        ? dfShort.format(item.meta.dateFrom)
+                        : dfShorter.format(item.meta.dateFrom),
+                    style: monospaceTextStyle,
+                  ),
+                  if (item is! ChecklistItem &&
+                      item is! Checklist &&
+                      item is! HabitCompletionEntry &&
+                      item is! MeasurementEntry &&
+                      item is! WorkoutEntry &&
+                      item is! QuantitativeEntry &&
+                      item is! SurveyEntry) ...[
+                    const SizedBox(width: 20),
+                    CategoryColorIcon(item.meta.categoryId),
+                  ],
+                ],
               ),
-              if (item is Task)
-                CategoryColorIcon((item as Task).meta.categoryId),
               if (item is Task) TaskStatusWidget(item as Task),
               Row(
                 children: [

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -330,7 +330,7 @@
   "syncAssistantStatusSuccess": "Account is successfully configured.",
   "syncAssistantStatusTesting": "Testing IMAP connection...",
   "syncAssistantStatusValid": "Account is valid.",
-  "taskCategoryLabel": "Task category:",
+  "taskCategoryLabel": "Category:",
   "taskCategoryUnassignedLabel": "unassigned",
   "taskCategoryAllLabel": "all",
   "taskDueLabel": "Task due:",

diff --git a/lib/widgets/app_bar/journal_sliver_appbar.dart b/lib/widgets/app_bar/journal_sliver_appbar.dart
@@ -7,6 +7,7 @@ import 'package:lotti/themes/theme.dart';
 import 'package:lotti/utils/modals.dart';
 import 'package:lotti/widgets/search/entry_type_filter.dart';
 import 'package:lotti/widgets/search/search_widget.dart';
+import 'package:lotti/widgets/search/task_category_filter.dart';
 import 'package:lotti/widgets/search/task_filter_icon.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
@@ -40,8 +41,10 @@ class JournalSliverAppBar extends StatelessWidget {
                       onChanged: cubit.setSearchString,
                     ),
                   ),
-                  if (showTasks) const TaskFilterIcon(),
-                  if (!showTasks) const JournalFilterIcon(),
+                  if (showTasks)
+                    const TaskFilterIcon()
+                  else
+                    const JournalFilterIcon(),
                 ],
               ),
             ],
@@ -136,10 +139,13 @@ class JournalFilterIcon extends StatelessWidget {
               );
             },
             builder: (_) => const Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 JournalFilter(),
                 SizedBox(height: 10),
                 EntryTypeFilter(),
+                SizedBox(height: 10),
+                TaskCategoryFilter(),
               ],
             ),
           );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.560+2842
+version: 0.9.561+2843
 
 msix_config:
   display_name: LottiApp

diff --git a/...pages/journal/entry_detail_page_test.dart → ...rnal/ui/pages/entry_detail_page_test.dart b/...pages/journal/entry_detail_page_test.dart → ...rnal/ui/pages/entry_detail_page_test.dart
@@ -24,10 +24,10 @@ import 'package:lotti/utils/consts.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:path_provider/path_provider.dart';
 
-import '../../helpers/path_provider.dart';
-import '../../mocks/mocks.dart';
-import '../../test_data/test_data.dart';
-import '../../widget_test_utils.dart';
+import '../../../../helpers/path_provider.dart';
+import '../../../../mocks/mocks.dart';
+import '../../../../test_data/test_data.dart';
+import '../../../../widget_test_utils.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

diff --git a/...s/journal/infinite_journal_page_test.dart → .../ui/pages/infinite_journal_page_test.dart b/...s/journal/infinite_journal_page_test.dart → .../ui/pages/infinite_journal_page_test.dart
@@ -29,11 +29,11 @@ import 'package:mocktail/mocktail.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
-import '../../helpers/path_provider.dart';
-import '../../mocks/mocks.dart';
-import '../../test_data/test_data.dart';
-import '../../utils/utils.dart';
-import '../../widget_test_utils.dart';
+import '../../../../helpers/path_provider.dart';
+import '../../../../mocks/mocks.dart';
+import '../../../../test_data/test_data.dart';
+import '../../../../utils/utils.dart';
+import '../../../../widget_test_utils.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

diff --git a/...ts/journal/editor/editor_widget_test.dart → ...ui/widgets/editor/editor_widget_test.dart b/...ts/journal/editor/editor_widget_test.dart → ...ui/widgets/editor/editor_widget_test.dart
@@ -16,9 +16,9 @@ import 'package:lotti/services/time_service.dart';
 import 'package:lotti/services/vector_clock_service.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   group('EditorWidget', () {

diff --git a/...ntry_details/delete_icon_widget_test.dart → ...ntry_details/delete_icon_widget_test.dart b/...ntry_details/delete_icon_widget_test.dart → ...ntry_details/delete_icon_widget_test.dart
@@ -11,9 +11,9 @@ import 'package:lotti/services/nav_service.dart';
 import 'package:lotti/services/notification_service.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   group('DeleteIconWidget', () {

diff --git a/...y_details/entry_datetime_widget_test.dart → ...y_details/entry_datetime_widget_test.dart b/...y_details/entry_datetime_widget_test.dart → ...y_details/entry_datetime_widget_test.dart
@@ -10,9 +10,9 @@ import 'package:lotti/services/editor_state_service.dart';
 import 'package:lotti/services/tags_service.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   group('EntryDetailFooter', () {

diff --git a/...try_details/entry_detail_footer_test.dart → ...try_details/entry_detail_footer_test.dart b/...try_details/entry_detail_footer_test.dart → ...try_details/entry_detail_footer_test.dart
@@ -15,9 +15,9 @@ import 'package:lotti/services/tags_service.dart';
 import 'package:lotti/services/time_service.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   group('EntryDetailFooter', () {

diff --git a/...try_details/entry_detail_header_test.dart → ...try_details/entry_detail_header_test.dart b/...try_details/entry_detail_header_test.dart → ...try_details/entry_detail_header_test.dart
@@ -14,9 +14,9 @@ import 'package:lotti/services/tags_service.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   group('EntryDetailHeader', () {

diff --git a/...try_details/measurement_summary_test.dart → ...try_details/measurement_summary_test.dart b/...try_details/measurement_summary_test.dart → ...try_details/measurement_summary_test.dart
@@ -6,9 +6,9 @@ import 'package:lotti/logic/health_import.dart';
 import 'package:lotti/services/entities_cache_service.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

diff --git a/...try_details/share_button_widget_test.dart → ...try_details/share_button_widget_test.dart b/...try_details/share_button_widget_test.dart → ...try_details/share_button_widget_test.dart
@@ -13,10 +13,10 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:mocktail/mocktail.dart';
 import 'package:path_provider/path_provider.dart';
 
-import '../../../helpers/path_provider.dart';
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../helpers/path_provider.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   group('ShareButtonWidget', () {

diff --git a/...al/entry_details/survey_summary_test.dart → ...ts/entry_details/survey_summary_test.dart b/...al/entry_details/survey_summary_test.dart → ...ts/entry_details/survey_summary_test.dart
@@ -8,8 +8,8 @@ import 'package:lotti/features/journal/ui/widgets/entry_details/survey_summary.d
 import 'package:lotti/get_it.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

diff --git a/...l/entry_details/workout_summary_test.dart → ...s/entry_details/workout_summary_test.dart b/...l/entry_details/workout_summary_test.dart → ...s/entry_details/workout_summary_test.dart
@@ -5,9 +5,9 @@ import 'package:lotti/get_it.dart';
 import 'package:lotti/logic/health_import.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../mocks/mocks.dart';
-import '../../../test_data/test_data.dart';
-import '../../../widget_test_utils.dart';
+import '../../../../../mocks/mocks.dart';
+import '../../../../../test_data/test_data.dart';
+import '../../../../../widget_test_utils.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();

diff --git a/test/widgets/journal/journal_card_test.dart → ...journal/ui/widgets/journal_card_test.dart b/test/widgets/journal/journal_card_test.dart → ...journal/ui/widgets/journal_card_test.dart
@@ -12,17 +12,18 @@ import 'package:lotti/features/speech/state/asr_service.dart';
 import 'package:lotti/features/speech/state/player_cubit.dart';
 import 'package:lotti/get_it.dart';
 import 'package:lotti/services/db_notification.dart';
+import 'package:lotti/services/entities_cache_service.dart';
 import 'package:lotti/services/logging_service.dart';
 import 'package:lotti/services/tags_service.dart';
 import 'package:lotti/services/time_service.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:path_provider/path_provider.dart';
 
-import '../../helpers/path_provider.dart';
-import '../../mocks/mocks.dart';
-import '../../test_data/test_data.dart';
-import '../../utils/utils.dart';
-import '../../widget_test_utils.dart';
+import '../../../../helpers/path_provider.dart';
+import '../../../../mocks/mocks.dart';
+import '../../../../test_data/test_data.dart';
+import '../../../../utils/utils.dart';
+import '../../../../widget_test_utils.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -41,6 +42,7 @@ void main() {
 
       final mockTagsService = mockTagsServiceWithTags([]);
       final mockTimeService = MockTimeService();
+      final mockEntitiesCacheService = MockEntitiesCacheService();
 
       final mockUpdateNotifications = MockUpdateNotifications();
       when(() => mockUpdateNotifications.updateStream).thenAnswer(
@@ -49,6 +51,7 @@ void main() {
 
       getIt
         ..registerSingleton<Directory>(await getApplicationDocumentsDirectory())
+        ..registerSingleton<EntitiesCacheService>(mockEntitiesCacheService)
         ..registerSingleton<UpdateNotifications>(mockUpdateNotifications)
         ..registerSingleton<LoggingDb>(MockLoggingDb())
         ..registerSingleton<LoggingService>(LoggingService())