aboutsummaryrefslogtreecommitdiff
path: root/lib/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'lib/widgets')
-rw-r--r--lib/widgets/error_widgets.dart6
-rw-r--r--lib/widgets/recipe_card_widget.dart14
-rw-r--r--lib/widgets/recipe_search_delegate.dart28
-rw-r--r--lib/widgets/utility_icon_row_widget.dart34
4 files changed, 41 insertions, 41 deletions
diff --git a/lib/widgets/error_widgets.dart b/lib/widgets/error_widgets.dart
index e17e409..356a997 100644
--- a/lib/widgets/error_widgets.dart
+++ b/lib/widgets/error_widgets.dart
@@ -9,7 +9,7 @@ class NoContentError extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return Container(
+ return SizedBox(
width: double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -35,7 +35,7 @@ class NetworkContentError extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return Container(
+ return SizedBox(
width: double.infinity,
child: Padding(
padding: const EdgeInsets.all(50.0),
@@ -74,7 +74,7 @@ class UnknownError extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return Container(
+ return SizedBox(
width: double.infinity,
child: Padding(
padding: const EdgeInsets.all(50.0),
diff --git a/lib/widgets/recipe_card_widget.dart b/lib/widgets/recipe_card_widget.dart
index a3db5f7..fab88aa 100644
--- a/lib/widgets/recipe_card_widget.dart
+++ b/lib/widgets/recipe_card_widget.dart
@@ -3,11 +3,11 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:kulinar_app/constants.dart';
+import 'package:kulinar_app/models/recipe_class.dart';
import 'package:kulinar_app/models/data/recipe_data_class.dart';
import 'package:kulinar_app/models/data/settings_data_class.dart';
-import 'package:kulinar_app/views/recipe_view.dart';
-import 'package:kulinar_app/models/recipe_class.dart';
import 'package:kulinar_app/widgets/page_route_transitions.dart';
+import 'package:kulinar_app/views/recipe_subview.dart';
class RecipeCard extends StatefulWidget {
const RecipeCard({Key? key, this.remote = false, this.inSearch = false, required this.recipe, this.redrawCallback, this.showToastCallback}) : super(key: key);
@@ -54,7 +54,7 @@ class RecipeCardState extends State<RecipeCard> {
await Navigator.push(
context,
SlideFromBottomRoute(
- child: RecipeView(
+ child: RecipeSubview(
remote: widget.remote,
recipe: widget.recipe,
redrawCallback: widget.redrawCallback,
@@ -118,16 +118,16 @@ class _RecipeInfoState extends State<_RecipeInfo> {
}
List<Widget> _buildRating(int rating) {
- List<Widget> _result = [];
+ List<Widget> result = [];
- if (rating == 0) return _result;
+ if (rating == 0) return result;
for (int i = 0; i < 5; i++) {
- _result.add(rating >= 1 ? const Icon(Icons.star_rounded) : const Icon(Icons.star_border_rounded));
+ result.add(rating >= 1 ? const Icon(Icons.star_rounded) : const Icon(Icons.star_border_rounded));
rating--;
}
- return _result;
+ return result;
}
Widget _buildRecipeInfo() {
diff --git a/lib/widgets/recipe_search_delegate.dart b/lib/widgets/recipe_search_delegate.dart
index cd58b29..f260dc1 100644
--- a/lib/widgets/recipe_search_delegate.dart
+++ b/lib/widgets/recipe_search_delegate.dart
@@ -30,21 +30,21 @@ class RecipeSearch extends SearchDelegate {
@override
Widget buildResults(BuildContext context) {
- List<Recipe> _filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase())).toList();
+ List<Recipe> filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase())).toList();
return ListView.builder(
- itemCount: _filteredRecipeList.length,
- itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: _filteredRecipeList[index]),
+ itemCount: filteredRecipeList.length,
+ itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: filteredRecipeList[index]),
);
}
@override
Widget buildSuggestions(BuildContext context) {
- List<Recipe> _filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase())).toList();
+ List<Recipe> filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase())).toList();
return ListView.builder(
- itemCount: _filteredRecipeList.length,
- itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: _filteredRecipeList[index]),
+ itemCount: filteredRecipeList.length,
+ itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: filteredRecipeList[index]),
);
}
@@ -52,7 +52,7 @@ class RecipeSearch extends SearchDelegate {
ThemeData appBarTheme(BuildContext context) {
return Theme.of(context).copyWith(
textTheme: const TextTheme(
- headline6: cSearchTextStyle,
+ titleLarge: cSearchTextStyle,
),
);
}
@@ -83,21 +83,21 @@ class FavoriteRecipeSearch extends SearchDelegate {
@override
Widget buildResults(BuildContext context) {
- List<Recipe> _filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase()) && element.favorite).toList();
+ List<Recipe> filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase()) && element.favorite).toList();
return ListView.builder(
- itemCount: _filteredRecipeList.length,
- itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: _filteredRecipeList[index]),
+ itemCount: filteredRecipeList.length,
+ itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: filteredRecipeList[index]),
);
}
@override
Widget buildSuggestions(BuildContext context) {
- List<Recipe> _filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase()) && element.favorite).toList();
+ List<Recipe> filteredRecipeList = RecipeData.recipeList.where((element) => element.title!.toLowerCase().contains(query.toLowerCase()) && element.favorite).toList();
return ListView.builder(
- itemCount: _filteredRecipeList.length,
- itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: _filteredRecipeList[index]),
+ itemCount: filteredRecipeList.length,
+ itemBuilder: (context, index) => RecipeCard(inSearch: true, recipe: filteredRecipeList[index]),
);
}
@@ -105,7 +105,7 @@ class FavoriteRecipeSearch extends SearchDelegate {
ThemeData appBarTheme(BuildContext context) {
return Theme.of(context).copyWith(
textTheme: const TextTheme(
- headline6: cSearchTextStyle,
+ titleLarge: cSearchTextStyle,
),
);
}
diff --git a/lib/widgets/utility_icon_row_widget.dart b/lib/widgets/utility_icon_row_widget.dart
index 8270ab0..a09c733 100644
--- a/lib/widgets/utility_icon_row_widget.dart
+++ b/lib/widgets/utility_icon_row_widget.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:kulinar_app/constants.dart';
-import 'package:kulinar_app/models/data/settings_data_class.dart';
import 'package:kulinar_app/models/recipe_class.dart';
import 'package:kulinar_app/models/data/recipe_data_class.dart';
+import 'package:kulinar_app/models/data/settings_data_class.dart';
class UtilityIconRow extends StatefulWidget {
const UtilityIconRow({
@@ -32,7 +32,7 @@ class UtilityIconRow extends StatefulWidget {
}
class UtilityIconRowState extends State<UtilityIconRow> {
- bool _isInputSourceCamera = SettingsData.settings["photoSource"] == "0" ? true : false;
+ final _isInputSourceCamera = SettingsData.settings["photoSource"] == "0" ? true : false;
@override
Widget build(BuildContext context) {
@@ -64,20 +64,20 @@ class UtilityIconRowState extends State<UtilityIconRow> {
}
IconButton _buildButtonAddImage() {
- Icon _pickImageIcon;
- Icon _removeImageIcon;
- bool _recipeHasImage = widget.unsavedRecipe.image == null;
+ Icon pickImageIcon;
+ Icon removeImageIcon;
+ bool recipeHasImage = widget.unsavedRecipe.image == null;
if (_isInputSourceCamera) {
- _pickImageIcon = const Icon(Icons.add_a_photo_rounded);
- _removeImageIcon = const Icon(Icons.no_photography_rounded);
+ pickImageIcon = const Icon(Icons.add_a_photo_rounded);
+ removeImageIcon = const Icon(Icons.no_photography_rounded);
} else {
- _pickImageIcon = const Icon(Icons.add_photo_alternate_rounded);
- _removeImageIcon = const Icon(Icons.image_not_supported_rounded);
+ pickImageIcon = const Icon(Icons.add_photo_alternate_rounded);
+ removeImageIcon = const Icon(Icons.image_not_supported_rounded);
}
- void _onPress() {
- if (_recipeHasImage) {
+ void onPress() {
+ if (recipeHasImage) {
widget.pickImageCallback();
} else {
widget.removeImageCallback();
@@ -85,13 +85,13 @@ class UtilityIconRowState extends State<UtilityIconRow> {
}
return IconButton(
- icon: _recipeHasImage ? _pickImageIcon : _removeImageIcon,
- onPressed: widget.isEditModeEnabled ? null : _onPress,
+ icon: recipeHasImage ? pickImageIcon : removeImageIcon,
+ onPressed: widget.isEditModeEnabled ? null : onPress,
);
}
Widget _buildIconRating(BuildContext context) {
- void _onPress() {
+ void onPress() {
widget.unsavedRecipe.updateRating();
widget.cacheUnsavedRecipeCallback();
RecipeData.save();
@@ -108,7 +108,7 @@ class UtilityIconRowState extends State<UtilityIconRow> {
IconButton(
iconSize: 28.0,
icon: const Icon(Icons.star_border_rounded),
- onPressed: !widget.remote ? _onPress : null,
+ onPressed: !widget.remote ? onPress : null,
),
],
);
@@ -123,7 +123,7 @@ class UtilityIconRowState extends State<UtilityIconRow> {
color = Colors.red;
}
- void _onPress() {
+ void onPress() {
widget.unsavedRecipe.toggleFavorite();
widget.cacheUnsavedRecipeCallback();
RecipeData.save();
@@ -134,7 +134,7 @@ class UtilityIconRowState extends State<UtilityIconRow> {
return IconButton(
icon: icon,
color: color,
- onPressed: !widget.remote ? _onPress : null,
+ onPressed: !widget.remote ? onPress : null,
);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 04:39:48 +0000