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
This commit is contained in:
parent
5ba0b8a2ad
commit
eacfd10580
22 changed files with 71 additions and 60 deletions
|
@ -0,0 +1 @@
|
|||
include: package:lint/analysis_options.yaml
|
|
@ -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 {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'Ingredient.dart';
|
||||
part of 'ingredient.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// TypeAdapterGenerator
|
||||
|
|
|
@ -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<PizzaRecipe> fromYaml(yamlPath) async{
|
||||
static Future<PizzaRecipe> 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<Ingredient> newIngredients = ingredients.map((ingredient) => Ingredient(ingredient["name"], ingredient["unit"], ingredient["value"])).toList();
|
||||
List<Ingredient> 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,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'PizzaRecipe.dart';
|
||||
part of 'pizza_recipe.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// TypeAdapterGenerator
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'RecipeStep.dart';
|
||||
part of 'recipe_step.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// TypeAdapterGenerator
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'RecipeSubStep.dart';
|
||||
part of 'recipe_substep.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// TypeAdapterGenerator
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'PizzaEvent.dart';
|
||||
part of 'pizza_event.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// TypeAdapterGenerator
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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<PizzaEventsPage> {
|
|||
);
|
||||
|
||||
if (newPizzaEvent != null){
|
||||
this.addPizzaEvent(newPizzaEvent);
|
||||
this.addPizzaEvent(newPizzaEvent as PizzaEvent);
|
||||
}
|
||||
},
|
||||
tooltip: "Add Pizza Plans",
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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<List<PizzaRecipe>> getRecipes() async {
|
||||
final manifestContent = await rootBundle.loadString('AssetManifest.json');
|
||||
final Map<String, dynamic> manifestMap = json.decode(manifestContent);
|
||||
final Map<String, dynamic> manifestMap = json.decode(manifestContent) as Map<String, dynamic>;
|
||||
final List<String> fileList = manifestMap.keys.toList();
|
||||
final List<PizzaRecipe> pizzaRecipes = [];
|
||||
for (var filePath in fileList) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -59,6 +59,8 @@ dev_dependencies:
|
|||
|
||||
flutter_launcher_icons: ^0.9.1
|
||||
|
||||
lint: ^1.6.0
|
||||
|
||||
flutter_icons:
|
||||
android: "app_icon"
|
||||
ios: true
|
||||
|
|
Loading…
Add table
Reference in a new issue