Skip to content

Commit 7bd4089

Browse files
authored
Merge pull request #242 from skdotv/bug-fix/232
added code: string? in ingredient.dart
2 parents 8ee9aaa + 67003a5 commit 7bd4089

26 files changed

+2337
-670
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# The .vscode folder contains launch configuration and tasks you configure in
1919
# VS Code which you may wish to be included in version control, so this line
2020
# is commented out by default.
21-
#.vscode/
21+
.vscode/
2222

2323
# Flutter/Dart/Pub related
2424
**/doc/api/
@@ -31,6 +31,7 @@
3131
.pub/
3232
/build/
3333

34+
3435
# Web related
3536
lib/generated_plugin_registrant.dart
3637

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"dart.lineLength": 100
2+
"dart.lineLength": 100,
3+
"diffEditor.ignoreTrimWhitespace": true,
34
}

ios/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
4446
</dict>
4547
</plist>

lib/models/body_weight/weight_entry.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/category.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/exercise.g.dart

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/image.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/measurements/measurement_category.g.dart

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/measurements/measurement_entry.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/nutrition/ingredient.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Ingredient {
2727

2828
/// Barcode of the product
2929
@JsonKey(required: true)
30-
final String code;
30+
final String? code;
3131

3232
/// Name of the product
3333
@JsonKey(required: true)

0 commit comments

Comments
 (0)