1
0
mirror of https://github.com/flutter/samples.git synced 2026-03-29 15:51:47 +00:00
This commit is contained in:
Brett Morgan
2022-05-11 12:48:11 -07:00
committed by GitHub
parent fb00d0a102
commit ccd68f34e2
242 changed files with 1719 additions and 1430 deletions

View File

@@ -42,7 +42,7 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
cupertino_icons:
dependency: "direct main"
description:
@@ -56,7 +56,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
federated_plugin:
dependency: "direct main"
description:
@@ -120,7 +120,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
lints:
dependency: transitive
description:
@@ -141,7 +141,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -155,7 +155,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
plugin_platform_interface:
dependency: transitive
description:
@@ -174,7 +174,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -209,21 +209,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
sdks:
dart: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
dart: ">=2.17.0-0 <3.0.0"

View File

@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
federated_plugin_windows
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin)

View File

@@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
federated_plugin_macos:
dependency: "direct main"
description:
@@ -89,7 +89,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -106,14 +106,14 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
lints:
dependency: transitive
description:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
matcher:
dependency: transitive
description:
@@ -127,7 +127,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -141,7 +141,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
plugin_platform_interface:
dependency: transitive
description:
@@ -160,7 +160,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -195,21 +195,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
sdks:
dart: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
dart: ">=2.17.0-206.0.dev <3.0.0"

View File

@@ -5,8 +5,7 @@ version: 0.0.1
publish_to: "none"
environment:
sdk: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
@@ -23,7 +22,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^1.0.0
flutter_lints: ^2.0.1
flutter:
plugin:

View File

@@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
flutter:
dependency: "direct main"
description: flutter
@@ -61,7 +61,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -73,7 +73,7 @@ packages:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
matcher:
dependency: transitive
description:
@@ -87,7 +87,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -101,7 +101,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
sky_engine:
dependency: transitive
description: flutter
@@ -113,7 +113,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -148,21 +148,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
sdks:
dart: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
dart: ">=2.17.0-206.0.dev <3.0.0"

View File

@@ -4,8 +4,7 @@ version: 0.0.1
homepage:
environment:
sdk: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
@@ -14,7 +13,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^1.0.0
flutter_lints: ^2.0.1
flutter:
plugin:

View File

@@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
flutter:
dependency: "direct main"
description: flutter
@@ -61,7 +61,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -73,7 +73,7 @@ packages:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
matcher:
dependency: transitive
description:
@@ -87,7 +87,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -101,7 +101,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
plugin_platform_interface:
dependency: "direct main"
description:
@@ -120,7 +120,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -155,21 +155,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
sdks:
dart: ">=2.15.1 <3.0.0"
flutter: ">=1.17.0"
dart: ">=2.17.0-206.0.dev <3.0.0"

View File

@@ -4,8 +4,7 @@ version: 0.0.1
homepage:
environment:
sdk: ">=2.15.1 <3.0.0"
flutter: ">=1.17.0"
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
@@ -15,4 +14,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^1.0.0
flutter_lints: ^2.0.1

View File

@@ -21,7 +21,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.6"
version: "3.1.11"
args:
dependency: transitive
description:
@@ -49,7 +49,7 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.3.0"
built_collection:
dependency: transitive
description:
@@ -63,7 +63,7 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.1.4"
version: "8.3.0"
characters:
dependency: transitive
description:
@@ -98,7 +98,7 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
convert:
dependency: transitive
description:
@@ -119,14 +119,14 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.2"
version: "2.2.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
federated_plugin_platform_interface:
dependency: "direct main"
description:
@@ -164,7 +164,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -198,14 +198,14 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
lints:
dependency: transitive
description:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
logging:
dependency: transitive
description:
@@ -226,7 +226,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -254,7 +254,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
platform:
dependency: transitive
description:
@@ -294,14 +294,14 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
version: "1.2.2"
source_span:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -343,7 +343,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
version: "0.4.9"
typed_data:
dependency: transitive
description:
@@ -357,14 +357,14 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
vm_service:
dependency: transitive
description:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "7.5.0"
version: "8.2.2"
watcher:
dependency: transitive
description:
@@ -387,5 +387,4 @@ packages:
source: hosted
version: "3.1.0"
sdks:
dart: ">=2.15.1 <3.0.0"
flutter: ">=1.17.0"
dart: ">=2.17.0-206.0.dev <3.0.0"

