Skip to content

Commit

Permalink
Merge branch 'release/new_recipe_screen' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Teifun2 committed Aug 15, 2020
2 parents 34de89e + f7cd859 commit 893a790
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
35 changes: 17 additions & 18 deletions lib/src/screens/recipe_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:nextcloud_cookbook_flutter/src/blocs/recipe/recipe.dart';
import 'package:nextcloud_cookbook_flutter/src/models/recipe.dart';
import 'package:nextcloud_cookbook_flutter/src/models/recipe_short.dart';
import 'package:nextcloud_cookbook_flutter/src/screens/recipe_edit_screen.dart';
import 'package:nextcloud_cookbook_flutter/src/widget/authentication_cached_network_image.dart';
import 'package:nextcloud_cookbook_flutter/src/widget/duration_indicator.dart';
import 'package:url_launcher/url_launcher.dart';
Expand Down Expand Up @@ -39,23 +38,23 @@ class RecipeScreenState extends State<RecipeScreen> {
appBar: AppBar(
title: Text("Recipe"),
),
floatingActionButton: FloatingActionButton(
onPressed: () {
if (state is RecipeLoadSuccess) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return BlocProvider.value(
value: recipeBloc,
child: RecipeEditScreen(state.recipe));
},
),
);
}
},
child: Icon(Icons.edit),
),
// floatingActionButton: FloatingActionButton(
// onPressed: () {
// if (state is RecipeLoadSuccess) {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) {
// return BlocProvider.value(
// value: recipeBloc,
// child: RecipeEditScreen(state.recipe));
// },
// ),
// );
// }
// },
// child: Icon(Icons.edit),
// ),
body: () {
if (state is RecipeLoadSuccess) {
return _buildRecipeScreen(state.recipe);
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: A new Flutter application.
# 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: 0.3.1+7
version: 0.3.2+8

environment:
sdk: ">=2.6.0 <3.0.0"
Expand Down

0 comments on commit 893a790

Please sign in to comment.