Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

Merge branch 'main' into deepLinks

Browse Source
This commit is contained in:
Username1548
2025-07-02 19:06:04 +07:00
parent e80b660210 4bed103cec
commit be5a858c73
13 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -388,7 +388,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 38;
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -538,7 +538,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 38;
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -576,7 +576,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 38;
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (

2
ios/Runner/Info.plist
View File

@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>37</string>
<string>38</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

2
lib/features/blog_post/presentation/pages/blog_post_screen.dart
View File

@@ -242,7 +242,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
if (blogPostState.blogPostModel?.description.isNotEmpty ?? false)
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8),
child: Html(data: blogPostState.blogPostModel?.description, style: {"*": Style(color: Colors.black87)}),
child: Html(data: blogPostState.blogPostModel?.description.replaceAll('\n', '<br>'), style: {"*": Style(color: Colors.black87)}),
),
const SizedBox(height: 8),
if (blogPostState.blogPostModel?.image.isNotEmpty ?? false)

5
lib/features/dev_tools/presentation/dev_tools_screen.dart
View File

@@ -1,6 +1,7 @@
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/firebase_api.dart';
import 'package:eatvio_app/core/locator_service.dart';
@@ -170,7 +171,7 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
// Show AlertDialog with error description
if (context.mounted) {
showDialog(
context: context,
context: AppRouter.navigatorKey.currentContext!,
builder: (context) => AlertDialog(
title: const Text('Test Failed'),
content: SingleChildScrollView(child: Text(result.error ?? 'No error details.')),
@@ -192,7 +193,7 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
// Show AlertDialog with error description
if (context.mounted) {
showDialog(
context: context,
context: AppRouter.navigatorKey.currentContext!,
builder: (context) => AlertDialog(
title: const Text('Test Failed'),
content: SingleChildScrollView(child: Text('$e\n$stack')),

4
lib/features/feed/presentation/widgets/blog_post_widget.dart
View File

@@ -156,9 +156,9 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Html(
data: state.feedBlogPostList[widget.index].description.length > 200
data: (state.feedBlogPostList[widget.index].description.length > 200
? state.feedBlogPostList[widget.index].description.substring(0, 200)
: state.feedBlogPostList[widget.index].description,
: state.feedBlogPostList[widget.index].description).replaceAll('\n', '<br>'),
style: {
"*": Style(
fontSize: FontSize(16),

2
lib/features/feed/presentation/widgets/diets_widget.dart
View File

@@ -131,7 +131,7 @@ class _DietsWidgetState extends State<DietsWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Html(
data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200)}...' : widget.diet.details,
data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.diet.details.replaceAll('\n', '<br>'),
style: {
"*": Style(
margin: Margins.zero,

2
lib/features/feed/presentation/widgets/plan_widget.dart
View File

@@ -137,7 +137,7 @@ class _PlanWidgetState extends State<PlanWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Html(
data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200)}...' : widget.plan.details,
data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.plan.details.replaceAll('\n', '<br>'),
style: {
"*": Style(
margin: Margins.zero,

4
lib/features/feed/presentation/widgets/recipes_widget.dart
View File

@@ -164,7 +164,9 @@ class _RecipesWidgetState extends State<RecipesWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Html(
data: widget.recipe.description.length > 200 ? widget.recipe.description.substring(0, 200) : widget.recipe.description,
data: widget.recipe.description.length > 200
? widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')
: widget.recipe.description.replaceAll('\n', '<br>'),
style: {
"*": Style(
color: appTheme.black,

2
lib/features/my_diets/presentation/widgets/my_diet_widget.dart
View File

@@ -89,7 +89,7 @@ class _MyDietWidgetState extends State<MyDietWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Html(
data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200)}...' : widget.diet.details,
data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.diet.details.replaceAll('\n', '<br>'),
style: {
"*": Style(
margin: Margins.zero,

2
lib/features/my_plans/presentation/widgets/my_plan_widget.dart
View File

@@ -87,7 +87,7 @@ class _MyPlanWidgetState extends State<MyPlanWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Html(
data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200)}...' : widget.plan.details,
data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.plan.details.replaceAll('\n', '<br>'),
style: {
"*": Style(
margin: Margins.zero,

4
lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
View File

@@ -128,8 +128,8 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Html(
data: state.blogPosts[widget.index].description.length > 200
? state.blogPosts[widget.index].description.substring(0, 200)
: state.blogPosts[widget.index].description,
? state.blogPosts[widget.index].description.substring(0, 200).replaceAll('\n', '<br>')
: state.blogPosts[widget.index].description.replaceAll('\n', '<br>'),
style: {
"*": Style(
fontSize: FontSize(16),

4
lib/features/recipe/presentation/widgets/my_recipe_widget.dart
View File

@@ -111,7 +111,9 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Html(
data: widget.recipe.description.length > 200 ? '${widget.recipe.description.substring(0, 200)}...' : widget.recipe.description,
data: widget.recipe.description.length > 200
? '${widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')}...'
: widget.recipe.description.replaceAll('\n', '<br>'),
style: {
"*": Style(
margin: Margins.zero,

34
pubspec.yaml
View File

@@ -1,6 +1,6 @@
name: eatvio_app
description: A new Flutter project.
version: 1.1.14+44
version: 1.1.15+45
publish_to: 'none'
environment:
@@ -16,19 +16,19 @@ dependencies:
flutter_secure_storage: ^9.2.4
flutter_bloc: ^9.1.1
cached_network_image: ^3.4.1
flutter_svg: ^2.1.0
flutter_svg: ^2.2.0
equatable: ^2.0.7
freezed_annotation: ^3.0.0
json_annotation: ^4.9.0
validators: ^3.0.0
path_provider: ^2.1.5
carousel_slider_plus: ^7.1.0
carousel_slider_plus: ^7.1.1
flutter_form_builder: ^10.0.1
image_picker: ^1.1.2
flutter_typeahead: ^5.2.0
go_router: ^15.2.3
go_router: ^16.0.0
keyboard_dismisser: ^3.0.0
retrofit: ^4.4.2
retrofit: ^4.5.0
get_it: ^8.0.3
dio: ^5.8.0+1
dart_pusher_channels: ^1.2.3
@@ -38,14 +38,14 @@ dependencies:
easy_debounce: ^2.0.3
badges: ^3.1.2
google_fonts: ^6.2.1
syncfusion_flutter_charts: ^30.1.37
syncfusion_flutter_gauges: ^30.1.37
syncfusion_flutter_charts: ^30.1.38
syncfusion_flutter_gauges: ^30.1.38
table_calendar: ^3.2.0
flutter_keyboard_visibility: ^6.0.0
share_plus: ^11.0.0
flutter_html: ^3.0.0
file_picker: ^10.1.9
audioplayers: ^6.4.0
file_picker: ^10.2.0
audioplayers: ^6.5.0
intl: ^0.20.2
mask_text_input_formatter: ^2.9.0
lottie: ^3.3.1
@@ -54,27 +54,27 @@ dependencies:
flutter_rating_bar: ^4.0.1
flutter_image_compress: ^2.4.0
image: ^4.5.4
dotted_border: ^3.0.1
dotted_border: ^3.1.0
http: ^1.4.0
flutter_native_splash: ^2.4.6
webview_flutter: ^4.12.0
sentry_flutter: ^8.14.2
webview_flutter: ^4.13.0
sentry_flutter: ^9.2.0
connectivity_plus: ^6.1.4
visibility_detector: ^0.4.0+2
firebase_core: ^3.13.1
firebase_messaging: ^15.2.6
firebase_core: ^3.15.0
firebase_messaging: ^15.2.8
http_parser: ^4.1.2
path: ^1.9.1
collection: ^1.19.1
shared_preferences: ^2.5.3
version: ^3.0.2
package_info_plus: ^8.3.0
device_info_plus: ^11.4.0
device_info_plus: ^11.5.0
permission_handler: ^12.0.0+1
qr_code_scanner_plus: ^2.0.10+1
dev_dependencies:
build_runner: ^2.4.15
build_runner: ^2.5.4
freezed: ^3.0.6
json_serializable: ^6.9.5
retrofit_generator: ^9.2.0
@@ -83,7 +83,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^6.0.0
flutter_lints: ^5.0.0
flutter:
uses-material-design: true