View File

@@ -4,8 +4,7 @@ version: 0.0.1
publish_to: none
environment:
sdk: ">=2.12.0 <3.0.0"
flutter: ">=1.17.0"
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
@@ -20,7 +19,7 @@ dev_dependencies:
sdk: flutter
integration_test:
sdk: flutter
flutter_lints: ^1.0.0
flutter_lints: ^2.0.1
mockito: ^5.0.2
flutter:

View File

@@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
flutter:
dependency: "direct main"
description: flutter
@@ -61,7 +61,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -73,7 +73,7 @@ packages:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
matcher:
dependency: transitive
description:
@@ -87,7 +87,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -101,7 +101,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
sky_engine:
dependency: transitive
description: flutter
@@ -113,7 +113,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -148,21 +148,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
sdks:
dart: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
dart: ">=2.17.0-206.0.dev <3.0.0"

View File

@@ -4,8 +4,7 @@ version: 0.0.1
homepage:
environment:
sdk: ">=2.15.1 <3.0.0"
flutter: ">=2.5.0"
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
@@ -14,7 +13,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^1.0.0
flutter_lints: ^2.0.1
flutter:
plugin:

View File

@@ -19,7 +19,7 @@ class LintingTool extends StatefulWidget {
static const String homeRoute = routes.homeRoute;
@override
_LintingToolState createState() => _LintingToolState();
State<LintingTool> createState() => _LintingToolState();
}
class _LintingToolState extends State<LintingTool> {

View File

@@ -60,6 +60,7 @@ class ProfilesStore extends ChangeNotifier {
}
Future<void> addToExistingProfile(RulesProfile profile, Rule rule) async {
// ignore: todo
// TODO(abd99): Consider refactoring to LinkedHashSet/SplayTreeSet to avoid
// duplication automatically.
// ref: https://github.com/flutter/samples/pull/870#discussion_r685666792

View File

@@ -32,7 +32,7 @@ class RuleStore extends ChangeNotifier {
String? get error => _error;
List<RulesProfile> get defaultProfiles {
List<RulesProfile> _defaultProfiles = [];
List<RulesProfile> defaultProfiles = [];
var rulesWithDefaultSets =
rules.where((rule) => rule.sets.isNotEmpty).toList();
@@ -40,16 +40,16 @@ class RuleStore extends ChangeNotifier {
for (final rule in rulesWithDefaultSets) {
for (final setName in rule.sets) {
var profileIndex =
_defaultProfiles.indexWhere((profile) => profile.name == setName);
defaultProfiles.indexWhere((profile) => profile.name == setName);
if (profileIndex >= 0) {
_defaultProfiles[profileIndex].rules.add(rule);
defaultProfiles[profileIndex].rules.add(rule);
} else {
_defaultProfiles.add(RulesProfile(name: setName, rules: [rule]));
defaultProfiles.add(RulesProfile(name: setName, rules: [rule]));
}
}
}
return _defaultProfiles;
return defaultProfiles;
}
Future<void> fetchRules() async {

View File

@@ -10,9 +10,14 @@ import 'package:linting_tool/pages/rules_page.dart';
import 'package:linting_tool/theme/colors.dart';
import 'package:provider/provider.dart';
class SavedLintsPage extends StatelessWidget {
class SavedLintsPage extends StatefulWidget {
const SavedLintsPage({Key? key}) : super(key: key);
@override
State<SavedLintsPage> createState() => _SavedLintsPageState();
}
class _SavedLintsPageState extends State<SavedLintsPage> {
@override
Widget build(BuildContext context) {
return Consumer<ProfilesStore>(
@@ -90,11 +95,14 @@ class SavedLintsPage extends StatelessWidget {
onSelected: (value) async {
switch (value) {
case 'Export file':
// ignore: todo
// TODO(abd99): Add option to select formatting style.
var saved = await profilesStore
.exportProfileFile(profile);
if (!mounted) return;
if (!saved) {
_showSnackBar(
context,
@@ -112,12 +120,12 @@ class SavedLintsPage extends StatelessWidget {
itemBuilder: (context) {
return [
const PopupMenuItem(
child: Text('Export file'),
value: 'Export file',
child: Text('Export file'),
),
const PopupMenuItem(
child: Text('Delete'),
value: 'Delete',
child: Text('Delete'),
),
];
},

View File

@@ -18,14 +18,14 @@ class AdaptiveNav extends StatefulWidget {
const AdaptiveNav({Key? key}) : super(key: key);
@override
_AdaptiveNavState createState() => _AdaptiveNavState();
State<AdaptiveNav> createState() => _AdaptiveNavState();
}
class _AdaptiveNavState extends State<AdaptiveNav> {
@override
Widget build(BuildContext context) {
final isDesktop = isDisplayLarge(context);
const _navigationDestinations = <_Destination>[
const navigationDestinations = <_Destination>[
_Destination(
textLabel: 'Home',
icon: Icons.home_outlined,
@@ -46,14 +46,14 @@ class _AdaptiveNavState extends State<AdaptiveNav> {
),
];
final _trailing = <String, IconData>{
final trailing = <String, IconData>{
'About': Icons.info_outline,
};
return _NavView(
extended: isDesktop,
destinations: _navigationDestinations,
trailing: _trailing,
destinations: navigationDestinations,
trailing: trailing,
);
}
}

View File

@@ -19,7 +19,7 @@ class LintExpansionTile extends StatefulWidget {
}) : super(key: key);
@override
_LintExpansionTileState createState() => _LintExpansionTileState();
State<LintExpansionTile> createState() => _LintExpansionTileState();
}
class _LintExpansionTileState extends State<LintExpansionTile> {
@@ -142,7 +142,7 @@ class _LintExpansionTileState extends State<LintExpansionTile> {
await showDialog<String>(
context: context,
builder: (context) {
return _NewProfileDialog(rule: rule);
return NewProfileDialog(rule: rule);
},
);
} else if (destinationProfileType ==
@@ -150,7 +150,7 @@ class _LintExpansionTileState extends State<LintExpansionTile> {
await showDialog<String>(
context: context,
builder: (context) {
return _ExistingProfileDialog(rule: rule);
return ExistingProfileDialog(rule: rule);
},
);
}
@@ -205,22 +205,27 @@ class _ProfileTypeDialog extends StatelessWidget {
}
}
class _NewProfileDialog extends StatelessWidget {
class NewProfileDialog extends StatefulWidget {
final Rule rule;
const _NewProfileDialog({
const NewProfileDialog({
required this.rule,
Key? key,
}) : super(key: key);
@override
State<NewProfileDialog> createState() => _NewProfileDialogState();
}
class _NewProfileDialogState extends State<NewProfileDialog> {
@override
Widget build(BuildContext context) {
String name = '';
final _formKey = GlobalKey<FormState>();
final formKey = GlobalKey<FormState>();
return AlertDialog(
title: const Text('Create new lint profile'),
content: Form(
key: _formKey,
key: formKey,
autovalidateMode: AutovalidateMode.onUserInteraction,
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -251,13 +256,14 @@ class _NewProfileDialog extends StatelessWidget {
),
ElevatedButton(
onPressed: () async {
if (_formKey.currentState!.validate()) {
if (formKey.currentState!.validate()) {
var newProfile = RulesProfile(
name: name,
rules: [rule],
rules: [widget.rule],
);
await Provider.of<ProfilesStore>(context, listen: false)
.addToNewProfile(newProfile);
if (!mounted) return;
Navigator.pop(context);
}
},
@@ -268,14 +274,19 @@ class _NewProfileDialog extends StatelessWidget {
}
}
class _ExistingProfileDialog extends StatelessWidget {
const _ExistingProfileDialog({
class ExistingProfileDialog extends StatefulWidget {
const ExistingProfileDialog({
Key? key,
required this.rule,
}) : super(key: key);
final Rule rule;
@override
State<ExistingProfileDialog> createState() => _ExistingProfileDialogState();
}
class _ExistingProfileDialogState extends State<ExistingProfileDialog> {
@override
Widget build(BuildContext context) {
var profilesStore = Provider.of<ProfilesStore>(context);
@@ -291,7 +302,8 @@ class _ExistingProfileDialog extends StatelessWidget {
title: Text(savedProfiles[index].name),
onTap: () async {
await profilesStore.addToExistingProfile(
savedProfiles[index], rule);
savedProfiles[index], widget.rule);
if (!mounted) return;
Navigator.pop(context);
},
),

View File

@@ -18,7 +18,7 @@ class SavedRuleTile extends StatefulWidget {
}) : super(key: key);
@override
_SavedRuleTileState createState() => _SavedRuleTileState();
State<SavedRuleTile> createState() => _SavedRuleTileState();
}
class _SavedRuleTileState extends State<SavedRuleTile> {

View File

@@ -8,6 +8,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
window_size
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -16,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin)

View File

@@ -29,12 +29,12 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_size/macos
SPEC CHECKSUMS:
file_selector_macos: ff6dc948d4ddd34e8602a1f60b7d0b4cc6051a47
file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6
FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f
url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4
url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
window_size: 339dafa0b27a95a62a843042038fa6c3c48de195
PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
COCOAPODS: 1.11.0
COCOAPODS: 1.11.3

View File

@@ -49,7 +49,7 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.3.0"
build_config:
dependency: transitive
description:
@@ -70,7 +70,7 @@ packages:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.6"
version: "2.0.8"
build_runner:
dependency: "direct dev"
description:
@@ -98,7 +98,7 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.1.4"
version: "8.3.0"
characters:
dependency: transitive
description:
@@ -140,7 +140,7 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
context_menus:
dependency: "direct main"
description:
@@ -161,14 +161,14 @@ packages:
name: cross_file
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.2"
version: "0.3.3"
crypto:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
version: "3.0.2"
cupertino_icons:
dependency: "direct main"
description:
@@ -182,7 +182,7 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.2"
version: "2.2.3"
equatable:
dependency: "direct main"
description:
@@ -196,7 +196,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
ffi:
dependency: transitive
description:
@@ -271,7 +271,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_markdown:
dependency: "direct main"
description:
@@ -372,7 +372,7 @@ packages:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3"
version: "0.6.4"
json2yaml:
dependency: "direct main"
description:
@@ -400,7 +400,7 @@ packages:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
logging:
dependency: transitive
description:
@@ -428,7 +428,7 @@ packages:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
meta:
dependency: transitive
description:
@@ -442,7 +442,7 @@ packages:
name: mime
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "1.0.2"
mockito:
dependency: "direct main"
description:
@@ -470,7 +470,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
path_provider:
dependency: transitive
description:
@@ -484,7 +484,7 @@ packages:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.12"
version: "2.0.13"
path_provider_ios:
dependency: transitive
description:
@@ -594,21 +594,21 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
version: "1.2.2"
source_helper:
dependency: transitive
description:
name: source_helper
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.3.2"
source_span:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
@@ -650,7 +650,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.8"
version: "0.4.9"
timing:
dependency: transitive
description:
@@ -671,14 +671,14 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.20"
version: "6.1.0"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.15"
version: "6.0.16"
url_launcher_ios:
dependency: transitive
description:
@@ -727,7 +727,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.2"
watcher:
dependency: transitive
description:
@@ -741,14 +741,14 @@ packages:
name: web_socket_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.2.0"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.1"
version: "2.5.2"
window_size:
dependency: "direct main"
description:
@@ -773,5 +773,5 @@ packages:
source: hosted
version: "3.1.0"
sdks:
dart: ">=2.16.0 <3.0.0"
dart: ">=2.17.0-206.0.dev <3.0.0"
flutter: ">=2.10.0"

View File

@@ -3,10 +3,10 @@ description: A new Flutter project.
version: 1.0.0+1
publish_to: 'none'
publish_to: "none"
environment:
sdk: ">=2.15.0 <3.0.0"
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
@@ -39,7 +39,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
build_runner: ^2.0.6
flutter_lints: ^1.0.3
flutter_lints: ^2.0.1
hive_generator: ^1.1.0
json_serializable: ^6.2.0

View File

@@ -8,6 +8,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
window_size
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -16,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin)

View File

@@ -51,7 +51,7 @@ class DashboardApp extends StatefulWidget {
super(key: key);
@override
_DashboardAppState createState() => _DashboardAppState();
State<DashboardApp> createState() => _DashboardAppState();
}
class _DashboardAppState extends State<DashboardApp> {
@@ -90,7 +90,7 @@ class SignInSwitcher extends StatefulWidget {
}) : super(key: key);
@override
_SignInSwitcherState createState() => _SignInSwitcherState();
State<SignInSwitcher> createState() => _SignInSwitcherState();
}
class _SignInSwitcherState extends State<SignInSwitcher> {

View File

@@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart' as intl;
import 'package:provider/provider.dart';
@@ -17,7 +15,7 @@ class EntriesPage extends StatefulWidget {
const EntriesPage({Key? key}) : super(key: key);
@override
_EntriesPageState createState() => _EntriesPageState();
State<EntriesPage> createState() => _EntriesPageState();
}
class _EntriesPageState extends State<EntriesPage> {
@@ -54,7 +52,7 @@ class EntriesList extends StatefulWidget {
}) : super(key: ValueKey(category?.id));
@override
_EntriesListState createState() => _EntriesListState();
State<EntriesList> createState() => _EntriesListState();
}
class _EntriesListState extends State<EntriesList> {
@@ -129,7 +127,9 @@ class EntryTile extends StatelessWidget {
TextButton(
child: const Text('Delete'),
onPressed: () async {
var shouldDelete = await (showDialog<bool>(
final appState = Provider.of<AppState>(context, listen: false);
final scaffoldMessenger = ScaffoldMessenger.of(context);
final bool? shouldDelete = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Delete entry?'),
@@ -144,14 +144,10 @@ class EntryTile extends StatelessWidget {
),
],
),
) as FutureOr<bool>);
if (shouldDelete) {
await Provider.of<AppState>(context, listen: false)
.api!
.entries
.delete(category!.id!, entry!.id!);
ScaffoldMessenger.of(context).showSnackBar(
);
if (shouldDelete != null && shouldDelete) {
await appState.api!.entries.delete(category!.id!, entry!.id!);
scaffoldMessenger.showSnackBar(
const SnackBar(
content: Text('Entry deleted'),
),

View File

@@ -20,7 +20,7 @@ class HomePage extends StatefulWidget {
}) : super(key: key);
@override
_HomePageState createState() => _HomePageState();
State<HomePage> createState() => _HomePageState();
}
class _HomePageState extends State<HomePage> {

View File

@@ -37,7 +37,7 @@ class SignInButton extends StatefulWidget {
}) : super(key: key);
@override
_SignInButtonState createState() => _SignInButtonState();
State<SignInButton> createState() => _SignInButtonState();
}
class _SignInButtonState extends State<SignInButton> {

View File

@@ -20,7 +20,7 @@ class CategoryDropdown extends StatefulWidget {
}) : super(key: key);
@override
_CategoryDropdownState createState() => _CategoryDropdownState();
State<CategoryDropdown> createState() => _CategoryDropdownState();
}
class _CategoryDropdownState extends State<CategoryDropdown> {
@@ -105,6 +105,6 @@ class _CategoryDropdownState extends State<CategoryDropdown> {
DropdownMenuItem<Category> _buildDropdownItem(Category category) {
return DropdownMenuItem<Category>(
child: Text(category.name), value: category);
value: category, child: Text(category.name));
}
}

View File

@@ -11,7 +11,7 @@ class NewCategoryForm extends StatefulWidget {
const NewCategoryForm({Key? key}) : super(key: key);
@override
_NewCategoryFormState createState() => _NewCategoryFormState();
State<NewCategoryForm> createState() => _NewCategoryFormState();
}
class _NewCategoryFormState extends State<NewCategoryForm> {
@@ -43,7 +43,7 @@ class EditCategoryForm extends StatefulWidget {
}) : super(key: key);
@override
_EditCategoryFormState createState() => _EditCategoryFormState();
State<EditCategoryForm> createState() => _EditCategoryFormState();
}
class _EditCategoryFormState extends State<EditCategoryForm> {

View File

@@ -57,7 +57,7 @@ class NewEntryDialog extends StatefulWidget {
const NewEntryDialog({Key? key}) : super(key: key);
@override
_NewEntryDialogState createState() => _NewEntryDialogState();
State<NewEntryDialog> createState() => _NewEntryDialogState();
}
class _NewEntryDialogState extends State<NewEntryDialog> {

View File

@@ -14,7 +14,7 @@ class NewEntryForm extends StatefulWidget {
const NewEntryForm({Key? key}) : super(key: key);
@override
_NewEntryFormState createState() => _NewEntryFormState();
State<NewEntryForm> createState() => _NewEntryFormState();
}
class _NewEntryFormState extends State<NewEntryForm> {
@@ -65,7 +65,7 @@ class EditEntryForm extends StatefulWidget {
}) : super(key: key);
@override
_EditEntryFormState createState() => _EditEntryFormState();
State<EditEntryForm> createState() => _EditEntryFormState();
}
class _EditEntryFormState extends State<EditEntryForm> {

View File

@@ -47,7 +47,7 @@ class AdaptiveScaffold extends StatefulWidget {
}) : super(key: key);
@override
_AdaptiveScaffoldState createState() => _AdaptiveScaffoldState();
State<AdaptiveScaffold> createState() => _AdaptiveScaffoldState();
}
class _AdaptiveScaffoldState extends State<AdaptiveScaffold> {

View File

@@ -91,7 +91,7 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.2.3"
version: "8.3.0"
characters:
dependency: transitive
description:
@@ -170,7 +170,7 @@ packages:
source: hosted
version: "4.1.0"
collection:
dependency: transitive
dependency: "direct main"
description:
name: collection
url: "https://pub.dartlang.org"
@@ -278,7 +278,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -367,7 +367,7 @@ packages:
source: hosted
version: "4.0.0"
intl:
dependency: transitive
dependency: "direct main"
description:
name: intl
url: "https://pub.dartlang.org"
@@ -407,7 +407,7 @@ packages:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
logging:
dependency: transitive
description:
@@ -458,7 +458,7 @@ packages:
source: hosted
version: "2.0.2"
path:
dependency: transitive
dependency: "direct main"
description:
name: path
url: "https://pub.dartlang.org"
@@ -638,5 +638,5 @@ packages:
source: hosted
version: "3.1.0"
sdks:
dart: ">=2.16.0 <3.0.0"
dart: ">=2.17.0-206.0.dev <3.0.0"
flutter: ">=2.8.0"

View File

@@ -2,26 +2,32 @@ name: web_dashboard
description: A dashboard app sample
version: 1.0.0+1
publish_to: none
environment:
sdk: '>=2.12.0 <3.0.0'
sdk: ">=2.17.0-0 <3.0.0"
dependencies:
flutter:
sdk: flutter
charts_flutter: ^0.12.0
cloud_firestore: ^3.1.14
collection: ^1.16.0
cupertino_icons: ^1.0.0
firebase_auth: ^3.3.17
firebase_core: ^1.16.0
flutter:
sdk: flutter
google_sign_in: ^5.3.1
intl: ^0.17.0
json_annotation: ^4.5.0
path: ^1.8.1
provider: ^6.0.0
uuid: ^3.0.0
charts_flutter: ^0.12.0
dev_dependencies:
build_runner: ^2.1.0
flutter_lints: ^2.0.1
flutter_test:
sdk: flutter
build_runner: ^2.1.0
json_serializable: ^6.2.0
grinder: ^0.9.0
flutter_lints: ^1.0.0
json_serializable: ^6.2.0
flutter:
uses-material-design: true

View File

@@ -82,7 +82,7 @@ Future copyright() async {
Future fixCopyright() async {
await for (var file in _filesWithoutCopyright()) {
var contents = await file.readAsString();
await file.writeAsString(_copyright + '\n\n' + contents);
await file.writeAsString('$_copyright\n\n$contents');
}
}
@@ -99,7 +99,7 @@ Stream<File> _filesWithoutCopyright() async* {
.take(3)
.fold<String>('', (previous, element) {
if (previous == '') return element;
return previous + '\n' + element;
return '$previous\n$element';
});
if (firstThreeLines != _copyright) {