Merge pull request #1627 from matthiasn/tag_chip_style

Tag chip style

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed:
+- Upgraded dependencies
+
+### Fixed:
+- Text color on tag and task status chips
+
+## [0.8.387] - 2023-06-22
+### Changed:
 - Unfocus keyboard on entry/task save
 
 ## [0.8.386] - 2023-06-22

lib/widgets/journal/tags/tag_widget.dart

@@ -5,6 +5,7 @@ import 'package:lotti/services/nav_service.dart';
 import 'package:lotti/themes/colors.dart';
 import 'package:lotti/themes/theme.dart';
 import 'package:lotti/themes/utils.dart';
+import 'package:tinycolor2/tinycolor2.dart';
 
 class TagWidget extends StatelessWidget {
   const TagWidget({
@@ -19,13 +20,19 @@ class TagWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final localizations = AppLocalizations.of(context)!;
+    final tagColor = getTagColor(tagEntity);
 
     return Chip(
       label: GestureDetector(
         onDoubleTap: () => beamToNamed('/settings/tags/${tagEntity.id}'),
-        child: Text(tagEntity.tag),
+        child: Text(
+          tagEntity.tag,
+          style: TextStyle(
+            color: tagColor.isLight ? Colors.black : Colors.white,
+          ),
+        ),
       ),
-      backgroundColor: getTagColor(tagEntity),
+      backgroundColor: tagColor,
       visualDensity: VisualDensity.compact,
       onDeleted: onTapRemove,
       deleteIcon: const Icon(

lib/widgets/tasks/task_status.dart

@@ -3,6 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:lotti/classes/journal_entities.dart';
 import 'package:lotti/themes/theme.dart';
 import 'package:lotti/utils/task_utils.dart';
+import 'package:tinycolor2/tinycolor2.dart';
 
 class TaskStatusWidget extends StatelessWidget {
   const TaskStatusWidget(
@@ -15,6 +16,7 @@ class TaskStatusWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final localizations = AppLocalizations.of(context)!;
+    final backgroundColor = taskColor(task.data.status) ?? Colors.grey;
 
     return Chip(
       label: Text(
@@ -29,9 +31,12 @@ class TaskStatusWidget extends StatelessWidget {
           done: (_) => localizations.taskStatusDone,
           rejected: (_) => localizations.taskStatusRejected,
         ),
-        style: const TextStyle(fontSize: fontSizeSmall),
+        style: TextStyle(
+          fontSize: fontSizeSmall,
+          color: backgroundColor.isLight ? Colors.black : Colors.white,
+        ),
       ),
-      backgroundColor: taskColor(task.data.status),
+      backgroundColor: backgroundColor,
       visualDensity: VisualDensity.compact,
     );
   }

pubspec.lock

@@ -2081,10 +2081,10 @@ packages:
     dependency: transitive
     description:
       name: sqlparser
-      sha256: "1c075a15ff144b9f381140b9abc73f46b3f88a7fce9207d3d6607a3c24439cf6"
+      sha256: "9611f46d30a4e8286e54d17a1b5182d132512dc6fc3da90c45ad8ec2828a58b1"
       url: "https://pub.dev"
     source: hosted
-    version: "0.30.2"
+    version: "0.30.3"
   stack_trace:
     dependency: transitive
     description:
@@ -2257,10 +2257,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: eed4e6a1164aa9794409325c3b707ff424d4d1c2a785e7db67f8bbda00e36e51
+      sha256: "15f5acbf0dce90146a0f5a2c4a002b1814a6303c4c5c075aa2623b2d16156f03"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.35"
+    version: "6.0.36"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -2465,10 +2465,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b"
+      sha256: "1414f27dd781737e51afa9711f2ac2ace6ab4498ee98e20863fa5505aa00c58c"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.3"
+    version: "5.0.4"
   win32_registry:
     dependency: transitive
     description:

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.387+2274
+version: 0.9.388+2276
 
 msix_config:
   display_name: LottiApp