Fix: sort categories

matthiasn · Jul 16, 2023 · e64dc16 · e64dc16
1 parent 4a20368
commit e64dc16
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Consistent microphone icon across app
 - Upgraded dependencies
 
+### Fixed:
+- Sort categories
+
 ## [0.8.392] - 2023-06-24
 ### Changed:
 - Hide measurement suggestions when input dirty

diff --git a/lib/widgets/habits/habit_category.dart b/lib/widgets/habits/habit_category.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -22,7 +23,8 @@ class SelectCategoryWidget extends StatelessWidget {
     return StreamBuilder<List<CategoryDefinition>>(
       stream: getIt<JournalDb>().watchCategories(),
       builder: (context, snapshot) {
-        final categories = snapshot.data ?? <CategoryDefinition>[];
+        final categories = snapshot.data ?? <CategoryDefinition>[]
+          ..sortBy((category) => category.name);
         final categoriesById = <String, CategoryDefinition>{};
 
         for (final category in categories) {

diff --git a/lib/widgets/settings/dashboards/dashboard_category.dart b/lib/widgets/settings/dashboards/dashboard_category.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:lotti/classes/entity_definitions.dart';
@@ -26,7 +27,8 @@ class SelectDashboardCategoryWidget extends StatelessWidget {
     return StreamBuilder<List<CategoryDefinition>>(
       stream: getIt<JournalDb>().watchCategories(),
       builder: (context, snapshot) {
-        final categories = snapshot.data ?? <CategoryDefinition>[];
+        final categories = snapshot.data ?? <CategoryDefinition>[]
+          ..sortBy((category) => category.name);
         final categoriesById = <String, CategoryDefinition>{};
 
         for (final category in categories) {

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.394+2286
+version: 0.9.394+2287
 
 msix_config:
   display_name: LottiApp