diff --git a/lib/src/common/database/database.g.dart b/lib/src/common/database/database.g.dart index c74b453..84788b6 100644 --- a/lib/src/common/database/database.g.dart +++ b/lib/src/common/database/database.g.dart @@ -621,65 +621,83 @@ typedef $$LogsTableTableUpdateCompanionBuilder = LogsTableCompanion Function({ }); class $$LogsTableTableFilterComposer - extends FilterComposer<_$AppDatabase, $LogsTableTable> { - $$LogsTableTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get message => $state.composableBuilder( - column: $state.table.message, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get time => $state.composableBuilder( - column: $state.table.time, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$AppDatabase, $LogsTableTable> { + $$LogsTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get message => $composableBuilder( + column: $table.message, builder: (column) => ColumnFilters(column)); + + ColumnFilters get time => $composableBuilder( + column: $table.time, builder: (column) => ColumnFilters(column)); ColumnWithTypeConverterFilters get level => - $state.composableBuilder( - column: $state.table.level, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); + $composableBuilder( + column: $table.level, + builder: (column) => ColumnWithTypeConverterFilters(column)); ColumnWithTypeConverterFilters - get stackTrace => $state.composableBuilder( - column: $state.table.stackTrace, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); + get stackTrace => $composableBuilder( + column: $table.stackTrace, + builder: (column) => ColumnWithTypeConverterFilters(column)); } class $$LogsTableTableOrderingComposer - extends OrderingComposer<_$AppDatabase, $LogsTableTable> { - $$LogsTableTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get message => $state.composableBuilder( - column: $state.table.message, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get time => $state.composableBuilder( - column: $state.table.time, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get level => $state.composableBuilder( - column: $state.table.level, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get stackTrace => $state.composableBuilder( - column: $state.table.stackTrace, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$AppDatabase, $LogsTableTable> { + $$LogsTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get message => $composableBuilder( + column: $table.message, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get time => $composableBuilder( + column: $table.time, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get level => $composableBuilder( + column: $table.level, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get stackTrace => $composableBuilder( + column: $table.stackTrace, builder: (column) => ColumnOrderings(column)); +} + +class $$LogsTableTableAnnotationComposer + extends Composer<_$AppDatabase, $LogsTableTable> { + $$LogsTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get message => + $composableBuilder(column: $table.message, builder: (column) => column); + + GeneratedColumn get time => + $composableBuilder(column: $table.time, builder: (column) => column); + + GeneratedColumnWithTypeConverter get level => + $composableBuilder(column: $table.level, builder: (column) => column); + + GeneratedColumnWithTypeConverter get stackTrace => + $composableBuilder( + column: $table.stackTrace, builder: (column) => column); } class $$LogsTableTableTableManager extends RootTableManager< @@ -688,6 +706,7 @@ class $$LogsTableTableTableManager extends RootTableManager< LogsTableData, $$LogsTableTableFilterComposer, $$LogsTableTableOrderingComposer, + $$LogsTableTableAnnotationComposer, $$LogsTableTableCreateCompanionBuilder, $$LogsTableTableUpdateCompanionBuilder, ( @@ -700,10 +719,12 @@ class $$LogsTableTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$LogsTableTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$LogsTableTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$LogsTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$LogsTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$LogsTableTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value message = const Value.absent(), @@ -745,6 +766,7 @@ typedef $$LogsTableTableProcessedTableManager = ProcessedTableManager< LogsTableData, $$LogsTableTableFilterComposer, $$LogsTableTableOrderingComposer, + $$LogsTableTableAnnotationComposer, $$LogsTableTableCreateCompanionBuilder, $$LogsTableTableUpdateCompanionBuilder, ( @@ -769,53 +791,71 @@ typedef $$MeasuresTableTableUpdateCompanionBuilder = MeasuresTableCompanion }); class $$MeasuresTableTableFilterComposer - extends FilterComposer<_$AppDatabase, $MeasuresTableTable> { - $$MeasuresTableTableFilterComposer(super.$state); - ColumnFilters get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); - - ColumnFilters get time => $state.composableBuilder( - column: $state.table.time, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + extends Composer<_$AppDatabase, $MeasuresTableTable> { + $$MeasuresTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get time => $composableBuilder( + column: $table.time, builder: (column) => ColumnFilters(column)); ColumnWithTypeConverterFilters get weight => - $state.composableBuilder( - column: $state.table.weight, - builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( - column, - joinBuilders: joinBuilders)); - - ColumnFilters get comment => $state.composableBuilder( - column: $state.table.comment, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + $composableBuilder( + column: $table.weight, + builder: (column) => ColumnWithTypeConverterFilters(column)); + + ColumnFilters get comment => $composableBuilder( + column: $table.comment, builder: (column) => ColumnFilters(column)); } class $$MeasuresTableTableOrderingComposer - extends OrderingComposer<_$AppDatabase, $MeasuresTableTable> { - $$MeasuresTableTableOrderingComposer(super.$state); - ColumnOrderings get id => $state.composableBuilder( - column: $state.table.id, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get time => $state.composableBuilder( - column: $state.table.time, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get weight => $state.composableBuilder( - column: $state.table.weight, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); - - ColumnOrderings get comment => $state.composableBuilder( - column: $state.table.comment, - builder: (column, joinBuilders) => - ColumnOrderings(column, joinBuilders: joinBuilders)); + extends Composer<_$AppDatabase, $MeasuresTableTable> { + $$MeasuresTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get time => $composableBuilder( + column: $table.time, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get weight => $composableBuilder( + column: $table.weight, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get comment => $composableBuilder( + column: $table.comment, builder: (column) => ColumnOrderings(column)); +} + +class $$MeasuresTableTableAnnotationComposer + extends Composer<_$AppDatabase, $MeasuresTableTable> { + $$MeasuresTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get time => + $composableBuilder(column: $table.time, builder: (column) => column); + + GeneratedColumnWithTypeConverter get weight => + $composableBuilder(column: $table.weight, builder: (column) => column); + + GeneratedColumn get comment => + $composableBuilder(column: $table.comment, builder: (column) => column); } class $$MeasuresTableTableTableManager extends RootTableManager< @@ -824,6 +864,7 @@ class $$MeasuresTableTableTableManager extends RootTableManager< MeasuresTableData, $$MeasuresTableTableFilterComposer, $$MeasuresTableTableOrderingComposer, + $$MeasuresTableTableAnnotationComposer, $$MeasuresTableTableCreateCompanionBuilder, $$MeasuresTableTableUpdateCompanionBuilder, ( @@ -836,10 +877,12 @@ class $$MeasuresTableTableTableManager extends RootTableManager< : super(TableManagerState( db: db, table: table, - filteringComposer: - $$MeasuresTableTableFilterComposer(ComposerState(db, table)), - orderingComposer: - $$MeasuresTableTableOrderingComposer(ComposerState(db, table)), + createFilteringComposer: () => + $$MeasuresTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$MeasuresTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$MeasuresTableTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), Value time = const Value.absent(), @@ -877,6 +920,7 @@ typedef $$MeasuresTableTableProcessedTableManager = ProcessedTableManager< MeasuresTableData, $$MeasuresTableTableFilterComposer, $$MeasuresTableTableOrderingComposer, + $$MeasuresTableTableAnnotationComposer, $$MeasuresTableTableCreateCompanionBuilder, $$MeasuresTableTableUpdateCompanionBuilder, ( diff --git a/lib/src/features/dashboard/widget/_dashboard_screen_cupertino.dart b/lib/src/features/dashboard/widget/_dashboard_screen_cupertino.dart index 3e08dc4..3a2cfe3 100644 --- a/lib/src/features/dashboard/widget/_dashboard_screen_cupertino.dart +++ b/lib/src/features/dashboard/widget/_dashboard_screen_cupertino.dart @@ -69,7 +69,7 @@ class _MeasureTile$Cupertino extends StatelessWidget { [ DateFormat.yMEd().format(measure.time), measure.comment, - ].whereNotNull().join(' '), + ].nonNulls.join(' '), ), trailing: Column( mainAxisSize: MainAxisSize.min, diff --git a/lib/src/features/dashboard/widget/_dashboard_screen_material.dart b/lib/src/features/dashboard/widget/_dashboard_screen_material.dart index 60accbd..14aef9a 100644 --- a/lib/src/features/dashboard/widget/_dashboard_screen_material.dart +++ b/lib/src/features/dashboard/widget/_dashboard_screen_material.dart @@ -67,7 +67,7 @@ class _MeasureTile$Material extends StatelessWidget { [ DateFormat.yMEd().format(measure.time), measure.comment, - ].whereNotNull().join(' '), + ].nonNulls.join(' '), ), trailing: Column( mainAxisSize: MainAxisSize.min, diff --git a/lib/src/features/dashboard/widget/dashboard_screen.dart b/lib/src/features/dashboard/widget/dashboard_screen.dart index 7914d13..f9b09fd 100644 --- a/lib/src/features/dashboard/widget/dashboard_screen.dart +++ b/lib/src/features/dashboard/widget/dashboard_screen.dart @@ -1,4 +1,3 @@ -import 'package:collection/collection.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; diff --git a/lib/src/features/initialization/logic/app_runner.dart b/lib/src/features/initialization/logic/app_runner.dart index 120e863..62fd43a 100644 --- a/lib/src/features/initialization/logic/app_runner.dart +++ b/lib/src/features/initialization/logic/app_runner.dart @@ -63,11 +63,7 @@ final class AppRunner { final trackingManager = DatabaseTrackingManager(database, logger); await trackingManager.enableReporting(); - const flutterSecureStorage = FlutterSecureStorage( - aOptions: AndroidOptions( - encryptedSharedPreferences: true, - ), - ); + const flutterSecureStorage = FlutterSecureStorage(); final packageInfo = await PackageInfo.fromPlatform(); final appMetadata = AppMetadata( diff --git a/pubspec.yaml b/pubspec.yaml index 20b553b..5e195b6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: flutter: sdk: flutter flutter_bloc: ^8.1.3 - flutter_secure_storage: ^9.0.0 + flutter_secure_storage: ^10.0.0-beta.4 logging: ^1.2.0 meta: ^1.10.0 octopus: ^0.0.8 @@ -31,7 +31,7 @@ dependencies: url_launcher: ^6.2.4 freezed_annotation: ^2.4.1 sqlite3_flutter_libs: ^0.5.20 - syncfusion_flutter_charts: ^27.1.51 + syncfusion_flutter_charts: ^28.1.37 collection: ^1.18.0 dev_dependencies: