From fb7ced036d3dcbf84b30bf0db44959c114a418ce Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Wed, 22 Jan 2025 15:15:33 +0100 Subject: [PATCH] Fix id --- api/lib/helpers/mapper.dart | 22 + api/lib/helpers/setup.dart | 3 +- api/lib/models/label/model.dart | 5 +- api/lib/models/label/model.mapper.dart | 10 +- api/pubspec.lock | 18 +- api/pubspec.yaml | 6 +- app/android/Gemfile.lock | 22 +- app/lib/api/storage/sources.dart | 4 +- app/lib/pages/notes/label.dart | 10 +- app/lib/pages/notes/navigator/labels.dart | 4 +- app/lib/pages/notes/view.dart | 4 +- .../Flutter/GeneratedPluginRegistrant.swift | 4 +- app/pubspec.lock | 164 +- app/pubspec.yaml | 16 +- docs/package.json | 10 +- docs/pnpm-lock.yaml | 1388 ++++++----------- tools/pubspec.lock | 8 +- 17 files changed, 625 insertions(+), 1073 deletions(-) diff --git a/api/lib/helpers/mapper.dart b/api/lib/helpers/mapper.dart index e054ec0e814..09d38b6dbe3 100644 --- a/api/lib/helpers/mapper.dart +++ b/api/lib/helpers/mapper.dart @@ -1,3 +1,5 @@ +import 'dart:typed_data'; + import 'package:dart_leap/dart_leap.dart'; import 'package:dart_mappable/dart_mappable.dart'; @@ -17,3 +19,23 @@ class SecondsDateTimeMapper extends SimpleMapper { return self?.secondsSinceEpoch; } } + +class Uint8ListConverter extends SimpleMapper { + const Uint8ListConverter(); + + @override + Uint8List decode(Object value) { + if (value is Uint8List) { + return value; + } + if (value is List) { + return Uint8List.fromList(value.cast()); + } + return Uint8List(0); + } + + @override + Object? encode(Uint8List self) { + return self; + } +} diff --git a/api/lib/helpers/setup.dart b/api/lib/helpers/setup.dart index c87ebc0fca8..4f48398b844 100644 --- a/api/lib/helpers/setup.dart +++ b/api/lib/helpers/setup.dart @@ -2,5 +2,6 @@ import 'package:dart_mappable/dart_mappable.dart'; import 'package:flow_api/helpers/mapper.dart'; void setupAPI() { - MapperContainer.globals.use(SecondsDateTimeMapper()); + MapperContainer.globals + .useAll([SecondsDateTimeMapper(), Uint8ListConverter()]); } diff --git a/api/lib/models/label/model.dart b/api/lib/models/label/model.dart index 855a77fd2d3..3074d6ae6dc 100644 --- a/api/lib/models/label/model.dart +++ b/api/lib/models/label/model.dart @@ -1,3 +1,4 @@ +import 'package:dart_leap/dart_leap.dart'; import 'package:dart_mappable/dart_mappable.dart'; import 'dart:typed_data'; import 'package:flow_api/models/model.dart'; @@ -10,13 +11,13 @@ class Label with LabelMappable, IdentifiedModel, NamedModel, DescriptiveModel { final Uint8List? id; @override final String name, description; - final int color; + final SRGBColor color; const Label({ this.id, this.name = '', this.description = '', - this.color = kColorBlack, + this.color = SRGBColor.black, }); factory Label.fromDatabase(Map row) => LabelMapper.fromMap({ diff --git a/api/lib/models/label/model.mapper.dart b/api/lib/models/label/model.mapper.dart index 034dcfa7c2e..f1f8e8bd1e3 100644 --- a/api/lib/models/label/model.mapper.dart +++ b/api/lib/models/label/model.mapper.dart @@ -28,9 +28,9 @@ class LabelMapper extends ClassMapperBase