From eacfd10580fba9290bd1d2947b3721f440909efa Mon Sep 17 00:00:00 2001 From: broodjeaap89 Date: Tue, 31 Aug 2021 21:45:36 +0200 Subject: [PATCH] applied standard linting to project, renamed all files to fit lower_case_names, and fixed some implicit type conversions that are now errors to get the project working again todo: go through project and fix all the warnings --- analysis_options.yaml | 1 + lib/entities/PizzaRecipe/ingredient.dart | 2 +- lib/entities/PizzaRecipe/ingredient.g.dart | 2 +- lib/entities/PizzaRecipe/pizza_recipe.dart | 50 +++++++++++-------- lib/entities/PizzaRecipe/pizza_recipe.g.dart | 2 +- lib/entities/PizzaRecipe/recipe_step.dart | 6 +-- lib/entities/PizzaRecipe/recipe_step.g.dart | 2 +- lib/entities/PizzaRecipe/recipe_substep.dart | 4 +- .../PizzaRecipe/recipe_substep.g.dart | 2 +- lib/entities/pizza_event.dart | 2 +- lib/entities/pizza_event.g.dart | 2 +- lib/main.dart | 26 +++++----- lib/pages/add_pizza_event_page.dart | 2 +- lib/pages/pick_pizza_recipe_page.dart | 2 +- lib/pages/pizza_event_notification_page.dart | 4 +- lib/pages/pizza_event_page.dart | 4 +- lib/pages/pizza_event_recipe_page.dart | 2 +- lib/pages/pizza_events_page.dart | 6 +-- lib/pages/recipe_step_instruction_page.dart | 2 +- lib/util.dart | 4 +- lib/widgets/pizza_event_widget.dart | 2 +- pubspec.yaml | 2 + 22 files changed, 71 insertions(+), 60 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index e69de29..26128b9 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -0,0 +1 @@ +include: package:lint/analysis_options.yaml \ No newline at end of file diff --git a/lib/entities/PizzaRecipe/ingredient.dart b/lib/entities/PizzaRecipe/ingredient.dart index 53e7f1c..1f09001 100644 --- a/lib/entities/PizzaRecipe/ingredient.dart +++ b/lib/entities/PizzaRecipe/ingredient.dart @@ -3,7 +3,7 @@ import 'package:hive/hive.dart'; import 'package:pizzaplanner/util.dart'; -part 'Ingredient.g.dart'; +part 'ingredient.g.dart'; @HiveType(typeId: 1) class Ingredient extends HiveObject { diff --git a/lib/entities/PizzaRecipe/ingredient.g.dart b/lib/entities/PizzaRecipe/ingredient.g.dart index 2894230..f38d86f 100644 --- a/lib/entities/PizzaRecipe/ingredient.g.dart +++ b/lib/entities/PizzaRecipe/ingredient.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'Ingredient.dart'; +part of 'ingredient.dart'; // ************************************************************************** // TypeAdapterGenerator diff --git a/lib/entities/PizzaRecipe/pizza_recipe.dart b/lib/entities/PizzaRecipe/pizza_recipe.dart index cc71c08..8beeafc 100644 --- a/lib/entities/PizzaRecipe/pizza_recipe.dart +++ b/lib/entities/PizzaRecipe/pizza_recipe.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; -import 'package:pizzaplanner/pages/PizzaEventPage.dart'; +import 'package:pizzaplanner/pages/pizza_event_page.dart'; import 'package:pizzaplanner/util.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/ingredient.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/RecipeStep.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/RecipeSubStep.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/recipe_step.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/recipe_substep.dart'; import 'package:yaml/yaml.dart'; -part 'PizzaRecipe.g.dart'; +part 'pizza_recipe.g.dart'; @HiveType(typeId: 0) class PizzaRecipe extends HiveObject { @@ -72,23 +72,28 @@ class PizzaRecipe extends HiveObject { return stepCount; } - static Future fromYaml(yamlPath) async{ + static Future fromYaml(String yamlPath) async{ String yamlString = await loadAsset(yamlPath); var yaml = loadYaml(yamlString); - var recipe = yaml["recipe"]; + YamlMap recipe = yaml["recipe"] as YamlMap; - String name = recipe["name"]; - String description = recipe["description"]; + String name = recipe["name"] as String; + String description = recipe["description"] as String; - YamlList ingredients = recipe["ingredients"]; + YamlList ingredients = recipe["ingredients"] as YamlList; - List newIngredients = ingredients.map((ingredient) => Ingredient(ingredient["name"], ingredient["unit"], ingredient["value"])).toList(); + List newIngredients = ingredients.map( + (ingredient) => Ingredient( + ingredient["name"] as String, + ingredient["unit"] as String, + ingredient["value"] as double + )).toList(); - YamlList steps = recipe["steps"]; + YamlList steps = recipe["steps"] as YamlList; var newRecipeSteps = List.generate(steps.length, (i) { - YamlMap step = steps[i]; - String stepName = step["name"]; - String stepDescription = step["description"]; + YamlMap step = steps[i] as YamlMap; + String stepName = step["name"] as String; + String stepDescription = step["description"] as String; String waitUnit = "none"; String waitDescription = ""; @@ -96,18 +101,21 @@ class PizzaRecipe extends HiveObject { int waitMax = 0; if (step.containsKey("wait")) { - YamlMap waitMap = step["wait"]; + YamlMap waitMap = step["wait"] as YamlMap; - waitDescription = waitMap["description"]; - waitUnit = waitMap["unit"]; - waitMin = waitMap["min"]; - waitMax = waitMap["max"]; + waitDescription = waitMap["description"] as String; + waitUnit = waitMap["unit"] as String; + waitMin = waitMap["min"] as int; + waitMax = waitMap["max"] as int; } - YamlList subSteps = step.containsKey("substeps") ? step["substeps"] : YamlList(); + YamlList subSteps = step.containsKey("substeps") ? step["substeps"] as YamlList : YamlList(); var newSubSteps = List.generate(subSteps.length, (j) { var subStep = subSteps[j]; - return RecipeSubStep(subStep["name"], subStep["description"]); + return RecipeSubStep( + subStep["name"] as String, + subStep["description"] as String + ); }); return RecipeStep( stepName, diff --git a/lib/entities/PizzaRecipe/pizza_recipe.g.dart b/lib/entities/PizzaRecipe/pizza_recipe.g.dart index a1868c4..a09339f 100644 --- a/lib/entities/PizzaRecipe/pizza_recipe.g.dart +++ b/lib/entities/PizzaRecipe/pizza_recipe.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'PizzaRecipe.dart'; +part of 'pizza_recipe.dart'; // ************************************************************************** // TypeAdapterGenerator diff --git a/lib/entities/PizzaRecipe/recipe_step.dart b/lib/entities/PizzaRecipe/recipe_step.dart index b0af2bb..f0979f2 100644 --- a/lib/entities/PizzaRecipe/recipe_step.dart +++ b/lib/entities/PizzaRecipe/recipe_step.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:fluttericon/font_awesome5_icons.dart'; import 'package:hive/hive.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/RecipeSubStep.dart'; -import 'package:pizzaplanner/pages/PizzaEventPage.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/recipe_substep.dart'; +import 'package:pizzaplanner/pages/pizza_event_page.dart'; -part 'RecipeStep.g.dart'; +part 'recipe_step.g.dart'; @HiveType(typeId: 2) class RecipeStep extends HiveObject { diff --git a/lib/entities/PizzaRecipe/recipe_step.g.dart b/lib/entities/PizzaRecipe/recipe_step.g.dart index f3f4b5a..bacdbbc 100644 --- a/lib/entities/PizzaRecipe/recipe_step.g.dart +++ b/lib/entities/PizzaRecipe/recipe_step.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'RecipeStep.dart'; +part of 'recipe_step.dart'; // ************************************************************************** // TypeAdapterGenerator diff --git a/lib/entities/PizzaRecipe/recipe_substep.dart b/lib/entities/PizzaRecipe/recipe_substep.dart index fe714f0..87cb3db 100644 --- a/lib/entities/PizzaRecipe/recipe_substep.dart +++ b/lib/entities/PizzaRecipe/recipe_substep.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; -import 'package:pizzaplanner/pages/PizzaEventPage.dart'; +import 'package:pizzaplanner/pages/pizza_event_page.dart'; -part 'RecipeSubStep.g.dart'; +part 'recipe_substep.g.dart'; @HiveType(typeId: 3) class RecipeSubStep extends HiveObject { diff --git a/lib/entities/PizzaRecipe/recipe_substep.g.dart b/lib/entities/PizzaRecipe/recipe_substep.g.dart index 7b38a68..e98e655 100644 --- a/lib/entities/PizzaRecipe/recipe_substep.g.dart +++ b/lib/entities/PizzaRecipe/recipe_substep.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'RecipeSubStep.dart'; +part of 'recipe_substep.dart'; // ************************************************************************** // TypeAdapterGenerator diff --git a/lib/entities/pizza_event.dart b/lib/entities/pizza_event.dart index 0127498..fa127e8 100644 --- a/lib/entities/pizza_event.dart +++ b/lib/entities/pizza_event.dart @@ -7,7 +7,7 @@ import 'package:pizzaplanner/main.dart'; import 'package:timezone/timezone.dart' as tz; import 'dart:math'; -part 'PizzaEvent.g.dart'; +part 'pizza_event.g.dart'; @HiveType(typeId: 4) class PizzaEvent extends HiveObject{ diff --git a/lib/entities/pizza_event.g.dart b/lib/entities/pizza_event.g.dart index 775084c..c1ac270 100644 --- a/lib/entities/pizza_event.g.dart +++ b/lib/entities/pizza_event.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'PizzaEvent.dart'; +part of 'pizza_event.dart'; // ************************************************************************** // TypeAdapterGenerator diff --git a/lib/main.dart b/lib/main.dart index a4829b5..6cbb04a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,22 +1,22 @@ import 'package:flutter/material.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_native_timezone/flutter_native_timezone.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/Ingredient.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/PizzaRecipe.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/RecipeStep.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/RecipeSubStep.dart'; -import 'package:pizzaplanner/pages/AddPizzaEventPage.dart'; -import 'package:pizzaplanner/pages/PickPizzaRecipePage.dart'; -import 'package:pizzaplanner/pages/PizzaEventNotificationPage.dart'; -import 'package:pizzaplanner/pages/PizzaEventPage.dart'; -import 'package:pizzaplanner/pages/PizzaEventsPage.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/ingredient.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/pizza_recipe.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/recipe_step.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/recipe_substep.dart'; +import 'package:pizzaplanner/pages/add_pizza_event_page.dart'; +import 'package:pizzaplanner/pages/pick_pizza_recipe_page.dart'; +import 'package:pizzaplanner/pages/pizza_event_notification_page.dart'; +import 'package:pizzaplanner/pages/pizza_event_page.dart'; +import 'package:pizzaplanner/pages/pizza_events_page.dart'; import 'package:hive/hive.dart'; import 'package:hive_flutter/hive_flutter.dart'; -import 'package:pizzaplanner/pages/PizzaEventRecipePage.dart'; -import 'package:pizzaplanner/pages/RecipeStepInstructionPage.dart'; -import 'package:pizzaplanner/recipes/NeapolitanCold.dart'; +import 'package:pizzaplanner/pages/pizza_event_recipe_page.dart'; +import 'package:pizzaplanner/pages/recipe_step_instruction_page.dart'; +import 'package:pizzaplanner/recipes/neapolitan_cold.dart'; import 'package:pizzaplanner/util.dart'; import 'package:rxdart/subjects.dart'; diff --git a/lib/pages/add_pizza_event_page.dart b/lib/pages/add_pizza_event_page.dart index 7036073..0a5547e 100644 --- a/lib/pages/add_pizza_event_page.dart +++ b/lib/pages/add_pizza_event_page.dart @@ -4,7 +4,7 @@ import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:fluttericon/font_awesome5_icons.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/pizza_recipe.dart'; import 'package:pizzaplanner/main.dart'; import 'package:pizzaplanner/util.dart'; diff --git a/lib/pages/pick_pizza_recipe_page.dart b/lib/pages/pick_pizza_recipe_page.dart index 18f5427..ea66253 100644 --- a/lib/pages/pick_pizza_recipe_page.dart +++ b/lib/pages/pick_pizza_recipe_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:hive_flutter/adapters.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/pizza_recipe.dart'; -import 'package:pizzaplanner/widgets/PizzaRecipeWidget.dart'; +import 'package:pizzaplanner/widgets/pizza_recipe_widget.dart'; class PickPizzaRecipePage extends StatelessWidget { @override diff --git a/lib/pages/pizza_event_notification_page.dart b/lib/pages/pizza_event_notification_page.dart index fb1d73d..807df85 100644 --- a/lib/pages/pizza_event_notification_page.dart +++ b/lib/pages/pizza_event_notification_page.dart @@ -5,10 +5,10 @@ import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_ringtone_player/flutter_ringtone_player.dart'; import 'package:hive/hive.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/recipe_step.dart'; import 'package:pizzaplanner/main.dart'; -import 'package:pizzaplanner/pages/RecipeStepInstructionPage.dart'; +import 'package:pizzaplanner/pages/recipe_step_instruction_page.dart'; import 'package:timezone/timezone.dart' as tz; import 'package:vibration/vibration.dart'; diff --git a/lib/pages/pizza_event_page.dart b/lib/pages/pizza_event_page.dart index b5810f7..7e6ba21 100644 --- a/lib/pages/pizza_event_page.dart +++ b/lib/pages/pizza_event_page.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:fluttericon/font_awesome5_icons.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/ingredient.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/recipe_step.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/recipe_substep.dart'; import 'package:pizzaplanner/main.dart'; import 'package:pizzaplanner/util.dart'; -import 'package:pizzaplanner/widgets/PizzaRecipeWidget.dart'; +import 'package:pizzaplanner/widgets/pizza_recipe_widget.dart'; import 'package:url_launcher/url_launcher.dart'; class PizzaEventPage extends StatefulWidget { diff --git a/lib/pages/pizza_event_recipe_page.dart b/lib/pages/pizza_event_recipe_page.dart index 53928e3..b0b3b7d 100644 --- a/lib/pages/pizza_event_recipe_page.dart +++ b/lib/pages/pizza_event_recipe_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/recipe_step.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/pages/pizza_events_page.dart b/lib/pages/pizza_events_page.dart index 9437f67..975ff4f 100644 --- a/lib/pages/pizza_events_page.dart +++ b/lib/pages/pizza_events_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; -import 'package:pizzaplanner/widgets/PizzaEventWidget.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; +import 'package:pizzaplanner/widgets/pizza_event_widget.dart'; import 'package:hive/hive.dart'; import 'package:hive_flutter/hive_flutter.dart'; @@ -46,7 +46,7 @@ class PizzaEventsState extends State { ); if (newPizzaEvent != null){ - this.addPizzaEvent(newPizzaEvent); + this.addPizzaEvent(newPizzaEvent as PizzaEvent); } }, tooltip: "Add Pizza Plans", diff --git a/lib/pages/recipe_step_instruction_page.dart b/lib/pages/recipe_step_instruction_page.dart index 48c0bd4..fe4f055 100644 --- a/lib/pages/recipe_step_instruction_page.dart +++ b/lib/pages/recipe_step_instruction_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/recipe_step.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; diff --git a/lib/util.dart b/lib/util.dart index 554d78d..774962b 100644 --- a/lib/util.dart +++ b/lib/util.dart @@ -2,11 +2,11 @@ import 'dart:convert'; import 'package:flutter/services.dart' show rootBundle; import 'package:intl/intl.dart'; -import 'package:pizzaplanner/entities/PizzaRecipe/PizzaRecipe.dart'; +import 'package:pizzaplanner/entities/PizzaRecipe/pizza_recipe.dart'; Future> getRecipes() async { final manifestContent = await rootBundle.loadString('AssetManifest.json'); - final Map manifestMap = json.decode(manifestContent); + final Map manifestMap = json.decode(manifestContent) as Map; final List fileList = manifestMap.keys.toList(); final List pizzaRecipes = []; for (var filePath in fileList) { diff --git a/lib/widgets/pizza_event_widget.dart b/lib/widgets/pizza_event_widget.dart index 0aceb50..4a084bc 100644 --- a/lib/widgets/pizza_event_widget.dart +++ b/lib/widgets/pizza_event_widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/entities/pizza_event.dart'; import 'package:pizzaplanner/util.dart'; class PizzaEventWidget extends StatelessWidget { diff --git a/pubspec.yaml b/pubspec.yaml index ee896ef..d34a5ee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -59,6 +59,8 @@ dev_dependencies: flutter_launcher_icons: ^0.9.1 + lint: ^1.6.0 + flutter_icons: android: "app_icon" ios: true