Merge branch 'master' into indonesia-language-translate

Author: rolandgeider

.gitignore

@@ -18,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -31,6 +31,7 @@
 .pub/
 /build/
 
+
 # Web related
 lib/generated_plugin_registrant.dart
 

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "dart.lineLength": 100
+    "dart.lineLength": 100,
+    "diffEditor.ignoreTrimWhitespace": true,
 }

AUTHORS.md

@@ -14,6 +14,7 @@
 - Karthik Reddy (Axel) - <https://github.com/AxelBlaz3>
 - Ogundoyin Toluwani - <https://github.com/Tolu007>
 - Nenza Nurfirmansyah - <https://github.com/nenzan>
+- Florian Schmitz - <https://github.com/floodoo>
 
 ## Translators
 

android/app/build.gradle

@@ -51,7 +51,7 @@ if (localMapsPropertiesFile.exists()) {
 def wgerApiKey = wgerProperties.getProperty('WGER_API_KEY')
 if(wgerApiKey == null){
     wgerApiKey = ""
-    project.logger.error('Wger Api Key not configured. Set it in `app/wger.properties` or in the environment variable `WGER_API_KEY`')
+    project.logger.error('Wger Api Key not configured. Set it in `/fastlane/metadata/android/envfiles/wger.properties` or in the environment variable `WGER_API_KEY`')
 }
 
 android {

android/fastlane/envfiles/wger.properties

@@ -41,5 +41,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

ios/Runner/Info.plist

@@ -93,8 +93,8 @@ extension TimeOfDayExtension on TimeOfDay {
 }
 
 void launchURL(String url, BuildContext context) async {
-  await canLaunch(url)
-      ? await launch(url)
+  await canLaunchUrl(Uri.parse(url))
+      ? await launchUrl(Uri.parse(url))
       : ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text('Could not open $url.')),
         );

lib/helpers/misc.dart

@@ -27,7 +27,7 @@ class Ingredient {
 
   /// Barcode of the product
   @JsonKey(required: true)
-  final String code;
+  final String? code;
 
   /// Name of the product
   @JsonKey(required: true)

lib/models/nutrition/ingredient.dart

@@ -91,7 +91,7 @@ class NutritionalValues {
 
   @override
   //ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => hashValues(
+  int get hashCode => Object.hash(
       energy, protein, carbohydrates, carbohydratesSugar, fat, fatSaturated, fibres, sodium);
 }