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

diet creation scrren is done

Browse Source
This commit is contained in:
Username1548
2024-12-11 19:15:25 +07:00
parent 2e0a8c559f
commit 2f168a2f35
63 changed files with 3113 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/app_router.dart
View File

@@ -112,9 +112,14 @@ class AppRouter {
GoRoute(
path: '/about-plan-screen',
name: 'aboutPlanScreen',
builder: (context, state) => AboutPlanScreen(
planModel: state.extra as PlanModel,
),
builder: (context, state) {
final data = state.extra as Map<String, dynamic>;
return AboutPlanScreen(
plan: data['plan'] as PlanModel,
// index: data['index'] as int,
navigateToComments: data['navigateToComments'] as bool,
);
},
),
GoRoute(
path: '/about-recipes-screen',

11
lib/core/locator_service.dart
View File

@@ -30,12 +30,16 @@ import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.da
import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:eatvio_app/features/feed/services/feed_service.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
import 'package:eatvio_app/features/glossary/services/glossary_service.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
import 'package:eatvio_app/features/plans/services/plan_service.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
@@ -78,9 +82,10 @@ Future<void> init() async {
sl.registerFactory<AboutDietCubit>(() => AboutDietCubit(dietsRepository: sl()));
sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
sl.registerFactory<CreateDietCubit>(() => CreateDietCubit( profileRepository: sl(),createDietRepository: sl(), glossaryRepository: sl()));
sl.registerFactory<CreateDietCubit>(() => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl()));
sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit());
sl.registerFactory<FeedProfileCubit>(() => FeedProfileCubit(profileRepository: sl()));
sl.registerFactory<AboutPlanCubit>(() => AboutPlanCubit(planRepository: sl()));
// Repository
sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));
@@ -96,6 +101,7 @@ Future<void> init() async {
sl.registerLazySingleton<DietRepository>(() => DietRepository(dietsService: sl()));
sl.registerLazySingleton<BlogPostRepository>(() => BlogPostRepository(blogPostService: sl()));
sl.registerLazySingleton<CreateDietRepository>(() => CreateDietRepository(createDietService: sl()));
sl.registerLazySingleton<PlanRepository>(() => PlanRepository(planService: sl()));
// Services
sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
@@ -111,6 +117,7 @@ Future<void> init() async {
sl.registerLazySingleton<DietService>(() => DietService(sl()));
sl.registerLazySingleton<BlogPostService>(() => BlogPostService(sl()));
sl.registerLazySingleton<CreateDietService>(() => CreateDietService(sl()));
sl.registerLazySingleton<PlanService>(() => PlanService(sl()));
// External
sl.registerLazySingleton(

6
lib/core/theme/theme_helper.dart
View File

@@ -178,10 +178,14 @@ class PrimaryColors {
Color get transparentBlue => Color(0xFF2F80ED).withOpacity(0.1);
Color get lightGray0 => Color(0xFFF6F6F6);
Color get lightGray00 => Color(0xFFE9E9EA);
Color get dottedBorder => Color(0xFFE6E6E6);
Color get red => Color(0xFFCD4141);
Color get transparentBlack => Color(0xFF1313264).withOpacity(0.3);
}
PrimaryColors get appTheme => ThemeHelper().themeColor();

4
lib/core/utils/string_extentions.dart
View File

@@ -1,8 +1,4 @@
extension Capitalization on String {
String capitalize() {
return "${this[0].toUpperCase()}${substring(1).toLowerCase()}";
}

34
lib/core/widgets/animated_option_button.dart Normal file
View File

@@ -0,0 +1,34 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter/material.dart';
class AnimatedOptionButton extends StatelessWidget {
const AnimatedOptionButton({required this.text, required this.isSelected, required this.onTap});
final String text;
final bool isSelected;
final void Function() onTap;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: AnimatedContainer(
duration: const Duration(milliseconds: 300),
height: 40,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: isSelected ? appTheme.blueA400 : appTheme.whiteA700,
),
child: Center(
child: AnimatedDefaultTextStyle(
duration: const Duration(milliseconds: 300),
style: TextStyles.textMSemibold.copyWith(
color: isSelected ? appTheme.whiteA700 : appTheme.black,
),
child: Text(text),
),
),
),
);
}
}

12
lib/core/widgets/custom_drop_down_button.dart
View File

@@ -9,11 +9,13 @@ class CustomDropDownButton<T> extends StatelessWidget {
required this.onChanged,
this.value,
this.hint,
this.hasError = false,
});
final T? value;
final List<DropdownMenuItem<T>> items;
final void Function(T?)? onChanged;
final Widget? hint;
final bool hasError;
@override
Widget build(BuildContext context) {
return DropdownButtonFormField(
@@ -28,7 +30,15 @@ class CustomDropDownButton<T> extends StatelessWidget {
decoration: InputDecoration(
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide.none,
borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none,
),
enabledBorder: OutlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(20)),
borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none,
),
focusedBorder: OutlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(20)),
borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none,
),
fillColor: appTheme.lightGray0,
filled: true,

