From 2888504b4d2de61c1eac750d491508aa9e724d82 Mon Sep 17 00:00:00 2001 From: broodjeaap89 Date: Tue, 7 Sep 2021 21:48:26 +0200 Subject: [PATCH] fixed linting warnings in util.dart --- lib/util.dart | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/util.dart b/lib/util.dart index c7da7cc..8ef05d2 100644 --- a/lib/util.dart +++ b/lib/util.dart @@ -9,9 +9,9 @@ Future> getRecipes() async { final Map manifestMap = json.decode(manifestContent) as Map; final List fileList = manifestMap.keys.toList(); final List pizzaRecipes = []; - for (var filePath in fileList) { + for (final filePath in fileList) { if (filePath.startsWith("assets/recipes") && filePath.endsWith(".yaml")) { - PizzaRecipe pizzaRecipe = await PizzaRecipe.fromYamlAsset(filePath); + final PizzaRecipe pizzaRecipe = await PizzaRecipe.fromYamlAsset(filePath); pizzaRecipes.add(pizzaRecipe); } } @@ -19,12 +19,12 @@ Future> getRecipes() async { } Future loadAsset(String path) async { - return await rootBundle.loadString(path); + return rootBundle.loadString(path); } extension StringExtensions on String { String capitalize() { - return this[0].toUpperCase() + this.substring(1); + return this[0].toUpperCase() + substring(1); } } @@ -33,21 +33,21 @@ DateFormat getDateFormat(){ } String getTimeRemainingString(DateTime other, {DateTime? now}){ - now = now ?? DateTime.now(); - Duration duration = other.difference(now); - Duration absDuration = duration.abs(); + now ??= DateTime.now(); + final duration = other.difference(now); + final absDuration = duration.abs(); String durationString = ""; if (absDuration.inHours <= 0 && absDuration.inMinutes > 0) { - durationString = "${absDuration.inMinutes} minute" + (absDuration.inMinutes > 1 ? "s" : ""); + durationString = "${"${absDuration.inMinutes} minute"}${absDuration.inMinutes > 1 ? "s" : ""}"; } else if (absDuration.inDays <= 0 && absDuration.inHours > 0) { durationString = "${absDuration.inHours} hours"; } else if (absDuration.inDays <= 31) { - durationString = "${absDuration.inDays} day" + (absDuration.inDays > 1 ? "s" : ""); + durationString = "${"${absDuration.inDays} day"}${absDuration.inDays > 1 ? "s" : ""}"; } else { - durationString = "${(absDuration.inDays / 7).floor()} week" + (absDuration.inDays >= 14 ? "s" : ""); + durationString = "${"${(absDuration.inDays / 7).floor()} week"}${absDuration.inDays >= 14 ? "s" : ""}"; } return duration.isNegative ? "$durationString ago" : "In $durationString"; } \ No newline at end of file