From f9f4a20ac985f4a3bcfa2d4896880907e8ed485d Mon Sep 17 00:00:00 2001 From: david Date: Thu, 9 May 2024 10:34:23 +0200 Subject: [PATCH] updated version --- android/app/build.gradle | 4 ++-- lib/entities/PizzaRecipe/pizza_recipe.dart | 2 +- lib/pages/add_pizza_event_page.dart | 5 ++--- pubspec.yaml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 9136ed9..42adbd6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 34 + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -41,7 +41,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "net.broodjeaap.pizzaplanner.pizzaplanner" - minSdkVersion flutter.minSdkVersion + minSdkVersion 20 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/lib/entities/PizzaRecipe/pizza_recipe.dart b/lib/entities/PizzaRecipe/pizza_recipe.dart index d9c19f4..d201515 100644 --- a/lib/entities/PizzaRecipe/pizza_recipe.dart +++ b/lib/entities/PizzaRecipe/pizza_recipe.dart @@ -94,7 +94,7 @@ class PizzaRecipe extends HiveObject { static Future fromParsedYaml(YamlMap recipeIn) async { var recipe = recipeIn; - if (!recipeIn.containsKey("recipe")){ + if (recipeIn.containsKey("recipe")){ recipe = recipeIn["recipe"] as YamlMap; } final String name = recipe["name"] as String; diff --git a/lib/pages/add_pizza_event_page.dart b/lib/pages/add_pizza_event_page.dart index 5145e8e..40c657f 100644 --- a/lib/pages/add_pizza_event_page.dart +++ b/lib/pages/add_pizza_event_page.dart @@ -105,13 +105,12 @@ class AddPizzaEventPageState extends State { ) ] ), - widget.pizzaRecipe.getIngredientsTable(pizzaCount, doughBallSize), + Expanded(child: widget.pizzaRecipe.getIngredientsTable(pizzaCount, doughBallSize)) ] ) ), - const Divider(), Expanded( - flex: 45, + flex: 40, child: ListView( children: [ Column( diff --git a/pubspec.yaml b/pubspec.yaml index 609b253..0858272 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.0 +version: 1.3.0 environment: sdk: ">=2.12.0 <3.0.0"