11
lib/core/widgets/custom_text_form_field.dart
View File

@@ -39,6 +39,7 @@ class CustomTextFormField extends StatelessWidget {
this.textAlignVertical,
this.counter = const SizedBox.shrink(),
super.key,
this.hasError = false,
});
final Widget? counter;
final Alignment? alignment;
@@ -74,12 +75,12 @@ class CustomTextFormField extends StatelessWidget {
final int? maxLength;
final bool expands;
final TextAlignVertical? textAlignVertical;
final bool hasError;
@override
Widget build(BuildContext context) {
return Align(
alignment: alignment ?? Alignment.center,
child: TextFormField(
child: TextFormField(
textAlignVertical: textAlignVertical,
expands: expands,
minLines: minLines,
@@ -123,17 +124,17 @@ class CustomTextFormField extends StatelessWidget {
border: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(20),
borderSide: BorderSide.none,
borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none,
),
enabledBorder: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(20),
borderSide: BorderSide.none,
borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none,
),
focusedBorder: borderDecoration ??
OutlineInputBorder(
borderRadius: BorderRadius.circular(20),
borderSide: BorderSide.none,
borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none,
),
),
keyboardType: keyboardType,

35
lib/core/widgets/diet_info_row.dart
View File

@@ -3,19 +3,29 @@ import 'package:eatvio_app/core/utils/localization_utils.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/type_badges.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
class DietInfoRow extends StatelessWidget {
const DietInfoRow({super.key, required this.diet, this.itemsBackgroundColor, this.disableDescriptionOfTypes = false});
class InfoRow extends StatelessWidget {
const InfoRow({
super.key,
this.diet,
this.itemsBackgroundColor,
this.disableDescriptionOfTypes = false,
this.plan,
});
final Color? itemsBackgroundColor;
final Diet diet;
final Diet? diet;
final PlanModel? plan;
final bool disableDescriptionOfTypes;
@override
Widget build(BuildContext context) {
final s = S.of(context);
return SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 16),
scrollDirection: Axis.horizontal,
@@ -31,7 +41,7 @@ class DietInfoRow extends StatelessWidget {
),
SizedBox(width: 4),
Text(
diet.duration.toString() + ' ' + getDayForm(diet.duration, s),
diet == null ? '${plan?.duration} ${getDayForm(plan?.duration ?? 7, s)}' : '${plan?.duration} ${getDayForm(plan?.duration ?? 7, s)}',
style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
),
],
@@ -53,12 +63,17 @@ class DietInfoRow extends StatelessWidget {
],
),
SizedBox(width: 12),
InfoBouble(
backgroundColor: itemsBackgroundColor,
children: [
TypeBadges(type: diet.type, disableDescriptionOfTypes: disableDescriptionOfTypes),
],
),
if (plan?.type.hasAtLeastOneType() == true || diet?.type.hasAtLeastOneType() == true)
InfoBouble(
backgroundColor: itemsBackgroundColor,
children: [
TypeBadges(
type: diet?.type,
planType: plan?.type,
disableDescriptionOfTypes: disableDescriptionOfTypes,
),
],
),
],
),
);

34
lib/core/widgets/main_background_bouble.dart
View File

@@ -2,31 +2,41 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter/material.dart';
class MainBackgroundBouble extends StatelessWidget {
const MainBackgroundBouble(
{super.key, required this.child, this.width, this.padding, this.enableShadow = false,});
const MainBackgroundBouble({
super.key,
required this.child,
this.width,
this.padding,
this.enableShadow = false,
this.hasError = false,
});
final double? width;
final Widget child;
final bool enableShadow;
final bool hasError;
final EdgeInsetsGeometry? padding;
@override
Widget build(BuildContext context) {
return DecoratedBox(
decoration: BoxDecoration(
boxShadow: enableShadow
? [
BoxShadow(
color: Color(0x00000000).withOpacity(0.2),
spreadRadius: 0,
blurRadius: 32,
offset: Offset(0, 0),
),
]
: null,),
border: hasError ? Border.all(color: appTheme.red, width: 1) : null,
boxShadow: enableShadow
? [
BoxShadow(
color: Color(0x00000000).withOpacity(0.2),
spreadRadius: 0,
blurRadius: 32,
offset: Offset(0, 0),
),
]
: null,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
child: Container(
decoration: BoxDecoration(
color: appTheme.whiteA700,
border: hasError ? Border.all(color: appTheme.red, width: 1) : null,
),
width: width ?? MediaQuery.sizeOf(context).width,
padding: padding,