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

feat(order info): added order info screen

Browse Source
This commit is contained in:
Username1548
2025-04-04 20:21:31 +07:00
parent 9715f4cac9
commit 748484cf8f
387 changed files with 16171 additions and 18199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
analysis_options.yaml
View File

@@ -1,5 +1,10 @@
include: package:flutter_lints/flutter.yaml
linter:
rules:
prefer_const_constructors: true
prefer_const_declarations: true
prefer_const_literals_to_create_immutables: true
analyzer:
exclude:

75
lib/core/app_router.dart
View File

@@ -9,11 +9,12 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/b
import 'package:eatvio_app/features/calendar/presentation/pages/calendar_screen.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
import 'package:eatvio_app/features/consultations/presentation/pages/consultations_screen.dart';
import 'package:eatvio_app/features/consultations/presentation/pages/info_by_order_screen.dart';
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
import 'package:eatvio_app/features/create_diet/presentation/diet_preview_screen.dart';
import 'package:eatvio_app/features/create_plan/presentation/create_plan_screen.dart';
@@ -34,6 +35,7 @@ import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_s
import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
import 'package:eatvio_app/features/notifications/presentation/pages/notifications_screen.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
@@ -77,9 +79,9 @@ class AppRouter {
return BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
builder: (BuildContext context, ProfileAvatarState state) {
if (state is ProfileAvatarStateLoaded) {
return BottomNavigationBarWidget(child: child, profileModel: state.profile);
return BottomNavigationBarWidget(profileModel: state.profile, child: child);
}
return SizedBox.shrink();
return const SizedBox.shrink();
},
);
},
@@ -92,25 +94,30 @@ class AppRouter {
return null;
},
pageBuilder: (context, state) {
return NoTransitionPage(child: ProfileScreen());
return const NoTransitionPage(child: ProfileScreen());
},
),
GoRoute(path: '/feed-screen', name: 'feedScreen', pageBuilder: (context, state) => NoTransitionPage(child: FeedScreen())),
GoRoute(path: '/diary-screen', name: 'diaryScreen', pageBuilder: (context, state) => NoTransitionPage(child: DiaryScreen())),
GoRoute(path: '/consultations-screen', name: 'consultationsScreen', pageBuilder: (context, state) => NoTransitionPage(child: ConsultationsScreen())),
GoRoute(path: '/chat-select-screen', name: 'chatSelectScreen', pageBuilder: (context, state) => NoTransitionPage(child: ChatsScreen())),
GoRoute(path: '/notifications-screen', name: 'notificationsScreen', pageBuilder: (context, state) => NoTransitionPage(child: NotificationsScreen())),
GoRoute(path: '/feed-screen', name: 'feedScreen', pageBuilder: (context, state) => const NoTransitionPage(child: FeedScreen())),
GoRoute(path: '/diary-screen', name: 'diaryScreen', pageBuilder: (context, state) => const NoTransitionPage(child: DiaryScreen())),
GoRoute(
path: '/consultations-screen',
name: 'consultationsScreen',
pageBuilder: (context, state) => const NoTransitionPage(child: ConsultationsScreen())),
GoRoute(path: '/chat-select-screen', name: 'chatSelectScreen', pageBuilder: (context, state) => const NoTransitionPage(child: ChatsScreen())),
GoRoute(
path: '/notifications-screen',
name: 'notificationsScreen',
pageBuilder: (context, state) => const NoTransitionPage(child: NotificationsScreen())),
GoRoute(
path: '/menu-screen',
name: 'menuScreen',
pageBuilder:
(context, state) => NoTransitionPage(
pageBuilder: (context, state) => NoTransitionPage(
child: BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
builder: (BuildContext context, ProfileAvatarState state) {
if (state is ProfileAvatarStateLoaded) {
return MenuScreen(profileModel: state.profile);
}
return SizedBox.shrink();
return const SizedBox.shrink();
},
),
),
@@ -120,17 +127,17 @@ class AppRouter {
GoRoute(
path: '/consultant-finance-screen',
name: 'consultantFinanceScreen',
builder: (context, state) => ConsultantFinanceScreen(),
builder: (context, state) => const ConsultantFinanceScreen(),
),
GoRoute(
path: '/user-finance-screen',
name: 'userFinanceScreen',
builder: (context, state) => UserFinanceScreen(),
builder: (context, state) => const UserFinanceScreen(),
),
GoRoute(
path: CardSettingsScreen.path,
name: CardSettingsScreen.name,
builder: (context, state) => CardSettingsScreen(),
builder: (context, state) => const CardSettingsScreen(),
),
GoRoute(
path: '/about-plan-screen',
@@ -140,7 +147,7 @@ class AppRouter {
return AboutPlanScreen(plan: data['plan'] as PlanModel, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
},
),
GoRoute(path: '/glossary-screen', name: 'glossaryScreen', builder: (context, state) => GlossaryScreen()),
GoRoute(path: '/glossary-screen', name: 'glossaryScreen', builder: (context, state) => const GlossaryScreen()),
GoRoute(
path: '/about-recipes-screen',
name: 'aboutRecipesScreen',
@@ -149,7 +156,7 @@ class AppRouter {
return AboutRecipeScreen(recipe: data['recipe'] as Recipe, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
},
),
GoRoute(path: RecipeCreateScreen.path, name: RecipeCreateScreen.name, builder: (context, state) => RecipeCreateScreen()),
GoRoute(path: RecipeCreateScreen.path, name: RecipeCreateScreen.name, builder: (context, state) => const RecipeCreateScreen()),
GoRoute(path: '/profile-screen', name: 'profileScreen', builder: (context, state) => ProfileScreen(author: state.extra as Author)),
GoRoute(
path: '/subs-screen/:slug',
@@ -182,7 +189,7 @@ class AppRouter {
GoRoute(
path: '/settings-screen',
name: 'settingsScreen',
builder: (context, state) => SettingsScreen(),
builder: (context, state) => const SettingsScreen(),
routes: [
GoRoute(
path: 'general-info-screen',
@@ -217,10 +224,11 @@ class AppRouter {
),
],
),
GoRoute(path: '/become-consultant-screen', name: 'becomeConsultantScreen', builder: (context, state) => BecomeConsultantScreen()),
GoRoute(path: '/stepper-become-consultant-screen', name: 'stepperBecomeConsultantScreen', builder: (context, state) => StepperBecomeConsultantScreen()),
GoRoute(path: '/calendar-screen', name: 'calendarScreen', builder: (context, state) => CalendarScreen()),
GoRoute(path: '/support-screen', name: 'supportScreen', builder: (context, state) => SupportScreen()),
GoRoute(path: '/become-consultant-screen', name: 'becomeConsultantScreen', builder: (context, state) => const BecomeConsultantScreen()),
GoRoute(
path: '/stepper-become-consultant-screen', name: 'stepperBecomeConsultantScreen', builder: (context, state) => const StepperBecomeConsultantScreen()),
GoRoute(path: '/calendar-screen', name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
GoRoute(path: '/support-screen', name: 'supportScreen', builder: (context, state) => const SupportScreen()),
GoRoute(
path: '/photo-view-screen/:index',
name: 'photoViewScreen',
@@ -242,13 +250,24 @@ class AppRouter {
return DietPreviewScreen(diet: data);
},
),
GoRoute(path: CreatePlanScreen.path, name: CreatePlanScreen.name, builder: (context, state) => CreatePlanScreen()),
GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => MyDietsScreen()),
GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => MyPlansScreen()),
GoRoute(path: CreatePlanScreen.path, name: CreatePlanScreen.name, builder: (context, state) => const CreatePlanScreen()),
GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => const MyDietsScreen()),
GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
GoRoute(path: UserDetailsScreen.path, name: UserDetailsScreen.name, builder: (context, state) => UserDetailsScreen(slug: state.extra as String)),
GoRoute(path: DevToolsScreen.path, name: DevToolsScreen.name, builder: (context, state) => DevToolsScreen()),
GoRoute(path: ConsultantRatingScreen.path, name: ConsultantRatingScreen.name, builder: (context, state) => ConsultantRatingScreen()),
GoRoute(path: InfoByOrderScreen.path, name: InfoByOrderScreen.name, builder: (context, state) => InfoByOrderScreen()),
GoRoute(path: DevToolsScreen.path, name: DevToolsScreen.name, builder: (context, state) => const DevToolsScreen()),
GoRoute(path: ConsultantRatingScreen.path, name: ConsultantRatingScreen.name, builder: (context, state) => const ConsultantRatingScreen()),
GoRoute(
path: InfoByOrderScreen.path,
name: InfoByOrderScreen.name,
builder: (context, state) => InfoByOrderScreen(
plan: state.extra as ChosenPlanModel,
)),
GoRoute(
path: PaymentScreen.path,
name: PaymentScreen.name,
builder: (context, state) => PaymentScreen(
url: state.extra as String,
)),
],
);
}

4
lib/core/const.dart
View File

@@ -1,5 +1,5 @@
String baseUrl = 'https://eatvio.ru';
// String baseUrl = 'https://dev2.eatvio.com';
// String baseUrl = 'https://eatvio.ru';
String baseUrl = 'https://dev2.eatvio.com';
const List<int> durationValues = [7, 14, 21];

14
lib/core/credentials_storage.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
abstract class CredentialsStorage {
static Future<bool> haveCredentialsInStorage() async {
try {
if (await FlutterSecureStorage().read(key: 'email') == null || await FlutterSecureStorage().read(key: 'password') == null) {
if (await const FlutterSecureStorage().read(key: 'email') == null || await const FlutterSecureStorage().read(key: 'password') == null) {
return false;
} else {
return true;
@@ -15,18 +15,18 @@ abstract class CredentialsStorage {
static Future<Map<String, String>> getCredentialsFromStorage() async {
return {
'email': (await FlutterSecureStorage().read(key: 'email'))!,
'password': (await FlutterSecureStorage().read(key: 'password'))!,
'email': (await const FlutterSecureStorage().read(key: 'email'))!,
'password': (await const FlutterSecureStorage().read(key: 'password'))!,
};
}
static saveCredentials(String email, String password) async {
await FlutterSecureStorage().write(key: 'email', value: email);
await FlutterSecureStorage().write(key: 'password', value: password);
await const FlutterSecureStorage().write(key: 'email', value: email);
await const FlutterSecureStorage().write(key: 'password', value: password);
}
static removeCredentials() async {
await FlutterSecureStorage().delete(key: 'email');
await FlutterSecureStorage().delete(key: 'password');
await const FlutterSecureStorage().delete(key: 'email');
await const FlutterSecureStorage().delete(key: 'password');
}
}

87
lib/core/data/selectionPopupModel/selection_popup_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'selection_popup_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$SelectionPopupModel {
@@ -32,9 +31,8 @@ mixin _$SelectionPopupModel {
/// @nodoc
abstract class $SelectionPopupModelCopyWith<$Res> {
factory $SelectionPopupModelCopyWith(
SelectionPopupModel value,
$Res Function(SelectionPopupModel) then,
) = _$SelectionPopupModelCopyWithImpl<$Res, SelectionPopupModel>;
SelectionPopupModel value, $Res Function(SelectionPopupModel) then) =
_$SelectionPopupModelCopyWithImpl<$Res, SelectionPopupModel>;
@useResult
$Res call({int? id, String title, dynamic value, bool isSelected});
}
@@ -59,41 +57,33 @@ class _$SelectionPopupModelCopyWithImpl<$Res, $Val extends SelectionPopupModel>
Object? value = freezed,
Object? isSelected = null,
}) {
return _then(
_value.copyWith(
id:
freezed == id
return _then(_value.copyWith(
id: freezed == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int?,
title:
null == title
title: null == title
? _value.title
: title // ignore: cast_nullable_to_non_nullable
as String,
value:
freezed == value
value: freezed == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as dynamic,
isSelected:
null == isSelected
isSelected: null == isSelected
? _value.isSelected
: isSelected // ignore: cast_nullable_to_non_nullable
as bool,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$SelectionPopupModelImplCopyWith<$Res>
implements $SelectionPopupModelCopyWith<$Res> {
factory _$$SelectionPopupModelImplCopyWith(
_$SelectionPopupModelImpl value,
$Res Function(_$SelectionPopupModelImpl) then,
) = __$$SelectionPopupModelImplCopyWithImpl<$Res>;
factory _$$SelectionPopupModelImplCopyWith(_$SelectionPopupModelImpl value,
$Res Function(_$SelectionPopupModelImpl) then) =
__$$SelectionPopupModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int? id, String title, dynamic value, bool isSelected});
@@ -103,10 +93,9 @@ abstract class _$$SelectionPopupModelImplCopyWith<$Res>
class __$$SelectionPopupModelImplCopyWithImpl<$Res>
extends _$SelectionPopupModelCopyWithImpl<$Res, _$SelectionPopupModelImpl>
implements _$$SelectionPopupModelImplCopyWith<$Res> {
__$$SelectionPopupModelImplCopyWithImpl(
_$SelectionPopupModelImpl _value,
$Res Function(_$SelectionPopupModelImpl) _then,
) : super(_value, _then);
__$$SelectionPopupModelImplCopyWithImpl(_$SelectionPopupModelImpl _value,
$Res Function(_$SelectionPopupModelImpl) _then)
: super(_value, _then);
/// Create a copy of SelectionPopupModel
/// with the given fields replaced by the non-null parameter values.
@@ -118,42 +107,32 @@ class __$$SelectionPopupModelImplCopyWithImpl<$Res>
Object? value = freezed,
Object? isSelected = null,
}) {
return _then(
_$SelectionPopupModelImpl(
id:
freezed == id
return _then(_$SelectionPopupModelImpl(
id: freezed == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int?,
title:
null == title
title: null == title
? _value.title
: title // ignore: cast_nullable_to_non_nullable
as String,
value:
freezed == value
value: freezed == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as dynamic,
isSelected:
null == isSelected
isSelected: null == isSelected
? _value.isSelected
: isSelected // ignore: cast_nullable_to_non_nullable
as bool,
),
);
));
}
}
/// @nodoc
class _$SelectionPopupModelImpl implements _SelectionPopupModel {
const _$SelectionPopupModelImpl({
this.id,
required this.title,
this.value,
this.isSelected = false,
});
const _$SelectionPopupModelImpl(
{this.id, required this.title, this.value, this.isSelected = false});
@override
final int? id;
@@ -183,13 +162,8 @@ class _$SelectionPopupModelImpl implements _SelectionPopupModel {
}
@override
int get hashCode => Object.hash(
runtimeType,
id,
title,
const DeepCollectionEquality().hash(value),
isSelected,
);
int get hashCode => Object.hash(runtimeType, id, title,
const DeepCollectionEquality().hash(value), isSelected);
/// Create a copy of SelectionPopupModel
/// with the given fields replaced by the non-null parameter values.
@@ -198,18 +172,15 @@ class _$SelectionPopupModelImpl implements _SelectionPopupModel {
@pragma('vm:prefer-inline')
_$$SelectionPopupModelImplCopyWith<_$SelectionPopupModelImpl> get copyWith =>
__$$SelectionPopupModelImplCopyWithImpl<_$SelectionPopupModelImpl>(
this,
_$identity,
);
this, _$identity);
}
abstract class _SelectionPopupModel implements SelectionPopupModel {
const factory _SelectionPopupModel({
final int? id,
const factory _SelectionPopupModel(
{final int? id,
required final String title,
final dynamic value,
final bool isSelected,
}) = _$SelectionPopupModelImpl;
final bool isSelected}) = _$SelectionPopupModelImpl;
@override
int? get id;

6
lib/core/locator_service.dart
View File

@@ -79,7 +79,7 @@ import 'package:eatvio_app/features/settings/services/settings_service.dart';
import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:get_it/get_it.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profilePlans;
import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
final sl = GetIt.instance;
@@ -98,7 +98,7 @@ Future<void> init() async {
sl.registerFactory<RecipesCubit>(() => RecipesCubit(feedRepository: sl(), recipeRepository: sl(), aboutRecipeRepository: sl()));
sl.registerFactory<CalendarCubit>(() => CalendarCubit(calendarRepository: sl()));
sl.registerFactory<ProfileCubit>(() => ProfileCubit(profileRepository: sl(), chatRepository: sl()));
sl.registerFactory<profilePlans.PlansCubit>(() => profilePlans.PlansCubit(plansRepository: sl()));
sl.registerFactory<profile_plans.PlansCubit>(() => profile_plans.PlansCubit(plansRepository: sl()));
sl.registerFactory<DietsCubit>(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl()));
sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
@@ -173,5 +173,5 @@ Future<void> init() async {
sl.registerLazySingleton(
() => Dio(BaseOptions(baseUrl: baseUrl, headers: {'accept': 'application/json', 'content-type': 'application/json'}))..interceptors.add(TokenInterceptor()),
);
sl.registerLazySingleton(() async => await FlutterSecureStorage());
sl.registerLazySingleton(() async => const FlutterSecureStorage());
}

267
lib/core/models/pagination_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'pagination_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
Links _$LinksFromJson(Map<String, dynamic> json) {
return _Links.fromJson(json);
@@ -44,12 +43,11 @@ abstract class $LinksCopyWith<$Res> {
factory $LinksCopyWith(Links value, $Res Function(Links) then) =
_$LinksCopyWithImpl<$Res, Links>;
@useResult
$Res call({
@JsonKey(name: "first") String first,
$Res call(
{@JsonKey(name: "first") String first,
@JsonKey(name: "last") String last,
@JsonKey(name: "prev") dynamic prev,
@JsonKey(name: "next") dynamic next,
});
@JsonKey(name: "next") dynamic next});
}
/// @nodoc
@@ -72,48 +70,39 @@ class _$LinksCopyWithImpl<$Res, $Val extends Links>
Object? prev = freezed,
Object? next = freezed,
}) {
return _then(
_value.copyWith(
first:
null == first
return _then(_value.copyWith(
first: null == first
? _value.first
: first // ignore: cast_nullable_to_non_nullable
as String,
last:
null == last
last: null == last
? _value.last
: last // ignore: cast_nullable_to_non_nullable
as String,
prev:
freezed == prev
prev: freezed == prev
? _value.prev
: prev // ignore: cast_nullable_to_non_nullable
as dynamic,
next:
freezed == next
next: freezed == next
? _value.next
: next // ignore: cast_nullable_to_non_nullable
as dynamic,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$LinksImplCopyWith<$Res> implements $LinksCopyWith<$Res> {
factory _$$LinksImplCopyWith(
_$LinksImpl value,
$Res Function(_$LinksImpl) then,
) = __$$LinksImplCopyWithImpl<$Res>;
_$LinksImpl value, $Res Function(_$LinksImpl) then) =
__$$LinksImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "first") String first,
$Res call(
{@JsonKey(name: "first") String first,
@JsonKey(name: "last") String last,
@JsonKey(name: "prev") dynamic prev,
@JsonKey(name: "next") dynamic next,
});
@JsonKey(name: "next") dynamic next});
}
/// @nodoc
@@ -121,9 +110,8 @@ class __$$LinksImplCopyWithImpl<$Res>
extends _$LinksCopyWithImpl<$Res, _$LinksImpl>
implements _$$LinksImplCopyWith<$Res> {
__$$LinksImplCopyWithImpl(
_$LinksImpl _value,
$Res Function(_$LinksImpl) _then,
) : super(_value, _then);
_$LinksImpl _value, $Res Function(_$LinksImpl) _then)
: super(_value, _then);
/// Create a copy of Links
/// with the given fields replaced by the non-null parameter values.
@@ -135,42 +123,35 @@ class __$$LinksImplCopyWithImpl<$Res>
Object? prev = freezed,
Object? next = freezed,
}) {
return _then(
_$LinksImpl(
first:
null == first
return _then(_$LinksImpl(
first: null == first
? _value.first
: first // ignore: cast_nullable_to_non_nullable
as String,
last:
null == last
last: null == last
? _value.last
: last // ignore: cast_nullable_to_non_nullable
as String,
prev:
freezed == prev
prev: freezed == prev
? _value.prev
: prev // ignore: cast_nullable_to_non_nullable
as dynamic,
next:
freezed == next
next: freezed == next
? _value.next
: next // ignore: cast_nullable_to_non_nullable
as dynamic,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$LinksImpl implements _Links {
const _$LinksImpl({
@JsonKey(name: "first") required this.first,
const _$LinksImpl(
{@JsonKey(name: "first") required this.first,
@JsonKey(name: "last") required this.last,
@JsonKey(name: "prev") required this.prev,
@JsonKey(name: "next") required this.next,
});
@JsonKey(name: "next") required this.next});
factory _$LinksImpl.fromJson(Map<String, dynamic> json) =>
_$$LinksImplFromJson(json);
@@ -211,8 +192,7 @@ class _$LinksImpl implements _Links {
first,
last,
const DeepCollectionEquality().hash(prev),
const DeepCollectionEquality().hash(next),
);
const DeepCollectionEquality().hash(next));
/// Create a copy of Links
/// with the given fields replaced by the non-null parameter values.
@@ -224,17 +204,18 @@ class _$LinksImpl implements _Links {
@override
Map<String, dynamic> toJson() {
return _$$LinksImplToJson(this);
return _$$LinksImplToJson(
this,
);
}
}
abstract class _Links implements Links {
const factory _Links({
@JsonKey(name: "first") required final String first,
const factory _Links(
{@JsonKey(name: "first") required final String first,
@JsonKey(name: "last") required final String last,
@JsonKey(name: "prev") required final dynamic prev,
@JsonKey(name: "next") required final dynamic next,
}) = _$LinksImpl;
@JsonKey(name: "next") required final dynamic next}) = _$LinksImpl;
factory _Links.fromJson(Map<String, dynamic> json) = _$LinksImpl.fromJson;
@@ -300,8 +281,8 @@ abstract class $MetaCopyWith<$Res> {
factory $MetaCopyWith(Meta value, $Res Function(Meta) then) =
_$MetaCopyWithImpl<$Res, Meta>;
@useResult
$Res call({
@JsonKey(name: "current_page") int currentPage,
$Res call(
{@JsonKey(name: "current_page") int currentPage,
@JsonKey(name: "from") dynamic from,
@JsonKey(name: "last_page") int lastPage,
@JsonKey(name: "links") List<Link> links,
@@ -310,8 +291,7 @@ abstract class $MetaCopyWith<$Res> {
@JsonKey(name: "to") dynamic to,
@JsonKey(name: "total") int total,
@JsonKey(name: "total_min_price") int? totalMinPrice,
@JsonKey(name: "total_max_price") int? totalMaxPrice,
});
@JsonKey(name: "total_max_price") int? totalMaxPrice});
}
/// @nodoc
@@ -340,74 +320,60 @@ class _$MetaCopyWithImpl<$Res, $Val extends Meta>
Object? totalMinPrice = freezed,
Object? totalMaxPrice = freezed,
}) {
return _then(
_value.copyWith(
currentPage:
null == currentPage
return _then(_value.copyWith(
currentPage: null == currentPage
? _value.currentPage
: currentPage // ignore: cast_nullable_to_non_nullable
as int,
from:
freezed == from
from: freezed == from
? _value.from
: from // ignore: cast_nullable_to_non_nullable
as dynamic,
lastPage:
null == lastPage
lastPage: null == lastPage
? _value.lastPage
: lastPage // ignore: cast_nullable_to_non_nullable
as int,
links:
null == links
links: null == links
? _value.links
: links // ignore: cast_nullable_to_non_nullable
as List<Link>,
path:
freezed == path
path: freezed == path
? _value.path
: path // ignore: cast_nullable_to_non_nullable
as String?,
perPage:
null == perPage
perPage: null == perPage
? _value.perPage
: perPage // ignore: cast_nullable_to_non_nullable
as int,
to:
freezed == to
to: freezed == to
? _value.to
: to // ignore: cast_nullable_to_non_nullable
as dynamic,
total:
null == total
total: null == total
? _value.total
: total // ignore: cast_nullable_to_non_nullable
as int,
totalMinPrice:
freezed == totalMinPrice
totalMinPrice: freezed == totalMinPrice
? _value.totalMinPrice
: totalMinPrice // ignore: cast_nullable_to_non_nullable
as int?,
totalMaxPrice:
freezed == totalMaxPrice
totalMaxPrice: freezed == totalMaxPrice
? _value.totalMaxPrice
: totalMaxPrice // ignore: cast_nullable_to_non_nullable
as int?,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$MetaImplCopyWith<$Res> implements $MetaCopyWith<$Res> {
factory _$$MetaImplCopyWith(
_$MetaImpl value,
$Res Function(_$MetaImpl) then,
) = __$$MetaImplCopyWithImpl<$Res>;
_$MetaImpl value, $Res Function(_$MetaImpl) then) =
__$$MetaImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "current_page") int currentPage,
$Res call(
{@JsonKey(name: "current_page") int currentPage,
@JsonKey(name: "from") dynamic from,
@JsonKey(name: "last_page") int lastPage,
@JsonKey(name: "links") List<Link> links,
@@ -416,8 +382,7 @@ abstract class _$$MetaImplCopyWith<$Res> implements $MetaCopyWith<$Res> {
@JsonKey(name: "to") dynamic to,
@JsonKey(name: "total") int total,
@JsonKey(name: "total_min_price") int? totalMinPrice,
@JsonKey(name: "total_max_price") int? totalMaxPrice,
});
@JsonKey(name: "total_max_price") int? totalMaxPrice});
}
/// @nodoc
@@ -443,68 +408,56 @@ class __$$MetaImplCopyWithImpl<$Res>
Object? totalMinPrice = freezed,
Object? totalMaxPrice = freezed,
}) {
return _then(
_$MetaImpl(
currentPage:
null == currentPage
return _then(_$MetaImpl(
currentPage: null == currentPage
? _value.currentPage
: currentPage // ignore: cast_nullable_to_non_nullable
as int,
from:
freezed == from
from: freezed == from
? _value.from
: from // ignore: cast_nullable_to_non_nullable
as dynamic,
lastPage:
null == lastPage
lastPage: null == lastPage
? _value.lastPage
: lastPage // ignore: cast_nullable_to_non_nullable
as int,
links:
null == links
links: null == links
? _value._links
: links // ignore: cast_nullable_to_non_nullable
as List<Link>,
path:
freezed == path
path: freezed == path
? _value.path
: path // ignore: cast_nullable_to_non_nullable
as String?,
perPage:
null == perPage
perPage: null == perPage
? _value.perPage
: perPage // ignore: cast_nullable_to_non_nullable
as int,
to:
freezed == to
to: freezed == to
? _value.to
: to // ignore: cast_nullable_to_non_nullable
as dynamic,
total:
null == total
total: null == total
? _value.total
: total // ignore: cast_nullable_to_non_nullable
as int,
totalMinPrice:
freezed == totalMinPrice
totalMinPrice: freezed == totalMinPrice
? _value.totalMinPrice
: totalMinPrice // ignore: cast_nullable_to_non_nullable
as int?,
totalMaxPrice:
freezed == totalMaxPrice
totalMaxPrice: freezed == totalMaxPrice
? _value.totalMaxPrice
: totalMaxPrice // ignore: cast_nullable_to_non_nullable
as int?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$MetaImpl implements _Meta {
const _$MetaImpl({
@JsonKey(name: "current_page") required this.currentPage,
const _$MetaImpl(
{@JsonKey(name: "current_page") required this.currentPage,
@JsonKey(name: "from") required this.from,
@JsonKey(name: "last_page") required this.lastPage,
@JsonKey(name: "links") required final List<Link> links,
@@ -513,8 +466,8 @@ class _$MetaImpl implements _Meta {
@JsonKey(name: "to") required this.to,
@JsonKey(name: "total") required this.total,
@JsonKey(name: "total_min_price") this.totalMinPrice,
@JsonKey(name: "total_max_price") this.totalMaxPrice,
}) : _links = links;
@JsonKey(name: "total_max_price") this.totalMaxPrice})
: _links = links;
factory _$MetaImpl.fromJson(Map<String, dynamic> json) =>
_$$MetaImplFromJson(json);
@@ -595,8 +548,7 @@ class _$MetaImpl implements _Meta {
const DeepCollectionEquality().hash(to),
total,
totalMinPrice,
totalMaxPrice,
);
totalMaxPrice);
/// Create a copy of Meta
/// with the given fields replaced by the non-null parameter values.
@@ -608,13 +560,15 @@ class _$MetaImpl implements _Meta {
@override
Map<String, dynamic> toJson() {
return _$$MetaImplToJson(this);
return _$$MetaImplToJson(
this,
);
}
}
abstract class _Meta implements Meta {
const factory _Meta({
@JsonKey(name: "current_page") required final int currentPage,
const factory _Meta(
{@JsonKey(name: "current_page") required final int currentPage,
@JsonKey(name: "from") required final dynamic from,
@JsonKey(name: "last_page") required final int lastPage,
@JsonKey(name: "links") required final List<Link> links,
@@ -623,8 +577,7 @@ abstract class _Meta implements Meta {
@JsonKey(name: "to") required final dynamic to,
@JsonKey(name: "total") required final int total,
@JsonKey(name: "total_min_price") final int? totalMinPrice,
@JsonKey(name: "total_max_price") final int? totalMaxPrice,
}) = _$MetaImpl;
@JsonKey(name: "total_max_price") final int? totalMaxPrice}) = _$MetaImpl;
factory _Meta.fromJson(Map<String, dynamic> json) = _$MetaImpl.fromJson;
@@ -694,11 +647,10 @@ abstract class $LinkCopyWith<$Res> {
factory $LinkCopyWith(Link value, $Res Function(Link) then) =
_$LinkCopyWithImpl<$Res, Link>;
@useResult
$Res call({
@JsonKey(name: "url") String? url,
$Res call(
{@JsonKey(name: "url") String? url,
@JsonKey(name: "label") String? label,
@JsonKey(name: "active") bool? active,
});
@JsonKey(name: "active") bool? active});
}
/// @nodoc
@@ -720,42 +672,34 @@ class _$LinkCopyWithImpl<$Res, $Val extends Link>
Object? label = freezed,
Object? active = freezed,
}) {
return _then(
_value.copyWith(
url:
freezed == url
return _then(_value.copyWith(
url: freezed == url
? _value.url
: url // ignore: cast_nullable_to_non_nullable
as String?,
label:
freezed == label
label: freezed == label
? _value.label
: label // ignore: cast_nullable_to_non_nullable
as String?,
active:
freezed == active
active: freezed == active
? _value.active
: active // ignore: cast_nullable_to_non_nullable
as bool?,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$LinkImplCopyWith<$Res> implements $LinkCopyWith<$Res> {
factory _$$LinkImplCopyWith(
_$LinkImpl value,
$Res Function(_$LinkImpl) then,
) = __$$LinkImplCopyWithImpl<$Res>;
_$LinkImpl value, $Res Function(_$LinkImpl) then) =
__$$LinkImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "url") String? url,
$Res call(
{@JsonKey(name: "url") String? url,
@JsonKey(name: "label") String? label,
@JsonKey(name: "active") bool? active,
});
@JsonKey(name: "active") bool? active});
}
/// @nodoc
@@ -774,36 +718,30 @@ class __$$LinkImplCopyWithImpl<$Res>
Object? label = freezed,
Object? active = freezed,
}) {
return _then(
_$LinkImpl(
url:
freezed == url
return _then(_$LinkImpl(
url: freezed == url
? _value.url
: url // ignore: cast_nullable_to_non_nullable
as String?,
label:
freezed == label
label: freezed == label
? _value.label
: label // ignore: cast_nullable_to_non_nullable
as String?,
active:
freezed == active
active: freezed == active
? _value.active
: active // ignore: cast_nullable_to_non_nullable
as bool?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$LinkImpl implements _Link {
const _$LinkImpl({
@JsonKey(name: "url") this.url,
const _$LinkImpl(
{@JsonKey(name: "url") this.url,
@JsonKey(name: "label") this.label,
@JsonKey(name: "active") this.active,
});
@JsonKey(name: "active") this.active});
factory _$LinkImpl.fromJson(Map<String, dynamic> json) =>
_$$LinkImplFromJson(json);
@@ -847,16 +785,17 @@ class _$LinkImpl implements _Link {
@override
Map<String, dynamic> toJson() {
return _$$LinkImplToJson(this);
return _$$LinkImplToJson(
this,
);
}
}
abstract class _Link implements Link {
const factory _Link({
@JsonKey(name: "url") final String? url,
const factory _Link(
{@JsonKey(name: "url") final String? url,
@JsonKey(name: "label") final String? label,
@JsonKey(name: "active") final bool? active,
}) = _$LinkImpl;
@JsonKey(name: "active") final bool? active}) = _$LinkImpl;
factory _Link.fromJson(Map<String, dynamic> json) = _$LinkImpl.fromJson;

3
lib/core/models/pagination_model.g.dart
View File

@@ -25,8 +25,7 @@ _$MetaImpl _$$MetaImplFromJson(Map<String, dynamic> json) => _$MetaImpl(
currentPage: (json['current_page'] as num).toInt(),
from: json['from'],
lastPage: (json['last_page'] as num).toInt(),
links:
(json['links'] as List<dynamic>)
links: (json['links'] as List<dynamic>)
.map((e) => Link.fromJson(e as Map<String, dynamic>))
.toList(),
path: json['path'] as String?,

8
lib/core/theme/app_decoration.dart
View File

@@ -80,7 +80,7 @@ class BorderRadiusStyle {
color: appTheme.black900.withValues(alpha: 0.15),
spreadRadius: 2,
blurRadius: 2,
offset: Offset(
offset: const Offset(
0,
2,
),
@@ -110,15 +110,15 @@ class BorderRadiusStyle {
);
// Custom borders
static BorderRadius get customBorderBL8 => BorderRadius.only(
static BorderRadius get customBorderBL8 => const BorderRadius.only(
bottomLeft: Radius.circular(8),
);
static BorderRadius get customBorderTL5 => BorderRadius.vertical(
static BorderRadius get customBorderTL5 => const BorderRadius.vertical(
top: Radius.circular(5),
);
static BorderRadius get customBorderTL51 => BorderRadius.only(
static BorderRadius get customBorderTL51 => const BorderRadius.only(
topLeft: Radius.circular(5),
bottomRight: Radius.circular(5),
);

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

@@ -5,15 +5,15 @@ import 'package:google_fonts/google_fonts.dart';
/// Helper class for managing themes and colors.
class ThemeHelper {
// The current app theme
var _appTheme = 'primary';
final _appTheme = 'primary';
// A map of custom color themes supported by the app
Map<String, PrimaryColors> _supportedCustomColor = {
final Map<String, PrimaryColors> _supportedCustomColor = {
'primary': PrimaryColors(),
};
// A map of color schemes supported by the app
Map<String, ColorScheme> _supportedColorScheme = {
final Map<String, ColorScheme> _supportedColorScheme = {
'primary': ColorSchemes.primaryColorScheme,
};
@@ -46,7 +46,7 @@ class ThemeHelper {
visualDensity: VisualDensity.standard,
colorScheme: colorScheme,
scaffoldBackgroundColor: colorScheme.onPrimary,
appBarTheme: AppBarTheme(
appBarTheme: const AppBarTheme(
scrolledUnderElevation: 0,
elevation: 0,
systemOverlayStyle: SystemUiOverlayStyle(
@@ -86,7 +86,7 @@ class ThemeHelper {
/// Class containing the supported color schemes.
class ColorSchemes {
static final primaryColorScheme = ColorScheme.light(
static const primaryColorScheme = ColorScheme.light(
// Primary colors
primary: Color(0XFF323F4B),
@@ -99,102 +99,103 @@ class ColorSchemes {
/// Class containing custom colors for a primary theme.
class PrimaryColors {
// Blue
Color get blue400 => Color(0XFF43A6F2);
Color get blue400 => const Color(0XFF43A6F2);
Color get blueA400 => Color(0XFF2F80ED);
Color get blueA400 => const Color(0XFF2F80ED);
// BlueGray
Color get blueGray400 => Color(0XFF7B8794);
Color get blueGray400 => const Color(0XFF7B8794);
Color get black900 => Color(0XFF000000);
Color get black900 => const Color(0XFF000000);
// Blue
Color get blue800 => Color(0XFF1F78B4);
Color get blue800 => const Color(0XFF1F78B4);
// BlueGray
Color get blueGray300 => Color(0XFF9AA5B1);
Color get blueGray300 => const Color(0XFF9AA5B1);
Color get black => Color(0XFF323F4B);
Color get black => const Color(0XFF323F4B);
Color get blueGray900 => Color(0XFF2A2F4C);
Color get blueGray900 => const Color(0XFF2A2F4C);
// DeepOrange
Color get deepOrange900 => Color(0XFF9A4A00);
Color get deepOrange900 => const Color(0XFF9A4A00);
// Gray
Color get gray100 => Color(0XFFF0F2F5);
Color get gray100 => const Color(0XFFF0F2F5);
Color get gray200 => Color(0XFFF0F0F0);
Color get gray200 => const Color(0XFFF0F0F0);
Color get gray400 => Color(0XFFC1C1C1);
Color get gray400 => const Color(0XFFC1C1C1);
Color get gray40001 => Color(0XFFC8C8C8);
Color get gray40001 => const Color(0XFFC8C8C8);
Color get gray50 => Color(0XFFF6FAFF);
Color get gray50 => const Color(0XFFF6FAFF);
Color get gray500 => Color(0XFFA3A3A3);
Color get gray500 => const Color(0XFFA3A3A3);
Color get gray600 => Color(0XFF6D6D6D);
Color get gray600 => const Color(0XFF6D6D6D);
Color get gray60001 => Color(0XFF848484);
Color get gray60001 => const Color(0XFF848484);
Color get gray60002 => Color(0XFF757575);
Color get gray60002 => const Color(0XFF757575);
Color get gray60003 => Color(0XFF707070);
Color get gray60003 => const Color(0XFF707070);
// Green
Color get greenA700 => Color(0XFF019A3E);
Color get greenA700 => const Color(0XFF019A3E);
Color get greenA70001 => Color(0XFF00BE13);
Color get greenA70001 => const Color(0XFF00BE13);
// LightGreen
Color get lightGreen300 => Color(0XFFB2DF8A);
Color get lightGreen300 => const Color(0XFFB2DF8A);
Color get lightGreenA700 => Color(0XFF18FF14);
Color get lightGreenA700 => const Color(0XFF18FF14);
// Red
Color get red200 => Color(0XFFE3A6A6);
Color get red200 => const Color(0XFFE3A6A6);
// Teal
Color get teal100 => Color(0XFFA6CEE3);
Color get teal100 => const Color(0XFFA6CEE3);
Color get teal900 => Color(0XFF0B3F56);
Color get teal900 => const Color(0XFF0B3F56);
// White
Color get whiteA700 => Color(0XFFFFFFFF);
Color get whiteA700 => const Color(0XFFFFFFFF);
Color get backgroundAvatar => Color(0xFFEBF4FF);
Color get backgroundAvatar => const Color(0xFFEBF4FF);
Color get cardBackground => Color(0xFFF7FAFF);
Color get cardBackground => const Color(0xFFF7FAFF);
Color get dividerColor => Color(0xFFF1F2F6);
Color get dividerColor => const Color(0xFFF1F2F6);
Color get gray => Color(0xFF6D6F71);
Color get gray => const Color(0xFF6D6F71);
Color get lightGray600 => Color(0xFFB0B0B0);
Color get lightGray600 => const Color(0xFFB0B0B0);
Color get lightGray => Color(0xFFCECECE);
Color get lightGray => const Color(0xFFCECECE);
Color get transparentBlue => Color(0xFF2F80ED).withValues(alpha: 0.1);
Color get transparentBlue => const Color(0xFF2F80ED).withValues(alpha: 0.1);
Color get lightGray0 => Color(0xFFF6F6F6);
Color get lightGray0 => const Color(0xFFF6F6F6);
Color get lightGray00 => Color(0xFFE9E9EA);
Color get lightGray00 => const Color(0xFFE9E9EA);
Color get dottedBorder => Color(0xFFE6E6E6);
Color get dottedBorder => const Color(0xFFE6E6E6);
Color get red => Color(0xFFCD4141);
Color get strongRed => Color(0xFFD01717);
Color get red => const Color(0xFFCD4141);
Color get strongRed => const Color(0xFFD01717);
Color get transparentRed => Color(0xFFCD4141).withValues(alpha: 0.75);
Color get transparentRed => const Color(0xFFCD4141).withValues(alpha: 0.75);
Color get transparentBlack => Color(0xFF1313264).withValues(alpha: 0.3);
// ignore: use_full_hex_values_for_flutter_colors
Color get transparentBlack => const Color(0xff1313264).withValues(alpha: 0.3);
Color get gray60004 => Color(0xFFD4DAE2).withValues(alpha: 0.2);
Color get gray60004 => const Color(0xFFD4DAE2).withValues(alpha: 0.2);
Color get blueGray => Color(0xFF809CB9);
Color get blueGray => const Color(0xFF809CB9);
Color get dialogShadow => Color.fromARGB(125, 0, 0, 0);
Color get dialogShadow => const Color.fromARGB(125, 0, 0, 0);
}
PrimaryColors get appTheme => ThemeHelper().themeColor();

8
lib/core/token_storage.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
abstract class TokenStorage {
static Future<bool> haveTokenInStorage() async {
try {
if (await FlutterSecureStorage().read(key: 'token') == null) {
if (await const FlutterSecureStorage().read(key: 'token') == null) {
return false;
} else {
return true;
@@ -13,11 +13,11 @@ abstract class TokenStorage {
}
}
static Future<String?> getTokenFromStorage() async => await FlutterSecureStorage().read(key: 'token');
static Future<String?> getTokenFromStorage() async => await const FlutterSecureStorage().read(key: 'token');
static saveTokenInStorage(String token) async {
await FlutterSecureStorage().write(key: 'token', value: token);
await const FlutterSecureStorage().write(key: 'token', value: token);
}
static Future<void> removeTokenInStorage() async => (await FlutterSecureStorage().delete(key: 'token'));
static Future<void> removeTokenInStorage() async => (await const FlutterSecureStorage().delete(key: 'token'));
}

6
lib/core/utils/localization_utils.dart
View File

@@ -3,11 +3,11 @@ import 'package:eatvio_app/generated/l10n.dart';
String getLocalizedMeasurementUnits(S s, Portion portion) {
switch (portion) {
case Portion.GRAMS:
case Portion.grams:
return s.gr;
case Portion.MILLILITERS:
case Portion.milliliters:
return s.milliliter;
case Portion.PCS:
case Portion.pcs:
return s.pcs;
}
}

18
lib/core/websockets/ws_manager.dart
View File

@@ -27,7 +27,7 @@ class WsManager {
Stream<ChannelReadEvent>? get clientTypingStream => _privateDirectChatChannel?.bind('client-typing');
Future<void> initialize() async {
if (this.client == null) {
if (client == null) {
try {
await TokenStorage.haveTokenInStorage();
final wsUrl = await wsService.getWebsocket();
@@ -37,7 +37,7 @@ class WsManager {
key: wsUrl.key,
host: wsUrl.host,
shouldSupplyMetadataQueries: true,
metadata: PusherChannelsOptionsMetadata.byDefault(),
metadata: const PusherChannelsOptionsMetadata.byDefault(),
port: 443,
);
client = PusherChannelsClient.websocket(
@@ -58,7 +58,7 @@ class WsManager {
await client?.connect();
this.client = client;
client = client;
userId = wsUrl.userId;
await _initPrivateNotificationsChannel();
@@ -82,10 +82,10 @@ class WsManager {
Future<void> _initPrivateNotificationsChannel() async {
final token = await TokenStorage.getTokenFromStorage();
_privateNotificationChannel = await client?.privateChannel(
_privateNotificationChannel = client?.privateChannel(
'$newNotificationsChannelName.$userId',
authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
authorizationEndpoint: Uri.parse(baseUrl + '/broadcasting/auth'),
authorizationEndpoint: Uri.parse('$baseUrl/broadcasting/auth'),
headers: {
'Authorization': 'Bearer $token',
},
@@ -95,10 +95,10 @@ class WsManager {
Future<void> _initPrivateMessagesChannel() async {
final token = await TokenStorage.getTokenFromStorage();
_privateMessagesChannel = await client?.privateChannel(
_privateMessagesChannel = client?.privateChannel(
'$newMessagesChannelName.$userId',
authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
authorizationEndpoint: Uri.parse(baseUrl + '/broadcasting/auth'),
authorizationEndpoint: Uri.parse('$baseUrl/broadcasting/auth'),
headers: {
'Authorization': 'Bearer $token',
},
@@ -108,10 +108,10 @@ class WsManager {
Future<void> initPrivateDirectChatChannel(String chatId) async {
final token = await TokenStorage.getTokenFromStorage();
_privateDirectChatChannel = await client?.privateChannel(
_privateDirectChatChannel = client?.privateChannel(
'$directChatChannelName.$chatId',
authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
authorizationEndpoint: Uri.parse(baseUrl + '/broadcasting/auth'),
authorizationEndpoint: Uri.parse('$baseUrl/broadcasting/auth'),
headers: {
'Authorization': 'Bearer $token',
},

4
lib/core/widgets/add_item_button.dart
View File

@@ -18,12 +18,12 @@ class AddItemButton extends StatelessWidget {
color: appTheme.blueA400,
shape: BoxShape.circle,
),
width: 40,
height: 40,
child: Icon(
Icons.add_rounded,
color: appTheme.gray100,
),
width: 40,
height: 40,
),
);
}

2
lib/core/widgets/animated_option_button.dart
View File

@@ -3,7 +3,7 @@ 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, this.textStyle});
const AnimatedOptionButton({super.key, required this.text, required this.isSelected, required this.onTap, this.textStyle});
final String text;
final bool isSelected;
final void Function() onTap;

8
lib/core/widgets/base_button.dart
View File

@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
class BaseButton extends StatelessWidget {
BaseButton({
Key? key,
const BaseButton({
super.key,
required this.text,
this.onPressed,
this.buttonStyle,
@@ -12,9 +12,7 @@ class BaseButton extends StatelessWidget {
this.width,
this.margin,
this.alignment,
}) : super(
key: key,
);
});
final String text;

2
lib/core/widgets/bottom_sheet_with_blur.dart
View File

@@ -32,7 +32,7 @@ Future<void> showBottomSheetWithBlur({
child: Container(
height: height,
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
),

10
lib/core/widgets/cpfc_container.dart
View File

@@ -15,31 +15,31 @@ class CpfcContainer extends StatelessWidget {
final s = S.of(context);
return Container(
color: appTheme.cardBackground,
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12),
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: [
Text('${calories.toStringAsFixed(roundDigit)}', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(calories.toStringAsFixed(roundDigit), style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(s.calories, style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
Column(
children: [
Text('${proteins.toStringAsFixed(roundDigit)}', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(proteins.toStringAsFixed(roundDigit), style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(s.proteins, style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
Column(
children: [
Text('${fats.toStringAsFixed(roundDigit)}', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(fats.toStringAsFixed(roundDigit), style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(s.fats, style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
Column(
children: [
Text('${carbohydrates.toStringAsFixed(roundDigit)}', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(carbohydrates.toStringAsFixed(roundDigit), style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
Text(s.carbohydrates, style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),

24
lib/core/widgets/custom_drop_down.dart
View File

@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.d
import 'package:flutter/material.dart';
class CustomDropDown extends StatelessWidget {
const CustomDropDown({
const CustomDropDown({super.key,
this.alignment,
this.width,
this.focusNode,
@@ -59,7 +59,7 @@ class CustomDropDown extends StatelessWidget {
_buildDropDownWidget(BuildContext context) {
return DropdownButtonFormField<SelectionPopupModel>(
focusNode: focusNode ?? FocusNode(),
icon: Icon(Icons.keyboard_arrow_down_rounded),
icon: const Icon(Icons.keyboard_arrow_down_rounded),
autofocus: autofocus!,
value: value,
isDense: true,
@@ -70,7 +70,7 @@ class CustomDropDown extends StatelessWidget {
child: Text(
item.title,
style: hintStyle ??
TextStyle(
const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w400,
color: Colors.black,
@@ -90,7 +90,7 @@ class CustomDropDown extends StatelessWidget {
InputDecoration _buildInputDecoration(BuildContext context) {
return InputDecoration(
labelStyle: TextStyle(
labelStyle: const TextStyle(
fontSize: 16,
color: Colors.black,
fontWeight: FontWeight.w400,
@@ -108,19 +108,19 @@ class CustomDropDown extends StatelessWidget {
suffixIcon: suffix,
isDense: true,
suffixIconConstraints: suffixConstraints,
contentPadding: EdgeInsets.symmetric(vertical: 16, horizontal: 12),
fillColor: Color(0xFFF6F6F6),
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
fillColor: const Color(0xFFF6F6F6),
filled: filled,
border: OutlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(20)),
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide.none,
),
enabledBorder: OutlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(20)),
enabledBorder: const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide.none,
),
focusedBorder: OutlineInputBorder(
borderRadius: const BorderRadius.all(Radius.circular(20)),
focusedBorder: const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide.none,
),
);

49
lib/core/widgets/custom_outlined_button.dart
View File

@@ -3,32 +3,21 @@ import 'package:eatvio_app/core/widgets/base_button.dart';
import 'package:flutter/material.dart';
class CustomOutlinedButton extends BaseButton {
CustomOutlinedButton({
Key? key,
const CustomOutlinedButton({super.key,
this.decoration,
this.leftIcon,
this.rightIcon,
this.label,
VoidCallback? onPressed,
ButtonStyle? buttonStyle,
TextStyle? buttonTextStyle,
bool? isDisabled,
Alignment? alignment,
double? height,
double? width,
EdgeInsets? margin,
required String text,
}) : super(
text: text,
onPressed: onPressed,
buttonStyle: buttonStyle,
isDisabled: isDisabled,
buttonTextStyle: buttonTextStyle,
height: height,
alignment: alignment,
width: width,
margin: margin,
);
super.onPressed,
super.buttonStyle,
super.buttonTextStyle,
super.isDisabled,
super.alignment,
super.height,
super.width,
super.margin,
required super.text,
});
final BoxDecoration? decoration;
final Widget? leftIcon;
@@ -41,8 +30,8 @@ class CustomOutlinedButton extends BaseButton {
return Align(
alignment: alignment ?? Alignment.center,
child: Container(
height: this.height ?? 30,
width: this.width ?? double.maxFinite,
height: height ?? 30,
width: width ?? double.maxFinite,
margin: margin,
decoration: decoration,
child: OutlinedButton(
@@ -52,12 +41,12 @@ class CustomOutlinedButton extends BaseButton {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
leftIcon ?? SizedBox.shrink(),
leftIcon ?? const SizedBox.shrink(),
Text(
text,
style: buttonTextStyle ?? CustomTextStyles.titleSmallBold,
),
rightIcon ?? SizedBox.shrink(),
rightIcon ?? const SizedBox.shrink(),
],
),
),
@@ -65,8 +54,8 @@ class CustomOutlinedButton extends BaseButton {
);
} else {
return Container(
height: this.height ?? 30,
width: this.width ?? double.maxFinite,
height: height ?? 30,
width: width ?? double.maxFinite,
margin: margin,
decoration: decoration,
child: OutlinedButton(
@@ -76,12 +65,12 @@ class CustomOutlinedButton extends BaseButton {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
leftIcon ?? SizedBox.shrink(),
leftIcon ?? const SizedBox.shrink(),
Text(
text,
style: buttonTextStyle ?? CustomTextStyles.titleSmallBold,
),
rightIcon ?? SizedBox.shrink(),
rightIcon ?? const SizedBox.shrink(),
],
),
),

4
lib/core/widgets/custom_search_bar.dart
View File

@@ -19,7 +19,7 @@ class CustomSearchBar extends StatelessWidget {
textCapitalization: TextCapitalization.sentences,
controller: searchController,
autofocus: false,
style: TextStyle(
style: const TextStyle(
fontSize: 12,
),
onChanged: onChanged,
@@ -38,7 +38,7 @@ class CustomSearchBar extends StatelessWidget {
)
: null,
isDense: false,
contentPadding: enableIcon ? EdgeInsets.all(8) : EdgeInsets.only(top: 8, left: 16, right: 8, bottom: 8),
contentPadding: enableIcon ? const EdgeInsets.all(8) : const EdgeInsets.only(top: 8, left: 16, right: 8, bottom: 8),
fillColor: backgroundColor ?? appTheme.gray100,
filled: true,
border: OutlineInputBorder(

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

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
class CustomTextFormField extends StatelessWidget {
CustomTextFormField({
const CustomTextFormField({
this.alignment,
this.width,
this.controller,
@@ -97,9 +97,9 @@ class CustomTextFormField extends StatelessWidget {
maxLength: maxLength,
onChanged: onChanged,
controller: controller,
focusNode: focusNode ?? null,
focusNode: focusNode,
autofocus: autofocus,
style: TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w500),
style: const TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w500),
obscureText: obscureText!,
textInputAction: textInputAction,
maxLines: maxLines,
@@ -110,16 +110,16 @@ class CustomTextFormField extends StatelessWidget {
counter: counter,
suffixText: suffixText,
hintText: hintText ?? "",
hintStyle: hintStyle ?? TextStyle(fontSize: 16, color: Color(0xFF323F4B).withAlpha((255 / 2).toInt()), fontWeight: FontWeight.w500),
hintStyle: hintStyle ?? TextStyle(fontSize: 16, color: const Color(0xFF323F4B).withAlpha((255 / 2).toInt()), fontWeight: FontWeight.w500),
prefixIcon: prefix,
prefixIconConstraints: prefixConstraints,
suffixIcon: suffix,
floatingLabelBehavior: FloatingLabelBehavior.always,
suffixStyle: textStyle ?? TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
suffixStyle: textStyle ?? const TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
suffixIconConstraints: suffixConstraints,
isDense: false,
contentPadding: EdgeInsets.symmetric(vertical: 16, horizontal: 12),
fillColor: Color(0xFFF6F6F6),
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
fillColor: const Color(0xFFF6F6F6),
filled: true,
border:
borderDecoration ??

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

@@ -24,31 +24,33 @@ class _DataErrorWidgetState extends State<DataErrorWidget> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset('assets/icons/cloud.svg'),
SizedBox(height: 30),
const SizedBox(height: 30),
Text(s.something_went_wrong, style: TextStyles.textLSemibold.copyWith(color: appTheme.black)),
SizedBox(height: 12),
const SizedBox(height: 12),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32),
child: Text(s.can_not_load_data_please_try_again, style: TextStyles.textSMedium.copyWith(color: appTheme.black), textAlign: TextAlign.center),
),
SizedBox(height: 20),
const SizedBox(height: 20),
isLoading
? Loader()
? const Loader()
: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: CustomOutlinedButton(
text: s.try_again,
height: 52,
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(side: WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
onPressed: () async {
setState(() {
isLoading = true;
});
await widget.onReload();
if (context.mounted) {
setState(() {
isLoading = false;
});
}
},
),
),

4
lib/core/widgets/feed_icon_button.dart
View File

@@ -18,7 +18,7 @@ class FeedIconButton extends StatelessWidget {
onTap: onTap ?? () {},
borderRadius: BorderRadius.circular(16),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 12, vertical: 4),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration(
color: backgroundColor ?? appTheme.gray100,
borderRadius: BorderRadius.circular(16),
@@ -35,7 +35,7 @@ class FeedIconButton extends StatelessWidget {
color: iconColor ?? appTheme.gray600,
),
if (text != null) ...[
SizedBox(width: 8),
const SizedBox(width: 8),
Text(
text!,
style: TextStyles.textSMedium.copyWith(

14
lib/core/widgets/info_row.dart
View File

@@ -55,18 +55,18 @@ class InfoRow extends StatelessWidget {
width: 13.3,
height: 13.3,
),
SizedBox(width: 4),
const SizedBox(width: 4),
Text(
switch (type) {
ProductType.diet => '${diet?.duration} ${getDayForm(diet?.duration ?? 7, s)}',
ProductType.plan => '${plan?.duration} ${getDayForm(plan?.duration ?? 7, s)}',
ProductType.recipe => '${timeTitle ?? ''}',
ProductType.recipe => timeTitle ?? '',
},
style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
),
],
),
SizedBox(width: 12),
const SizedBox(width: 12),
InfoBouble(
backgroundColor: itemsBackgroundColor,
children: [
@@ -79,18 +79,18 @@ class InfoRow extends StatelessWidget {
width: 13.3,
height: 13.3,
),
SizedBox(width: 4),
const SizedBox(width: 4),
Text(
switch (type) {
ProductType.diet => '80 человек прошли',
ProductType.plan => '80 человек прошли',
ProductType.recipe => (recipe?.calories.toStringAsFixed(0) ?? '0') + ' ккал',
ProductType.recipe => '${recipe?.calories.toStringAsFixed(0) ?? '0'} ккал',
},
style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
),
],
),
SizedBox(width: 12),
const SizedBox(width: 12),
if (type == ProductType.recipe)
InfoBouble(
backgroundColor: itemsBackgroundColor,
@@ -100,7 +100,7 @@ class InfoRow extends StatelessWidget {
width: 13.3,
height: 13.3,
),
SizedBox(width: 4),
const SizedBox(width: 4),
Text(
'${recipe?.steps?.length ?? 0} ${getStepForm(recipe?.steps?.length ?? 0)}',
style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),

2
lib/core/widgets/item_widget.dart
View File

@@ -18,7 +18,7 @@ class ItemWidget extends StatelessWidget {
width: iconSize,
height: iconSize,
),
SizedBox(width: 8),
const SizedBox(width: 8),
Expanded(
child: Text(
text,

2
lib/core/widgets/loader.dart
View File

@@ -6,7 +6,7 @@ class Loader extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Center(
return const Center(
child: SizedBox(
height: 32,
width: 32,

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

@@ -23,10 +23,10 @@ class MainBackgroundBouble extends StatelessWidget {
boxShadow: enableShadow
? [
BoxShadow(
color: Color(0x00000000).withValues(alpha: 0.2),
color: const Color(0x00000000).withValues(alpha: 0.2),
spreadRadius: 0,
blurRadius: 32,
offset: Offset(0, 0),
offset: const Offset(0, 0),
),
]
: null,

94
lib/core/widgets/option_widget.dart Normal file
View File

@@ -0,0 +1,94 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/utils/localization_utils.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/core/widgets/item_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter/material.dart';
class OptionWidget extends StatelessWidget {
const OptionWidget({super.key, required this.option, this.disableDuration = false});
final PacketOptions? option;
final bool disableDuration;
@override
Widget build(BuildContext context) {
if (option == null) {
return const SizedBox.shrink();
}
return MainBackgroundBouble(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 16),
Text(
option?.short ?? '',
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
const SizedBox(height: 12),
Text(
option?.description ?? '',
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(height: 12),
if (!disableDuration) ...[
const _OptionDurationWidget(duration: 7),
const SizedBox(height: 16),
],
const CustomDivider(),
const SizedBox(height: 16),
ListView.separated(
physics: const NeverScrollableScrollPhysics(),
separatorBuilder: (context, index) => const SizedBox(height: 12),
itemBuilder: (context, index) => ItemWidget(text: option?.items[index] ?? ''),
itemCount: option?.items.length ?? 0,
shrinkWrap: true,
),
],
),
);
}
}
class _OptionDurationWidget extends StatelessWidget {
const _OptionDurationWidget({required this.duration});
final int duration;
@override
Widget build(BuildContext context) {
final s = S.of(context);
return Container(
decoration: BoxDecoration(borderRadius: BorderRadius.circular(4), color: appTheme.cardBackground),
child: Row(
children: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: Container(
width: 4,
height: 20,
decoration: BoxDecoration(
color: appTheme.blueA400,
borderRadius: const BorderRadius.only(
topRight: Radius.circular(100),
bottomRight: Radius.circular(100),
),
),
),
),
const SizedBox(
width: 12,
),
Text(
'${s.option_duration} $duration ${getDayForm(duration, s)}',
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
const SizedBox(
width: 12,
),
],
),
);
}
}

8
lib/core/widgets/show_error_dialog.dart
View File

@@ -17,7 +17,7 @@ void showErrorDialog(BuildContext context, {String? title, String? description})
child: Container(
decoration: BoxDecoration(
color: appTheme.whiteA700,
borderRadius: BorderRadius.all(Radius.circular(20)),
borderRadius: const BorderRadius.all(Radius.circular(20)),
boxShadow: [BoxShadow(color: appTheme.dialogShadow, blurRadius: 32)],
),
width: MediaQuery.sizeOf(context).width,
@@ -27,12 +27,12 @@ void showErrorDialog(BuildContext context, {String? title, String? description})
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 20),
const SizedBox(height: 20),
Text(
title ?? s.some_error_occurred,
style: TextStyles.textLSemibold.copyWith(color: appTheme.black, decoration: TextDecoration.none),
),
SizedBox(height: 12),
const SizedBox(height: 12),
Padding(
padding: const EdgeInsets.only(right: 72),
child: Text(
@@ -47,7 +47,7 @@ void showErrorDialog(BuildContext context, {String? title, String? description})
child: Text(s.ok, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
),
),
SizedBox(height: 12),
const SizedBox(height: 12),
],
),
),

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

@@ -15,11 +15,11 @@ class SuccessPublishedDietBottomSheet extends StatelessWidget {
final s = S.of(context);
return Column(
children: [
SizedBox(
const SizedBox(
height: 20,
),
BottomSheetHandlerBar(),
SizedBox(
const BottomSheetHandlerBar(),
const SizedBox(
height: 20,
),
Text(
@@ -30,7 +30,7 @@ class SuccessPublishedDietBottomSheet extends StatelessWidget {
'опубликованна',
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(
const SizedBox(
height: 20,
),
Padding(
@@ -43,12 +43,12 @@ class SuccessPublishedDietBottomSheet extends StatelessWidget {
height: 52,
buttonTextStyle: TextStyles.textSSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(
side: WidgetStatePropertyAll(BorderSide.none),
side: const WidgetStatePropertyAll(BorderSide.none),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
),
),
),
SizedBox(
const SizedBox(
height: 20,
),
],

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

@@ -15,11 +15,11 @@ class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
final s = S.of(context);
return Column(
children: [
SizedBox(
const SizedBox(
height: 20,
),
BottomSheetHandlerBar(),
SizedBox(
const BottomSheetHandlerBar(),
const SizedBox(
height: 20,
),
Text(
@@ -30,7 +30,7 @@ class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
'"$title" ${s.successfully_published}',
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(
const SizedBox(
height: 20,
),
Padding(
@@ -43,12 +43,12 @@ class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
height: 52,
buttonTextStyle: TextStyles.textSSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(
side: WidgetStatePropertyAll(BorderSide.none),
side: const WidgetStatePropertyAll(BorderSide.none),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
),
),
),
SizedBox(
const SizedBox(
height: 20,
),
],

72
lib/features/auth/models/credentials_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'credentials_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
CredentialsModel _$CredentialsModelFromJson(Map<String, dynamic> json) {
return _CredentialsModel.fromJson(json);
@@ -37,9 +36,8 @@ mixin _$CredentialsModel {
/// @nodoc
abstract class $CredentialsModelCopyWith<$Res> {
factory $CredentialsModelCopyWith(
CredentialsModel value,
$Res Function(CredentialsModel) then,
) = _$CredentialsModelCopyWithImpl<$Res, CredentialsModel>;
CredentialsModel value, $Res Function(CredentialsModel) then) =
_$CredentialsModelCopyWithImpl<$Res, CredentialsModel>;
@useResult
$Res call({String email, String password});
}
@@ -58,32 +56,29 @@ class _$CredentialsModelCopyWithImpl<$Res, $Val extends CredentialsModel>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? email = null, Object? password = null}) {
return _then(
_value.copyWith(
email:
null == email
$Res call({
Object? email = null,
Object? password = null,
}) {
return _then(_value.copyWith(
email: null == email
? _value.email
: email // ignore: cast_nullable_to_non_nullable
as String,
password:
null == password
password: null == password
? _value.password
: password // ignore: cast_nullable_to_non_nullable
as String,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$CredentialsModelImplCopyWith<$Res>
implements $CredentialsModelCopyWith<$Res> {
factory _$$CredentialsModelImplCopyWith(
_$CredentialsModelImpl value,
$Res Function(_$CredentialsModelImpl) then,
) = __$$CredentialsModelImplCopyWithImpl<$Res>;
factory _$$CredentialsModelImplCopyWith(_$CredentialsModelImpl value,
$Res Function(_$CredentialsModelImpl) then) =
__$$CredentialsModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String email, String password});
@@ -93,30 +88,28 @@ abstract class _$$CredentialsModelImplCopyWith<$Res>
class __$$CredentialsModelImplCopyWithImpl<$Res>
extends _$CredentialsModelCopyWithImpl<$Res, _$CredentialsModelImpl>
implements _$$CredentialsModelImplCopyWith<$Res> {
__$$CredentialsModelImplCopyWithImpl(
_$CredentialsModelImpl _value,
$Res Function(_$CredentialsModelImpl) _then,
) : super(_value, _then);
__$$CredentialsModelImplCopyWithImpl(_$CredentialsModelImpl _value,
$Res Function(_$CredentialsModelImpl) _then)
: super(_value, _then);
/// Create a copy of CredentialsModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? email = null, Object? password = null}) {
return _then(
_$CredentialsModelImpl(
email:
null == email
$Res call({
Object? email = null,
Object? password = null,
}) {
return _then(_$CredentialsModelImpl(
email: null == email
? _value.email
: email // ignore: cast_nullable_to_non_nullable
as String,
password:
null == password
password: null == password
? _value.password
: password // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -159,21 +152,20 @@ class _$CredentialsModelImpl implements _CredentialsModel {
@pragma('vm:prefer-inline')
_$$CredentialsModelImplCopyWith<_$CredentialsModelImpl> get copyWith =>
__$$CredentialsModelImplCopyWithImpl<_$CredentialsModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$CredentialsModelImplToJson(this);
return _$$CredentialsModelImplToJson(
this,
);
}
}
abstract class _CredentialsModel implements CredentialsModel {
const factory _CredentialsModel({
required final String email,
required final String password,
}) = _$CredentialsModelImpl;
const factory _CredentialsModel(
{required final String email,
required final String password}) = _$CredentialsModelImpl;
factory _CredentialsModel.fromJson(Map<String, dynamic> json) =
_$CredentialsModelImpl.fromJson;

11
lib/features/auth/models/credentials_model.g.dart
View File

@@ -7,12 +7,15 @@ part of 'credentials_model.dart';
// **************************************************************************
_$CredentialsModelImpl _$$CredentialsModelImplFromJson(
Map<String, dynamic> json,
) => _$CredentialsModelImpl(
Map<String, dynamic> json) =>
_$CredentialsModelImpl(
email: json['email'] as String,
password: json['password'] as String,
);
Map<String, dynamic> _$$CredentialsModelImplToJson(
_$CredentialsModelImpl instance,
) => <String, dynamic>{'email': instance.email, 'password': instance.password};
_$CredentialsModelImpl instance) =>
<String, dynamic>{
'email': instance.email,
'password': instance.password,
};

49
lib/features/auth/models/token_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'token_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
TokenModel _$TokenModelFromJson(Map<String, dynamic> json) {
return _TokenModel.fromJson(json);
@@ -36,9 +35,8 @@ mixin _$TokenModel {
/// @nodoc
abstract class $TokenModelCopyWith<$Res> {
factory $TokenModelCopyWith(
TokenModel value,
$Res Function(TokenModel) then,
) = _$TokenModelCopyWithImpl<$Res, TokenModel>;
TokenModel value, $Res Function(TokenModel) then) =
_$TokenModelCopyWithImpl<$Res, TokenModel>;
@useResult
$Res call({String token});
}
@@ -57,17 +55,15 @@ class _$TokenModelCopyWithImpl<$Res, $Val extends TokenModel>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? token = null}) {
return _then(
_value.copyWith(
token:
null == token
$Res call({
Object? token = null,
}) {
return _then(_value.copyWith(
token: null == token
? _value.token
: token // ignore: cast_nullable_to_non_nullable
as String,
)
as $Val,
);
) as $Val);
}
}
@@ -75,9 +71,8 @@ class _$TokenModelCopyWithImpl<$Res, $Val extends TokenModel>
abstract class _$$TokenModelImplCopyWith<$Res>
implements $TokenModelCopyWith<$Res> {
factory _$$TokenModelImplCopyWith(
_$TokenModelImpl value,
$Res Function(_$TokenModelImpl) then,
) = __$$TokenModelImplCopyWithImpl<$Res>;
_$TokenModelImpl value, $Res Function(_$TokenModelImpl) then) =
__$$TokenModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String token});
@@ -88,24 +83,22 @@ class __$$TokenModelImplCopyWithImpl<$Res>
extends _$TokenModelCopyWithImpl<$Res, _$TokenModelImpl>
implements _$$TokenModelImplCopyWith<$Res> {
__$$TokenModelImplCopyWithImpl(
_$TokenModelImpl _value,
$Res Function(_$TokenModelImpl) _then,
) : super(_value, _then);
_$TokenModelImpl _value, $Res Function(_$TokenModelImpl) _then)
: super(_value, _then);
/// Create a copy of TokenModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? token = null}) {
return _then(
_$TokenModelImpl(
token:
null == token
$Res call({
Object? token = null,
}) {
return _then(_$TokenModelImpl(
token: null == token
? _value.token
: token // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -147,7 +140,9 @@ class _$TokenModelImpl implements _TokenModel {
@override
Map<String, dynamic> toJson() {
return _$$TokenModelImplToJson(this);
return _$$TokenModelImplToJson(
this,
);
}
}

8
lib/features/auth/models/token_model.g.dart
View File

@@ -7,7 +7,11 @@ part of 'token_model.dart';
// **************************************************************************
_$TokenModelImpl _$$TokenModelImplFromJson(Map<String, dynamic> json) =>
_$TokenModelImpl(token: json['token'] as String);
_$TokenModelImpl(
token: json['token'] as String,
);
Map<String, dynamic> _$$TokenModelImplToJson(_$TokenModelImpl instance) =>
<String, dynamic>{'token': instance.token};
<String, dynamic>{
'token': instance.token,
};

8
lib/features/auth/presentation/bloc/auth_cubit.dart
View File

@@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/token_storage.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
@@ -11,10 +13,10 @@ class AuthCubit extends Cubit<AuthState> {
AuthCubit({
required this.authRepository,
}) : super(AuthState());
}) : super(const AuthState());
Future<bool> getTokenByCredentials(String email, String password) async {
emit(AuthState.loading());
emit(const AuthState.loading());
try {
final token = (await authRepository.getTokenByCredentials(
email,
@@ -31,7 +33,7 @@ class AuthCubit extends Cubit<AuthState> {
AppRouter.navigatorKey.currentContext?.go('/my-profile-screen');
return true;
} catch (e) {
print(e);
log(e.toString());
showErrorToast('Неверный адрес электронной почты или пароль');
emit(AuthState.error(errorMessage: '$e'));
return false;

103
lib/features/auth/presentation/bloc/auth_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'auth_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$AuthState {
@@ -23,14 +22,16 @@ mixin _$AuthState {
required TResult Function() loading,
required TResult Function(String token) loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
TResult? Function()? loading,
TResult? Function(String token)? loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -38,21 +39,24 @@ mixin _$AuthState {
TResult Function(String token)? loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_AuthState value) $default, {
required TResult Function(AuthStateLoading value) loading,
required TResult Function(AuthStateLoaded value) loaded,
required TResult Function(AuthStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_AuthState value)? $default, {
TResult? Function(AuthStateLoading value)? loading,
TResult? Function(AuthStateLoaded value)? loaded,
TResult? Function(AuthStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_AuthState value)? $default, {
@@ -60,7 +64,8 @@ mixin _$AuthState {
TResult Function(AuthStateLoaded value)? loaded,
TResult Function(AuthStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
@@ -86,9 +91,8 @@ class _$AuthStateCopyWithImpl<$Res, $Val extends AuthState>
/// @nodoc
abstract class _$$AuthStateImplCopyWith<$Res> {
factory _$$AuthStateImplCopyWith(
_$AuthStateImpl value,
$Res Function(_$AuthStateImpl) then,
) = __$$AuthStateImplCopyWithImpl<$Res>;
_$AuthStateImpl value, $Res Function(_$AuthStateImpl) then) =
__$$AuthStateImplCopyWithImpl<$Res>;
}
/// @nodoc
@@ -96,9 +100,8 @@ class __$$AuthStateImplCopyWithImpl<$Res>
extends _$AuthStateCopyWithImpl<$Res, _$AuthStateImpl>
implements _$$AuthStateImplCopyWith<$Res> {
__$$AuthStateImplCopyWithImpl(
_$AuthStateImpl _value,
$Res Function(_$AuthStateImpl) _then,
) : super(_value, _then);
_$AuthStateImpl _value, $Res Function(_$AuthStateImpl) _then)
: super(_value, _then);
/// Create a copy of AuthState
/// with the given fields replaced by the non-null parameter values.
@@ -204,20 +207,18 @@ abstract class _AuthState implements AuthState {
/// @nodoc
abstract class _$$AuthStateLoadingImplCopyWith<$Res> {
factory _$$AuthStateLoadingImplCopyWith(
_$AuthStateLoadingImpl value,
$Res Function(_$AuthStateLoadingImpl) then,
) = __$$AuthStateLoadingImplCopyWithImpl<$Res>;
factory _$$AuthStateLoadingImplCopyWith(_$AuthStateLoadingImpl value,
$Res Function(_$AuthStateLoadingImpl) then) =
__$$AuthStateLoadingImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$AuthStateLoadingImplCopyWithImpl<$Res>
extends _$AuthStateCopyWithImpl<$Res, _$AuthStateLoadingImpl>
implements _$$AuthStateLoadingImplCopyWith<$Res> {
__$$AuthStateLoadingImplCopyWithImpl(
_$AuthStateLoadingImpl _value,
$Res Function(_$AuthStateLoadingImpl) _then,
) : super(_value, _then);
__$$AuthStateLoadingImplCopyWithImpl(_$AuthStateLoadingImpl _value,
$Res Function(_$AuthStateLoadingImpl) _then)
: super(_value, _then);
/// Create a copy of AuthState
/// with the given fields replaced by the non-null parameter values.
@@ -323,10 +324,9 @@ abstract class AuthStateLoading implements AuthState {
/// @nodoc
abstract class _$$AuthStateLoadedImplCopyWith<$Res> {
factory _$$AuthStateLoadedImplCopyWith(
_$AuthStateLoadedImpl value,
$Res Function(_$AuthStateLoadedImpl) then,
) = __$$AuthStateLoadedImplCopyWithImpl<$Res>;
factory _$$AuthStateLoadedImplCopyWith(_$AuthStateLoadedImpl value,
$Res Function(_$AuthStateLoadedImpl) then) =
__$$AuthStateLoadedImplCopyWithImpl<$Res>;
@useResult
$Res call({String token});
}
@@ -336,24 +336,22 @@ class __$$AuthStateLoadedImplCopyWithImpl<$Res>
extends _$AuthStateCopyWithImpl<$Res, _$AuthStateLoadedImpl>
implements _$$AuthStateLoadedImplCopyWith<$Res> {
__$$AuthStateLoadedImplCopyWithImpl(
_$AuthStateLoadedImpl _value,
$Res Function(_$AuthStateLoadedImpl) _then,
) : super(_value, _then);
_$AuthStateLoadedImpl _value, $Res Function(_$AuthStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of AuthState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? token = null}) {
return _then(
_$AuthStateLoadedImpl(
token:
null == token
$Res call({
Object? token = null,
}) {
return _then(_$AuthStateLoadedImpl(
token: null == token
? _value.token
: token // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -388,9 +386,7 @@ class _$AuthStateLoadedImpl implements AuthStateLoaded {
@pragma('vm:prefer-inline')
_$$AuthStateLoadedImplCopyWith<_$AuthStateLoadedImpl> get copyWith =>
__$$AuthStateLoadedImplCopyWithImpl<_$AuthStateLoadedImpl>(
this,
_$identity,
);
this, _$identity);
@override
@optionalTypeArgs
@@ -482,10 +478,9 @@ abstract class AuthStateLoaded implements AuthState {
/// @nodoc
abstract class _$$AuthStateErrorImplCopyWith<$Res> {
factory _$$AuthStateErrorImplCopyWith(
_$AuthStateErrorImpl value,
$Res Function(_$AuthStateErrorImpl) then,
) = __$$AuthStateErrorImplCopyWithImpl<$Res>;
factory _$$AuthStateErrorImplCopyWith(_$AuthStateErrorImpl value,
$Res Function(_$AuthStateErrorImpl) then) =
__$$AuthStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
@@ -495,24 +490,22 @@ class __$$AuthStateErrorImplCopyWithImpl<$Res>
extends _$AuthStateCopyWithImpl<$Res, _$AuthStateErrorImpl>
implements _$$AuthStateErrorImplCopyWith<$Res> {
__$$AuthStateErrorImplCopyWithImpl(
_$AuthStateErrorImpl _value,
$Res Function(_$AuthStateErrorImpl) _then,
) : super(_value, _then);
_$AuthStateErrorImpl _value, $Res Function(_$AuthStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of AuthState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$AuthStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$AuthStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -548,9 +541,7 @@ class _$AuthStateErrorImpl implements AuthStateError {
@pragma('vm:prefer-inline')
_$$AuthStateErrorImplCopyWith<_$AuthStateErrorImpl> get copyWith =>
__$$AuthStateErrorImplCopyWithImpl<_$AuthStateErrorImpl>(
this,
_$identity,
);
this, _$identity);
@override
@optionalTypeArgs

37
lib/features/auth/presentation/pages/auth_screen.dart
View File

@@ -1,5 +1,6 @@
import 'dart:async';
import 'package:easy_debounce/easy_debounce.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -22,7 +23,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../bloc/auth_state.dart';
class AuthScreen extends StatefulWidget {
const AuthScreen();
const AuthScreen({super.key});
@override
State<AuthScreen> createState() => _AuthScreenState();
@@ -36,7 +37,7 @@ class _AuthScreenState extends State<AuthScreen> {
final authCubit = sl<AuthCubit>();
late StreamSubscription<bool> keyboardSubscription;
bool isFocused = false;
int tapsCount = 0;
@override
void initState() {
super.initState();
@@ -60,15 +61,27 @@ class _AuthScreenState extends State<AuthScreen> {
appBar: AppBar(
centerTitle: true,
toolbarHeight: isFocused ? 64 : MediaQuery.of(context).size.width - 64,
title: SvgPicture.asset(
title: GestureDetector(
onTap: () {
tapsCount++;
if (tapsCount == 6) {
tapsCount = 0;
// showModalBottomSheet(context: context, builder: (context) => );
}
EasyDebounce.debounce('change env', Durations.medium4, () {
tapsCount = 0;
});
},
child: SvgPicture.asset(
ImageConstant.imgLogoEatvio,
height: isFocused ? 64 : MediaQuery.of(context).size.width - 64,
fit: BoxFit.contain,
),
),
),
body: SafeArea(
child: Padding(
padding: EdgeInsets.all(16),
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -104,7 +117,7 @@ class _AuthScreenState extends State<AuthScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text('Нет аккаунта? '),
const Text('Нет аккаунта? '),
GestureDetector(
onTap: () => GoRouter.of(context).goNamed('webViewRegistrationScreen'),
child: Text(
@@ -118,18 +131,18 @@ class _AuthScreenState extends State<AuthScreen> {
),
],
),
Spacer(),
const Spacer(),
Center(
child: RichText(
textAlign: TextAlign.center,
text: TextSpan(
text: 'Нажимая "Войти", Вы соглашаетесь \n',
style: TextStyle(
style: const TextStyle(
fontSize: 12,
color: Colors.black,
),
children: [
TextSpan(text: 'c '),
const TextSpan(text: 'c '),
TextSpan(
text: ' Публичной офертой',
style: TextStyle(
@@ -138,14 +151,14 @@ class _AuthScreenState extends State<AuthScreen> {
decorationColor: appTheme.blueA400,
decoration: TextDecoration.underline,
),
recognizer: TapGestureRecognizer()..onTap = () async => await launchUrl(Uri.parse(baseUrl + '/oferta_bs.pdf')),
recognizer: TapGestureRecognizer()..onTap = () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
),
],
),
),
),
const SizedBox(height: 16),
Container(
SizedBox(
height: 48,
width: MediaQuery.of(context).size.width - 32,
child: FloatingActionButton.extended(
@@ -165,12 +178,14 @@ class _AuthScreenState extends State<AuthScreen> {
passwordController.text,
);
if (isAuthenticated) {
if (context.mounted) {
context.read<ProfileAvatarCubit>().getMyProfile();
context.read<ChatsCubit>().getChatRoomsWithLoading();
}
}
},
label: state is AuthStateLoading
? CupertinoActivityIndicator()
? const CupertinoActivityIndicator()
: Text(
'Войти',
style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),

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

@@ -24,7 +24,7 @@ import 'package:share_plus/share_plus.dart';
class BlogPostScreen extends StatefulWidget {
final FeedBlogPostModel blogPost;
BlogPostScreen({super.key, required this.blogPost});
const BlogPostScreen({super.key, required this.blogPost});
@override
State<BlogPostScreen> createState() => _BlogPostScreenState();
@@ -60,7 +60,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
return Scaffold(
resizeToAvoidBottomInset: true,
bottomSheet: Container(
padding: EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
decoration: BoxDecoration(color: Colors.white, border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1)))),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@@ -79,14 +79,14 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
height: 32,
width: 32,
child: Icon(Icons.close_rounded, size: 18, color: Colors.white),
child: const Icon(Icons.close_rounded, size: 18, color: Colors.white),
),
),
if (replyId != null) SizedBox(width: 8),
if (replyId != null) const SizedBox(width: 8),
SizedBox(
width: MediaQuery.of(context).size.width - (replyId == null ? 64 : 104),
child: ConstrainedBox(
constraints: BoxConstraints(minHeight: 52),
constraints: const BoxConstraints(minHeight: 52),
child: TextFormField(
textCapitalization: TextCapitalization.sentences,
onChanged: (_) {
@@ -96,7 +96,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
maxLines: 5,
minLines: 1,
keyboardType: TextInputType.multiline,
style: TextStyle(
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w400,
color: Colors.black,
@@ -104,9 +104,9 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
),
decoration: InputDecoration(
isDense: false, // убираем true, чтобы padding учитывался корректно
contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 16), // вертикальный паддинг увеличен
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), // вертикальный паддинг увеличен
hintText: 'Комментарий',
hintStyle: TextStyle(
hintStyle: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w400,
height: 1.2,
@@ -115,21 +115,21 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(16),
borderSide: BorderSide(color: Color(0xFFD1D1D6), width: 1),
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(16),
borderSide: BorderSide(color: Color(0xFFD1D1D6), width: 1),
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(16),
borderSide: BorderSide(color: Color(0xFFD1D1D6), width: 1),
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
),
),
),
),
SizedBox(width: 8),
const SizedBox(width: 8),
GestureDetector(
onTap: () {
if (textEditingController.text.length > 2) {
@@ -151,7 +151,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
decoration: BoxDecoration(color: textEditingController.text.length > 2 ? appTheme.blueA400 : Colors.grey, shape: BoxShape.circle),
height: 32,
width: 32,
child: Icon(Icons.send_rounded, size: 18, color: Colors.white),
child: const Icon(Icons.send_rounded, size: 18, color: Colors.white),
),
),
],
@@ -164,6 +164,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
onSelected: (value) async {
if (value == 'delete') {
final result = await sl<BlogPostCreateCubit>().deleteBlogPost(widget.blogPost.id);
if (!context.mounted) return;
if (!result) {
showErrorDialog(context, title: S.current.could_not_delete_blog_post);
return;
@@ -175,14 +176,13 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
GoRouter.of(context).replaceNamed('blogPostCreateScreen', extra: widget.blogPost);
}
},
itemBuilder:
(context) => [
if (widget.blogPost.author.authorIsMe) PopupMenuItem(value: 'edit', child: Text('Редактировать')),
if (widget.blogPost.author.authorIsMe) PopupMenuItem(value: 'delete', child: Text('Удалить')),
itemBuilder: (context) => [
if (widget.blogPost.author.authorIsMe) const PopupMenuItem(value: 'edit', child: Text('Редактировать')),
if (widget.blogPost.author.authorIsMe) const PopupMenuItem(value: 'delete', child: Text('Удалить')),
if (!widget.blogPost.author.authorIsMe)
PopupMenuItem(
value: 'report',
child: Text('Пожаловаться'),
child: const Text('Пожаловаться'),
onTap: () {
showModalBottomSheet(
context: context,
@@ -196,8 +196,8 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
],
),
body: SingleChildScrollView(
padding: EdgeInsets.only(bottom: 80),
physics: BouncingScrollPhysics(),
padding: const EdgeInsets.only(bottom: 80),
physics: const BouncingScrollPhysics(),
child: Column(
children: [
GestureDetector(
@@ -209,15 +209,15 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
CircleAvatar(radius: 16, backgroundImage: NetworkImage(widget.blogPost.author.authorProfileIcon)),
SizedBox(width: 8),
const SizedBox(width: 8),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
widget.blogPost.author.authorName,
style: TextStyle(color: Colors.black, fontSize: 14, fontWeight: FontWeight.w400, height: 1),
style: const TextStyle(color: Colors.black, fontSize: 14, fontWeight: FontWeight.w400, height: 1),
),
SizedBox(height: 2),
const SizedBox(height: 2),
Text(
widget.blogPost.createdAt.format('dd MMMM', 'ru'),
style: TextStyle(color: Colors.grey.shade600, fontSize: 12, fontWeight: FontWeight.w400, height: 1),
@@ -233,8 +233,8 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
padding: const EdgeInsets.symmetric(horizontal: 8),
child: Html(data: widget.blogPost.description, style: {"*": Style(color: Colors.black87)}),
),
SizedBox(height: 8),
CachedNetworkImage(imageUrl: baseUrl + '/storage/' + (widget.blogPost.image)),
const SizedBox(height: 8),
CachedNetworkImage(imageUrl: '$baseUrl/storage/${widget.blogPost.image}'),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Row(
@@ -256,20 +256,20 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
sl<FeedCubit>().updateFeedBlogPostList(widget.blogPost, isLiked);
},
),
SizedBox(width: 8),
const SizedBox(width: 8),
_iconButton(
icon: Icons.reply_rounded,
onTap: () {
final box = context.findRenderObject() as RenderBox?;
Share.shareUri(
Uri.parse(baseUrl + '/ru/blog_post/' + widget.blogPost.id.toString()),
Uri.parse('$baseUrl/ru/blog_post/${widget.blogPost.id}'),
sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
);
},
),
Spacer(),
const Spacer(),
Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
SizedBox(width: 4),
const SizedBox(width: 4),
Text(widget.blogPost.totalViews.toString(), style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400)),
],
),
@@ -279,16 +279,16 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
height: 0.4,
decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.2), borderRadius: BorderRadius.circular(16)),
),
SizedBox(height: 8),
const SizedBox(height: 8),
Container(
padding: EdgeInsets.symmetric(horizontal: 16),
padding: const EdgeInsets.symmetric(horizontal: 16),
alignment: Alignment.centerLeft,
child: Text(
widget.blogPost.totalComments.toString() + ' КОММЕНТАРИЕВ',
'${widget.blogPost.totalComments} КОММЕНТАРИЕВ',
style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
),
),
SizedBox(height: 16),
const SizedBox(height: 16),
if (state is CommentsStateLoading) const Loader(),
if (state is CommentsStateLoaded)
CommentsWidget(id: widget.blogPost.id.toString(), commentSourceType: CommentSourceType.blogPost, comment: state.comment, replyId: replyId),
@@ -306,14 +306,14 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
onTap: onTap ?? () {},
borderRadius: BorderRadius.circular(16),
child: Ink(
padding: EdgeInsets.symmetric(horizontal: 12, vertical: 4),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration(color: backgroundColor ?? appTheme.gray100, borderRadius: BorderRadius.circular(16)),
height: 32,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 20, color: iconColor ?? appTheme.gray600),
if (text != null) SizedBox(width: 8),
if (text != null) const SizedBox(width: 8),
if (text != null) Text(text, style: TextStyle(color: textColor ?? appTheme.gray600, fontWeight: FontWeight.w500)),
],
),

12
lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart
View File

@@ -10,7 +10,7 @@ class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
BlogPostCreateCubit({
required this.blogPostRepository,
}) : super(BlogPostCreateState());
}) : super(const BlogPostCreateState());
Future<bool> createBlogPost({
String? title,
@@ -19,7 +19,7 @@ class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
XFile? image,
}) async {
try {
emit(BlogPostCreateState.loading());
emit(const BlogPostCreateState.loading());
await blogPostRepository.createBlogPost(
title,
videoUrl,
@@ -29,7 +29,7 @@ class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
return true;
} catch (e, st) {
log(e.toString(), stackTrace: st);
emit(BlogPostCreateState.loaded());
emit(const BlogPostCreateState.loaded());
return false;
}
}
@@ -43,7 +43,7 @@ class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
String? oldImageUrl,
}) async {
try {
emit(BlogPostCreateState.loading());
emit(const BlogPostCreateState.loading());
await blogPostRepository.updateBlogPost(
id,
title,
@@ -52,11 +52,11 @@ class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
image,
oldImageUrl,
);
emit(BlogPostCreateState.loaded());
emit(const BlogPostCreateState.loaded());
return true;
} catch (e, st) {
log(e.toString(), stackTrace: st);
emit(BlogPostCreateState.loaded());
emit(const BlogPostCreateState.loaded());
return false;
}
}

95
lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'blog_post_create_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$BlogPostCreateState {
@@ -23,14 +22,16 @@ mixin _$BlogPostCreateState {
required TResult Function() loading,
required TResult Function() loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
TResult? Function()? loading,
TResult? Function()? loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -38,21 +39,24 @@ mixin _$BlogPostCreateState {
TResult Function()? loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_BlogPostCreateState value) $default, {
required TResult Function(BlogPostCreateStateLoading value) loading,
required TResult Function(BlogPostCreateStateLoaded value) loaded,
required TResult Function(BlogPostCreateStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_BlogPostCreateState value)? $default, {
TResult? Function(BlogPostCreateStateLoading value)? loading,
TResult? Function(BlogPostCreateStateLoaded value)? loaded,
TResult? Function(BlogPostCreateStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_BlogPostCreateState value)? $default, {
@@ -60,15 +64,15 @@ mixin _$BlogPostCreateState {
TResult Function(BlogPostCreateStateLoaded value)? loaded,
TResult Function(BlogPostCreateStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $BlogPostCreateStateCopyWith<$Res> {
factory $BlogPostCreateStateCopyWith(
BlogPostCreateState value,
$Res Function(BlogPostCreateState) then,
) = _$BlogPostCreateStateCopyWithImpl<$Res, BlogPostCreateState>;
BlogPostCreateState value, $Res Function(BlogPostCreateState) then) =
_$BlogPostCreateStateCopyWithImpl<$Res, BlogPostCreateState>;
}
/// @nodoc
@@ -87,20 +91,18 @@ class _$BlogPostCreateStateCopyWithImpl<$Res, $Val extends BlogPostCreateState>
/// @nodoc
abstract class _$$BlogPostCreateStateImplCopyWith<$Res> {
factory _$$BlogPostCreateStateImplCopyWith(
_$BlogPostCreateStateImpl value,
$Res Function(_$BlogPostCreateStateImpl) then,
) = __$$BlogPostCreateStateImplCopyWithImpl<$Res>;
factory _$$BlogPostCreateStateImplCopyWith(_$BlogPostCreateStateImpl value,
$Res Function(_$BlogPostCreateStateImpl) then) =
__$$BlogPostCreateStateImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$BlogPostCreateStateImplCopyWithImpl<$Res>
extends _$BlogPostCreateStateCopyWithImpl<$Res, _$BlogPostCreateStateImpl>
implements _$$BlogPostCreateStateImplCopyWith<$Res> {
__$$BlogPostCreateStateImplCopyWithImpl(
_$BlogPostCreateStateImpl _value,
$Res Function(_$BlogPostCreateStateImpl) _then,
) : super(_value, _then);
__$$BlogPostCreateStateImplCopyWithImpl(_$BlogPostCreateStateImpl _value,
$Res Function(_$BlogPostCreateStateImpl) _then)
: super(_value, _then);
/// Create a copy of BlogPostCreateState
/// with the given fields replaced by the non-null parameter values.
@@ -209,22 +211,19 @@ abstract class _BlogPostCreateState implements BlogPostCreateState {
abstract class _$$BlogPostCreateStateLoadingImplCopyWith<$Res> {
factory _$$BlogPostCreateStateLoadingImplCopyWith(
_$BlogPostCreateStateLoadingImpl value,
$Res Function(_$BlogPostCreateStateLoadingImpl) then,
) = __$$BlogPostCreateStateLoadingImplCopyWithImpl<$Res>;
$Res Function(_$BlogPostCreateStateLoadingImpl) then) =
__$$BlogPostCreateStateLoadingImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$BlogPostCreateStateLoadingImplCopyWithImpl<$Res>
extends
_$BlogPostCreateStateCopyWithImpl<
$Res,
_$BlogPostCreateStateLoadingImpl
>
extends _$BlogPostCreateStateCopyWithImpl<$Res,
_$BlogPostCreateStateLoadingImpl>
implements _$$BlogPostCreateStateLoadingImplCopyWith<$Res> {
__$$BlogPostCreateStateLoadingImplCopyWithImpl(
_$BlogPostCreateStateLoadingImpl _value,
$Res Function(_$BlogPostCreateStateLoadingImpl) _then,
) : super(_value, _then);
$Res Function(_$BlogPostCreateStateLoadingImpl) _then)
: super(_value, _then);
/// Create a copy of BlogPostCreateState
/// with the given fields replaced by the non-null parameter values.
@@ -333,19 +332,19 @@ abstract class BlogPostCreateStateLoading implements BlogPostCreateState {
abstract class _$$BlogPostCreateStateLoadedImplCopyWith<$Res> {
factory _$$BlogPostCreateStateLoadedImplCopyWith(
_$BlogPostCreateStateLoadedImpl value,
$Res Function(_$BlogPostCreateStateLoadedImpl) then,
) = __$$BlogPostCreateStateLoadedImplCopyWithImpl<$Res>;
$Res Function(_$BlogPostCreateStateLoadedImpl) then) =
__$$BlogPostCreateStateLoadedImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$BlogPostCreateStateLoadedImplCopyWithImpl<$Res>
extends
_$BlogPostCreateStateCopyWithImpl<$Res, _$BlogPostCreateStateLoadedImpl>
extends _$BlogPostCreateStateCopyWithImpl<$Res,
_$BlogPostCreateStateLoadedImpl>
implements _$$BlogPostCreateStateLoadedImplCopyWith<$Res> {
__$$BlogPostCreateStateLoadedImplCopyWithImpl(
_$BlogPostCreateStateLoadedImpl _value,
$Res Function(_$BlogPostCreateStateLoadedImpl) _then,
) : super(_value, _then);
$Res Function(_$BlogPostCreateStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of BlogPostCreateState
/// with the given fields replaced by the non-null parameter values.
@@ -454,36 +453,35 @@ abstract class BlogPostCreateStateLoaded implements BlogPostCreateState {
abstract class _$$BlogPostCreateStateErrorImplCopyWith<$Res> {
factory _$$BlogPostCreateStateErrorImplCopyWith(
_$BlogPostCreateStateErrorImpl value,
$Res Function(_$BlogPostCreateStateErrorImpl) then,
) = __$$BlogPostCreateStateErrorImplCopyWithImpl<$Res>;
$Res Function(_$BlogPostCreateStateErrorImpl) then) =
__$$BlogPostCreateStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
/// @nodoc
class __$$BlogPostCreateStateErrorImplCopyWithImpl<$Res>
extends
_$BlogPostCreateStateCopyWithImpl<$Res, _$BlogPostCreateStateErrorImpl>
extends _$BlogPostCreateStateCopyWithImpl<$Res,
_$BlogPostCreateStateErrorImpl>
implements _$$BlogPostCreateStateErrorImplCopyWith<$Res> {
__$$BlogPostCreateStateErrorImplCopyWithImpl(
_$BlogPostCreateStateErrorImpl _value,
$Res Function(_$BlogPostCreateStateErrorImpl) _then,
) : super(_value, _then);
$Res Function(_$BlogPostCreateStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of BlogPostCreateState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$BlogPostCreateStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$BlogPostCreateStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -519,8 +517,7 @@ class _$BlogPostCreateStateErrorImpl implements BlogPostCreateStateError {
@pragma('vm:prefer-inline')
_$$BlogPostCreateStateErrorImplCopyWith<_$BlogPostCreateStateErrorImpl>
get copyWith => __$$BlogPostCreateStateErrorImplCopyWithImpl<
_$BlogPostCreateStateErrorImpl
>(this, _$identity);
_$BlogPostCreateStateErrorImpl>(this, _$identity);
@override
@optionalTypeArgs

60
lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
View File

@@ -22,8 +22,9 @@ class BlogPostCreateScreen extends StatefulWidget {
final FeedBlogPostModel? feedBlogPostModel;
const BlogPostCreateScreen({
super.key,
this.feedBlogPostModel,
}) : super();
});
@override
State<BlogPostCreateScreen> createState() => _BlogPostCreateScreenState();
@@ -61,6 +62,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
super.dispose();
}
@override
Widget build(BuildContext context) {
return BlocProvider<BlogPostCreateCubit>(
create: (BuildContext context) => blogPostCubit,
@@ -70,7 +72,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
context.read<FeedCubit>().loadFeedBlogPostList();
}
},
child: _buildBlogPostCreate(),
child: _buildBlogPostCreate(context),
),
);
}
@@ -85,10 +87,11 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
final picker = ImagePicker();
image = await picker.pickImage(source: ImageSource.camera);
setState(() {});
if (!context.mounted) return;
Navigator.of(context).pop();
},
child: const Row(
children: const [
children: [
Icon(Icons.photo_camera),
SizedBox(width: 8),
Text('Фото'),
@@ -100,10 +103,11 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
final picker = ImagePicker();
image = await picker.pickImage(source: ImageSource.gallery);
setState(() {});
if (!context.mounted) return;
Navigator.of(context).pop();
},
child: const Row(
children: const [
children: [
Icon(Icons.photo),
SizedBox(width: 8),
Text('Галерея'),
@@ -120,7 +124,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
);
}
_buildBlogPostCreate() {
_buildBlogPostCreate(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: true,
appBar: AppBar(),
@@ -137,8 +141,8 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
),
backgroundColor: appTheme.blueA400,
label: isLoading
? CircularProgressIndicator()
: Text(
? const CircularProgressIndicator()
: const Text(
'Создать',
style: TextStyle(
color: Colors.white,
@@ -164,8 +168,10 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
isLoading = false;
});
if (!result) {
if (!context.mounted) return;
showErrorDialog(context, title: S.current.could_not_update_blog_post);
} else {
if (!context.mounted) return;
context.pop();
}
} else {
@@ -179,8 +185,10 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
isLoading = false;
});
if (!result) {
if (!context.mounted) return;
showErrorDialog(context, title: S.current.could_not_publish_blog_post);
} else {
if (!context.mounted) return;
context.pop();
}
}
@@ -188,36 +196,36 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
),
),
body: SingleChildScrollView(
padding: EdgeInsets.all(16),
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 16),
Text('Заголовок'),
SizedBox(height: 8),
const SizedBox(height: 16),
const Text('Заголовок'),
const SizedBox(height: 8),
CustomTextFormField(
controller: titleController,
),
SizedBox(height: 16),
Text('Описание'),
SizedBox(height: 8),
const SizedBox(height: 16),
const Text('Описание'),
const SizedBox(height: 8),
CustomTextFormField(
controller: descriptionController,
maxLines: 6,
minLines: 4,
),
SizedBox(height: 16),
if (videoUrlController.text.isEmpty) Text('Изображение поста'),
if (videoUrlController.text.isEmpty) SizedBox(height: 8),
const SizedBox(height: 16),
if (videoUrlController.text.isEmpty) const Text('Изображение поста'),
if (videoUrlController.text.isEmpty) const SizedBox(height: 8),
if (videoUrlController.text.isEmpty) _buildAddPhoto(),
SizedBox(height: 16),
if (image == null && widget.feedBlogPostModel?.image == null) Text('Ссылка на видео'),
if (image == null && widget.feedBlogPostModel?.image == null) SizedBox(height: 8),
const SizedBox(height: 16),
if (image == null && widget.feedBlogPostModel?.image == null) const Text('Ссылка на видео'),
if (image == null && widget.feedBlogPostModel?.image == null) const SizedBox(height: 8),
if (image == null && widget.feedBlogPostModel?.image == null)
CustomTextFormField(
controller: videoUrlController,
),
SizedBox(height: 80),
const SizedBox(height: 80),
],
),
),
@@ -235,7 +243,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
AnimatedContainer(
height: shrinkImage ? 52 : 128,
curve: Curves.easeIn,
duration: Duration(milliseconds: 150),
duration: const Duration(milliseconds: 150),
decoration: AppDecoration.fillGray.copyWith(
borderRadius: BorderRadius.circular(16),
),
@@ -247,7 +255,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
Icons.photo_library,
color: appTheme.blueGray300,
),
SizedBox(width: 8),
const SizedBox(width: 8),
Text(
"Добавить фото",
selectionColor: appTheme.blueA400,
@@ -256,7 +264,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
),
),
if (image != null)
Container(
SizedBox(
width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
child: ClipRRect(
borderRadius: BorderRadius.circular(16),
@@ -270,12 +278,12 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
),
),
if (widget.feedBlogPostModel?.image != null && image == null)
Container(
SizedBox(
width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
child: ClipRRect(
borderRadius: BorderRadius.circular(16),
child: Image(
image: NetworkImage(baseUrl + '/storage/' + widget.feedBlogPostModel!.image),
image: NetworkImage('$baseUrl/storage/${widget.feedBlogPostModel!.image}'),
),
),
),

7
lib/features/blog_post_create/repositories/blog_post_repository.dart
View File

@@ -1,3 +1,4 @@
import 'dart:developer';
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:eatvio_app/core/const.dart';
@@ -35,7 +36,7 @@ class BlogPostRepository {
Future<XFile?> downloadImage(String imageUrl) async {
try {
// Загрузка изображения
final response = await http.get(Uri.parse(baseUrl + '/storage/' + imageUrl));
final response = await http.get(Uri.parse('$baseUrl/storage/$imageUrl'));
if (response.statusCode == 200) {
// Получение временной директории
@@ -49,11 +50,11 @@ class BlogPostRepository {
// Возвращаем объект XFile
return XFile(file.path);
} else {
print('Ошибка загрузки изображения: ${response.statusCode}');
log('Ошибка загрузки изображения: ${response.statusCode}');
return null;
}
} catch (e) {
print('Произошла ошибка: $e');
log('Произошла ошибка: $e');
return null;
}
}

110
lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'new_messages_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$NewMessagesState {
@@ -23,14 +22,16 @@ mixin _$NewMessagesState {
required TResult Function() empty,
required TResult Function(int messagesCount) loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
TResult? Function()? empty,
TResult? Function(int messagesCount)? loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -38,21 +39,24 @@ mixin _$NewMessagesState {
TResult Function(int messagesCount)? loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_NewMessagesState value) $default, {
required TResult Function(NewMessagesStateEmpty value) empty,
required TResult Function(NewMessagesStateLoaded value) loaded,
required TResult Function(NewMessagesStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_NewMessagesState value)? $default, {
TResult? Function(NewMessagesStateEmpty value)? empty,
TResult? Function(NewMessagesStateLoaded value)? loaded,
TResult? Function(NewMessagesStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_NewMessagesState value)? $default, {
@@ -60,15 +64,15 @@ mixin _$NewMessagesState {
TResult Function(NewMessagesStateLoaded value)? loaded,
TResult Function(NewMessagesStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $NewMessagesStateCopyWith<$Res> {
factory $NewMessagesStateCopyWith(
NewMessagesState value,
$Res Function(NewMessagesState) then,
) = _$NewMessagesStateCopyWithImpl<$Res, NewMessagesState>;
NewMessagesState value, $Res Function(NewMessagesState) then) =
_$NewMessagesStateCopyWithImpl<$Res, NewMessagesState>;
}
/// @nodoc
@@ -87,20 +91,18 @@ class _$NewMessagesStateCopyWithImpl<$Res, $Val extends NewMessagesState>
/// @nodoc
abstract class _$$NewMessagesStateImplCopyWith<$Res> {
factory _$$NewMessagesStateImplCopyWith(
_$NewMessagesStateImpl value,
$Res Function(_$NewMessagesStateImpl) then,
) = __$$NewMessagesStateImplCopyWithImpl<$Res>;
factory _$$NewMessagesStateImplCopyWith(_$NewMessagesStateImpl value,
$Res Function(_$NewMessagesStateImpl) then) =
__$$NewMessagesStateImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$NewMessagesStateImplCopyWithImpl<$Res>
extends _$NewMessagesStateCopyWithImpl<$Res, _$NewMessagesStateImpl>
implements _$$NewMessagesStateImplCopyWith<$Res> {
__$$NewMessagesStateImplCopyWithImpl(
_$NewMessagesStateImpl _value,
$Res Function(_$NewMessagesStateImpl) _then,
) : super(_value, _then);
__$$NewMessagesStateImplCopyWithImpl(_$NewMessagesStateImpl _value,
$Res Function(_$NewMessagesStateImpl) _then)
: super(_value, _then);
/// Create a copy of NewMessagesState
/// with the given fields replaced by the non-null parameter values.
@@ -208,18 +210,17 @@ abstract class _NewMessagesState implements NewMessagesState {
abstract class _$$NewMessagesStateEmptyImplCopyWith<$Res> {
factory _$$NewMessagesStateEmptyImplCopyWith(
_$NewMessagesStateEmptyImpl value,
$Res Function(_$NewMessagesStateEmptyImpl) then,
) = __$$NewMessagesStateEmptyImplCopyWithImpl<$Res>;
$Res Function(_$NewMessagesStateEmptyImpl) then) =
__$$NewMessagesStateEmptyImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$NewMessagesStateEmptyImplCopyWithImpl<$Res>
extends _$NewMessagesStateCopyWithImpl<$Res, _$NewMessagesStateEmptyImpl>
implements _$$NewMessagesStateEmptyImplCopyWith<$Res> {
__$$NewMessagesStateEmptyImplCopyWithImpl(
_$NewMessagesStateEmptyImpl _value,
$Res Function(_$NewMessagesStateEmptyImpl) _then,
) : super(_value, _then);
__$$NewMessagesStateEmptyImplCopyWithImpl(_$NewMessagesStateEmptyImpl _value,
$Res Function(_$NewMessagesStateEmptyImpl) _then)
: super(_value, _then);
/// Create a copy of NewMessagesState
/// with the given fields replaced by the non-null parameter values.
@@ -328,8 +329,8 @@ abstract class NewMessagesStateEmpty implements NewMessagesState {
abstract class _$$NewMessagesStateLoadedImplCopyWith<$Res> {
factory _$$NewMessagesStateLoadedImplCopyWith(
_$NewMessagesStateLoadedImpl value,
$Res Function(_$NewMessagesStateLoadedImpl) then,
) = __$$NewMessagesStateLoadedImplCopyWithImpl<$Res>;
$Res Function(_$NewMessagesStateLoadedImpl) then) =
__$$NewMessagesStateLoadedImplCopyWithImpl<$Res>;
@useResult
$Res call({int messagesCount});
}
@@ -340,23 +341,22 @@ class __$$NewMessagesStateLoadedImplCopyWithImpl<$Res>
implements _$$NewMessagesStateLoadedImplCopyWith<$Res> {
__$$NewMessagesStateLoadedImplCopyWithImpl(
_$NewMessagesStateLoadedImpl _value,
$Res Function(_$NewMessagesStateLoadedImpl) _then,
) : super(_value, _then);
$Res Function(_$NewMessagesStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of NewMessagesState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? messagesCount = null}) {
return _then(
_$NewMessagesStateLoadedImpl(
messagesCount:
null == messagesCount
$Res call({
Object? messagesCount = null,
}) {
return _then(_$NewMessagesStateLoadedImpl(
messagesCount: null == messagesCount
? _value.messagesCount
: messagesCount // ignore: cast_nullable_to_non_nullable
as int,
),
);
));
}
}
@@ -391,11 +391,8 @@ class _$NewMessagesStateLoadedImpl implements NewMessagesStateLoaded {
@override
@pragma('vm:prefer-inline')
_$$NewMessagesStateLoadedImplCopyWith<_$NewMessagesStateLoadedImpl>
get copyWith =>
__$$NewMessagesStateLoadedImplCopyWithImpl<_$NewMessagesStateLoadedImpl>(
this,
_$identity,
);
get copyWith => __$$NewMessagesStateLoadedImplCopyWithImpl<
_$NewMessagesStateLoadedImpl>(this, _$identity);
@override
@optionalTypeArgs
@@ -489,8 +486,8 @@ abstract class NewMessagesStateLoaded implements NewMessagesState {
abstract class _$$NewMessagesStateErrorImplCopyWith<$Res> {
factory _$$NewMessagesStateErrorImplCopyWith(
_$NewMessagesStateErrorImpl value,
$Res Function(_$NewMessagesStateErrorImpl) then,
) = __$$NewMessagesStateErrorImplCopyWithImpl<$Res>;
$Res Function(_$NewMessagesStateErrorImpl) then) =
__$$NewMessagesStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
@@ -499,25 +496,23 @@ abstract class _$$NewMessagesStateErrorImplCopyWith<$Res> {
class __$$NewMessagesStateErrorImplCopyWithImpl<$Res>
extends _$NewMessagesStateCopyWithImpl<$Res, _$NewMessagesStateErrorImpl>
implements _$$NewMessagesStateErrorImplCopyWith<$Res> {
__$$NewMessagesStateErrorImplCopyWithImpl(
_$NewMessagesStateErrorImpl _value,
$Res Function(_$NewMessagesStateErrorImpl) _then,
) : super(_value, _then);
__$$NewMessagesStateErrorImplCopyWithImpl(_$NewMessagesStateErrorImpl _value,
$Res Function(_$NewMessagesStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of NewMessagesState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$NewMessagesStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$NewMessagesStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -552,11 +547,8 @@ class _$NewMessagesStateErrorImpl implements NewMessagesStateError {
@override
@pragma('vm:prefer-inline')
_$$NewMessagesStateErrorImplCopyWith<_$NewMessagesStateErrorImpl>
get copyWith =>
__$$NewMessagesStateErrorImplCopyWithImpl<_$NewMessagesStateErrorImpl>(
this,
_$identity,
);
get copyWith => __$$NewMessagesStateErrorImplCopyWithImpl<
_$NewMessagesStateErrorImpl>(this, _$identity);
@override
@optionalTypeArgs

160
lib/features/bottom_navigation_bar/presentation/bloc/notifications_cubit/notifications_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'notifications_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$NotificationsState {
@@ -22,12 +21,11 @@ mixin _$NotificationsState {
TResult Function() $default, {
required TResult Function() empty,
required TResult Function(
List<String> notifications,
int notificationsCount,
)
List<String> notifications, int notificationsCount)
loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
@@ -35,7 +33,8 @@ mixin _$NotificationsState {
TResult? Function(List<String> notifications, int notificationsCount)?
loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -44,21 +43,24 @@ mixin _$NotificationsState {
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_NotificationsState value) $default, {
required TResult Function(NotificationsStateEmpty value) empty,
required TResult Function(NotificationsStateLoaded value) loaded,
required TResult Function(NotificationsStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_NotificationsState value)? $default, {
TResult? Function(NotificationsStateEmpty value)? empty,
TResult? Function(NotificationsStateLoaded value)? loaded,
TResult? Function(NotificationsStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_NotificationsState value)? $default, {
@@ -66,15 +68,15 @@ mixin _$NotificationsState {
TResult Function(NotificationsStateLoaded value)? loaded,
TResult Function(NotificationsStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $NotificationsStateCopyWith<$Res> {
factory $NotificationsStateCopyWith(
NotificationsState value,
$Res Function(NotificationsState) then,
) = _$NotificationsStateCopyWithImpl<$Res, NotificationsState>;
NotificationsState value, $Res Function(NotificationsState) then) =
_$NotificationsStateCopyWithImpl<$Res, NotificationsState>;
}
/// @nodoc
@@ -93,20 +95,18 @@ class _$NotificationsStateCopyWithImpl<$Res, $Val extends NotificationsState>
/// @nodoc
abstract class _$$NotificationsStateImplCopyWith<$Res> {
factory _$$NotificationsStateImplCopyWith(
_$NotificationsStateImpl value,
$Res Function(_$NotificationsStateImpl) then,
) = __$$NotificationsStateImplCopyWithImpl<$Res>;
factory _$$NotificationsStateImplCopyWith(_$NotificationsStateImpl value,
$Res Function(_$NotificationsStateImpl) then) =
__$$NotificationsStateImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$NotificationsStateImplCopyWithImpl<$Res>
extends _$NotificationsStateCopyWithImpl<$Res, _$NotificationsStateImpl>
implements _$$NotificationsStateImplCopyWith<$Res> {
__$$NotificationsStateImplCopyWithImpl(
_$NotificationsStateImpl _value,
$Res Function(_$NotificationsStateImpl) _then,
) : super(_value, _then);
__$$NotificationsStateImplCopyWithImpl(_$NotificationsStateImpl _value,
$Res Function(_$NotificationsStateImpl) _then)
: super(_value, _then);
/// Create a copy of NotificationsState
/// with the given fields replaced by the non-null parameter values.
@@ -137,9 +137,7 @@ class _$NotificationsStateImpl implements _NotificationsState {
TResult Function() $default, {
required TResult Function() empty,
required TResult Function(
List<String> notifications,
int notificationsCount,
)
List<String> notifications, int notificationsCount)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -220,19 +218,19 @@ abstract class _NotificationsState implements NotificationsState {
abstract class _$$NotificationsStateEmptyImplCopyWith<$Res> {
factory _$$NotificationsStateEmptyImplCopyWith(
_$NotificationsStateEmptyImpl value,
$Res Function(_$NotificationsStateEmptyImpl) then,
) = __$$NotificationsStateEmptyImplCopyWithImpl<$Res>;
$Res Function(_$NotificationsStateEmptyImpl) then) =
__$$NotificationsStateEmptyImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$NotificationsStateEmptyImplCopyWithImpl<$Res>
extends
_$NotificationsStateCopyWithImpl<$Res, _$NotificationsStateEmptyImpl>
extends _$NotificationsStateCopyWithImpl<$Res,
_$NotificationsStateEmptyImpl>
implements _$$NotificationsStateEmptyImplCopyWith<$Res> {
__$$NotificationsStateEmptyImplCopyWithImpl(
_$NotificationsStateEmptyImpl _value,
$Res Function(_$NotificationsStateEmptyImpl) _then,
) : super(_value, _then);
$Res Function(_$NotificationsStateEmptyImpl) _then)
: super(_value, _then);
/// Create a copy of NotificationsState
/// with the given fields replaced by the non-null parameter values.
@@ -264,9 +262,7 @@ class _$NotificationsStateEmptyImpl implements NotificationsStateEmpty {
TResult Function() $default, {
required TResult Function() empty,
required TResult Function(
List<String> notifications,
int notificationsCount,
)
List<String> notifications, int notificationsCount)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -347,51 +343,50 @@ abstract class NotificationsStateEmpty implements NotificationsState {
abstract class _$$NotificationsStateLoadedImplCopyWith<$Res> {
factory _$$NotificationsStateLoadedImplCopyWith(
_$NotificationsStateLoadedImpl value,
$Res Function(_$NotificationsStateLoadedImpl) then,
) = __$$NotificationsStateLoadedImplCopyWithImpl<$Res>;
$Res Function(_$NotificationsStateLoadedImpl) then) =
__$$NotificationsStateLoadedImplCopyWithImpl<$Res>;
@useResult
$Res call({List<String> notifications, int notificationsCount});
}
/// @nodoc
class __$$NotificationsStateLoadedImplCopyWithImpl<$Res>
extends
_$NotificationsStateCopyWithImpl<$Res, _$NotificationsStateLoadedImpl>
extends _$NotificationsStateCopyWithImpl<$Res,
_$NotificationsStateLoadedImpl>
implements _$$NotificationsStateLoadedImplCopyWith<$Res> {
__$$NotificationsStateLoadedImplCopyWithImpl(
_$NotificationsStateLoadedImpl _value,
$Res Function(_$NotificationsStateLoadedImpl) _then,
) : super(_value, _then);
$Res Function(_$NotificationsStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of NotificationsState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? notifications = null, Object? notificationsCount = null}) {
return _then(
_$NotificationsStateLoadedImpl(
notifications:
null == notifications
$Res call({
Object? notifications = null,
Object? notificationsCount = null,
}) {
return _then(_$NotificationsStateLoadedImpl(
notifications: null == notifications
? _value._notifications
: notifications // ignore: cast_nullable_to_non_nullable
as List<String>,
notificationsCount:
null == notificationsCount
notificationsCount: null == notificationsCount
? _value.notificationsCount
: notificationsCount // ignore: cast_nullable_to_non_nullable
as int,
),
);
));
}
}
/// @nodoc
class _$NotificationsStateLoadedImpl implements NotificationsStateLoaded {
const _$NotificationsStateLoadedImpl({
required final List<String> notifications,
required this.notificationsCount,
}) : _notifications = notifications;
const _$NotificationsStateLoadedImpl(
{required final List<String> notifications,
required this.notificationsCount})
: _notifications = notifications;
final List<String> _notifications;
@override
@@ -414,20 +409,15 @@ class _$NotificationsStateLoadedImpl implements NotificationsStateLoaded {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$NotificationsStateLoadedImpl &&
const DeepCollectionEquality().equals(
other._notifications,
_notifications,
) &&
const DeepCollectionEquality()
.equals(other._notifications, _notifications) &&
(identical(other.notificationsCount, notificationsCount) ||
other.notificationsCount == notificationsCount));
}
@override
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(_notifications),
notificationsCount,
);
int get hashCode => Object.hash(runtimeType,
const DeepCollectionEquality().hash(_notifications), notificationsCount);
/// Create a copy of NotificationsState
/// with the given fields replaced by the non-null parameter values.
@@ -436,8 +426,7 @@ class _$NotificationsStateLoadedImpl implements NotificationsStateLoaded {
@pragma('vm:prefer-inline')
_$$NotificationsStateLoadedImplCopyWith<_$NotificationsStateLoadedImpl>
get copyWith => __$$NotificationsStateLoadedImplCopyWithImpl<
_$NotificationsStateLoadedImpl
>(this, _$identity);
_$NotificationsStateLoadedImpl>(this, _$identity);
@override
@optionalTypeArgs
@@ -445,9 +434,7 @@ class _$NotificationsStateLoadedImpl implements NotificationsStateLoaded {
TResult Function() $default, {
required TResult Function() empty,
required TResult Function(
List<String> notifications,
int notificationsCount,
)
List<String> notifications, int notificationsCount)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -521,10 +508,9 @@ class _$NotificationsStateLoadedImpl implements NotificationsStateLoaded {
}
abstract class NotificationsStateLoaded implements NotificationsState {
const factory NotificationsStateLoaded({
required final List<String> notifications,
required final int notificationsCount,
}) = _$NotificationsStateLoadedImpl;
const factory NotificationsStateLoaded(
{required final List<String> notifications,
required final int notificationsCount}) = _$NotificationsStateLoadedImpl;
List<String> get notifications;
int get notificationsCount;
@@ -540,36 +526,35 @@ abstract class NotificationsStateLoaded implements NotificationsState {
abstract class _$$NotificationsStateErrorImplCopyWith<$Res> {
factory _$$NotificationsStateErrorImplCopyWith(
_$NotificationsStateErrorImpl value,
$Res Function(_$NotificationsStateErrorImpl) then,
) = __$$NotificationsStateErrorImplCopyWithImpl<$Res>;
$Res Function(_$NotificationsStateErrorImpl) then) =
__$$NotificationsStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
/// @nodoc
class __$$NotificationsStateErrorImplCopyWithImpl<$Res>
extends
_$NotificationsStateCopyWithImpl<$Res, _$NotificationsStateErrorImpl>
extends _$NotificationsStateCopyWithImpl<$Res,
_$NotificationsStateErrorImpl>
implements _$$NotificationsStateErrorImplCopyWith<$Res> {
__$$NotificationsStateErrorImplCopyWithImpl(
_$NotificationsStateErrorImpl _value,
$Res Function(_$NotificationsStateErrorImpl) _then,
) : super(_value, _then);
$Res Function(_$NotificationsStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of NotificationsState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$NotificationsStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$NotificationsStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -605,8 +590,7 @@ class _$NotificationsStateErrorImpl implements NotificationsStateError {
@pragma('vm:prefer-inline')
_$$NotificationsStateErrorImplCopyWith<_$NotificationsStateErrorImpl>
get copyWith => __$$NotificationsStateErrorImplCopyWithImpl<
_$NotificationsStateErrorImpl
>(this, _$identity);
_$NotificationsStateErrorImpl>(this, _$identity);
@override
@optionalTypeArgs
@@ -614,9 +598,7 @@ class _$NotificationsStateErrorImpl implements NotificationsStateError {
TResult Function() $default, {
required TResult Function() empty,
required TResult Function(
List<String> notifications,
int notificationsCount,
)
List<String> notifications, int notificationsCount)
loaded,
required TResult Function(String errorMessage) error,
}) {

113
lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'profile_avatar_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$ProfileAvatarState {
@@ -23,14 +22,16 @@ mixin _$ProfileAvatarState {
required TResult Function() loading,
required TResult Function(ProfileModel profile) loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
TResult? Function()? loading,
TResult? Function(ProfileModel profile)? loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -38,21 +39,24 @@ mixin _$ProfileAvatarState {
TResult Function(ProfileModel profile)? loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_ProfileAvatarState value) $default, {
required TResult Function(ProfileAvatarStateLoading value) loading,
required TResult Function(ProfileAvatarStateLoaded value) loaded,
required TResult Function(ProfileAvatarStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_ProfileAvatarState value)? $default, {
TResult? Function(ProfileAvatarStateLoading value)? loading,
TResult? Function(ProfileAvatarStateLoaded value)? loaded,
TResult? Function(ProfileAvatarStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_ProfileAvatarState value)? $default, {
@@ -60,15 +64,15 @@ mixin _$ProfileAvatarState {
TResult Function(ProfileAvatarStateLoaded value)? loaded,
TResult Function(ProfileAvatarStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $ProfileAvatarStateCopyWith<$Res> {
factory $ProfileAvatarStateCopyWith(
ProfileAvatarState value,
$Res Function(ProfileAvatarState) then,
) = _$ProfileAvatarStateCopyWithImpl<$Res, ProfileAvatarState>;
ProfileAvatarState value, $Res Function(ProfileAvatarState) then) =
_$ProfileAvatarStateCopyWithImpl<$Res, ProfileAvatarState>;
}
/// @nodoc
@@ -87,20 +91,18 @@ class _$ProfileAvatarStateCopyWithImpl<$Res, $Val extends ProfileAvatarState>
/// @nodoc
abstract class _$$ProfileAvatarStateImplCopyWith<$Res> {
factory _$$ProfileAvatarStateImplCopyWith(
_$ProfileAvatarStateImpl value,
$Res Function(_$ProfileAvatarStateImpl) then,
) = __$$ProfileAvatarStateImplCopyWithImpl<$Res>;
factory _$$ProfileAvatarStateImplCopyWith(_$ProfileAvatarStateImpl value,
$Res Function(_$ProfileAvatarStateImpl) then) =
__$$ProfileAvatarStateImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$ProfileAvatarStateImplCopyWithImpl<$Res>
extends _$ProfileAvatarStateCopyWithImpl<$Res, _$ProfileAvatarStateImpl>
implements _$$ProfileAvatarStateImplCopyWith<$Res> {
__$$ProfileAvatarStateImplCopyWithImpl(
_$ProfileAvatarStateImpl _value,
$Res Function(_$ProfileAvatarStateImpl) _then,
) : super(_value, _then);
__$$ProfileAvatarStateImplCopyWithImpl(_$ProfileAvatarStateImpl _value,
$Res Function(_$ProfileAvatarStateImpl) _then)
: super(_value, _then);
/// Create a copy of ProfileAvatarState
/// with the given fields replaced by the non-null parameter values.
@@ -208,19 +210,19 @@ abstract class _ProfileAvatarState implements ProfileAvatarState {
abstract class _$$ProfileAvatarStateLoadingImplCopyWith<$Res> {
factory _$$ProfileAvatarStateLoadingImplCopyWith(
_$ProfileAvatarStateLoadingImpl value,
$Res Function(_$ProfileAvatarStateLoadingImpl) then,
) = __$$ProfileAvatarStateLoadingImplCopyWithImpl<$Res>;
$Res Function(_$ProfileAvatarStateLoadingImpl) then) =
__$$ProfileAvatarStateLoadingImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$ProfileAvatarStateLoadingImplCopyWithImpl<$Res>
extends
_$ProfileAvatarStateCopyWithImpl<$Res, _$ProfileAvatarStateLoadingImpl>
extends _$ProfileAvatarStateCopyWithImpl<$Res,
_$ProfileAvatarStateLoadingImpl>
implements _$$ProfileAvatarStateLoadingImplCopyWith<$Res> {
__$$ProfileAvatarStateLoadingImplCopyWithImpl(
_$ProfileAvatarStateLoadingImpl _value,
$Res Function(_$ProfileAvatarStateLoadingImpl) _then,
) : super(_value, _then);
$Res Function(_$ProfileAvatarStateLoadingImpl) _then)
: super(_value, _then);
/// Create a copy of ProfileAvatarState
/// with the given fields replaced by the non-null parameter values.
@@ -329,8 +331,8 @@ abstract class ProfileAvatarStateLoading implements ProfileAvatarState {
abstract class _$$ProfileAvatarStateLoadedImplCopyWith<$Res> {
factory _$$ProfileAvatarStateLoadedImplCopyWith(
_$ProfileAvatarStateLoadedImpl value,
$Res Function(_$ProfileAvatarStateLoadedImpl) then,
) = __$$ProfileAvatarStateLoadedImplCopyWithImpl<$Res>;
$Res Function(_$ProfileAvatarStateLoadedImpl) then) =
__$$ProfileAvatarStateLoadedImplCopyWithImpl<$Res>;
@useResult
$Res call({ProfileModel profile});
@@ -339,28 +341,27 @@ abstract class _$$ProfileAvatarStateLoadedImplCopyWith<$Res> {
/// @nodoc
class __$$ProfileAvatarStateLoadedImplCopyWithImpl<$Res>
extends
_$ProfileAvatarStateCopyWithImpl<$Res, _$ProfileAvatarStateLoadedImpl>
extends _$ProfileAvatarStateCopyWithImpl<$Res,
_$ProfileAvatarStateLoadedImpl>
implements _$$ProfileAvatarStateLoadedImplCopyWith<$Res> {
__$$ProfileAvatarStateLoadedImplCopyWithImpl(
_$ProfileAvatarStateLoadedImpl _value,
$Res Function(_$ProfileAvatarStateLoadedImpl) _then,
) : super(_value, _then);
$Res Function(_$ProfileAvatarStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of ProfileAvatarState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? profile = null}) {
return _then(
_$ProfileAvatarStateLoadedImpl(
profile:
null == profile
$Res call({
Object? profile = null,
}) {
return _then(_$ProfileAvatarStateLoadedImpl(
profile: null == profile
? _value.profile
: profile // ignore: cast_nullable_to_non_nullable
as ProfileModel,
),
);
));
}
/// Create a copy of ProfileAvatarState
@@ -405,8 +406,7 @@ class _$ProfileAvatarStateLoadedImpl implements ProfileAvatarStateLoaded {
@pragma('vm:prefer-inline')
_$$ProfileAvatarStateLoadedImplCopyWith<_$ProfileAvatarStateLoadedImpl>
get copyWith => __$$ProfileAvatarStateLoadedImplCopyWithImpl<
_$ProfileAvatarStateLoadedImpl
>(this, _$identity);
_$ProfileAvatarStateLoadedImpl>(this, _$identity);
@override
@optionalTypeArgs
@@ -484,9 +484,8 @@ class _$ProfileAvatarStateLoadedImpl implements ProfileAvatarStateLoaded {
}
abstract class ProfileAvatarStateLoaded implements ProfileAvatarState {
const factory ProfileAvatarStateLoaded({
required final ProfileModel profile,
}) = _$ProfileAvatarStateLoadedImpl;
const factory ProfileAvatarStateLoaded(
{required final ProfileModel profile}) = _$ProfileAvatarStateLoadedImpl;
ProfileModel get profile;
@@ -501,36 +500,35 @@ abstract class ProfileAvatarStateLoaded implements ProfileAvatarState {
abstract class _$$ProfileAvatarStateErrorImplCopyWith<$Res> {
factory _$$ProfileAvatarStateErrorImplCopyWith(
_$ProfileAvatarStateErrorImpl value,
$Res Function(_$ProfileAvatarStateErrorImpl) then,
) = __$$ProfileAvatarStateErrorImplCopyWithImpl<$Res>;
$Res Function(_$ProfileAvatarStateErrorImpl) then) =
__$$ProfileAvatarStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
/// @nodoc
class __$$ProfileAvatarStateErrorImplCopyWithImpl<$Res>
extends
_$ProfileAvatarStateCopyWithImpl<$Res, _$ProfileAvatarStateErrorImpl>
extends _$ProfileAvatarStateCopyWithImpl<$Res,
_$ProfileAvatarStateErrorImpl>
implements _$$ProfileAvatarStateErrorImplCopyWith<$Res> {
__$$ProfileAvatarStateErrorImplCopyWithImpl(
_$ProfileAvatarStateErrorImpl _value,
$Res Function(_$ProfileAvatarStateErrorImpl) _then,
) : super(_value, _then);
$Res Function(_$ProfileAvatarStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of ProfileAvatarState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$ProfileAvatarStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$ProfileAvatarStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -566,8 +564,7 @@ class _$ProfileAvatarStateErrorImpl implements ProfileAvatarStateError {
@pragma('vm:prefer-inline')
_$$ProfileAvatarStateErrorImplCopyWith<_$ProfileAvatarStateErrorImpl>
get copyWith => __$$ProfileAvatarStateErrorImplCopyWithImpl<
_$ProfileAvatarStateErrorImpl
>(this, _$identity);
_$ProfileAvatarStateErrorImpl>(this, _$identity);
@override
@optionalTypeArgs

16
lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
View File

@@ -90,7 +90,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
icon: Padding(
padding: const EdgeInsets.only(bottom: 2),
child: SvgPicture.asset(
colorFilter: ColorFilter.mode(Colors.grey, BlendMode.srcIn),
colorFilter: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
width: 20,
height: 20,
ImageConstant.icnFeed,
@@ -114,7 +114,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
icon: Padding(
padding: const EdgeInsets.only(bottom: 2),
child: SvgPicture.asset(
colorFilter: ColorFilter.mode(Colors.grey, BlendMode.srcIn),
colorFilter: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
ImageConstant.icnDiary,
width: 20,
height: 20,
@@ -139,7 +139,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
icon: Padding(
padding: const EdgeInsets.only(bottom: 2),
child: SvgPicture.asset(
colorFilter: ColorFilter.mode(Colors.grey, BlendMode.srcIn),
colorFilter: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
'assets/icons/consultations.svg',
width: 20,
height: 20,
@@ -165,7 +165,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
final hasUnreadMessages = state.chatsWithUnreadMessagesCount > 0;
return badges.Badge(
position: badges.BadgePosition.topEnd(),
badgeAnimation: badges.BadgeAnimation.fade(),
badgeAnimation: const badges.BadgeAnimation.fade(),
badgeStyle: badges.BadgeStyle(
badgeColor: hasUnreadMessages ? Colors.red : Colors.transparent,
),
@@ -187,7 +187,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
appTheme.blueA400,
BlendMode.srcIn,
)
: ColorFilter.mode(Colors.grey, BlendMode.srcIn),
: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
),
),
);
@@ -200,10 +200,10 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
builder: (BuildContext context, NotificationsState state) {
return badges.Badge(
position: badges.BadgePosition.topEnd(),
badgeAnimation: badges.BadgeAnimation.fade(),
badgeAnimation: const badges.BadgeAnimation.fade(),
badgeContent: Text(
(state is NotificationsStateLoaded) ? state.notificationsCount.toString() : '0',
style: TextStyle(
style: const TextStyle(
color: Colors.white,
fontSize: 8,
),
@@ -217,7 +217,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
appTheme.blueA400,
BlendMode.srcIn,
)
: ColorFilter.mode(Colors.grey, BlendMode.srcIn),
: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
width: 20,
height: 20,
),

21
lib/features/calendar/models/calendar_entry_model.dart
View File

@@ -1,21 +0,0 @@
/// This class is used in the [userprofile_item_widget] screen.
// ignore_for_file: must_be_immutable
class CalendarEntryModel {
String? date;
String? status;
String id;
bool is_current_day_included_in_the_chosen_diet_progression;
CalendarEntryModel({
this.date,
this.status,
required this.id,
required this.is_current_day_included_in_the_chosen_diet_progression,
}) {
date = date;
status = status;
id = id;
is_current_day_included_in_the_chosen_diet_progression = is_current_day_included_in_the_chosen_diet_progression;
}
}

2
lib/features/calendar/models/calendar_model.dart
View File

@@ -8,7 +8,7 @@ part 'calendar_model.g.dart';
class CalendarModel with _$CalendarModel {
const factory CalendarModel({
required String date,
required bool is_current_day_included_in_the_chosen_diet_progression,
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression') required bool isCurrentDayIncludedInTheChosenDietProgression,
Object? diary,
}) = _CalendarModel;

128
lib/features/calendar/models/calendar_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'calendar_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
CalendarModel _$CalendarModelFromJson(Map<String, dynamic> json) {
return _CalendarModel.fromJson(json);
@@ -22,7 +21,8 @@ CalendarModel _$CalendarModelFromJson(Map<String, dynamic> json) {
/// @nodoc
mixin _$CalendarModel {
String get date => throw _privateConstructorUsedError;
bool get is_current_day_included_in_the_chosen_diet_progression =>
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
bool get isCurrentDayIncludedInTheChosenDietProgression =>
throw _privateConstructorUsedError;
Object? get diary => throw _privateConstructorUsedError;
@@ -39,15 +39,14 @@ mixin _$CalendarModel {
/// @nodoc
abstract class $CalendarModelCopyWith<$Res> {
factory $CalendarModelCopyWith(
CalendarModel value,
$Res Function(CalendarModel) then,
) = _$CalendarModelCopyWithImpl<$Res, CalendarModel>;
CalendarModel value, $Res Function(CalendarModel) then) =
_$CalendarModelCopyWithImpl<$Res, CalendarModel>;
@useResult
$Res call({
String date,
bool is_current_day_included_in_the_chosen_diet_progression,
Object? diary,
});
$Res call(
{String date,
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
bool isCurrentDayIncludedInTheChosenDietProgression,
Object? diary});
}
/// @nodoc
@@ -66,26 +65,21 @@ class _$CalendarModelCopyWithImpl<$Res, $Val extends CalendarModel>
@override
$Res call({
Object? date = null,
Object? is_current_day_included_in_the_chosen_diet_progression = null,
Object? isCurrentDayIncludedInTheChosenDietProgression = null,
Object? diary = freezed,
}) {
return _then(
_value.copyWith(
date:
null == date
return _then(_value.copyWith(
date: null == date
? _value.date
: date // ignore: cast_nullable_to_non_nullable
as String,
is_current_day_included_in_the_chosen_diet_progression:
null == is_current_day_included_in_the_chosen_diet_progression
? _value
.is_current_day_included_in_the_chosen_diet_progression
: is_current_day_included_in_the_chosen_diet_progression // ignore: cast_nullable_to_non_nullable
isCurrentDayIncludedInTheChosenDietProgression: null ==
isCurrentDayIncludedInTheChosenDietProgression
? _value.isCurrentDayIncludedInTheChosenDietProgression
: isCurrentDayIncludedInTheChosenDietProgression // ignore: cast_nullable_to_non_nullable
as bool,
diary: freezed == diary ? _value.diary : diary,
)
as $Val,
);
) as $Val);
}
}
@@ -93,16 +87,15 @@ class _$CalendarModelCopyWithImpl<$Res, $Val extends CalendarModel>
abstract class _$$CalendarModelImplCopyWith<$Res>
implements $CalendarModelCopyWith<$Res> {
factory _$$CalendarModelImplCopyWith(
_$CalendarModelImpl value,
$Res Function(_$CalendarModelImpl) then,
) = __$$CalendarModelImplCopyWithImpl<$Res>;
_$CalendarModelImpl value, $Res Function(_$CalendarModelImpl) then) =
__$$CalendarModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
String date,
bool is_current_day_included_in_the_chosen_diet_progression,
Object? diary,
});
$Res call(
{String date,
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
bool isCurrentDayIncludedInTheChosenDietProgression,
Object? diary});
}
/// @nodoc
@@ -110,9 +103,8 @@ class __$$CalendarModelImplCopyWithImpl<$Res>
extends _$CalendarModelCopyWithImpl<$Res, _$CalendarModelImpl>
implements _$$CalendarModelImplCopyWith<$Res> {
__$$CalendarModelImplCopyWithImpl(
_$CalendarModelImpl _value,
$Res Function(_$CalendarModelImpl) _then,
) : super(_value, _then);
_$CalendarModelImpl _value, $Res Function(_$CalendarModelImpl) _then)
: super(_value, _then);
/// Create a copy of CalendarModel
/// with the given fields replaced by the non-null parameter values.
@@ -120,35 +112,32 @@ class __$$CalendarModelImplCopyWithImpl<$Res>
@override
$Res call({
Object? date = null,
Object? is_current_day_included_in_the_chosen_diet_progression = null,
Object? isCurrentDayIncludedInTheChosenDietProgression = null,
Object? diary = freezed,
}) {
return _then(
_$CalendarModelImpl(
date:
null == date
return _then(_$CalendarModelImpl(
date: null == date
? _value.date
: date // ignore: cast_nullable_to_non_nullable
as String,
is_current_day_included_in_the_chosen_diet_progression:
null == is_current_day_included_in_the_chosen_diet_progression
? _value.is_current_day_included_in_the_chosen_diet_progression
: is_current_day_included_in_the_chosen_diet_progression // ignore: cast_nullable_to_non_nullable
isCurrentDayIncludedInTheChosenDietProgression: null ==
isCurrentDayIncludedInTheChosenDietProgression
? _value.isCurrentDayIncludedInTheChosenDietProgression
: isCurrentDayIncludedInTheChosenDietProgression // ignore: cast_nullable_to_non_nullable
as bool,
diary: freezed == diary ? _value.diary : diary,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$CalendarModelImpl implements _CalendarModel {
const _$CalendarModelImpl({
required this.date,
required this.is_current_day_included_in_the_chosen_diet_progression,
this.diary,
});
const _$CalendarModelImpl(
{required this.date,
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
required this.isCurrentDayIncludedInTheChosenDietProgression,
this.diary});
factory _$CalendarModelImpl.fromJson(Map<String, dynamic> json) =>
_$$CalendarModelImplFromJson(json);
@@ -156,13 +145,14 @@ class _$CalendarModelImpl implements _CalendarModel {
@override
final String date;
@override
final bool is_current_day_included_in_the_chosen_diet_progression;
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
final bool isCurrentDayIncludedInTheChosenDietProgression;
@override
final Object? diary;
@override
String toString() {
return 'CalendarModel(date: $date, is_current_day_included_in_the_chosen_diet_progression: $is_current_day_included_in_the_chosen_diet_progression, diary: $diary)';
return 'CalendarModel(date: $date, isCurrentDayIncludedInTheChosenDietProgression: $isCurrentDayIncludedInTheChosenDietProgression, diary: $diary)';
}
@override
@@ -171,12 +161,10 @@ class _$CalendarModelImpl implements _CalendarModel {
(other.runtimeType == runtimeType &&
other is _$CalendarModelImpl &&
(identical(other.date, date) || other.date == date) &&
(identical(
other.is_current_day_included_in_the_chosen_diet_progression,
is_current_day_included_in_the_chosen_diet_progression,
) ||
other.is_current_day_included_in_the_chosen_diet_progression ==
is_current_day_included_in_the_chosen_diet_progression) &&
(identical(other.isCurrentDayIncludedInTheChosenDietProgression,
isCurrentDayIncludedInTheChosenDietProgression) ||
other.isCurrentDayIncludedInTheChosenDietProgression ==
isCurrentDayIncludedInTheChosenDietProgression) &&
const DeepCollectionEquality().equals(other.diary, diary));
}
@@ -185,9 +173,8 @@ class _$CalendarModelImpl implements _CalendarModel {
int get hashCode => Object.hash(
runtimeType,
date,
is_current_day_included_in_the_chosen_diet_progression,
const DeepCollectionEquality().hash(diary),
);
isCurrentDayIncludedInTheChosenDietProgression,
const DeepCollectionEquality().hash(diary));
/// Create a copy of CalendarModel
/// with the given fields replaced by the non-null parameter values.
@@ -199,16 +186,18 @@ class _$CalendarModelImpl implements _CalendarModel {
@override
Map<String, dynamic> toJson() {
return _$$CalendarModelImplToJson(this);
return _$$CalendarModelImplToJson(
this,
);
}
}
abstract class _CalendarModel implements CalendarModel {
const factory _CalendarModel({
required final String date,
required final bool is_current_day_included_in_the_chosen_diet_progression,
final Object? diary,
}) = _$CalendarModelImpl;
const factory _CalendarModel(
{required final String date,
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
required final bool isCurrentDayIncludedInTheChosenDietProgression,
final Object? diary}) = _$CalendarModelImpl;
factory _CalendarModel.fromJson(Map<String, dynamic> json) =
_$CalendarModelImpl.fromJson;
@@ -216,7 +205,8 @@ abstract class _CalendarModel implements CalendarModel {
@override
String get date;
@override
bool get is_current_day_included_in_the_chosen_diet_progression;
@JsonKey(name: 'is_current_day_included_in_the_chosen_diet_progression')
bool get isCurrentDayIncludedInTheChosenDietProgression;
@override
Object? get diary;

4
lib/features/calendar/models/calendar_model.g.dart
View File

@@ -9,7 +9,7 @@ part of 'calendar_model.dart';
_$CalendarModelImpl _$$CalendarModelImplFromJson(Map<String, dynamic> json) =>
_$CalendarModelImpl(
date: json['date'] as String,
is_current_day_included_in_the_chosen_diet_progression:
isCurrentDayIncludedInTheChosenDietProgression:
json['is_current_day_included_in_the_chosen_diet_progression']
as bool,
diary: json['diary'],
@@ -19,6 +19,6 @@ Map<String, dynamic> _$$CalendarModelImplToJson(_$CalendarModelImpl instance) =>
<String, dynamic>{
'date': instance.date,
'is_current_day_included_in_the_chosen_diet_progression':
instance.is_current_day_included_in_the_chosen_diet_progression,
instance.isCurrentDayIncludedInTheChosenDietProgression,
'diary': instance.diary,
};

134
lib/features/calendar/presentation/bloc/calendar_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'calendar_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$CalendarState {
@@ -23,14 +22,16 @@ mixin _$CalendarState {
required TResult Function() loading,
required TResult Function(List<CalendarModel> calendarList) loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
TResult? Function()? loading,
TResult? Function(List<CalendarModel> calendarList)? loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -38,21 +39,24 @@ mixin _$CalendarState {
TResult Function(List<CalendarModel> calendarList)? loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_CalendarState value) $default, {
required TResult Function(CalendarStateLoading value) loading,
required TResult Function(CalendarStateLoaded value) loaded,
required TResult Function(CalendarStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_CalendarState value)? $default, {
TResult? Function(CalendarStateLoading value)? loading,
TResult? Function(CalendarStateLoaded value)? loaded,
TResult? Function(CalendarStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_CalendarState value)? $default, {
@@ -60,15 +64,15 @@ mixin _$CalendarState {
TResult Function(CalendarStateLoaded value)? loaded,
TResult Function(CalendarStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $CalendarStateCopyWith<$Res> {
factory $CalendarStateCopyWith(
CalendarState value,
$Res Function(CalendarState) then,
) = _$CalendarStateCopyWithImpl<$Res, CalendarState>;
CalendarState value, $Res Function(CalendarState) then) =
_$CalendarStateCopyWithImpl<$Res, CalendarState>;
}
/// @nodoc
@@ -88,9 +92,8 @@ class _$CalendarStateCopyWithImpl<$Res, $Val extends CalendarState>
/// @nodoc
abstract class _$$CalendarStateImplCopyWith<$Res> {
factory _$$CalendarStateImplCopyWith(
_$CalendarStateImpl value,
$Res Function(_$CalendarStateImpl) then,
) = __$$CalendarStateImplCopyWithImpl<$Res>;
_$CalendarStateImpl value, $Res Function(_$CalendarStateImpl) then) =
__$$CalendarStateImplCopyWithImpl<$Res>;
}
/// @nodoc
@@ -98,9 +101,8 @@ class __$$CalendarStateImplCopyWithImpl<$Res>
extends _$CalendarStateCopyWithImpl<$Res, _$CalendarStateImpl>
implements _$$CalendarStateImplCopyWith<$Res> {
__$$CalendarStateImplCopyWithImpl(
_$CalendarStateImpl _value,
$Res Function(_$CalendarStateImpl) _then,
) : super(_value, _then);
_$CalendarStateImpl _value, $Res Function(_$CalendarStateImpl) _then)
: super(_value, _then);
/// Create a copy of CalendarState
/// with the given fields replaced by the non-null parameter values.
@@ -206,20 +208,18 @@ abstract class _CalendarState implements CalendarState {
/// @nodoc
abstract class _$$CalendarStateLoadingImplCopyWith<$Res> {
factory _$$CalendarStateLoadingImplCopyWith(
_$CalendarStateLoadingImpl value,
$Res Function(_$CalendarStateLoadingImpl) then,
) = __$$CalendarStateLoadingImplCopyWithImpl<$Res>;
factory _$$CalendarStateLoadingImplCopyWith(_$CalendarStateLoadingImpl value,
$Res Function(_$CalendarStateLoadingImpl) then) =
__$$CalendarStateLoadingImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$CalendarStateLoadingImplCopyWithImpl<$Res>
extends _$CalendarStateCopyWithImpl<$Res, _$CalendarStateLoadingImpl>
implements _$$CalendarStateLoadingImplCopyWith<$Res> {
__$$CalendarStateLoadingImplCopyWithImpl(
_$CalendarStateLoadingImpl _value,
$Res Function(_$CalendarStateLoadingImpl) _then,
) : super(_value, _then);
__$$CalendarStateLoadingImplCopyWithImpl(_$CalendarStateLoadingImpl _value,
$Res Function(_$CalendarStateLoadingImpl) _then)
: super(_value, _then);
/// Create a copy of CalendarState
/// with the given fields replaced by the non-null parameter values.
@@ -326,10 +326,9 @@ abstract class CalendarStateLoading implements CalendarState {
/// @nodoc
abstract class _$$CalendarStateLoadedImplCopyWith<$Res> {
factory _$$CalendarStateLoadedImplCopyWith(
_$CalendarStateLoadedImpl value,
$Res Function(_$CalendarStateLoadedImpl) then,
) = __$$CalendarStateLoadedImplCopyWithImpl<$Res>;
factory _$$CalendarStateLoadedImplCopyWith(_$CalendarStateLoadedImpl value,
$Res Function(_$CalendarStateLoadedImpl) then) =
__$$CalendarStateLoadedImplCopyWithImpl<$Res>;
@useResult
$Res call({List<CalendarModel> calendarList});
}
@@ -338,34 +337,32 @@ abstract class _$$CalendarStateLoadedImplCopyWith<$Res> {
class __$$CalendarStateLoadedImplCopyWithImpl<$Res>
extends _$CalendarStateCopyWithImpl<$Res, _$CalendarStateLoadedImpl>
implements _$$CalendarStateLoadedImplCopyWith<$Res> {
__$$CalendarStateLoadedImplCopyWithImpl(
_$CalendarStateLoadedImpl _value,
$Res Function(_$CalendarStateLoadedImpl) _then,
) : super(_value, _then);
__$$CalendarStateLoadedImplCopyWithImpl(_$CalendarStateLoadedImpl _value,
$Res Function(_$CalendarStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of CalendarState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? calendarList = null}) {
return _then(
_$CalendarStateLoadedImpl(
calendarList:
null == calendarList
$Res call({
Object? calendarList = null,
}) {
return _then(_$CalendarStateLoadedImpl(
calendarList: null == calendarList
? _value._calendarList
: calendarList // ignore: cast_nullable_to_non_nullable
as List<CalendarModel>,
),
);
));
}
}
/// @nodoc
class _$CalendarStateLoadedImpl implements CalendarStateLoaded {
const _$CalendarStateLoadedImpl({
required final List<CalendarModel> calendarList,
}) : _calendarList = calendarList;
const _$CalendarStateLoadedImpl(
{required final List<CalendarModel> calendarList})
: _calendarList = calendarList;
final List<CalendarModel> _calendarList;
@override
@@ -385,17 +382,13 @@ class _$CalendarStateLoadedImpl implements CalendarStateLoaded {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$CalendarStateLoadedImpl &&
const DeepCollectionEquality().equals(
other._calendarList,
_calendarList,
));
const DeepCollectionEquality()
.equals(other._calendarList, _calendarList));
}
@override
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(_calendarList),
);
runtimeType, const DeepCollectionEquality().hash(_calendarList));
/// Create a copy of CalendarState
/// with the given fields replaced by the non-null parameter values.
@@ -404,9 +397,7 @@ class _$CalendarStateLoadedImpl implements CalendarStateLoaded {
@pragma('vm:prefer-inline')
_$$CalendarStateLoadedImplCopyWith<_$CalendarStateLoadedImpl> get copyWith =>
__$$CalendarStateLoadedImplCopyWithImpl<_$CalendarStateLoadedImpl>(
this,
_$identity,
);
this, _$identity);
@override
@optionalTypeArgs
@@ -484,9 +475,9 @@ class _$CalendarStateLoadedImpl implements CalendarStateLoaded {
}
abstract class CalendarStateLoaded implements CalendarState {
const factory CalendarStateLoaded({
required final List<CalendarModel> calendarList,
}) = _$CalendarStateLoadedImpl;
const factory CalendarStateLoaded(
{required final List<CalendarModel> calendarList}) =
_$CalendarStateLoadedImpl;
List<CalendarModel> get calendarList;
@@ -499,10 +490,9 @@ abstract class CalendarStateLoaded implements CalendarState {
/// @nodoc
abstract class _$$CalendarStateErrorImplCopyWith<$Res> {
factory _$$CalendarStateErrorImplCopyWith(
_$CalendarStateErrorImpl value,
$Res Function(_$CalendarStateErrorImpl) then,
) = __$$CalendarStateErrorImplCopyWithImpl<$Res>;
factory _$$CalendarStateErrorImplCopyWith(_$CalendarStateErrorImpl value,
$Res Function(_$CalendarStateErrorImpl) then) =
__$$CalendarStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
@@ -511,25 +501,23 @@ abstract class _$$CalendarStateErrorImplCopyWith<$Res> {
class __$$CalendarStateErrorImplCopyWithImpl<$Res>
extends _$CalendarStateCopyWithImpl<$Res, _$CalendarStateErrorImpl>
implements _$$CalendarStateErrorImplCopyWith<$Res> {
__$$CalendarStateErrorImplCopyWithImpl(
_$CalendarStateErrorImpl _value,
$Res Function(_$CalendarStateErrorImpl) _then,
) : super(_value, _then);
__$$CalendarStateErrorImplCopyWithImpl(_$CalendarStateErrorImpl _value,
$Res Function(_$CalendarStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of CalendarState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$CalendarStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$CalendarStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -565,9 +553,7 @@ class _$CalendarStateErrorImpl implements CalendarStateError {
@pragma('vm:prefer-inline')
_$$CalendarStateErrorImplCopyWith<_$CalendarStateErrorImpl> get copyWith =>
__$$CalendarStateErrorImplCopyWithImpl<_$CalendarStateErrorImpl>(
this,
_$identity,
);
this, _$identity);
@override
@optionalTypeArgs

75
lib/features/calendar/presentation/pages/calendar_screen.dart
View File

@@ -12,8 +12,9 @@ import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
class CalendarScreen extends StatelessWidget {
CalendarScreen({Key? key}) : super(key: key);
const CalendarScreen({super.key});
@override
Widget build(BuildContext context) {
return BlocProvider<CalendarCubit>(
create: (context) => sl<CalendarCubit>()..loadCalendarList(),
@@ -22,8 +23,8 @@ class CalendarScreen extends StatelessWidget {
if (state is CalendarStateLoaded) {
return _buildCalendar(context, state);
} else if (state is CalendarStateLoading) {
return Scaffold(
body: const Loader(),
return const Scaffold(
body: Loader(),
);
} else if (state is CalendarStateError) {
return Scaffold(
@@ -34,10 +35,10 @@ class CalendarScreen extends StatelessWidget {
),
),
);
} else
return Scaffold(
}
return const Scaffold(
body: Padding(
padding: const EdgeInsets.all(16),
padding: EdgeInsets.all(16),
child: Center(
child: Text("Неопределенная ошибка"),
),
@@ -55,7 +56,7 @@ class CalendarScreen extends StatelessWidget {
FormBuilder(
child: Scaffold(
appBar: AppBar(
title: Text(
title: const Text(
'Календарь',
),
),
@@ -68,12 +69,12 @@ class CalendarScreen extends StatelessWidget {
Expanded(
child: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.only(bottom: 8),
padding: const EdgeInsets.only(bottom: 8),
child: Column(
children: [
SizedBox(height: 24),
const SizedBox(height: 24),
_buildCalendarBody(context, state),
SizedBox(height: 24),
const SizedBox(height: 24),
],
),
),
@@ -90,11 +91,11 @@ class CalendarScreen extends StatelessWidget {
_buildCalendarBody(BuildContext context, CalendarStateLoaded state) {
return ListView.separated(
padding: EdgeInsets.all(8),
padding: const EdgeInsets.all(8),
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(),
separatorBuilder: (context, index) {
return SizedBox(
return const SizedBox(
height: 4,
);
},
@@ -106,12 +107,12 @@ class CalendarScreen extends StatelessWidget {
return InkWell(
borderRadius: BorderRadiusStyle.circleBorder8,
child: Ink(
padding: EdgeInsets.all(8),
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadiusStyle.circleBorder8,
color: state.calendarList[index].is_current_day_included_in_the_chosen_diet_progression
? Color.fromRGBO(59, 130, 246, .2)
: Color.fromRGBO(126, 136, 151, .1),
color: state.calendarList[index].isCurrentDayIncludedInTheChosenDietProgression
? const Color.fromRGBO(59, 130, 246, .2)
: const Color.fromRGBO(126, 136, 151, .1),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@@ -125,12 +126,12 @@ class CalendarScreen extends StatelessWidget {
formatDate(state.calendarList[index].date),
style: theme.textTheme.titleMedium,
),
SizedBox(height: 4),
if (state.calendarList[index].is_current_day_included_in_the_chosen_diet_progression)
const SizedBox(height: 4),
if (state.calendarList[index].isCurrentDayIncludedInTheChosenDietProgression)
Container(
padding: EdgeInsets.all(4.0), // Отступы внутри контейнера
padding: const EdgeInsets.all(4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
color: const Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(24.0), // Закругленные углы
),
child: Text(
@@ -138,11 +139,11 @@ class CalendarScreen extends StatelessWidget {
style: CustomTextStyles.titleSmallBold, // Предполагается, что текст белый
),
),
if (!state.calendarList[index].is_current_day_included_in_the_chosen_diet_progression)
if (!state.calendarList[index].isCurrentDayIncludedInTheChosenDietProgression)
Container(
padding: EdgeInsets.all(4.0), // Отступы внутри контейнера
padding: const EdgeInsets.all(4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(108, 117, 125, 1),
color: const Color.fromRGBO(108, 117, 125, 1),
borderRadius: BorderRadius.circular(24.0), // Закругленные углы
),
child: Text(
@@ -166,7 +167,7 @@ class CalendarScreen extends StatelessWidget {
extra: diary['id'].toString(),
),
child: Ink(
padding: EdgeInsets.all(8),
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadiusStyle.circleBorder8,
color: getBackgroundColor(diary['state']),
@@ -183,13 +184,13 @@ class CalendarScreen extends StatelessWidget {
formatDate(state.calendarList[index].date),
style: theme.textTheme.titleMedium,
),
SizedBox(height: 4),
const SizedBox(height: 4),
Row(
children: [
Container(
padding: EdgeInsets.all(4.0), // Отступы внутри контейнера
padding: const EdgeInsets.all(4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: diary['state'] == 'finished' ? Color.fromRGBO(1, 154, 62, 1) : Color.fromRGBO(154, 74, 1, 1),
color: diary['state'] == 'finished' ? const Color.fromRGBO(1, 154, 62, 1) : const Color.fromRGBO(154, 74, 1, 1),
borderRadius: BorderRadius.circular(24.0), // Закругленные углы
),
child: Text(
@@ -197,12 +198,12 @@ class CalendarScreen extends StatelessWidget {
style: CustomTextStyles.titleSmallBold, // Предполагается, что текст белый
),
),
SizedBox(width: 4),
const SizedBox(width: 4),
if (diary['state'] == 'started')
Container(
padding: EdgeInsets.all(4.0), // Отступы внутри контейнера
padding: const EdgeInsets.all(4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
color: const Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(24.0), // Закругленные углы
),
child: Text(
@@ -212,9 +213,9 @@ class CalendarScreen extends StatelessWidget {
),
if (diary['state'] == 'finished')
Container(
padding: EdgeInsets.all(4.0), // Отступы внутри контейнера
padding: const EdgeInsets.all(4.0), // Отступы внутри контейнера
decoration: BoxDecoration(
color: Color.fromRGBO(13, 110, 253, 1),
color: const Color.fromRGBO(13, 110, 253, 1),
borderRadius: BorderRadius.circular(24.0), // Закругленные углы
),
child: Text(
@@ -256,16 +257,16 @@ String formatDate(String dateString) {
String formattedDate = DateFormat('d MMMM', 'ru_RU').format(dateTime);
// Возвращаем результат в нужном формате
return '$formattedDate';
return formattedDate;
}
Color getBackgroundColor(String? status) {
switch (status) {
case 'finished':
return Color.fromRGBO(1, 154, 62, .1);
return const Color.fromRGBO(1, 154, 62, .1);
case 'started':
return Color.fromRGBO(154, 74, 1, .1);
return const Color.fromRGBO(154, 74, 1, .1);
default:
return Color.fromRGBO(126, 136, 151, .1);
return const Color.fromRGBO(126, 136, 151, .1);
}
}

6
lib/features/calendar/services/calendar_service.g.dart
View File

@@ -36,11 +36,9 @@ class _CalendarService implements CalendarService {
final _result = await _dio.fetch<List<dynamic>>(_options);
late List<CalendarModel> _value;
try {
_value =
_result.data!
_value = _result.data!
.map(
(dynamic i) =>
CalendarModel.fromJson(i as Map<String, dynamic>),
(dynamic i) => CalendarModel.fromJson(i as Map<String, dynamic>),
)
.toList();
} on Object catch (e, s) {

133
lib/features/chat/models/chat_message_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chat_message_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatMessageModel _$ChatMessageModelFromJson(Map<String, dynamic> json) {
return _ChatMessageModel.fromJson(json);
@@ -49,20 +48,18 @@ mixin _$ChatMessageModel {
/// @nodoc
abstract class $ChatMessageModelCopyWith<$Res> {
factory $ChatMessageModelCopyWith(
ChatMessageModel value,
$Res Function(ChatMessageModel) then,
) = _$ChatMessageModelCopyWithImpl<$Res, ChatMessageModel>;
ChatMessageModel value, $Res Function(ChatMessageModel) then) =
_$ChatMessageModelCopyWithImpl<$Res, ChatMessageModel>;
@useResult
$Res call({
int id,
$Res call(
{int id,
String data,
@JsonKey(name: 'media_data') List<dynamic>? mediaData,
@JsonKey(name: 'author_id') int authorId,
@JsonKey(name: 'updated_at', fromJson: parseDate) DateTime updatedAt,
@JsonKey(name: 'read_by_to_user', defaultValue: false) bool isRead,
@JsonKey(name: 'is_author_message_auth_user') bool? isCurrentUserAuthor,
@JsonKey(name: 'room_id') String? roomId,
});
@JsonKey(name: 'room_id') String? roomId});
}
/// @nodoc
@@ -89,83 +86,69 @@ class _$ChatMessageModelCopyWithImpl<$Res, $Val extends ChatMessageModel>
Object? isCurrentUserAuthor = freezed,
Object? roomId = freezed,
}) {
return _then(
_value.copyWith(
id:
null == id
return _then(_value.copyWith(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
data:
null == data
data: null == data
? _value.data
: data // ignore: cast_nullable_to_non_nullable
as String,
mediaData:
freezed == mediaData
mediaData: freezed == mediaData
? _value.mediaData
: mediaData // ignore: cast_nullable_to_non_nullable
as List<dynamic>?,
authorId:
null == authorId
authorId: null == authorId
? _value.authorId
: authorId // ignore: cast_nullable_to_non_nullable
as int,
updatedAt:
null == updatedAt
updatedAt: null == updatedAt
? _value.updatedAt
: updatedAt // ignore: cast_nullable_to_non_nullable
as DateTime,
isRead:
null == isRead
isRead: null == isRead
? _value.isRead
: isRead // ignore: cast_nullable_to_non_nullable
as bool,
isCurrentUserAuthor:
freezed == isCurrentUserAuthor
isCurrentUserAuthor: freezed == isCurrentUserAuthor
? _value.isCurrentUserAuthor
: isCurrentUserAuthor // ignore: cast_nullable_to_non_nullable
as bool?,
roomId:
freezed == roomId
roomId: freezed == roomId
? _value.roomId
: roomId // ignore: cast_nullable_to_non_nullable
as String?,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$ChatMessageModelImplCopyWith<$Res>
implements $ChatMessageModelCopyWith<$Res> {
factory _$$ChatMessageModelImplCopyWith(
_$ChatMessageModelImpl value,
$Res Function(_$ChatMessageModelImpl) then,
) = __$$ChatMessageModelImplCopyWithImpl<$Res>;
factory _$$ChatMessageModelImplCopyWith(_$ChatMessageModelImpl value,
$Res Function(_$ChatMessageModelImpl) then) =
__$$ChatMessageModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
int id,
$Res call(
{int id,
String data,
@JsonKey(name: 'media_data') List<dynamic>? mediaData,
@JsonKey(name: 'author_id') int authorId,
@JsonKey(name: 'updated_at', fromJson: parseDate) DateTime updatedAt,
@JsonKey(name: 'read_by_to_user', defaultValue: false) bool isRead,
@JsonKey(name: 'is_author_message_auth_user') bool? isCurrentUserAuthor,
@JsonKey(name: 'room_id') String? roomId,
});
@JsonKey(name: 'room_id') String? roomId});
}
/// @nodoc
class __$$ChatMessageModelImplCopyWithImpl<$Res>
extends _$ChatMessageModelCopyWithImpl<$Res, _$ChatMessageModelImpl>
implements _$$ChatMessageModelImplCopyWith<$Res> {
__$$ChatMessageModelImplCopyWithImpl(
_$ChatMessageModelImpl _value,
$Res Function(_$ChatMessageModelImpl) _then,
) : super(_value, _then);
__$$ChatMessageModelImplCopyWithImpl(_$ChatMessageModelImpl _value,
$Res Function(_$ChatMessageModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatMessageModel
/// with the given fields replaced by the non-null parameter values.
@@ -181,67 +164,58 @@ class __$$ChatMessageModelImplCopyWithImpl<$Res>
Object? isCurrentUserAuthor = freezed,
Object? roomId = freezed,
}) {
return _then(
_$ChatMessageModelImpl(
id:
null == id
return _then(_$ChatMessageModelImpl(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
data:
null == data
data: null == data
? _value.data
: data // ignore: cast_nullable_to_non_nullable
as String,
mediaData:
freezed == mediaData
mediaData: freezed == mediaData
? _value._mediaData
: mediaData // ignore: cast_nullable_to_non_nullable
as List<dynamic>?,
authorId:
null == authorId
authorId: null == authorId
? _value.authorId
: authorId // ignore: cast_nullable_to_non_nullable
as int,
updatedAt:
null == updatedAt
updatedAt: null == updatedAt
? _value.updatedAt
: updatedAt // ignore: cast_nullable_to_non_nullable
as DateTime,
isRead:
null == isRead
isRead: null == isRead
? _value.isRead
: isRead // ignore: cast_nullable_to_non_nullable
as bool,
isCurrentUserAuthor:
freezed == isCurrentUserAuthor
isCurrentUserAuthor: freezed == isCurrentUserAuthor
? _value.isCurrentUserAuthor
: isCurrentUserAuthor // ignore: cast_nullable_to_non_nullable
as bool?,
roomId:
freezed == roomId
roomId: freezed == roomId
? _value.roomId
: roomId // ignore: cast_nullable_to_non_nullable
as String?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatMessageModelImpl implements _ChatMessageModel {
const _$ChatMessageModelImpl({
required this.id,
const _$ChatMessageModelImpl(
{required this.id,
required this.data,
@JsonKey(name: 'media_data') required final List<dynamic>? mediaData,
@JsonKey(name: 'author_id') required this.authorId,
@JsonKey(name: 'updated_at', fromJson: parseDate) required this.updatedAt,
@JsonKey(name: 'read_by_to_user', defaultValue: false) required this.isRead,
@JsonKey(name: 'read_by_to_user', defaultValue: false)
required this.isRead,
@JsonKey(name: 'is_author_message_auth_user')
required this.isCurrentUserAuthor,
@JsonKey(name: 'room_id') required this.roomId,
}) : _mediaData = mediaData;
@JsonKey(name: 'room_id') required this.roomId})
: _mediaData = mediaData;
factory _$ChatMessageModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatMessageModelImplFromJson(json);
@@ -289,10 +263,8 @@ class _$ChatMessageModelImpl implements _ChatMessageModel {
other is _$ChatMessageModelImpl &&
(identical(other.id, id) || other.id == id) &&
(identical(other.data, data) || other.data == data) &&
const DeepCollectionEquality().equals(
other._mediaData,
_mediaData,
) &&
const DeepCollectionEquality()
.equals(other._mediaData, _mediaData) &&
(identical(other.authorId, authorId) ||
other.authorId == authorId) &&
(identical(other.updatedAt, updatedAt) ||
@@ -314,8 +286,7 @@ class _$ChatMessageModelImpl implements _ChatMessageModel {
updatedAt,
isRead,
isCurrentUserAuthor,
roomId,
);
roomId);
/// Create a copy of ChatMessageModel
/// with the given fields replaced by the non-null parameter values.
@@ -324,19 +295,19 @@ class _$ChatMessageModelImpl implements _ChatMessageModel {
@pragma('vm:prefer-inline')
_$$ChatMessageModelImplCopyWith<_$ChatMessageModelImpl> get copyWith =>
__$$ChatMessageModelImplCopyWithImpl<_$ChatMessageModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$ChatMessageModelImplToJson(this);
return _$$ChatMessageModelImplToJson(
this,
);
}
}
abstract class _ChatMessageModel implements ChatMessageModel {
const factory _ChatMessageModel({
required final int id,
const factory _ChatMessageModel(
{required final int id,
required final String data,
@JsonKey(name: 'media_data') required final List<dynamic>? mediaData,
@JsonKey(name: 'author_id') required final int authorId,
@@ -346,8 +317,8 @@ abstract class _ChatMessageModel implements ChatMessageModel {
required final bool isRead,
@JsonKey(name: 'is_author_message_auth_user')
required final bool? isCurrentUserAuthor,
@JsonKey(name: 'room_id') required final String? roomId,
}) = _$ChatMessageModelImpl;
@JsonKey(name: 'room_id') required final String? roomId}) =
_$ChatMessageModelImpl;
factory _ChatMessageModel.fromJson(Map<String, dynamic> json) =
_$ChatMessageModelImpl.fromJson;

8
lib/features/chat/models/chat_message_model.g.dart
View File

@@ -7,8 +7,8 @@ part of 'chat_message_model.dart';
// **************************************************************************
_$ChatMessageModelImpl _$$ChatMessageModelImplFromJson(
Map<String, dynamic> json,
) => _$ChatMessageModelImpl(
Map<String, dynamic> json) =>
_$ChatMessageModelImpl(
id: (json['id'] as num).toInt(),
data: json['data'] as String,
mediaData: json['media_data'] as List<dynamic>?,
@@ -20,8 +20,8 @@ _$ChatMessageModelImpl _$$ChatMessageModelImplFromJson(
);
Map<String, dynamic> _$$ChatMessageModelImplToJson(
_$ChatMessageModelImpl instance,
) => <String, dynamic>{
_$ChatMessageModelImpl instance) =>
<String, dynamic>{
'id': instance.id,
'data': instance.data,
'media_data': instance.mediaData,

107
lib/features/chat/models/chat_messages_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chat_messages_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatMessagesModel _$ChatMessagesModelFromJson(Map<String, dynamic> json) {
return _ChatMessagesModel.fromJson(json);
@@ -38,14 +37,12 @@ mixin _$ChatMessagesModel {
/// @nodoc
abstract class $ChatMessagesModelCopyWith<$Res> {
factory $ChatMessagesModelCopyWith(
ChatMessagesModel value,
$Res Function(ChatMessagesModel) then,
) = _$ChatMessagesModelCopyWithImpl<$Res, ChatMessagesModel>;
ChatMessagesModel value, $Res Function(ChatMessagesModel) then) =
_$ChatMessagesModelCopyWithImpl<$Res, ChatMessagesModel>;
@useResult
$Res call({
@JsonKey(name: 'data') List<ChatMessageModel> messagesList,
ChatMetaModel meta,
});
$Res call(
{@JsonKey(name: 'data') List<ChatMessageModel> messagesList,
ChatMetaModel meta});
$ChatMetaModelCopyWith<$Res> get meta;
}
@@ -64,22 +61,20 @@ class _$ChatMessagesModelCopyWithImpl<$Res, $Val extends ChatMessagesModel>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? messagesList = null, Object? meta = null}) {
return _then(
_value.copyWith(
messagesList:
null == messagesList
$Res call({
Object? messagesList = null,
Object? meta = null,
}) {
return _then(_value.copyWith(
messagesList: null == messagesList
? _value.messagesList
: messagesList // ignore: cast_nullable_to_non_nullable
as List<ChatMessageModel>,
meta:
null == meta
meta: null == meta
? _value.meta
: meta // ignore: cast_nullable_to_non_nullable
as ChatMetaModel,
)
as $Val,
);
) as $Val);
}
/// Create a copy of ChatMessagesModel
@@ -96,16 +91,14 @@ class _$ChatMessagesModelCopyWithImpl<$Res, $Val extends ChatMessagesModel>
/// @nodoc
abstract class _$$ChatMessagesModelImplCopyWith<$Res>
implements $ChatMessagesModelCopyWith<$Res> {
factory _$$ChatMessagesModelImplCopyWith(
_$ChatMessagesModelImpl value,
$Res Function(_$ChatMessagesModelImpl) then,
) = __$$ChatMessagesModelImplCopyWithImpl<$Res>;
factory _$$ChatMessagesModelImplCopyWith(_$ChatMessagesModelImpl value,
$Res Function(_$ChatMessagesModelImpl) then) =
__$$ChatMessagesModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: 'data') List<ChatMessageModel> messagesList,
ChatMetaModel meta,
});
$Res call(
{@JsonKey(name: 'data') List<ChatMessageModel> messagesList,
ChatMetaModel meta});
@override
$ChatMetaModelCopyWith<$Res> get meta;
@@ -115,40 +108,39 @@ abstract class _$$ChatMessagesModelImplCopyWith<$Res>
class __$$ChatMessagesModelImplCopyWithImpl<$Res>
extends _$ChatMessagesModelCopyWithImpl<$Res, _$ChatMessagesModelImpl>
implements _$$ChatMessagesModelImplCopyWith<$Res> {
__$$ChatMessagesModelImplCopyWithImpl(
_$ChatMessagesModelImpl _value,
$Res Function(_$ChatMessagesModelImpl) _then,
) : super(_value, _then);
__$$ChatMessagesModelImplCopyWithImpl(_$ChatMessagesModelImpl _value,
$Res Function(_$ChatMessagesModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatMessagesModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? messagesList = null, Object? meta = null}) {
return _then(
_$ChatMessagesModelImpl(
messagesList:
null == messagesList
$Res call({
Object? messagesList = null,
Object? meta = null,
}) {
return _then(_$ChatMessagesModelImpl(
messagesList: null == messagesList
? _value._messagesList
: messagesList // ignore: cast_nullable_to_non_nullable
as List<ChatMessageModel>,
meta:
null == meta
meta: null == meta
? _value.meta
: meta // ignore: cast_nullable_to_non_nullable
as ChatMetaModel,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatMessagesModelImpl implements _ChatMessagesModel {
const _$ChatMessagesModelImpl({
@JsonKey(name: 'data') required final List<ChatMessageModel> messagesList,
required this.meta,
}) : _messagesList = messagesList;
const _$ChatMessagesModelImpl(
{@JsonKey(name: 'data')
required final List<ChatMessageModel> messagesList,
required this.meta})
: _messagesList = messagesList;
factory _$ChatMessagesModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatMessagesModelImplFromJson(json);
@@ -175,20 +167,15 @@ class _$ChatMessagesModelImpl implements _ChatMessagesModel {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$ChatMessagesModelImpl &&
const DeepCollectionEquality().equals(
other._messagesList,
_messagesList,
) &&
const DeepCollectionEquality()
.equals(other._messagesList, _messagesList) &&
(identical(other.meta, meta) || other.meta == meta));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(_messagesList),
meta,
);
runtimeType, const DeepCollectionEquality().hash(_messagesList), meta);
/// Create a copy of ChatMessagesModel
/// with the given fields replaced by the non-null parameter values.
@@ -197,21 +184,21 @@ class _$ChatMessagesModelImpl implements _ChatMessagesModel {
@pragma('vm:prefer-inline')
_$$ChatMessagesModelImplCopyWith<_$ChatMessagesModelImpl> get copyWith =>
__$$ChatMessagesModelImplCopyWithImpl<_$ChatMessagesModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$ChatMessagesModelImplToJson(this);
return _$$ChatMessagesModelImplToJson(
this,
);
}
}
abstract class _ChatMessagesModel implements ChatMessagesModel {
const factory _ChatMessagesModel({
@JsonKey(name: 'data') required final List<ChatMessageModel> messagesList,
required final ChatMetaModel meta,
}) = _$ChatMessagesModelImpl;
const factory _ChatMessagesModel(
{@JsonKey(name: 'data')
required final List<ChatMessageModel> messagesList,
required final ChatMetaModel meta}) = _$ChatMessagesModelImpl;
factory _ChatMessagesModel.fromJson(Map<String, dynamic> json) =
_$ChatMessagesModelImpl.fromJson;

14
lib/features/chat/models/chat_messages_model.g.dart
View File

@@ -7,15 +7,17 @@ part of 'chat_messages_model.dart';
// **************************************************************************
_$ChatMessagesModelImpl _$$ChatMessagesModelImplFromJson(
Map<String, dynamic> json,
) => _$ChatMessagesModelImpl(
messagesList:
(json['data'] as List<dynamic>)
Map<String, dynamic> json) =>
_$ChatMessagesModelImpl(
messagesList: (json['data'] as List<dynamic>)
.map((e) => ChatMessageModel.fromJson(e as Map<String, dynamic>))
.toList(),
meta: ChatMetaModel.fromJson(json['meta'] as Map<String, dynamic>),
);
Map<String, dynamic> _$$ChatMessagesModelImplToJson(
_$ChatMessagesModelImpl instance,
) => <String, dynamic>{'data': instance.messagesList, 'meta': instance.meta};
_$ChatMessagesModelImpl instance) =>
<String, dynamic>{
'data': instance.messagesList,
'meta': instance.meta,
};

60
lib/features/chat/models/chat_meta_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chat_meta_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatMetaModel _$ChatMetaModelFromJson(Map<String, dynamic> json) {
return _ChatMetaModel.fromJson(json);
@@ -37,9 +36,8 @@ mixin _$ChatMetaModel {
/// @nodoc
abstract class $ChatMetaModelCopyWith<$Res> {
factory $ChatMetaModelCopyWith(
ChatMetaModel value,
$Res Function(ChatMetaModel) then,
) = _$ChatMetaModelCopyWithImpl<$Res, ChatMetaModel>;
ChatMetaModel value, $Res Function(ChatMetaModel) then) =
_$ChatMetaModelCopyWithImpl<$Res, ChatMetaModel>;
@useResult
$Res call({@JsonKey(name: "last_page") int lastPage});
}
@@ -58,17 +56,15 @@ class _$ChatMetaModelCopyWithImpl<$Res, $Val extends ChatMetaModel>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? lastPage = null}) {
return _then(
_value.copyWith(
lastPage:
null == lastPage
$Res call({
Object? lastPage = null,
}) {
return _then(_value.copyWith(
lastPage: null == lastPage
? _value.lastPage
: lastPage // ignore: cast_nullable_to_non_nullable
as int,
)
as $Val,
);
) as $Val);
}
}
@@ -76,9 +72,8 @@ class _$ChatMetaModelCopyWithImpl<$Res, $Val extends ChatMetaModel>
abstract class _$$ChatMetaModelImplCopyWith<$Res>
implements $ChatMetaModelCopyWith<$Res> {
factory _$$ChatMetaModelImplCopyWith(
_$ChatMetaModelImpl value,
$Res Function(_$ChatMetaModelImpl) then,
) = __$$ChatMetaModelImplCopyWithImpl<$Res>;
_$ChatMetaModelImpl value, $Res Function(_$ChatMetaModelImpl) then) =
__$$ChatMetaModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({@JsonKey(name: "last_page") int lastPage});
@@ -89,33 +84,30 @@ class __$$ChatMetaModelImplCopyWithImpl<$Res>
extends _$ChatMetaModelCopyWithImpl<$Res, _$ChatMetaModelImpl>
implements _$$ChatMetaModelImplCopyWith<$Res> {
__$$ChatMetaModelImplCopyWithImpl(
_$ChatMetaModelImpl _value,
$Res Function(_$ChatMetaModelImpl) _then,
) : super(_value, _then);
_$ChatMetaModelImpl _value, $Res Function(_$ChatMetaModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatMetaModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? lastPage = null}) {
return _then(
_$ChatMetaModelImpl(
lastPage:
null == lastPage
$Res call({
Object? lastPage = null,
}) {
return _then(_$ChatMetaModelImpl(
lastPage: null == lastPage
? _value.lastPage
: lastPage // ignore: cast_nullable_to_non_nullable
as int,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatMetaModelImpl implements _ChatMetaModel {
const _$ChatMetaModelImpl({
@JsonKey(name: "last_page") required this.lastPage,
});
const _$ChatMetaModelImpl(
{@JsonKey(name: "last_page") required this.lastPage});
factory _$ChatMetaModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatMetaModelImplFromJson(json);
@@ -152,14 +144,16 @@ class _$ChatMetaModelImpl implements _ChatMetaModel {
@override
Map<String, dynamic> toJson() {
return _$$ChatMetaModelImplToJson(this);
return _$$ChatMetaModelImplToJson(
this,
);
}
}
abstract class _ChatMetaModel implements ChatMetaModel {
const factory _ChatMetaModel({
@JsonKey(name: "last_page") required final int lastPage,
}) = _$ChatMetaModelImpl;
const factory _ChatMetaModel(
{@JsonKey(name: "last_page") required final int lastPage}) =
_$ChatMetaModelImpl;
factory _ChatMetaModel.fromJson(Map<String, dynamic> json) =
_$ChatMetaModelImpl.fromJson;

8
lib/features/chat/models/chat_meta_model.g.dart
View File

@@ -7,7 +7,11 @@ part of 'chat_meta_model.dart';
// **************************************************************************
_$ChatMetaModelImpl _$$ChatMetaModelImplFromJson(Map<String, dynamic> json) =>
_$ChatMetaModelImpl(lastPage: (json['last_page'] as num).toInt());
_$ChatMetaModelImpl(
lastPage: (json['last_page'] as num).toInt(),
);
Map<String, dynamic> _$$ChatMetaModelImplToJson(_$ChatMetaModelImpl instance) =>
<String, dynamic>{'last_page': instance.lastPage};
<String, dynamic>{
'last_page': instance.lastPage,
};

176
lib/features/chat/models/chat_room_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chat_room_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatRoomModel _$ChatRoomModelFromJson(Map<String, dynamic> json) {
return _ChatRoomModel.fromJson(json);
@@ -42,17 +41,16 @@ mixin _$ChatRoomModel {
/// @nodoc
abstract class $ChatRoomModelCopyWith<$Res> {
factory $ChatRoomModelCopyWith(
ChatRoomModel value,
$Res Function(ChatRoomModel) then,
) = _$ChatRoomModelCopyWithImpl<$Res, ChatRoomModel>;
ChatRoomModel value, $Res Function(ChatRoomModel) then) =
_$ChatRoomModelCopyWithImpl<$Res, ChatRoomModel>;
@useResult
$Res call({
String id,
@JsonKey(name: 'chat_room_setting') ChatRoomSettingsModel chatRoomSettings,
$Res call(
{String id,
@JsonKey(name: 'chat_room_setting')
ChatRoomSettingsModel chatRoomSettings,
Users users,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
ChosenPlanModel? chosenPlan,
});
ChosenPlanModel? chosenPlan});
$ChatRoomSettingsModelCopyWith<$Res> get chatRoomSettings;
$UsersCopyWith<$Res> get users;
@@ -79,31 +77,24 @@ class _$ChatRoomModelCopyWithImpl<$Res, $Val extends ChatRoomModel>
Object? users = null,
Object? chosenPlan = freezed,
}) {
return _then(
_value.copyWith(
id:
null == id
return _then(_value.copyWith(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as String,
chatRoomSettings:
null == chatRoomSettings
chatRoomSettings: null == chatRoomSettings
? _value.chatRoomSettings
: chatRoomSettings // ignore: cast_nullable_to_non_nullable
as ChatRoomSettingsModel,
users:
null == users
users: null == users
? _value.users
: users // ignore: cast_nullable_to_non_nullable
as Users,
chosenPlan:
freezed == chosenPlan
chosenPlan: freezed == chosenPlan
? _value.chosenPlan
: chosenPlan // ignore: cast_nullable_to_non_nullable
as ChosenPlanModel?,
)
as $Val,
);
) as $Val);
}
/// Create a copy of ChatRoomModel
@@ -111,9 +102,8 @@ class _$ChatRoomModelCopyWithImpl<$Res, $Val extends ChatRoomModel>
@override
@pragma('vm:prefer-inline')
$ChatRoomSettingsModelCopyWith<$Res> get chatRoomSettings {
return $ChatRoomSettingsModelCopyWith<$Res>(_value.chatRoomSettings, (
value,
) {
return $ChatRoomSettingsModelCopyWith<$Res>(_value.chatRoomSettings,
(value) {
return _then(_value.copyWith(chatRoomSettings: value) as $Val);
});
}
@@ -147,18 +137,17 @@ class _$ChatRoomModelCopyWithImpl<$Res, $Val extends ChatRoomModel>
abstract class _$$ChatRoomModelImplCopyWith<$Res>
implements $ChatRoomModelCopyWith<$Res> {
factory _$$ChatRoomModelImplCopyWith(
_$ChatRoomModelImpl value,
$Res Function(_$ChatRoomModelImpl) then,
) = __$$ChatRoomModelImplCopyWithImpl<$Res>;
_$ChatRoomModelImpl value, $Res Function(_$ChatRoomModelImpl) then) =
__$$ChatRoomModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
String id,
@JsonKey(name: 'chat_room_setting') ChatRoomSettingsModel chatRoomSettings,
$Res call(
{String id,
@JsonKey(name: 'chat_room_setting')
ChatRoomSettingsModel chatRoomSettings,
Users users,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
ChosenPlanModel? chosenPlan,
});
ChosenPlanModel? chosenPlan});
@override
$ChatRoomSettingsModelCopyWith<$Res> get chatRoomSettings;
@@ -173,9 +162,8 @@ class __$$ChatRoomModelImplCopyWithImpl<$Res>
extends _$ChatRoomModelCopyWithImpl<$Res, _$ChatRoomModelImpl>
implements _$$ChatRoomModelImplCopyWith<$Res> {
__$$ChatRoomModelImplCopyWithImpl(
_$ChatRoomModelImpl _value,
$Res Function(_$ChatRoomModelImpl) _then,
) : super(_value, _then);
_$ChatRoomModelImpl _value, $Res Function(_$ChatRoomModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomModel
/// with the given fields replaced by the non-null parameter values.
@@ -187,43 +175,36 @@ class __$$ChatRoomModelImplCopyWithImpl<$Res>
Object? users = null,
Object? chosenPlan = freezed,
}) {
return _then(
_$ChatRoomModelImpl(
id:
null == id
return _then(_$ChatRoomModelImpl(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as String,
chatRoomSettings:
null == chatRoomSettings
chatRoomSettings: null == chatRoomSettings
? _value.chatRoomSettings
: chatRoomSettings // ignore: cast_nullable_to_non_nullable
as ChatRoomSettingsModel,
users:
null == users
users: null == users
? _value.users
: users // ignore: cast_nullable_to_non_nullable
as Users,
chosenPlan:
freezed == chosenPlan
chosenPlan: freezed == chosenPlan
? _value.chosenPlan
: chosenPlan // ignore: cast_nullable_to_non_nullable
as ChosenPlanModel?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatRoomModelImpl implements _ChatRoomModel {
const _$ChatRoomModelImpl({
required this.id,
const _$ChatRoomModelImpl(
{required this.id,
@JsonKey(name: 'chat_room_setting') required this.chatRoomSettings,
required this.users,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
required this.chosenPlan,
});
required this.chosenPlan});
factory _$ChatRoomModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatRoomModelImplFromJson(json);
@@ -272,19 +253,20 @@ class _$ChatRoomModelImpl implements _ChatRoomModel {
@override
Map<String, dynamic> toJson() {
return _$$ChatRoomModelImplToJson(this);
return _$$ChatRoomModelImplToJson(
this,
);
}
}
abstract class _ChatRoomModel implements ChatRoomModel {
const factory _ChatRoomModel({
required final String id,
const factory _ChatRoomModel(
{required final String id,
@JsonKey(name: 'chat_room_setting')
required final ChatRoomSettingsModel chatRoomSettings,
required final Users users,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
required final ChosenPlanModel? chosenPlan,
}) = _$ChatRoomModelImpl;
required final ChosenPlanModel? chosenPlan}) = _$ChatRoomModelImpl;
factory _ChatRoomModel.fromJson(Map<String, dynamic> json) =
_$ChatRoomModelImpl.fromJson;
@@ -333,10 +315,9 @@ abstract class $UsersCopyWith<$Res> {
factory $UsersCopyWith(Users value, $Res Function(Users) then) =
_$UsersCopyWithImpl<$Res, Users>;
@useResult
$Res call({
@JsonKey(name: 'from_chat_user') ChatUserModel sender,
@JsonKey(name: 'to_chat_user') ChatUserModel receiver,
});
$Res call(
{@JsonKey(name: 'from_chat_user') ChatUserModel sender,
@JsonKey(name: 'to_chat_user') ChatUserModel receiver});
$ChatUserModelCopyWith<$Res> get sender;
$ChatUserModelCopyWith<$Res> get receiver;
@@ -356,22 +337,20 @@ class _$UsersCopyWithImpl<$Res, $Val extends Users>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? sender = null, Object? receiver = null}) {
return _then(
_value.copyWith(
sender:
null == sender
$Res call({
Object? sender = null,
Object? receiver = null,
}) {
return _then(_value.copyWith(
sender: null == sender
? _value.sender
: sender // ignore: cast_nullable_to_non_nullable
as ChatUserModel,
receiver:
null == receiver
receiver: null == receiver
? _value.receiver
: receiver // ignore: cast_nullable_to_non_nullable
as ChatUserModel,
)
as $Val,
);
) as $Val);
}
/// Create a copy of Users
@@ -398,15 +377,13 @@ class _$UsersCopyWithImpl<$Res, $Val extends Users>
/// @nodoc
abstract class _$$UsersImplCopyWith<$Res> implements $UsersCopyWith<$Res> {
factory _$$UsersImplCopyWith(
_$UsersImpl value,
$Res Function(_$UsersImpl) then,
) = __$$UsersImplCopyWithImpl<$Res>;
_$UsersImpl value, $Res Function(_$UsersImpl) then) =
__$$UsersImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: 'from_chat_user') ChatUserModel sender,
@JsonKey(name: 'to_chat_user') ChatUserModel receiver,
});
$Res call(
{@JsonKey(name: 'from_chat_user') ChatUserModel sender,
@JsonKey(name: 'to_chat_user') ChatUserModel receiver});
@override
$ChatUserModelCopyWith<$Res> get sender;
@@ -419,39 +396,36 @@ class __$$UsersImplCopyWithImpl<$Res>
extends _$UsersCopyWithImpl<$Res, _$UsersImpl>
implements _$$UsersImplCopyWith<$Res> {
__$$UsersImplCopyWithImpl(
_$UsersImpl _value,
$Res Function(_$UsersImpl) _then,
) : super(_value, _then);
_$UsersImpl _value, $Res Function(_$UsersImpl) _then)
: super(_value, _then);
/// Create a copy of Users
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? sender = null, Object? receiver = null}) {
return _then(
_$UsersImpl(
sender:
null == sender
$Res call({
Object? sender = null,
Object? receiver = null,
}) {
return _then(_$UsersImpl(
sender: null == sender
? _value.sender
: sender // ignore: cast_nullable_to_non_nullable
as ChatUserModel,
receiver:
null == receiver
receiver: null == receiver
? _value.receiver
: receiver // ignore: cast_nullable_to_non_nullable
as ChatUserModel,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$UsersImpl implements _Users {
const _$UsersImpl({
@JsonKey(name: 'from_chat_user') required this.sender,
@JsonKey(name: 'to_chat_user') required this.receiver,
});
const _$UsersImpl(
{@JsonKey(name: 'from_chat_user') required this.sender,
@JsonKey(name: 'to_chat_user') required this.receiver});
factory _$UsersImpl.fromJson(Map<String, dynamic> json) =>
_$$UsersImplFromJson(json);
@@ -492,15 +466,17 @@ class _$UsersImpl implements _Users {
@override
Map<String, dynamic> toJson() {
return _$$UsersImplToJson(this);
return _$$UsersImplToJson(
this,
);
}
}
abstract class _Users implements Users {
const factory _Users({
@JsonKey(name: 'from_chat_user') required final ChatUserModel sender,
@JsonKey(name: 'to_chat_user') required final ChatUserModel receiver,
}) = _$UsersImpl;
const factory _Users(
{@JsonKey(name: 'from_chat_user') required final ChatUserModel sender,
@JsonKey(name: 'to_chat_user')
required final ChatUserModel receiver}) = _$UsersImpl;
factory _Users.fromJson(Map<String, dynamic> json) = _$UsersImpl.fromJson;

11
lib/features/chat/models/chat_room_model.g.dart
View File

@@ -10,8 +10,7 @@ _$ChatRoomModelImpl _$$ChatRoomModelImplFromJson(Map<String, dynamic> json) =>
_$ChatRoomModelImpl(
id: json['id'] as String,
chatRoomSettings: ChatRoomSettingsModel.fromJson(
json['chat_room_setting'] as Map<String, dynamic>,
),
json['chat_room_setting'] as Map<String, dynamic>),
users: Users.fromJson(json['users'] as Map<String, dynamic>),
chosenPlan: parseChosenPlan(json['chosen_plan']),
);
@@ -26,11 +25,9 @@ Map<String, dynamic> _$$ChatRoomModelImplToJson(_$ChatRoomModelImpl instance) =>
_$UsersImpl _$$UsersImplFromJson(Map<String, dynamic> json) => _$UsersImpl(
sender: ChatUserModel.fromJson(
json['from_chat_user'] as Map<String, dynamic>,
),
receiver: ChatUserModel.fromJson(
json['to_chat_user'] as Map<String, dynamic>,
),
json['from_chat_user'] as Map<String, dynamic>),
receiver:
ChatUserModel.fromJson(json['to_chat_user'] as Map<String, dynamic>),
);
Map<String, dynamic> _$$UsersImplToJson(_$UsersImpl instance) =>

451
lib/features/chat/models/chat_room_pagination_model.freezed.dart
View File

@@ -12,12 +12,10 @@ part of 'chat_room_pagination_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatRoomPaginationModel _$ChatRoomPaginationModelFromJson(
Map<String, dynamic> json,
) {
Map<String, dynamic> json) {
return _ChatRoomPreviewModel.fromJson(json);
}
@@ -40,24 +38,20 @@ mixin _$ChatRoomPaginationModel {
/// @nodoc
abstract class $ChatRoomPaginationModelCopyWith<$Res> {
factory $ChatRoomPaginationModelCopyWith(
ChatRoomPaginationModel value,
$Res Function(ChatRoomPaginationModel) then,
) = _$ChatRoomPaginationModelCopyWithImpl<$Res, ChatRoomPaginationModel>;
factory $ChatRoomPaginationModelCopyWith(ChatRoomPaginationModel value,
$Res Function(ChatRoomPaginationModel) then) =
_$ChatRoomPaginationModelCopyWithImpl<$Res, ChatRoomPaginationModel>;
@useResult
$Res call({
@JsonKey(name: "chatRooms") ChatRooms chatRooms,
@JsonKey(name: "number_of_unread_chat_rooms") int unreadChatsCount,
});
$Res call(
{@JsonKey(name: "chatRooms") ChatRooms chatRooms,
@JsonKey(name: "number_of_unread_chat_rooms") int unreadChatsCount});
$ChatRoomsCopyWith<$Res> get chatRooms;
}
/// @nodoc
class _$ChatRoomPaginationModelCopyWithImpl<
$Res,
$Val extends ChatRoomPaginationModel
>
class _$ChatRoomPaginationModelCopyWithImpl<$Res,
$Val extends ChatRoomPaginationModel>
implements $ChatRoomPaginationModelCopyWith<$Res> {
_$ChatRoomPaginationModelCopyWithImpl(this._value, this._then);
@@ -70,22 +64,20 @@ class _$ChatRoomPaginationModelCopyWithImpl<
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? chatRooms = null, Object? unreadChatsCount = null}) {
return _then(
_value.copyWith(
chatRooms:
null == chatRooms
$Res call({
Object? chatRooms = null,
Object? unreadChatsCount = null,
}) {
return _then(_value.copyWith(
chatRooms: null == chatRooms
? _value.chatRooms
: chatRooms // ignore: cast_nullable_to_non_nullable
as ChatRooms,
unreadChatsCount:
null == unreadChatsCount
unreadChatsCount: null == unreadChatsCount
? _value.unreadChatsCount
: unreadChatsCount // ignore: cast_nullable_to_non_nullable
as int,
)
as $Val,
);
) as $Val);
}
/// Create a copy of ChatRoomPaginationModel
@@ -102,16 +94,14 @@ class _$ChatRoomPaginationModelCopyWithImpl<
/// @nodoc
abstract class _$$ChatRoomPreviewModelImplCopyWith<$Res>
implements $ChatRoomPaginationModelCopyWith<$Res> {
factory _$$ChatRoomPreviewModelImplCopyWith(
_$ChatRoomPreviewModelImpl value,
$Res Function(_$ChatRoomPreviewModelImpl) then,
) = __$$ChatRoomPreviewModelImplCopyWithImpl<$Res>;
factory _$$ChatRoomPreviewModelImplCopyWith(_$ChatRoomPreviewModelImpl value,
$Res Function(_$ChatRoomPreviewModelImpl) then) =
__$$ChatRoomPreviewModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "chatRooms") ChatRooms chatRooms,
@JsonKey(name: "number_of_unread_chat_rooms") int unreadChatsCount,
});
$Res call(
{@JsonKey(name: "chatRooms") ChatRooms chatRooms,
@JsonKey(name: "number_of_unread_chat_rooms") int unreadChatsCount});
@override
$ChatRoomsCopyWith<$Res> get chatRooms;
@@ -119,44 +109,41 @@ abstract class _$$ChatRoomPreviewModelImplCopyWith<$Res>
/// @nodoc
class __$$ChatRoomPreviewModelImplCopyWithImpl<$Res>
extends
_$ChatRoomPaginationModelCopyWithImpl<$Res, _$ChatRoomPreviewModelImpl>
extends _$ChatRoomPaginationModelCopyWithImpl<$Res,
_$ChatRoomPreviewModelImpl>
implements _$$ChatRoomPreviewModelImplCopyWith<$Res> {
__$$ChatRoomPreviewModelImplCopyWithImpl(
_$ChatRoomPreviewModelImpl _value,
$Res Function(_$ChatRoomPreviewModelImpl) _then,
) : super(_value, _then);
__$$ChatRoomPreviewModelImplCopyWithImpl(_$ChatRoomPreviewModelImpl _value,
$Res Function(_$ChatRoomPreviewModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomPaginationModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? chatRooms = null, Object? unreadChatsCount = null}) {
return _then(
_$ChatRoomPreviewModelImpl(
chatRooms:
null == chatRooms
$Res call({
Object? chatRooms = null,
Object? unreadChatsCount = null,
}) {
return _then(_$ChatRoomPreviewModelImpl(
chatRooms: null == chatRooms
? _value.chatRooms
: chatRooms // ignore: cast_nullable_to_non_nullable
as ChatRooms,
unreadChatsCount:
null == unreadChatsCount
unreadChatsCount: null == unreadChatsCount
? _value.unreadChatsCount
: unreadChatsCount // ignore: cast_nullable_to_non_nullable
as int,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatRoomPreviewModelImpl implements _ChatRoomPreviewModel {
const _$ChatRoomPreviewModelImpl({
@JsonKey(name: "chatRooms") required this.chatRooms,
const _$ChatRoomPreviewModelImpl(
{@JsonKey(name: "chatRooms") required this.chatRooms,
@JsonKey(name: "number_of_unread_chat_rooms")
required this.unreadChatsCount,
});
required this.unreadChatsCount});
factory _$ChatRoomPreviewModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatRoomPreviewModelImplFromJson(json);
@@ -196,22 +183,21 @@ class _$ChatRoomPreviewModelImpl implements _ChatRoomPreviewModel {
_$$ChatRoomPreviewModelImplCopyWith<_$ChatRoomPreviewModelImpl>
get copyWith =>
__$$ChatRoomPreviewModelImplCopyWithImpl<_$ChatRoomPreviewModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$ChatRoomPreviewModelImplToJson(this);
return _$$ChatRoomPreviewModelImplToJson(
this,
);
}
}
abstract class _ChatRoomPreviewModel implements ChatRoomPaginationModel {
const factory _ChatRoomPreviewModel({
@JsonKey(name: "chatRooms") required final ChatRooms chatRooms,
const factory _ChatRoomPreviewModel(
{@JsonKey(name: "chatRooms") required final ChatRooms chatRooms,
@JsonKey(name: "number_of_unread_chat_rooms")
required final int unreadChatsCount,
}) = _$ChatRoomPreviewModelImpl;
required final int unreadChatsCount}) = _$ChatRoomPreviewModelImpl;
factory _ChatRoomPreviewModel.fromJson(Map<String, dynamic> json) =
_$ChatRoomPreviewModelImpl.fromJson;
@@ -259,11 +245,10 @@ abstract class $ChatRoomsCopyWith<$Res> {
factory $ChatRoomsCopyWith(ChatRooms value, $Res Function(ChatRooms) then) =
_$ChatRoomsCopyWithImpl<$Res, ChatRooms>;
@useResult
$Res call({
@JsonKey(name: "data") List<ChatRoom> data,
$Res call(
{@JsonKey(name: "data") List<ChatRoom> data,
@JsonKey(name: "last_page") int lastPage,
@JsonKey(name: "current_page") int currentPage,
});
@JsonKey(name: "current_page") int currentPage});
}
/// @nodoc
@@ -285,26 +270,20 @@ class _$ChatRoomsCopyWithImpl<$Res, $Val extends ChatRooms>
Object? lastPage = null,
Object? currentPage = null,
}) {
return _then(
_value.copyWith(
data:
null == data
return _then(_value.copyWith(
data: null == data
? _value.data
: data // ignore: cast_nullable_to_non_nullable
as List<ChatRoom>,
lastPage:
null == lastPage
lastPage: null == lastPage
? _value.lastPage
: lastPage // ignore: cast_nullable_to_non_nullable
as int,
currentPage:
null == currentPage
currentPage: null == currentPage
? _value.currentPage
: currentPage // ignore: cast_nullable_to_non_nullable
as int,
)
as $Val,
);
) as $Val);
}
}
@@ -312,16 +291,14 @@ class _$ChatRoomsCopyWithImpl<$Res, $Val extends ChatRooms>
abstract class _$$ChatRoomsImplCopyWith<$Res>
implements $ChatRoomsCopyWith<$Res> {
factory _$$ChatRoomsImplCopyWith(
_$ChatRoomsImpl value,
$Res Function(_$ChatRoomsImpl) then,
) = __$$ChatRoomsImplCopyWithImpl<$Res>;
_$ChatRoomsImpl value, $Res Function(_$ChatRoomsImpl) then) =
__$$ChatRoomsImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "data") List<ChatRoom> data,
$Res call(
{@JsonKey(name: "data") List<ChatRoom> data,
@JsonKey(name: "last_page") int lastPage,
@JsonKey(name: "current_page") int currentPage,
});
@JsonKey(name: "current_page") int currentPage});
}
/// @nodoc
@@ -329,9 +306,8 @@ class __$$ChatRoomsImplCopyWithImpl<$Res>
extends _$ChatRoomsCopyWithImpl<$Res, _$ChatRoomsImpl>
implements _$$ChatRoomsImplCopyWith<$Res> {
__$$ChatRoomsImplCopyWithImpl(
_$ChatRoomsImpl _value,
$Res Function(_$ChatRoomsImpl) _then,
) : super(_value, _then);
_$ChatRoomsImpl _value, $Res Function(_$ChatRoomsImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRooms
/// with the given fields replaced by the non-null parameter values.
@@ -342,36 +318,31 @@ class __$$ChatRoomsImplCopyWithImpl<$Res>
Object? lastPage = null,
Object? currentPage = null,
}) {
return _then(
_$ChatRoomsImpl(
data:
null == data
return _then(_$ChatRoomsImpl(
data: null == data
? _value._data
: data // ignore: cast_nullable_to_non_nullable
as List<ChatRoom>,
lastPage:
null == lastPage
lastPage: null == lastPage
? _value.lastPage
: lastPage // ignore: cast_nullable_to_non_nullable
as int,
currentPage:
null == currentPage
currentPage: null == currentPage
? _value.currentPage
: currentPage // ignore: cast_nullable_to_non_nullable
as int,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatRoomsImpl implements _ChatRooms {
const _$ChatRoomsImpl({
@JsonKey(name: "data") required final List<ChatRoom> data,
const _$ChatRoomsImpl(
{@JsonKey(name: "data") required final List<ChatRoom> data,
@JsonKey(name: "last_page") required this.lastPage,
@JsonKey(name: "current_page") required this.currentPage,
}) : _data = data;
@JsonKey(name: "current_page") required this.currentPage})
: _data = data;
factory _$ChatRoomsImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatRoomsImplFromJson(json);
@@ -411,12 +382,8 @@ class _$ChatRoomsImpl implements _ChatRooms {
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(_data),
lastPage,
currentPage,
);
int get hashCode => Object.hash(runtimeType,
const DeepCollectionEquality().hash(_data), lastPage, currentPage);
/// Create a copy of ChatRooms
/// with the given fields replaced by the non-null parameter values.
@@ -428,16 +395,18 @@ class _$ChatRoomsImpl implements _ChatRooms {
@override
Map<String, dynamic> toJson() {
return _$$ChatRoomsImplToJson(this);
return _$$ChatRoomsImplToJson(
this,
);
}
}
abstract class _ChatRooms implements ChatRooms {
const factory _ChatRooms({
@JsonKey(name: "data") required final List<ChatRoom> data,
const factory _ChatRooms(
{@JsonKey(name: "data") required final List<ChatRoom> data,
@JsonKey(name: "last_page") required final int lastPage,
@JsonKey(name: "current_page") required final int currentPage,
}) = _$ChatRoomsImpl;
@JsonKey(name: "current_page") required final int currentPage}) =
_$ChatRoomsImpl;
factory _ChatRooms.fromJson(Map<String, dynamic> json) =
_$ChatRoomsImpl.fromJson;
@@ -494,16 +463,15 @@ abstract class $ChatRoomCopyWith<$Res> {
factory $ChatRoomCopyWith(ChatRoom value, $Res Function(ChatRoom) then) =
_$ChatRoomCopyWithImpl<$Res, ChatRoom>;
@useResult
$Res call({
@JsonKey(name: "id") String id,
$Res call(
{@JsonKey(name: "id") String id,
@JsonKey(name: "room_name") String roomName,
@JsonKey(name: "last_message", fromJson: parseLastMessage)
ChatMessageModel? lastMessage,
@JsonKey(name: "users") Users users,
@JsonKey(name: "unread_messages_count") int unreadMessagesCount,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
ChosenPlanModel? chosenPlan,
});
ChosenPlanModel? chosenPlan});
$ChatMessageModelCopyWith<$Res>? get lastMessage;
$UsersCopyWith<$Res> get users;
@@ -532,41 +500,32 @@ class _$ChatRoomCopyWithImpl<$Res, $Val extends ChatRoom>
Object? unreadMessagesCount = null,
Object? chosenPlan = freezed,
}) {
return _then(
_value.copyWith(
id:
null == id
return _then(_value.copyWith(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as String,
roomName:
null == roomName
roomName: null == roomName
? _value.roomName
: roomName // ignore: cast_nullable_to_non_nullable
as String,
lastMessage:
freezed == lastMessage
lastMessage: freezed == lastMessage
? _value.lastMessage
: lastMessage // ignore: cast_nullable_to_non_nullable
as ChatMessageModel?,
users:
null == users
users: null == users
? _value.users
: users // ignore: cast_nullable_to_non_nullable
as Users,
unreadMessagesCount:
null == unreadMessagesCount
unreadMessagesCount: null == unreadMessagesCount
? _value.unreadMessagesCount
: unreadMessagesCount // ignore: cast_nullable_to_non_nullable
as int,
chosenPlan:
freezed == chosenPlan
chosenPlan: freezed == chosenPlan
? _value.chosenPlan
: chosenPlan // ignore: cast_nullable_to_non_nullable
as ChosenPlanModel?,
)
as $Val,
);
) as $Val);
}
/// Create a copy of ChatRoom
@@ -612,21 +571,19 @@ class _$ChatRoomCopyWithImpl<$Res, $Val extends ChatRoom>
abstract class _$$ChatRoomImplCopyWith<$Res>
implements $ChatRoomCopyWith<$Res> {
factory _$$ChatRoomImplCopyWith(
_$ChatRoomImpl value,
$Res Function(_$ChatRoomImpl) then,
) = __$$ChatRoomImplCopyWithImpl<$Res>;
_$ChatRoomImpl value, $Res Function(_$ChatRoomImpl) then) =
__$$ChatRoomImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "id") String id,
$Res call(
{@JsonKey(name: "id") String id,
@JsonKey(name: "room_name") String roomName,
@JsonKey(name: "last_message", fromJson: parseLastMessage)
ChatMessageModel? lastMessage,
@JsonKey(name: "users") Users users,
@JsonKey(name: "unread_messages_count") int unreadMessagesCount,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
ChosenPlanModel? chosenPlan,
});
ChosenPlanModel? chosenPlan});
@override
$ChatMessageModelCopyWith<$Res>? get lastMessage;
@@ -641,9 +598,8 @@ class __$$ChatRoomImplCopyWithImpl<$Res>
extends _$ChatRoomCopyWithImpl<$Res, _$ChatRoomImpl>
implements _$$ChatRoomImplCopyWith<$Res> {
__$$ChatRoomImplCopyWithImpl(
_$ChatRoomImpl _value,
$Res Function(_$ChatRoomImpl) _then,
) : super(_value, _then);
_$ChatRoomImpl _value, $Res Function(_$ChatRoomImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoom
/// with the given fields replaced by the non-null parameter values.
@@ -657,56 +613,47 @@ class __$$ChatRoomImplCopyWithImpl<$Res>
Object? unreadMessagesCount = null,
Object? chosenPlan = freezed,
}) {
return _then(
_$ChatRoomImpl(
id:
null == id
return _then(_$ChatRoomImpl(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as String,
roomName:
null == roomName
roomName: null == roomName
? _value.roomName
: roomName // ignore: cast_nullable_to_non_nullable
as String,
lastMessage:
freezed == lastMessage
lastMessage: freezed == lastMessage
? _value.lastMessage
: lastMessage // ignore: cast_nullable_to_non_nullable
as ChatMessageModel?,
users:
null == users
users: null == users
? _value.users
: users // ignore: cast_nullable_to_non_nullable
as Users,
unreadMessagesCount:
null == unreadMessagesCount
unreadMessagesCount: null == unreadMessagesCount
? _value.unreadMessagesCount
: unreadMessagesCount // ignore: cast_nullable_to_non_nullable
as int,
chosenPlan:
freezed == chosenPlan
chosenPlan: freezed == chosenPlan
? _value.chosenPlan
: chosenPlan // ignore: cast_nullable_to_non_nullable
as ChosenPlanModel?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatRoomImpl implements _ChatRoom {
const _$ChatRoomImpl({
@JsonKey(name: "id") required this.id,
const _$ChatRoomImpl(
{@JsonKey(name: "id") required this.id,
@JsonKey(name: "room_name") required this.roomName,
@JsonKey(name: "last_message", fromJson: parseLastMessage)
required this.lastMessage,
@JsonKey(name: "users") required this.users,
@JsonKey(name: "unread_messages_count") required this.unreadMessagesCount,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
required this.chosenPlan,
});
required this.chosenPlan});
factory _$ChatRoomImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatRoomImplFromJson(json);
@@ -754,15 +701,8 @@ class _$ChatRoomImpl implements _ChatRoom {
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(
runtimeType,
id,
roomName,
lastMessage,
users,
unreadMessagesCount,
chosenPlan,
);
int get hashCode => Object.hash(runtimeType, id, roomName, lastMessage, users,
unreadMessagesCount, chosenPlan);
/// Create a copy of ChatRoom
/// with the given fields replaced by the non-null parameter values.
@@ -774,13 +714,15 @@ class _$ChatRoomImpl implements _ChatRoom {
@override
Map<String, dynamic> toJson() {
return _$$ChatRoomImplToJson(this);
return _$$ChatRoomImplToJson(
this,
);
}
}
abstract class _ChatRoom implements ChatRoom {
const factory _ChatRoom({
@JsonKey(name: "id") required final String id,
const factory _ChatRoom(
{@JsonKey(name: "id") required final String id,
@JsonKey(name: "room_name") required final String roomName,
@JsonKey(name: "last_message", fromJson: parseLastMessage)
required final ChatMessageModel? lastMessage,
@@ -788,8 +730,7 @@ abstract class _ChatRoom implements ChatRoom {
@JsonKey(name: "unread_messages_count")
required final int unreadMessagesCount,
@JsonKey(name: 'chosen_plan', fromJson: parseChosenPlan)
required final ChosenPlanModel? chosenPlan,
}) = _$ChatRoomImpl;
required final ChosenPlanModel? chosenPlan}) = _$ChatRoomImpl;
factory _ChatRoom.fromJson(Map<String, dynamic> json) =
_$ChatRoomImpl.fromJson;
@@ -846,10 +787,9 @@ abstract class $UsersCopyWith<$Res> {
factory $UsersCopyWith(Users value, $Res Function(Users) then) =
_$UsersCopyWithImpl<$Res, Users>;
@useResult
$Res call({
@JsonKey(name: "from_chat_user") ChatUser fromChatUser,
@JsonKey(name: "to_chat_user") ChatUser toChatUser,
});
$Res call(
{@JsonKey(name: "from_chat_user") ChatUser fromChatUser,
@JsonKey(name: "to_chat_user") ChatUser toChatUser});
$ChatUserCopyWith<$Res> get fromChatUser;
$ChatUserCopyWith<$Res> get toChatUser;
@@ -869,22 +809,20 @@ class _$UsersCopyWithImpl<$Res, $Val extends Users>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? fromChatUser = null, Object? toChatUser = null}) {
return _then(
_value.copyWith(
fromChatUser:
null == fromChatUser
$Res call({
Object? fromChatUser = null,
Object? toChatUser = null,
}) {
return _then(_value.copyWith(
fromChatUser: null == fromChatUser
? _value.fromChatUser
: fromChatUser // ignore: cast_nullable_to_non_nullable
as ChatUser,
toChatUser:
null == toChatUser
toChatUser: null == toChatUser
? _value.toChatUser
: toChatUser // ignore: cast_nullable_to_non_nullable
as ChatUser,
)
as $Val,
);
) as $Val);
}
/// Create a copy of Users
@@ -911,15 +849,13 @@ class _$UsersCopyWithImpl<$Res, $Val extends Users>
/// @nodoc
abstract class _$$UsersImplCopyWith<$Res> implements $UsersCopyWith<$Res> {
factory _$$UsersImplCopyWith(
_$UsersImpl value,
$Res Function(_$UsersImpl) then,
) = __$$UsersImplCopyWithImpl<$Res>;
_$UsersImpl value, $Res Function(_$UsersImpl) then) =
__$$UsersImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "from_chat_user") ChatUser fromChatUser,
@JsonKey(name: "to_chat_user") ChatUser toChatUser,
});
$Res call(
{@JsonKey(name: "from_chat_user") ChatUser fromChatUser,
@JsonKey(name: "to_chat_user") ChatUser toChatUser});
@override
$ChatUserCopyWith<$Res> get fromChatUser;
@@ -932,39 +868,36 @@ class __$$UsersImplCopyWithImpl<$Res>
extends _$UsersCopyWithImpl<$Res, _$UsersImpl>
implements _$$UsersImplCopyWith<$Res> {
__$$UsersImplCopyWithImpl(
_$UsersImpl _value,
$Res Function(_$UsersImpl) _then,
) : super(_value, _then);
_$UsersImpl _value, $Res Function(_$UsersImpl) _then)
: super(_value, _then);
/// Create a copy of Users
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? fromChatUser = null, Object? toChatUser = null}) {
return _then(
_$UsersImpl(
fromChatUser:
null == fromChatUser
$Res call({
Object? fromChatUser = null,
Object? toChatUser = null,
}) {
return _then(_$UsersImpl(
fromChatUser: null == fromChatUser
? _value.fromChatUser
: fromChatUser // ignore: cast_nullable_to_non_nullable
as ChatUser,
toChatUser:
null == toChatUser
toChatUser: null == toChatUser
? _value.toChatUser
: toChatUser // ignore: cast_nullable_to_non_nullable
as ChatUser,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$UsersImpl implements _Users {
const _$UsersImpl({
@JsonKey(name: "from_chat_user") required this.fromChatUser,
@JsonKey(name: "to_chat_user") required this.toChatUser,
});
const _$UsersImpl(
{@JsonKey(name: "from_chat_user") required this.fromChatUser,
@JsonKey(name: "to_chat_user") required this.toChatUser});
factory _$UsersImpl.fromJson(Map<String, dynamic> json) =>
_$$UsersImplFromJson(json);
@@ -1006,15 +939,17 @@ class _$UsersImpl implements _Users {
@override
Map<String, dynamic> toJson() {
return _$$UsersImplToJson(this);
return _$$UsersImplToJson(
this,
);
}
}
abstract class _Users implements Users {
const factory _Users({
@JsonKey(name: "from_chat_user") required final ChatUser fromChatUser,
@JsonKey(name: "to_chat_user") required final ChatUser toChatUser,
}) = _$UsersImpl;
const factory _Users(
{@JsonKey(name: "from_chat_user") required final ChatUser fromChatUser,
@JsonKey(name: "to_chat_user")
required final ChatUser toChatUser}) = _$UsersImpl;
factory _Users.fromJson(Map<String, dynamic> json) = _$UsersImpl.fromJson;
@@ -1063,12 +998,11 @@ abstract class $ChatUserCopyWith<$Res> {
factory $ChatUserCopyWith(ChatUser value, $Res Function(ChatUser) then) =
_$ChatUserCopyWithImpl<$Res, ChatUser>;
@useResult
$Res call({
@JsonKey(name: "id") int id,
$Res call(
{@JsonKey(name: "id") int id,
@JsonKey(name: "name") String name,
@JsonKey(name: "profile_photo_path") String? profilePhotoPath,
@JsonKey(name: "profile_photo_url") String profilePhotoUrl,
});
@JsonKey(name: "profile_photo_url") String profilePhotoUrl});
}
/// @nodoc
@@ -1091,31 +1025,24 @@ class _$ChatUserCopyWithImpl<$Res, $Val extends ChatUser>
Object? profilePhotoPath = freezed,
Object? profilePhotoUrl = null,
}) {
return _then(
_value.copyWith(
id:
null == id
return _then(_value.copyWith(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
name:
null == name
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
profilePhotoPath:
freezed == profilePhotoPath
profilePhotoPath: freezed == profilePhotoPath
? _value.profilePhotoPath
: profilePhotoPath // ignore: cast_nullable_to_non_nullable
as String?,
profilePhotoUrl:
null == profilePhotoUrl
profilePhotoUrl: null == profilePhotoUrl
? _value.profilePhotoUrl
: profilePhotoUrl // ignore: cast_nullable_to_non_nullable
as String,
)
as $Val,
);
) as $Val);
}
}
@@ -1123,17 +1050,15 @@ class _$ChatUserCopyWithImpl<$Res, $Val extends ChatUser>
abstract class _$$ChatUserImplCopyWith<$Res>
implements $ChatUserCopyWith<$Res> {
factory _$$ChatUserImplCopyWith(
_$ChatUserImpl value,
$Res Function(_$ChatUserImpl) then,
) = __$$ChatUserImplCopyWithImpl<$Res>;
_$ChatUserImpl value, $Res Function(_$ChatUserImpl) then) =
__$$ChatUserImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: "id") int id,
$Res call(
{@JsonKey(name: "id") int id,
@JsonKey(name: "name") String name,
@JsonKey(name: "profile_photo_path") String? profilePhotoPath,
@JsonKey(name: "profile_photo_url") String profilePhotoUrl,
});
@JsonKey(name: "profile_photo_url") String profilePhotoUrl});
}
/// @nodoc
@@ -1141,9 +1066,8 @@ class __$$ChatUserImplCopyWithImpl<$Res>
extends _$ChatUserCopyWithImpl<$Res, _$ChatUserImpl>
implements _$$ChatUserImplCopyWith<$Res> {
__$$ChatUserImplCopyWithImpl(
_$ChatUserImpl _value,
$Res Function(_$ChatUserImpl) _then,
) : super(_value, _then);
_$ChatUserImpl _value, $Res Function(_$ChatUserImpl) _then)
: super(_value, _then);
/// Create a copy of ChatUser
/// with the given fields replaced by the non-null parameter values.
@@ -1155,42 +1079,35 @@ class __$$ChatUserImplCopyWithImpl<$Res>
Object? profilePhotoPath = freezed,
Object? profilePhotoUrl = null,
}) {
return _then(
_$ChatUserImpl(
id:
null == id
return _then(_$ChatUserImpl(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
name:
null == name
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
profilePhotoPath:
freezed == profilePhotoPath
profilePhotoPath: freezed == profilePhotoPath
? _value.profilePhotoPath
: profilePhotoPath // ignore: cast_nullable_to_non_nullable
as String?,
profilePhotoUrl:
null == profilePhotoUrl
profilePhotoUrl: null == profilePhotoUrl
? _value.profilePhotoUrl
: profilePhotoUrl // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatUserImpl implements _ChatUser {
const _$ChatUserImpl({
@JsonKey(name: "id") required this.id,
const _$ChatUserImpl(
{@JsonKey(name: "id") required this.id,
@JsonKey(name: "name") required this.name,
@JsonKey(name: "profile_photo_path") required this.profilePhotoPath,
@JsonKey(name: "profile_photo_url") required this.profilePhotoUrl,
});
@JsonKey(name: "profile_photo_url") required this.profilePhotoUrl});
factory _$ChatUserImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatUserImplFromJson(json);
@@ -1241,18 +1158,20 @@ class _$ChatUserImpl implements _ChatUser {
@override
Map<String, dynamic> toJson() {
return _$$ChatUserImplToJson(this);
return _$$ChatUserImplToJson(
this,
);
}
}
abstract class _ChatUser implements ChatUser {
const factory _ChatUser({
@JsonKey(name: "id") required final int id,
const factory _ChatUser(
{@JsonKey(name: "id") required final int id,
@JsonKey(name: "name") required final String name,
@JsonKey(name: "profile_photo_path")
required final String? profilePhotoPath,
@JsonKey(name: "profile_photo_url") required final String profilePhotoUrl,
}) = _$ChatUserImpl;
@JsonKey(name: "profile_photo_url")
required final String profilePhotoUrl}) = _$ChatUserImpl;
factory _ChatUser.fromJson(Map<String, dynamic> json) =
_$ChatUserImpl.fromJson;

19
lib/features/chat/models/chat_room_pagination_model.g.dart
View File

@@ -7,23 +7,22 @@ part of 'chat_room_pagination_model.dart';
// **************************************************************************
_$ChatRoomPreviewModelImpl _$$ChatRoomPreviewModelImplFromJson(
Map<String, dynamic> json,
) => _$ChatRoomPreviewModelImpl(
Map<String, dynamic> json) =>
_$ChatRoomPreviewModelImpl(
chatRooms: ChatRooms.fromJson(json['chatRooms'] as Map<String, dynamic>),
unreadChatsCount: (json['number_of_unread_chat_rooms'] as num).toInt(),
);
Map<String, dynamic> _$$ChatRoomPreviewModelImplToJson(
_$ChatRoomPreviewModelImpl instance,
) => <String, dynamic>{
_$ChatRoomPreviewModelImpl instance) =>
<String, dynamic>{
'chatRooms': instance.chatRooms,
'number_of_unread_chat_rooms': instance.unreadChatsCount,
};
_$ChatRoomsImpl _$$ChatRoomsImplFromJson(Map<String, dynamic> json) =>
_$ChatRoomsImpl(
data:
(json['data'] as List<dynamic>)
data: (json['data'] as List<dynamic>)
.map((e) => ChatRoom.fromJson(e as Map<String, dynamic>))
.toList(),
lastPage: (json['last_page'] as num).toInt(),
@@ -58,10 +57,10 @@ Map<String, dynamic> _$$ChatRoomImplToJson(_$ChatRoomImpl instance) =>
};
_$UsersImpl _$$UsersImplFromJson(Map<String, dynamic> json) => _$UsersImpl(
fromChatUser: ChatUser.fromJson(
json['from_chat_user'] as Map<String, dynamic>,
),
toChatUser: ChatUser.fromJson(json['to_chat_user'] as Map<String, dynamic>),
fromChatUser:
ChatUser.fromJson(json['from_chat_user'] as Map<String, dynamic>),
toChatUser:
ChatUser.fromJson(json['to_chat_user'] as Map<String, dynamic>),
);
Map<String, dynamic> _$$UsersImplToJson(_$UsersImpl instance) =>

117
lib/features/chat/models/chat_room_settings_model.freezed.dart
View File

@@ -12,12 +12,10 @@ part of 'chat_room_settings_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatRoomSettingsModel _$ChatRoomSettingsModelFromJson(
Map<String, dynamic> json,
) {
Map<String, dynamic> json) {
return _ChatRoomSettingsModel.fromJson(json);
}
@@ -44,25 +42,21 @@ mixin _$ChatRoomSettingsModel {
/// @nodoc
abstract class $ChatRoomSettingsModelCopyWith<$Res> {
factory $ChatRoomSettingsModelCopyWith(
ChatRoomSettingsModel value,
$Res Function(ChatRoomSettingsModel) then,
) = _$ChatRoomSettingsModelCopyWithImpl<$Res, ChatRoomSettingsModel>;
factory $ChatRoomSettingsModelCopyWith(ChatRoomSettingsModel value,
$Res Function(ChatRoomSettingsModel) then) =
_$ChatRoomSettingsModelCopyWithImpl<$Res, ChatRoomSettingsModel>;
@useResult
$Res call({
int id,
$Res call(
{int id,
@JsonKey(name: 'room_name') String roomName,
String state,
@JsonKey(name: 'access_level') String accessLevel,
@JsonKey(name: 'updated_at') String updatedAt,
});
@JsonKey(name: 'updated_at') String updatedAt});
}
/// @nodoc
class _$ChatRoomSettingsModelCopyWithImpl<
$Res,
$Val extends ChatRoomSettingsModel
>
class _$ChatRoomSettingsModelCopyWithImpl<$Res,
$Val extends ChatRoomSettingsModel>
implements $ChatRoomSettingsModelCopyWith<$Res> {
_$ChatRoomSettingsModelCopyWithImpl(this._value, this._then);
@@ -82,36 +76,28 @@ class _$ChatRoomSettingsModelCopyWithImpl<
Object? accessLevel = null,
Object? updatedAt = null,
}) {
return _then(
_value.copyWith(
id:
null == id
return _then(_value.copyWith(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
roomName:
null == roomName
roomName: null == roomName
? _value.roomName
: roomName // ignore: cast_nullable_to_non_nullable
as String,
state:
null == state
state: null == state
? _value.state
: state // ignore: cast_nullable_to_non_nullable
as String,
accessLevel:
null == accessLevel
accessLevel: null == accessLevel
? _value.accessLevel
: accessLevel // ignore: cast_nullable_to_non_nullable
as String,
updatedAt:
null == updatedAt
updatedAt: null == updatedAt
? _value.updatedAt
: updatedAt // ignore: cast_nullable_to_non_nullable
as String,
)
as $Val,
);
) as $Val);
}
}
@@ -120,28 +106,26 @@ abstract class _$$ChatRoomSettingsModelImplCopyWith<$Res>
implements $ChatRoomSettingsModelCopyWith<$Res> {
factory _$$ChatRoomSettingsModelImplCopyWith(
_$ChatRoomSettingsModelImpl value,
$Res Function(_$ChatRoomSettingsModelImpl) then,
) = __$$ChatRoomSettingsModelImplCopyWithImpl<$Res>;
$Res Function(_$ChatRoomSettingsModelImpl) then) =
__$$ChatRoomSettingsModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
int id,
$Res call(
{int id,
@JsonKey(name: 'room_name') String roomName,
String state,
@JsonKey(name: 'access_level') String accessLevel,
@JsonKey(name: 'updated_at') String updatedAt,
});
@JsonKey(name: 'updated_at') String updatedAt});
}
/// @nodoc
class __$$ChatRoomSettingsModelImplCopyWithImpl<$Res>
extends
_$ChatRoomSettingsModelCopyWithImpl<$Res, _$ChatRoomSettingsModelImpl>
extends _$ChatRoomSettingsModelCopyWithImpl<$Res,
_$ChatRoomSettingsModelImpl>
implements _$$ChatRoomSettingsModelImplCopyWith<$Res> {
__$$ChatRoomSettingsModelImplCopyWithImpl(
_$ChatRoomSettingsModelImpl _value,
$Res Function(_$ChatRoomSettingsModelImpl) _then,
) : super(_value, _then);
__$$ChatRoomSettingsModelImplCopyWithImpl(_$ChatRoomSettingsModelImpl _value,
$Res Function(_$ChatRoomSettingsModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomSettingsModel
/// with the given fields replaced by the non-null parameter values.
@@ -154,48 +138,40 @@ class __$$ChatRoomSettingsModelImplCopyWithImpl<$Res>
Object? accessLevel = null,
Object? updatedAt = null,
}) {
return _then(
_$ChatRoomSettingsModelImpl(
id:
null == id
return _then(_$ChatRoomSettingsModelImpl(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
roomName:
null == roomName
roomName: null == roomName
? _value.roomName
: roomName // ignore: cast_nullable_to_non_nullable
as String,
state:
null == state
state: null == state
? _value.state
: state // ignore: cast_nullable_to_non_nullable
as String,
accessLevel:
null == accessLevel
accessLevel: null == accessLevel
? _value.accessLevel
: accessLevel // ignore: cast_nullable_to_non_nullable
as String,
updatedAt:
null == updatedAt
updatedAt: null == updatedAt
? _value.updatedAt
: updatedAt // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatRoomSettingsModelImpl implements _ChatRoomSettingsModel {
const _$ChatRoomSettingsModelImpl({
required this.id,
const _$ChatRoomSettingsModelImpl(
{required this.id,
@JsonKey(name: 'room_name') required this.roomName,
required this.state,
@JsonKey(name: 'access_level') required this.accessLevel,
@JsonKey(name: 'updated_at') required this.updatedAt,
});
@JsonKey(name: 'updated_at') required this.updatedAt});
factory _$ChatRoomSettingsModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatRoomSettingsModelImplFromJson(json);
@@ -245,26 +221,25 @@ class _$ChatRoomSettingsModelImpl implements _ChatRoomSettingsModel {
@override
@pragma('vm:prefer-inline')
_$$ChatRoomSettingsModelImplCopyWith<_$ChatRoomSettingsModelImpl>
get copyWith =>
__$$ChatRoomSettingsModelImplCopyWithImpl<_$ChatRoomSettingsModelImpl>(
this,
_$identity,
);
get copyWith => __$$ChatRoomSettingsModelImplCopyWithImpl<
_$ChatRoomSettingsModelImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$ChatRoomSettingsModelImplToJson(this);
return _$$ChatRoomSettingsModelImplToJson(
this,
);
}
}
abstract class _ChatRoomSettingsModel implements ChatRoomSettingsModel {
const factory _ChatRoomSettingsModel({
required final int id,
const factory _ChatRoomSettingsModel(
{required final int id,
@JsonKey(name: 'room_name') required final String roomName,
required final String state,
@JsonKey(name: 'access_level') required final String accessLevel,
@JsonKey(name: 'updated_at') required final String updatedAt,
}) = _$ChatRoomSettingsModelImpl;
@JsonKey(name: 'updated_at') required final String updatedAt}) =
_$ChatRoomSettingsModelImpl;
factory _ChatRoomSettingsModel.fromJson(Map<String, dynamic> json) =
_$ChatRoomSettingsModelImpl.fromJson;

8
lib/features/chat/models/chat_room_settings_model.g.dart
View File

@@ -7,8 +7,8 @@ part of 'chat_room_settings_model.dart';
// **************************************************************************
_$ChatRoomSettingsModelImpl _$$ChatRoomSettingsModelImplFromJson(
Map<String, dynamic> json,
) => _$ChatRoomSettingsModelImpl(
Map<String, dynamic> json) =>
_$ChatRoomSettingsModelImpl(
id: (json['id'] as num).toInt(),
roomName: json['room_name'] as String,
state: json['state'] as String,
@@ -17,8 +17,8 @@ _$ChatRoomSettingsModelImpl _$$ChatRoomSettingsModelImplFromJson(
);
Map<String, dynamic> _$$ChatRoomSettingsModelImplToJson(
_$ChatRoomSettingsModelImpl instance,
) => <String, dynamic>{
_$ChatRoomSettingsModelImpl instance) =>
<String, dynamic>{
'id': instance.id,
'room_name': instance.roomName,
'state': instance.state,

102
lib/features/chat/models/chat_user_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chat_user_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ChatUserModel _$ChatUserModelFromJson(Map<String, dynamic> json) {
return _ChatUserModel.fromJson(json);
@@ -42,17 +41,15 @@ mixin _$ChatUserModel {
/// @nodoc
abstract class $ChatUserModelCopyWith<$Res> {
factory $ChatUserModelCopyWith(
ChatUserModel value,
$Res Function(ChatUserModel) then,
) = _$ChatUserModelCopyWithImpl<$Res, ChatUserModel>;
ChatUserModel value, $Res Function(ChatUserModel) then) =
_$ChatUserModelCopyWithImpl<$Res, ChatUserModel>;
@useResult
$Res call({
int id,
$Res call(
{int id,
String name,
String slug,
@JsonKey(name: 'profile_photo_path') String? profilePhotoPath,
@JsonKey(name: 'profile_photo_url') String? profilePhotoUrl,
});
@JsonKey(name: 'profile_photo_url') String? profilePhotoUrl});
}
/// @nodoc
@@ -76,36 +73,28 @@ class _$ChatUserModelCopyWithImpl<$Res, $Val extends ChatUserModel>
Object? profilePhotoPath = freezed,
Object? profilePhotoUrl = freezed,
}) {
return _then(
_value.copyWith(
id:
null == id
return _then(_value.copyWith(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
name:
null == name
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
slug:
null == slug
slug: null == slug
? _value.slug
: slug // ignore: cast_nullable_to_non_nullable
as String,
profilePhotoPath:
freezed == profilePhotoPath
profilePhotoPath: freezed == profilePhotoPath
? _value.profilePhotoPath
: profilePhotoPath // ignore: cast_nullable_to_non_nullable
as String?,
profilePhotoUrl:
freezed == profilePhotoUrl
profilePhotoUrl: freezed == profilePhotoUrl
? _value.profilePhotoUrl
: profilePhotoUrl // ignore: cast_nullable_to_non_nullable
as String?,
)
as $Val,
);
) as $Val);
}
}
@@ -113,18 +102,16 @@ class _$ChatUserModelCopyWithImpl<$Res, $Val extends ChatUserModel>
abstract class _$$ChatUserModelImplCopyWith<$Res>
implements $ChatUserModelCopyWith<$Res> {
factory _$$ChatUserModelImplCopyWith(
_$ChatUserModelImpl value,
$Res Function(_$ChatUserModelImpl) then,
) = __$$ChatUserModelImplCopyWithImpl<$Res>;
_$ChatUserModelImpl value, $Res Function(_$ChatUserModelImpl) then) =
__$$ChatUserModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
int id,
$Res call(
{int id,
String name,
String slug,
@JsonKey(name: 'profile_photo_path') String? profilePhotoPath,
@JsonKey(name: 'profile_photo_url') String? profilePhotoUrl,
});
@JsonKey(name: 'profile_photo_url') String? profilePhotoUrl});
}
/// @nodoc
@@ -132,9 +119,8 @@ class __$$ChatUserModelImplCopyWithImpl<$Res>
extends _$ChatUserModelCopyWithImpl<$Res, _$ChatUserModelImpl>
implements _$$ChatUserModelImplCopyWith<$Res> {
__$$ChatUserModelImplCopyWithImpl(
_$ChatUserModelImpl _value,
$Res Function(_$ChatUserModelImpl) _then,
) : super(_value, _then);
_$ChatUserModelImpl _value, $Res Function(_$ChatUserModelImpl) _then)
: super(_value, _then);
/// Create a copy of ChatUserModel
/// with the given fields replaced by the non-null parameter values.
@@ -147,48 +133,40 @@ class __$$ChatUserModelImplCopyWithImpl<$Res>
Object? profilePhotoPath = freezed,
Object? profilePhotoUrl = freezed,
}) {
return _then(
_$ChatUserModelImpl(
id:
null == id
return _then(_$ChatUserModelImpl(
id: null == id
? _value.id
: id // ignore: cast_nullable_to_non_nullable
as int,
name:
null == name
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
slug:
null == slug
slug: null == slug
? _value.slug
: slug // ignore: cast_nullable_to_non_nullable
as String,
profilePhotoPath:
freezed == profilePhotoPath
profilePhotoPath: freezed == profilePhotoPath
? _value.profilePhotoPath
: profilePhotoPath // ignore: cast_nullable_to_non_nullable
as String?,
profilePhotoUrl:
freezed == profilePhotoUrl
profilePhotoUrl: freezed == profilePhotoUrl
? _value.profilePhotoUrl
: profilePhotoUrl // ignore: cast_nullable_to_non_nullable
as String?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ChatUserModelImpl implements _ChatUserModel {
const _$ChatUserModelImpl({
required this.id,
const _$ChatUserModelImpl(
{required this.id,
required this.name,
required this.slug,
@JsonKey(name: 'profile_photo_path') this.profilePhotoPath,
@JsonKey(name: 'profile_photo_url') this.profilePhotoUrl,
});
@JsonKey(name: 'profile_photo_url') this.profilePhotoUrl});
factory _$ChatUserModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ChatUserModelImplFromJson(json);
@@ -228,13 +206,7 @@ class _$ChatUserModelImpl implements _ChatUserModel {
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(
runtimeType,
id,
name,
slug,
profilePhotoPath,
profilePhotoUrl,
);
runtimeType, id, name, slug, profilePhotoPath, profilePhotoUrl);
/// Create a copy of ChatUserModel
/// with the given fields replaced by the non-null parameter values.
@@ -246,18 +218,20 @@ class _$ChatUserModelImpl implements _ChatUserModel {
@override
Map<String, dynamic> toJson() {
return _$$ChatUserModelImplToJson(this);
return _$$ChatUserModelImplToJson(
this,
);
}
}
abstract class _ChatUserModel implements ChatUserModel {
const factory _ChatUserModel({
required final int id,
const factory _ChatUserModel(
{required final int id,
required final String name,
required final String slug,
@JsonKey(name: 'profile_photo_path') final String? profilePhotoPath,
@JsonKey(name: 'profile_photo_url') final String? profilePhotoUrl,
}) = _$ChatUserModelImpl;
@JsonKey(name: 'profile_photo_url') final String? profilePhotoUrl}) =
_$ChatUserModelImpl;
factory _ChatUserModel.fromJson(Map<String, dynamic> json) =
_$ChatUserModelImpl.fromJson;

14
lib/features/chat/models/payment_model.dart Normal file
View File

@@ -0,0 +1,14 @@
import 'package:freezed_annotation/freezed_annotation.dart';
part 'payment_model.freezed.dart';
part 'payment_model.g.dart';
@freezed
class PaymentModel with _$PaymentModel {
factory PaymentModel({
@JsonKey(name: 'checkout_url') required String paymentUrl,
}) = _PaymentModel;
factory PaymentModel.fromJson(Map<String, dynamic> json) => _$PaymentModelFromJson(json);
}

170
lib/features/chat/models/payment_model.freezed.dart Normal file
View File

@@ -0,0 +1,170 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
part of 'payment_model.dart';
// **************************************************************************
// FreezedGenerator
// **************************************************************************
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
PaymentModel _$PaymentModelFromJson(Map<String, dynamic> json) {
return _PaymentModel.fromJson(json);
}
/// @nodoc
mixin _$PaymentModel {
@JsonKey(name: 'checkout_url')
String get paymentUrl => throw _privateConstructorUsedError;
/// Serializes this PaymentModel to a JSON map.
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
/// Create a copy of PaymentModel
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
$PaymentModelCopyWith<PaymentModel> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $PaymentModelCopyWith<$Res> {
factory $PaymentModelCopyWith(
PaymentModel value, $Res Function(PaymentModel) then) =
_$PaymentModelCopyWithImpl<$Res, PaymentModel>;
@useResult
$Res call({@JsonKey(name: 'checkout_url') String paymentUrl});
}
/// @nodoc
class _$PaymentModelCopyWithImpl<$Res, $Val extends PaymentModel>
implements $PaymentModelCopyWith<$Res> {
_$PaymentModelCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
/// Create a copy of PaymentModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({
Object? paymentUrl = null,
}) {
return _then(_value.copyWith(
paymentUrl: null == paymentUrl
? _value.paymentUrl
: paymentUrl // ignore: cast_nullable_to_non_nullable
as String,
) as $Val);
}
}
/// @nodoc
abstract class _$$PaymentModelImplCopyWith<$Res>
implements $PaymentModelCopyWith<$Res> {
factory _$$PaymentModelImplCopyWith(
_$PaymentModelImpl value, $Res Function(_$PaymentModelImpl) then) =
__$$PaymentModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({@JsonKey(name: 'checkout_url') String paymentUrl});
}
/// @nodoc
class __$$PaymentModelImplCopyWithImpl<$Res>
extends _$PaymentModelCopyWithImpl<$Res, _$PaymentModelImpl>
implements _$$PaymentModelImplCopyWith<$Res> {
__$$PaymentModelImplCopyWithImpl(
_$PaymentModelImpl _value, $Res Function(_$PaymentModelImpl) _then)
: super(_value, _then);
/// Create a copy of PaymentModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({
Object? paymentUrl = null,
}) {
return _then(_$PaymentModelImpl(
paymentUrl: null == paymentUrl
? _value.paymentUrl
: paymentUrl // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// @nodoc
@JsonSerializable()
class _$PaymentModelImpl implements _PaymentModel {
_$PaymentModelImpl({@JsonKey(name: 'checkout_url') required this.paymentUrl});
factory _$PaymentModelImpl.fromJson(Map<String, dynamic> json) =>
_$$PaymentModelImplFromJson(json);
@override
@JsonKey(name: 'checkout_url')
final String paymentUrl;
@override
String toString() {
return 'PaymentModel(paymentUrl: $paymentUrl)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$PaymentModelImpl &&
(identical(other.paymentUrl, paymentUrl) ||
other.paymentUrl == paymentUrl));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(runtimeType, paymentUrl);
/// Create a copy of PaymentModel
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@override
@pragma('vm:prefer-inline')
_$$PaymentModelImplCopyWith<_$PaymentModelImpl> get copyWith =>
__$$PaymentModelImplCopyWithImpl<_$PaymentModelImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$PaymentModelImplToJson(
this,
);
}
}
abstract class _PaymentModel implements PaymentModel {
factory _PaymentModel(
{@JsonKey(name: 'checkout_url') required final String paymentUrl}) =
_$PaymentModelImpl;
factory _PaymentModel.fromJson(Map<String, dynamic> json) =
_$PaymentModelImpl.fromJson;
@override
@JsonKey(name: 'checkout_url')
String get paymentUrl;
/// Create a copy of PaymentModel
/// with the given fields replaced by the non-null parameter values.
@override
@JsonKey(includeFromJson: false, includeToJson: false)
_$$PaymentModelImplCopyWith<_$PaymentModelImpl> get copyWith =>
throw _privateConstructorUsedError;
}

17
lib/features/chat/models/payment_model.g.dart Normal file
View File

@@ -0,0 +1,17 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'payment_model.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
_$PaymentModelImpl _$$PaymentModelImplFromJson(Map<String, dynamic> json) =>
_$PaymentModelImpl(
paymentUrl: json['checkout_url'] as String,
);
Map<String, dynamic> _$$PaymentModelImplToJson(_$PaymentModelImpl instance) =>
<String, dynamic>{
'checkout_url': instance.paymentUrl,
};

102
lib/features/chat/models/websocket_info_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'websocket_info_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
WebsocketInfoModel _$WebsocketInfoModelFromJson(Map<String, dynamic> json) {
return _WebsocketInfoModel.fromJson(json);
@@ -41,17 +40,15 @@ mixin _$WebsocketInfoModel {
/// @nodoc
abstract class $WebsocketInfoModelCopyWith<$Res> {
factory $WebsocketInfoModelCopyWith(
WebsocketInfoModel value,
$Res Function(WebsocketInfoModel) then,
) = _$WebsocketInfoModelCopyWithImpl<$Res, WebsocketInfoModel>;
WebsocketInfoModel value, $Res Function(WebsocketInfoModel) then) =
_$WebsocketInfoModelCopyWithImpl<$Res, WebsocketInfoModel>;
@useResult
$Res call({
String key,
$Res call(
{String key,
String host,
String port,
String cluster,
@JsonKey(name: 'user_id') int userId,
});
@JsonKey(name: 'user_id') int userId});
}
/// @nodoc
@@ -75,65 +72,54 @@ class _$WebsocketInfoModelCopyWithImpl<$Res, $Val extends WebsocketInfoModel>
Object? cluster = null,
Object? userId = null,
}) {
return _then(
_value.copyWith(
key:
null == key
return _then(_value.copyWith(
key: null == key
? _value.key
: key // ignore: cast_nullable_to_non_nullable
as String,
host:
null == host
host: null == host
? _value.host
: host // ignore: cast_nullable_to_non_nullable
as String,
port:
null == port
port: null == port
? _value.port
: port // ignore: cast_nullable_to_non_nullable
as String,
cluster:
null == cluster
cluster: null == cluster
? _value.cluster
: cluster // ignore: cast_nullable_to_non_nullable
as String,
userId:
null == userId
userId: null == userId
? _value.userId
: userId // ignore: cast_nullable_to_non_nullable
as int,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$WebsocketInfoModelImplCopyWith<$Res>
implements $WebsocketInfoModelCopyWith<$Res> {
factory _$$WebsocketInfoModelImplCopyWith(
_$WebsocketInfoModelImpl value,
$Res Function(_$WebsocketInfoModelImpl) then,
) = __$$WebsocketInfoModelImplCopyWithImpl<$Res>;
factory _$$WebsocketInfoModelImplCopyWith(_$WebsocketInfoModelImpl value,
$Res Function(_$WebsocketInfoModelImpl) then) =
__$$WebsocketInfoModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
String key,
$Res call(
{String key,
String host,
String port,
String cluster,
@JsonKey(name: 'user_id') int userId,
});
@JsonKey(name: 'user_id') int userId});
}
/// @nodoc
class __$$WebsocketInfoModelImplCopyWithImpl<$Res>
extends _$WebsocketInfoModelCopyWithImpl<$Res, _$WebsocketInfoModelImpl>
implements _$$WebsocketInfoModelImplCopyWith<$Res> {
__$$WebsocketInfoModelImplCopyWithImpl(
_$WebsocketInfoModelImpl _value,
$Res Function(_$WebsocketInfoModelImpl) _then,
) : super(_value, _then);
__$$WebsocketInfoModelImplCopyWithImpl(_$WebsocketInfoModelImpl _value,
$Res Function(_$WebsocketInfoModelImpl) _then)
: super(_value, _then);
/// Create a copy of WebsocketInfoModel
/// with the given fields replaced by the non-null parameter values.
@@ -146,48 +132,40 @@ class __$$WebsocketInfoModelImplCopyWithImpl<$Res>
Object? cluster = null,
Object? userId = null,
}) {
return _then(
_$WebsocketInfoModelImpl(
key:
null == key
return _then(_$WebsocketInfoModelImpl(
key: null == key
? _value.key
: key // ignore: cast_nullable_to_non_nullable
as String,
host:
null == host
host: null == host
? _value.host
: host // ignore: cast_nullable_to_non_nullable
as String,
port:
null == port
port: null == port
? _value.port
: port // ignore: cast_nullable_to_non_nullable
as String,
cluster:
null == cluster
cluster: null == cluster
? _value.cluster
: cluster // ignore: cast_nullable_to_non_nullable
as String,
userId:
null == userId
userId: null == userId
? _value.userId
: userId // ignore: cast_nullable_to_non_nullable
as int,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$WebsocketInfoModelImpl implements _WebsocketInfoModel {
const _$WebsocketInfoModelImpl({
required this.key,
const _$WebsocketInfoModelImpl(
{required this.key,
required this.host,
required this.port,
required this.cluster,
@JsonKey(name: 'user_id') required this.userId,
});
@JsonKey(name: 'user_id') required this.userId});
factory _$WebsocketInfoModelImpl.fromJson(Map<String, dynamic> json) =>
_$$WebsocketInfoModelImplFromJson(json);
@@ -233,24 +211,24 @@ class _$WebsocketInfoModelImpl implements _WebsocketInfoModel {
@pragma('vm:prefer-inline')
_$$WebsocketInfoModelImplCopyWith<_$WebsocketInfoModelImpl> get copyWith =>
__$$WebsocketInfoModelImplCopyWithImpl<_$WebsocketInfoModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$WebsocketInfoModelImplToJson(this);
return _$$WebsocketInfoModelImplToJson(
this,
);
}
}
abstract class _WebsocketInfoModel implements WebsocketInfoModel {
const factory _WebsocketInfoModel({
required final String key,
const factory _WebsocketInfoModel(
{required final String key,
required final String host,
required final String port,
required final String cluster,
@JsonKey(name: 'user_id') required final int userId,
}) = _$WebsocketInfoModelImpl;
@JsonKey(name: 'user_id') required final int userId}) =
_$WebsocketInfoModelImpl;
factory _WebsocketInfoModel.fromJson(Map<String, dynamic> json) =
_$WebsocketInfoModelImpl.fromJson;

8
lib/features/chat/models/websocket_info_model.g.dart
View File

@@ -7,8 +7,8 @@ part of 'websocket_info_model.dart';
// **************************************************************************
_$WebsocketInfoModelImpl _$$WebsocketInfoModelImplFromJson(
Map<String, dynamic> json,
) => _$WebsocketInfoModelImpl(
Map<String, dynamic> json) =>
_$WebsocketInfoModelImpl(
key: json['key'] as String,
host: json['host'] as String,
port: json['port'] as String,
@@ -17,8 +17,8 @@ _$WebsocketInfoModelImpl _$$WebsocketInfoModelImplFromJson(
);
Map<String, dynamic> _$$WebsocketInfoModelImplToJson(
_$WebsocketInfoModelImpl instance,
) => <String, dynamic>{
_$WebsocketInfoModelImpl instance) =>
<String, dynamic>{
'key': instance.key,
'host': instance.host,
'port': instance.port,

52
lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
View File

@@ -7,12 +7,14 @@ import 'package:audioplayers/audioplayers.dart';
import 'package:dart_pusher_channels/dart_pusher_channels.dart';
import 'package:easy_debounce/easy_debounce.dart';
import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/core/websockets/ws_manager.dart';
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
import 'package:eatvio_app/features/my_finance/models/card_model.dart';
import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ChatRoomCubit extends Cubit<ChatRoomState> {
@@ -23,10 +25,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
StreamSubscription<ChannelReadEvent>? typingSubscription;
StreamSubscription<ChannelReadEvent>? messagesSubscription;
int currentPage = 1;
late final int lastPage;
late int lastPage;
bool isLoading = false;
ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(ChatRoomState.loading());
ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(const ChatRoomState.loading());
loadNextPage(String chatId) async {
if (currentPage < lastPage && !isLoading) {
@@ -47,7 +49,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
currentPage++;
} catch (e) {
emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
emit(const ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
}
}
}
@@ -57,7 +59,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
final cards = await cardsRepository.getCards();
setCard(cards: cards);
} catch (e) {
emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
emit(const ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
}
}
@@ -80,13 +82,29 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
await _subscribeToChatChannel(chatId: chatId);
emit(ChatRoomState.loaded(chatRoom: chatRoom, chatMessages: chatMessages.messagesList, isTyping: false, isLoading: isLoading, hasCard: false));
final cards = await cardsRepository.getCards();
setCard(cards: cards);
// final cards = await cardsRepository.getCards();
// setCard(cards: cards);
} catch (e) {
log(e.toString());
typingSubscription?.cancel();
messagesSubscription?.cancel();
wsManager.unsubscribeDirectChatChannel();
emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
emit(const ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
}
}
Future<bool> choseStartPlanDate(DateTime date) async {
try {
if (state is! ChatRoomStateLoaded) return false;
final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
if (planId == null) return false;
final stringDate = date.format('yyyy-MM-dd');
await chatRepository.choseStartPlanDate(id: planId, date: {'start_date': stringDate});
emit((state as ChatRoomStateLoaded).copyWith.chatRoom.chosenPlan?.call(chosenPlanState: ChosenPlanStateEnum.stateStartDateHasBeenSet) ?? state);
return true;
} catch (e, st) {
log(e.toString(), stackTrace: st);
return false;
}
}
@@ -96,7 +114,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
final chatRoom = await chatRepository.getChatRoom(chatId);
emit((state as ChatRoomStateLoaded).copyWith(chatRoom: chatRoom));
} catch (e) {
emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
emit(const ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
}
}
@@ -115,7 +133,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
typingSubscription = wsManager.clientTypingStream?.listen((event) {
emit((state as ChatRoomStateLoaded).copyWith(isTyping: true, isLoading: isLoading));
EasyDebounce.debounce('client-typing', Duration(seconds: 3), () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)));
EasyDebounce.debounce('client-typing', const Duration(seconds: 3), () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)));
});
}
@@ -136,9 +154,9 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
final ids = messagesIds.map((e) => e.id).toList();
await chatRepository.markMessagesAsRead(chatId, ids);
final currentMessages = [...(state as ChatRoomStateLoaded).chatMessages];
messagesIds.forEach((elem) {
for (var elem in messagesIds) {
currentMessages[elem.index] = currentMessages[elem.index].copyWith(isRead: true);
});
}
if (!isClosed) {
emit((state as ChatRoomStateLoaded).copyWith(chatMessages: currentMessages));
}
@@ -151,6 +169,18 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
}
}
Future<String?> getPaymentLink() async {
try {
final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
if (planId == null) return null;
final paymentModel = await chatRepository.getPaymentLink(id: planId);
return paymentModel.paymentUrl;
} catch (e, st) {
log(e.toString(), stackTrace: st);
return null;
}
}
@override
Future<void> close() async {
wsManager.unsubscribeDirectChatChannel();

196
lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chat_room_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$ChatRoomState {
@@ -26,11 +25,11 @@ mixin _$ChatRoomState {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)
bool isLoading)
loaded,
required TResult Function(String errorMessage) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? whenOrNull<TResult extends Object?>(
TResult? Function()? $default, {
@@ -40,11 +39,11 @@ mixin _$ChatRoomState {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult? Function(String errorMessage)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeWhen<TResult extends Object?>(
TResult Function()? $default, {
@@ -54,26 +53,28 @@ mixin _$ChatRoomState {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult map<TResult extends Object?>(
TResult Function(_ChatRoomState value) $default, {
required TResult Function(ChatRoomStateLoading value) loading,
required TResult Function(ChatRoomStateLoaded value) loaded,
required TResult Function(ChatRoomStateError value) error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult? mapOrNull<TResult extends Object?>(
TResult? Function(_ChatRoomState value)? $default, {
TResult? Function(ChatRoomStateLoading value)? loading,
TResult? Function(ChatRoomStateLoaded value)? loaded,
TResult? Function(ChatRoomStateError value)? error,
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
@optionalTypeArgs
TResult maybeMap<TResult extends Object?>(
TResult Function(_ChatRoomState value)? $default, {
@@ -81,15 +82,15 @@ mixin _$ChatRoomState {
TResult Function(ChatRoomStateLoaded value)? loaded,
TResult Function(ChatRoomStateError value)? error,
required TResult orElse(),
}) => throw _privateConstructorUsedError;
}) =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $ChatRoomStateCopyWith<$Res> {
factory $ChatRoomStateCopyWith(
ChatRoomState value,
$Res Function(ChatRoomState) then,
) = _$ChatRoomStateCopyWithImpl<$Res, ChatRoomState>;
ChatRoomState value, $Res Function(ChatRoomState) then) =
_$ChatRoomStateCopyWithImpl<$Res, ChatRoomState>;
}
/// @nodoc
@@ -109,9 +110,8 @@ class _$ChatRoomStateCopyWithImpl<$Res, $Val extends ChatRoomState>
/// @nodoc
abstract class _$$ChatRoomStateImplCopyWith<$Res> {
factory _$$ChatRoomStateImplCopyWith(
_$ChatRoomStateImpl value,
$Res Function(_$ChatRoomStateImpl) then,
) = __$$ChatRoomStateImplCopyWithImpl<$Res>;
_$ChatRoomStateImpl value, $Res Function(_$ChatRoomStateImpl) then) =
__$$ChatRoomStateImplCopyWithImpl<$Res>;
}
/// @nodoc
@@ -119,9 +119,8 @@ class __$$ChatRoomStateImplCopyWithImpl<$Res>
extends _$ChatRoomStateCopyWithImpl<$Res, _$ChatRoomStateImpl>
implements _$$ChatRoomStateImplCopyWith<$Res> {
__$$ChatRoomStateImplCopyWithImpl(
_$ChatRoomStateImpl _value,
$Res Function(_$ChatRoomStateImpl) _then,
) : super(_value, _then);
_$ChatRoomStateImpl _value, $Res Function(_$ChatRoomStateImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomState
/// with the given fields replaced by the non-null parameter values.
@@ -156,8 +155,7 @@ class _$ChatRoomStateImpl implements _ChatRoomState {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)
bool isLoading)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -174,8 +172,7 @@ class _$ChatRoomStateImpl implements _ChatRoomState {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -192,8 +189,7 @@ class _$ChatRoomStateImpl implements _ChatRoomState {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -248,20 +244,18 @@ abstract class _ChatRoomState implements ChatRoomState {
/// @nodoc
abstract class _$$ChatRoomStateLoadingImplCopyWith<$Res> {
factory _$$ChatRoomStateLoadingImplCopyWith(
_$ChatRoomStateLoadingImpl value,
$Res Function(_$ChatRoomStateLoadingImpl) then,
) = __$$ChatRoomStateLoadingImplCopyWithImpl<$Res>;
factory _$$ChatRoomStateLoadingImplCopyWith(_$ChatRoomStateLoadingImpl value,
$Res Function(_$ChatRoomStateLoadingImpl) then) =
__$$ChatRoomStateLoadingImplCopyWithImpl<$Res>;
}
/// @nodoc
class __$$ChatRoomStateLoadingImplCopyWithImpl<$Res>
extends _$ChatRoomStateCopyWithImpl<$Res, _$ChatRoomStateLoadingImpl>
implements _$$ChatRoomStateLoadingImplCopyWith<$Res> {
__$$ChatRoomStateLoadingImplCopyWithImpl(
_$ChatRoomStateLoadingImpl _value,
$Res Function(_$ChatRoomStateLoadingImpl) _then,
) : super(_value, _then);
__$$ChatRoomStateLoadingImplCopyWithImpl(_$ChatRoomStateLoadingImpl _value,
$Res Function(_$ChatRoomStateLoadingImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomState
/// with the given fields replaced by the non-null parameter values.
@@ -297,8 +291,7 @@ class _$ChatRoomStateLoadingImpl implements ChatRoomStateLoading {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)
bool isLoading)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -315,8 +308,7 @@ class _$ChatRoomStateLoadingImpl implements ChatRoomStateLoading {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -333,8 +325,7 @@ class _$ChatRoomStateLoadingImpl implements ChatRoomStateLoading {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -389,18 +380,16 @@ abstract class ChatRoomStateLoading implements ChatRoomState {
/// @nodoc
abstract class _$$ChatRoomStateLoadedImplCopyWith<$Res> {
factory _$$ChatRoomStateLoadedImplCopyWith(
_$ChatRoomStateLoadedImpl value,
$Res Function(_$ChatRoomStateLoadedImpl) then,
) = __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>;
factory _$$ChatRoomStateLoadedImplCopyWith(_$ChatRoomStateLoadedImpl value,
$Res Function(_$ChatRoomStateLoadedImpl) then) =
__$$ChatRoomStateLoadedImplCopyWithImpl<$Res>;
@useResult
$Res call({
ChatRoomModel chatRoom,
$Res call(
{ChatRoomModel chatRoom,
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
});
bool isLoading});
$ChatRoomModelCopyWith<$Res> get chatRoom;
}
@@ -409,10 +398,9 @@ abstract class _$$ChatRoomStateLoadedImplCopyWith<$Res> {
class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>
extends _$ChatRoomStateCopyWithImpl<$Res, _$ChatRoomStateLoadedImpl>
implements _$$ChatRoomStateLoadedImplCopyWith<$Res> {
__$$ChatRoomStateLoadedImplCopyWithImpl(
_$ChatRoomStateLoadedImpl _value,
$Res Function(_$ChatRoomStateLoadedImpl) _then,
) : super(_value, _then);
__$$ChatRoomStateLoadedImplCopyWithImpl(_$ChatRoomStateLoadedImpl _value,
$Res Function(_$ChatRoomStateLoadedImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomState
/// with the given fields replaced by the non-null parameter values.
@@ -425,35 +413,28 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>
Object? isTyping = null,
Object? isLoading = null,
}) {
return _then(
_$ChatRoomStateLoadedImpl(
chatRoom:
null == chatRoom
return _then(_$ChatRoomStateLoadedImpl(
chatRoom: null == chatRoom
? _value.chatRoom
: chatRoom // ignore: cast_nullable_to_non_nullable
as ChatRoomModel,
chatMessages:
null == chatMessages
chatMessages: null == chatMessages
? _value._chatMessages
: chatMessages // ignore: cast_nullable_to_non_nullable
as List<ChatMessageModel>,
hasCard:
null == hasCard
hasCard: null == hasCard
? _value.hasCard
: hasCard // ignore: cast_nullable_to_non_nullable
as bool,
isTyping:
null == isTyping
isTyping: null == isTyping
? _value.isTyping
: isTyping // ignore: cast_nullable_to_non_nullable
as bool,
isLoading:
null == isLoading
isLoading: null == isLoading
? _value.isLoading
: isLoading // ignore: cast_nullable_to_non_nullable
as bool,
),
);
));
}
/// Create a copy of ChatRoomState
@@ -470,13 +451,13 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>
/// @nodoc
class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
const _$ChatRoomStateLoadedImpl({
required this.chatRoom,
const _$ChatRoomStateLoadedImpl(
{required this.chatRoom,
required final List<ChatMessageModel> chatMessages,
required this.hasCard,
required this.isTyping,
required this.isLoading,
}) : _chatMessages = chatMessages;
required this.isLoading})
: _chatMessages = chatMessages;
@override
final ChatRoomModel chatRoom;
@@ -507,10 +488,8 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
other is _$ChatRoomStateLoadedImpl &&
(identical(other.chatRoom, chatRoom) ||
other.chatRoom == chatRoom) &&
const DeepCollectionEquality().equals(
other._chatMessages,
_chatMessages,
) &&
const DeepCollectionEquality()
.equals(other._chatMessages, _chatMessages) &&
(identical(other.hasCard, hasCard) || other.hasCard == hasCard) &&
(identical(other.isTyping, isTyping) ||
other.isTyping == isTyping) &&
@@ -525,8 +504,7 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
const DeepCollectionEquality().hash(_chatMessages),
hasCard,
isTyping,
isLoading,
);
isLoading);
/// Create a copy of ChatRoomState
/// with the given fields replaced by the non-null parameter values.
@@ -535,9 +513,7 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
@pragma('vm:prefer-inline')
_$$ChatRoomStateLoadedImplCopyWith<_$ChatRoomStateLoadedImpl> get copyWith =>
__$$ChatRoomStateLoadedImplCopyWithImpl<_$ChatRoomStateLoadedImpl>(
this,
_$identity,
);
this, _$identity);
@override
@optionalTypeArgs
@@ -549,8 +525,7 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)
bool isLoading)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -567,8 +542,7 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -585,8 +559,7 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),
@@ -636,13 +609,12 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
}
abstract class ChatRoomStateLoaded implements ChatRoomState {
const factory ChatRoomStateLoaded({
required final ChatRoomModel chatRoom,
const factory ChatRoomStateLoaded(
{required final ChatRoomModel chatRoom,
required final List<ChatMessageModel> chatMessages,
required final bool hasCard,
required final bool isTyping,
required final bool isLoading,
}) = _$ChatRoomStateLoadedImpl;
required final bool isLoading}) = _$ChatRoomStateLoadedImpl;
ChatRoomModel get chatRoom;
List<ChatMessageModel> get chatMessages;
@@ -659,10 +631,9 @@ abstract class ChatRoomStateLoaded implements ChatRoomState {
/// @nodoc
abstract class _$$ChatRoomStateErrorImplCopyWith<$Res> {
factory _$$ChatRoomStateErrorImplCopyWith(
_$ChatRoomStateErrorImpl value,
$Res Function(_$ChatRoomStateErrorImpl) then,
) = __$$ChatRoomStateErrorImplCopyWithImpl<$Res>;
factory _$$ChatRoomStateErrorImplCopyWith(_$ChatRoomStateErrorImpl value,
$Res Function(_$ChatRoomStateErrorImpl) then) =
__$$ChatRoomStateErrorImplCopyWithImpl<$Res>;
@useResult
$Res call({String errorMessage});
}
@@ -671,25 +642,23 @@ abstract class _$$ChatRoomStateErrorImplCopyWith<$Res> {
class __$$ChatRoomStateErrorImplCopyWithImpl<$Res>
extends _$ChatRoomStateCopyWithImpl<$Res, _$ChatRoomStateErrorImpl>
implements _$$ChatRoomStateErrorImplCopyWith<$Res> {
__$$ChatRoomStateErrorImplCopyWithImpl(
_$ChatRoomStateErrorImpl _value,
$Res Function(_$ChatRoomStateErrorImpl) _then,
) : super(_value, _then);
__$$ChatRoomStateErrorImplCopyWithImpl(_$ChatRoomStateErrorImpl _value,
$Res Function(_$ChatRoomStateErrorImpl) _then)
: super(_value, _then);
/// Create a copy of ChatRoomState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? errorMessage = null}) {
return _then(
_$ChatRoomStateErrorImpl(
errorMessage:
null == errorMessage
$Res call({
Object? errorMessage = null,
}) {
return _then(_$ChatRoomStateErrorImpl(
errorMessage: null == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -725,9 +694,7 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError {
@pragma('vm:prefer-inline')
_$$ChatRoomStateErrorImplCopyWith<_$ChatRoomStateErrorImpl> get copyWith =>
__$$ChatRoomStateErrorImplCopyWithImpl<_$ChatRoomStateErrorImpl>(
this,
_$identity,
);
this, _$identity);
@override
@optionalTypeArgs
@@ -739,8 +706,7 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)
bool isLoading)
loaded,
required TResult Function(String errorMessage) error,
}) {
@@ -757,8 +723,7 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult? Function(String errorMessage)? error,
}) {
@@ -775,8 +740,7 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError {
List<ChatMessageModel> chatMessages,
bool hasCard,
bool isTyping,
bool isLoading,
)?
bool isLoading)?
loaded,
TResult Function(String errorMessage)? error,
required TResult orElse(),

105
lib/features/chat/presentation/bloc/chats_cubit/chats_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'chats_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$ChatsState {
@@ -33,17 +32,15 @@ mixin _$ChatsState {
/// @nodoc
abstract class $ChatsStateCopyWith<$Res> {
factory $ChatsStateCopyWith(
ChatsState value,
$Res Function(ChatsState) then,
) = _$ChatsStateCopyWithImpl<$Res, ChatsState>;
ChatsState value, $Res Function(ChatsState) then) =
_$ChatsStateCopyWithImpl<$Res, ChatsState>;
@useResult
$Res call({
BaseState state,
$Res call(
{BaseState state,
int chatsWithUnreadMessagesCount,
List<ChatRoom> chatRooms,
bool isLoadingMoreChats,
String? errorMessage,
});
String? errorMessage});
}
/// @nodoc
@@ -67,36 +64,28 @@ class _$ChatsStateCopyWithImpl<$Res, $Val extends ChatsState>
Object? isLoadingMoreChats = null,
Object? errorMessage = freezed,
}) {
return _then(
_value.copyWith(
state:
null == state
return _then(_value.copyWith(
state: null == state
? _value.state
: state // ignore: cast_nullable_to_non_nullable
as BaseState,
chatsWithUnreadMessagesCount:
null == chatsWithUnreadMessagesCount
chatsWithUnreadMessagesCount: null == chatsWithUnreadMessagesCount
? _value.chatsWithUnreadMessagesCount
: chatsWithUnreadMessagesCount // ignore: cast_nullable_to_non_nullable
as int,
chatRooms:
null == chatRooms
chatRooms: null == chatRooms
? _value.chatRooms
: chatRooms // ignore: cast_nullable_to_non_nullable
as List<ChatRoom>,
isLoadingMoreChats:
null == isLoadingMoreChats
isLoadingMoreChats: null == isLoadingMoreChats
? _value.isLoadingMoreChats
: isLoadingMoreChats // ignore: cast_nullable_to_non_nullable
as bool,
errorMessage:
freezed == errorMessage
errorMessage: freezed == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String?,
)
as $Val,
);
) as $Val);
}
}
@@ -104,18 +93,16 @@ class _$ChatsStateCopyWithImpl<$Res, $Val extends ChatsState>
abstract class _$$ChatsStateImplCopyWith<$Res>
implements $ChatsStateCopyWith<$Res> {
factory _$$ChatsStateImplCopyWith(
_$ChatsStateImpl value,
$Res Function(_$ChatsStateImpl) then,
) = __$$ChatsStateImplCopyWithImpl<$Res>;
_$ChatsStateImpl value, $Res Function(_$ChatsStateImpl) then) =
__$$ChatsStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
BaseState state,
$Res call(
{BaseState state,
int chatsWithUnreadMessagesCount,
List<ChatRoom> chatRooms,
bool isLoadingMoreChats,
String? errorMessage,
});
String? errorMessage});
}
/// @nodoc
@@ -123,9 +110,8 @@ class __$$ChatsStateImplCopyWithImpl<$Res>
extends _$ChatsStateCopyWithImpl<$Res, _$ChatsStateImpl>
implements _$$ChatsStateImplCopyWith<$Res> {
__$$ChatsStateImplCopyWithImpl(
_$ChatsStateImpl _value,
$Res Function(_$ChatsStateImpl) _then,
) : super(_value, _then);
_$ChatsStateImpl _value, $Res Function(_$ChatsStateImpl) _then)
: super(_value, _then);
/// Create a copy of ChatsState
/// with the given fields replaced by the non-null parameter values.
@@ -138,48 +124,41 @@ class __$$ChatsStateImplCopyWithImpl<$Res>
Object? isLoadingMoreChats = null,
Object? errorMessage = freezed,
}) {
return _then(
_$ChatsStateImpl(
state:
null == state
return _then(_$ChatsStateImpl(
state: null == state
? _value.state
: state // ignore: cast_nullable_to_non_nullable
as BaseState,
chatsWithUnreadMessagesCount:
null == chatsWithUnreadMessagesCount
chatsWithUnreadMessagesCount: null == chatsWithUnreadMessagesCount
? _value.chatsWithUnreadMessagesCount
: chatsWithUnreadMessagesCount // ignore: cast_nullable_to_non_nullable
as int,
chatRooms:
null == chatRooms
chatRooms: null == chatRooms
? _value._chatRooms
: chatRooms // ignore: cast_nullable_to_non_nullable
as List<ChatRoom>,
isLoadingMoreChats:
null == isLoadingMoreChats
isLoadingMoreChats: null == isLoadingMoreChats
? _value.isLoadingMoreChats
: isLoadingMoreChats // ignore: cast_nullable_to_non_nullable
as bool,
errorMessage:
freezed == errorMessage
errorMessage: freezed == errorMessage
? _value.errorMessage
: errorMessage // ignore: cast_nullable_to_non_nullable
as String?,
),
);
));
}
}
/// @nodoc
class _$ChatsStateImpl implements _ChatsState {
_$ChatsStateImpl({
this.state = BaseState.initial,
_$ChatsStateImpl(
{this.state = BaseState.initial,
this.chatsWithUnreadMessagesCount = 0,
final List<ChatRoom> chatRooms = const [],
this.isLoadingMoreChats = false,
this.errorMessage = null,
}) : _chatRooms = chatRooms;
this.errorMessage = null})
: _chatRooms = chatRooms;
@override
@JsonKey()
@@ -214,16 +193,12 @@ class _$ChatsStateImpl implements _ChatsState {
(other.runtimeType == runtimeType &&
other is _$ChatsStateImpl &&
(identical(other.state, state) || other.state == state) &&
(identical(
other.chatsWithUnreadMessagesCount,
chatsWithUnreadMessagesCount,
) ||
(identical(other.chatsWithUnreadMessagesCount,
chatsWithUnreadMessagesCount) ||
other.chatsWithUnreadMessagesCount ==
chatsWithUnreadMessagesCount) &&
const DeepCollectionEquality().equals(
other._chatRooms,
_chatRooms,
) &&
const DeepCollectionEquality()
.equals(other._chatRooms, _chatRooms) &&
(identical(other.isLoadingMoreChats, isLoadingMoreChats) ||
other.isLoadingMoreChats == isLoadingMoreChats) &&
(identical(other.errorMessage, errorMessage) ||
@@ -237,8 +212,7 @@ class _$ChatsStateImpl implements _ChatsState {
chatsWithUnreadMessagesCount,
const DeepCollectionEquality().hash(_chatRooms),
isLoadingMoreChats,
errorMessage,
);
errorMessage);
/// Create a copy of ChatsState
/// with the given fields replaced by the non-null parameter values.
@@ -250,13 +224,12 @@ class _$ChatsStateImpl implements _ChatsState {
}
abstract class _ChatsState implements ChatsState {
factory _ChatsState({
final BaseState state,
factory _ChatsState(
{final BaseState state,
final int chatsWithUnreadMessagesCount,
final List<ChatRoom> chatRooms,
final bool isLoadingMoreChats,
final String? errorMessage,
}) = _$ChatsStateImpl;
final String? errorMessage}) = _$ChatsStateImpl;
@override
BaseState get state;

84
lib/features/chat/presentation/pages/chat_screen.dart
View File

@@ -16,6 +16,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/order_card.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
@@ -62,6 +63,7 @@ class _ChatScreenState extends State<ChatScreen> {
super.dispose();
}
@override
Widget build(BuildContext context) {
return BlocProvider<ChatRoomCubit>(
create: (BuildContext context) => chatRoomCubit,
@@ -73,7 +75,7 @@ class _ChatScreenState extends State<ChatScreen> {
} else if (state is ChatRoomStateError) {
return Scaffold(appBar: AppBar(), body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.chatId)));
} else {
return Scaffold(body: const Loader());
return const Scaffold(body: Loader());
}
},
),
@@ -85,11 +87,13 @@ class _ChatScreenState extends State<ChatScreen> {
final amIConsultant = chosenPlan?.consultantId == state.chatRoom.users.sender.id;
final showAboutOrderButton = showableChatBadgeStates.contains(chosenPlan?.chosenPlanState);
BannerType? bannerType;
if (amIConsultant && !state.hasCard) {
if (amIConsultant && state.hasCard) {
bannerType = BannerType.card;
} else if (amIConsultant && chosenPlan?.chosenPlanState == ChosenPlanStateEnum.stateInCoordination) {
bannerType = BannerType.date;
} else if (!amIConsultant && chosenPlan?.chosenPlanState == ChosenPlanStateEnum.stateStartDateHasBeenSet) {
} else if (!amIConsultant &&
(chosenPlan?.chosenPlanState == ChosenPlanStateEnum.stateStartDateHasBeenSet ||
chosenPlan?.chosenPlanState == ChosenPlanStateEnum.statePendingPayment)) {
bannerType = BannerType.payment;
}
return Scaffold(
@@ -122,20 +126,20 @@ class _ChatScreenState extends State<ChatScreen> {
width: 40,
height: 40,
alignment: Alignment.center,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Color(0xFFEBF4FF),
shape: BoxShape.circle,
),
child: Text(
state.chatRoom.users.receiver.name.split(' ').first[0] + state.chatRoom.users.receiver.name.split(' ')[1][0],
style: TextStyle(
style: const TextStyle(
color: Color(0xFF7F9CF5),
fontWeight: FontWeight.w400,
fontSize: 20,
),
),
),
SizedBox(width: 16),
const SizedBox(width: 16),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -154,7 +158,7 @@ class _ChatScreenState extends State<ChatScreen> {
secondCurve: Curves.easeOut,
secondChild: const SizedBox.shrink(),
crossFadeState: state.isTyping ? CrossFadeState.showFirst : CrossFadeState.showSecond,
duration: Duration(milliseconds: 150),
duration: const Duration(milliseconds: 150),
),
],
),
@@ -173,19 +177,19 @@ class _ChatScreenState extends State<ChatScreen> {
color: appTheme.whiteA700,
width: double.maxFinite,
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
physics: const BouncingScrollPhysics(),
controller: scrollController,
reverse: true,
child: Column(
children: [
SizedBox(height: 16),
const SizedBox(height: 16),
ListView.builder(
physics: NeverScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(),
reverse: true,
shrinkWrap: true,
itemBuilder: (context, index) {
if (index == state.chatMessages.length) {
return Padding(padding: const EdgeInsets.all(8), child: const Loader());
return const Padding(padding: EdgeInsets.all(8), child: Loader());
}
if ((index + 1 != state.chatMessages.length &&
@@ -200,9 +204,10 @@ class _ChatScreenState extends State<ChatScreen> {
onVisibilityChanged: (VisibilityInfo info) {
if (!state.chatMessages[index].isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
unreadMessagesIdsCopy.add((id: state.chatMessages[index].id, index: index));
EasyDebounce.debounce('mark_as_read', Duration(milliseconds: 500), () async {
EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
final result = await context.read<ChatRoomCubit>().markMessagesAsRead(state.chatRoom.id, unreadMessagesIdsCopy);
if (!result) return;
if (!context.mounted) return;
context.read<ChatsCubit>().reduceUnreadMessagesCount(
chatId: state.chatRoom.id,
count: unreadMessagesIdsCopy.length,
@@ -228,9 +233,10 @@ class _ChatScreenState extends State<ChatScreen> {
onVisibilityChanged: (VisibilityInfo info) {
if (!state.chatMessages[index].isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
unreadMessagesIds.add((id: state.chatMessages[index].id, index: index));
EasyDebounce.debounce('mark_as_read', Duration(milliseconds: 500), () async {
EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
final result = await context.read<ChatRoomCubit>().markMessagesAsRead(state.chatRoom.id, unreadMessagesIds);
if (!result) return;
if (!context.mounted) return;
context.read<ChatsCubit>().reduceUnreadMessagesCount(chatId: state.chatRoom.id, count: unreadMessagesIds.length);
unreadMessagesIds.clear();
});
@@ -247,7 +253,7 @@ class _ChatScreenState extends State<ChatScreen> {
},
itemCount: state.chatMessages.length + (state.isLoading ? 1 : 0),
),
SizedBox(height: 16),
const SizedBox(height: 16),
if (chosenPlan != null) ...[
OrderCard(
plan: chosenPlan.plan,
@@ -257,15 +263,15 @@ class _ChatScreenState extends State<ChatScreen> {
await context.read<ChatRoomCubit>().cancelChosenPlan(chatId: state.chatRoom.id, planId: chosenPlan.id);
},
),
if (amIConsultant) ...[
if (amIConsultant)
Padding(
padding: EdgeInsets.symmetric(vertical: 12, horizontal: 16),
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
child: CustomOutlinedButton(
text: S.current.user_info,
height: 52,
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(
side: WidgetStatePropertyAll(BorderSide.none),
side: const WidgetStatePropertyAll(BorderSide.none),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
),
onPressed: () async {
@@ -274,8 +280,7 @@ class _ChatScreenState extends State<ChatScreen> {
),
),
if (bannerType != null)
Padding(padding: EdgeInsets.symmetric(vertical: 12, horizontal: 16), child: NotificationBanner(bannerType: bannerType)),
],
Padding(padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), child: NotificationBanner(bannerType: bannerType)),
],
],
),
@@ -283,11 +288,11 @@ class _ChatScreenState extends State<ChatScreen> {
),
),
Container(
padding: EdgeInsets.symmetric(vertical: 8),
padding: const EdgeInsets.symmetric(vertical: 8),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
SizedBox(width: 8),
const SizedBox(width: 8),
InkWell(
onTap: () async {
FilePickerResult? result = await FilePicker.platform.pickFiles(
@@ -320,14 +325,14 @@ class _ChatScreenState extends State<ChatScreen> {
await chatRoomCubit.sendMessage(chatId: widget.chatId, files: files);
}
},
customBorder: CircleBorder(),
customBorder: const CircleBorder(),
child: Ink(
height: 40,
width: 40,
child: Transform.rotate(angle: pi / 4, child: Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99))),
child: Transform.rotate(angle: pi / 4, child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99))),
),
),
SizedBox(width: 8),
const SizedBox(width: 8),
Expanded(
child: SizedBox(
height: 40,
@@ -338,29 +343,29 @@ class _ChatScreenState extends State<ChatScreen> {
maxLines: null,
minLines: null,
keyboardType: TextInputType.multiline,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1),
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black, height: 1),
decoration: InputDecoration(
isDense: true,
contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 10),
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
hintText: 'Сообщение',
hintStyle: TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
filled: true,
border: OutlineInputBorder(borderRadius: BorderRadius.circular(100), borderSide: BorderSide(color: Color(0xFFD1D1D6), width: 1)),
border: OutlineInputBorder(borderRadius: BorderRadius.circular(100), borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1)),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(100),
borderSide: BorderSide(color: Color(0xFFD1D1D6), width: 1),
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(100),
borderSide: BorderSide(color: Color(0xFFD1D1D6), width: 1),
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
),
),
),
),
),
SizedBox(width: 8),
const SizedBox(width: 8),
InkWell(
customBorder: CircleBorder(),
customBorder: const CircleBorder(),
onTap: () {
if (textEditingController.text.isNotEmpty) {
chatRoomCubit.sendMessage(chatId: widget.chatId, data: textEditingController.text.trim());
@@ -373,16 +378,25 @@ class _ChatScreenState extends State<ChatScreen> {
decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
height: 40,
width: 40,
child: Icon(Icons.arrow_upward_rounded, size: 24, color: Colors.white),
child: const Icon(Icons.arrow_upward_rounded, size: 24, color: Colors.white),
),
),
SizedBox(width: 8),
const SizedBox(width: 8),
],
),
),
],
),
if (showAboutOrderButton) Positioned(top: 8, right: 15, left: 16, child: AboutOrderButton()),
if (showAboutOrderButton)
Positioned(
top: 8,
right: 15,
left: 16,
child: AboutOrderButton(
onTap: () {
GoRouter.of(context).push(InfoByOrderScreen.path, extra: state.chatRoom.chosenPlan);
},
)),
],
),
),

17
lib/features/chat/presentation/pages/chats_screen.dart
View File

@@ -11,7 +11,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ChatsScreen extends StatefulWidget {
const ChatsScreen({Key? key}) : super(key: key);
const ChatsScreen({super.key});
@override
State<ChatsScreen> createState() => _ChatsScreenState();
@@ -20,6 +20,7 @@ class ChatsScreen extends StatefulWidget {
class _ChatsScreenState extends State<ChatsScreen> {
final searchController = TextEditingController();
@override
Widget build(BuildContext context) {
return BlocBuilder<ChatsCubit, ChatsState>(
builder: (context, state) {
@@ -47,7 +48,7 @@ class _ChatsScreenState extends State<ChatsScreen> {
if (query.length > 2) {
EasyDebounce.debounce(
'searchChatRoom',
Duration(milliseconds: 300),
const Duration(milliseconds: 300),
() => context.read<ChatsCubit>().getChatRooms(query: query),
);
} else {
@@ -55,9 +56,9 @@ class _ChatsScreenState extends State<ChatsScreen> {
}
},
controller: searchController,
fillColor: Color(0xFFF0F2F5),
fillColor: const Color(0xFFF0F2F5),
hintText: "Поиск",
hintStyle: TextStyle(
hintStyle: const TextStyle(
color: Color(0xFF7B8794),
),
),
@@ -84,18 +85,18 @@ class _ChatsScreenState extends State<ChatsScreen> {
return false;
},
child: ListView.separated(
padding: EdgeInsets.all(16),
padding: const EdgeInsets.all(16),
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(),
separatorBuilder: (context, index) {
return SizedBox(
return const SizedBox(
height: 8,
);
},
itemCount: state.isLoadingMoreChats ? state.chatRooms.length + 1 : state.chatRooms.length,
itemBuilder: (context, index) {
if (index == state.chatRooms.length) {
return Center(child: Loader());
return const Center(child: Loader());
}
return ChatEntryWidget(chatRoom: state.chatRooms[index]);
},

49
lib/features/chat/presentation/pages/payment_screen.dart Normal file
View File

@@ -0,0 +1,49 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
class PaymentScreen extends StatefulWidget {
static const name = 'paymentScreen';
static const path = '/payment-screen';
final String url;
const PaymentScreen({super.key, required this.url});
@override
State<PaymentScreen> createState() => _PaymentScreenState();
}
class _PaymentScreenState extends State<PaymentScreen> {
late final WebViewController _controller;
@override
void initState() {
super.initState();
_controller = WebViewController()
..setJavaScriptMode(JavaScriptMode.unrestricted)
..setNavigationDelegate(
NavigationDelegate(
onProgress: (int progress) {},
onPageStarted: (String url) {},
onPageFinished: (String url) {},
onHttpError: (HttpResponseError error) {},
onWebResourceError: (WebResourceError error) {},
onNavigationRequest: (NavigationRequest request) {
log(request.url);
return NavigationDecision.navigate;
},
),
)
..loadRequest(Uri.parse(widget.url));
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(),
body: WebViewWidget(
controller: _controller,
),
);
}
}

18
lib/features/chat/presentation/pages/photo_view_screen.dart
View File

@@ -27,7 +27,7 @@ class PhotoViewScreen extends StatefulWidget {
}
class _PhotoViewScreenState extends State<PhotoViewScreen> {
late final pageController;
late final PageController pageController;
int imageIndex = 0;
@override
@@ -45,7 +45,7 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
direction: DismissiblePageDismissDirection.vertical,
isFullScreen: true,
child: PhotoViewGallery.builder(
backgroundDecoration: BoxDecoration(
backgroundDecoration: const BoxDecoration(
color: Colors.transparent,
),
scrollPhysics: const BouncingScrollPhysics(),
@@ -71,29 +71,29 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
child: Column(
children: [
const SizedBox(height: 32),
Text('Файл'),
const Text('Файл'),
const SizedBox(height: 8),
ListTile(
shape: RoundedRectangleBorder(
borderRadius: BorderRadiusStyle.circleBorder17,
),
contentPadding: EdgeInsets.all(16),
contentPadding: const EdgeInsets.all(16),
onTap: () async {
if (!await launchUrl(Uri.parse(widget.imageUrls[index]))) {
throw Exception('Could not launch ${widget.imageUrls[index]}');
}
},
leading: Icon(
leading: const Icon(
Icons.file_copy_outlined,
color: Colors.white,
),
trailing: Icon(
trailing: const Icon(
Icons.download_outlined,
color: Colors.white,
),
title: Text(
widget.imageUrls[index].replaceAll(baseUrl + '/storage/' + 'chat_files/', ''),
style: TextStyle(
widget.imageUrls[index].replaceAll('$baseUrl/storage/chat_files/', ''),
style: const TextStyle(
color: Colors.white,
fontSize: 12,
),
@@ -108,7 +108,7 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
},
itemCount: widget.imageUrls.length,
loadingBuilder: (context, event) => Center(
child: Container(
child: SizedBox(
width: 20.0,
height: 20.0,
child: CircularProgressIndicator(

10
lib/features/chat/presentation/widgets/about_order_button.dart
View File

@@ -5,12 +5,12 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
class AboutOrderButton extends StatelessWidget {
const AboutOrderButton({super.key});
const AboutOrderButton({super.key, required this.onTap});
final void Function() onTap;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {},
onTap: onTap,
child: Container(
height: 44,
decoration: BoxDecoration(
@@ -20,13 +20,13 @@ class AboutOrderButton extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SizedBox.shrink(),
const SizedBox.shrink(),
Text(
S.current.more_about_order,
style: TextStyles.textSMedium.copyWith(color: appTheme.black),
),
Container(
margin: EdgeInsets.only(right: 4),
margin: const EdgeInsets.only(right: 4),
width: 36,
height: 36,
decoration: BoxDecoration(

34
lib/features/chat/presentation/widgets/chat_bubble_widget.dart
View File

@@ -27,7 +27,7 @@ class ChatBubbleWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final size = MediaQuery.sizeOf(context);
return Container(
return SizedBox(
width: size.width,
child: Padding(
padding: EdgeInsets.fromLTRB(isCurrentUser ? 64 : 16, 10, isCurrentUser ? 16 : 64, 4),
@@ -41,7 +41,7 @@ class ChatBubbleWidget extends StatelessWidget {
padding: const EdgeInsets.only(right: 4, bottom: 4),
child: Text(
sendTime.format('hh:mm'),
style: TextStyle(
style: const TextStyle(
color: Color(0xFF7B8794),
height: 1,
fontSize: 10,
@@ -52,16 +52,16 @@ class ChatBubbleWidget extends StatelessWidget {
constraints: BoxConstraints(maxWidth: size.width * 0.7),
decoration: BoxDecoration(
color: isCurrentUser ? appTheme.gray50 : appTheme.gray60004,
borderRadius: mediaData.length > 0
borderRadius: mediaData.isNotEmpty
? BorderRadius.circular(24)
: BorderRadius.horizontal(
left: isCurrentUser ? Radius.circular(32) : Radius.circular(16),
right: isCurrentUser ? Radius.circular(16) : Radius.circular(24),
left: isCurrentUser ? const Radius.circular(32) : const Radius.circular(16),
right: isCurrentUser ? const Radius.circular(16) : const Radius.circular(24),
),
),
child: Padding(
padding:
mediaData.isNotEmpty ? EdgeInsets.all(8) : EdgeInsets.only(top: 8, bottom: 8, left: isCurrentUser ? 16 : 8, right: isCurrentUser ? 8 : 16),
mediaData.isNotEmpty ? const EdgeInsets.all(8) : EdgeInsets.only(top: 8, bottom: 8, left: isCurrentUser ? 16 : 8, right: isCurrentUser ? 8 : 16),
child: Column(
crossAxisAlignment: isCurrentUser ? CrossAxisAlignment.end : CrossAxisAlignment.start,
children: [
@@ -70,7 +70,7 @@ class ChatBubbleWidget extends StatelessWidget {
width: size.width * 0.7,
child: CustomScrollView(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(),
slivers: [
SliverList.separated(
itemBuilder: (BuildContext context, int index) {
@@ -78,25 +78,25 @@ class ChatBubbleWidget extends StatelessWidget {
!mediaData[index].toString().contains('.jpg') &&
!mediaData[index].toString().contains('.jpeg')) {
return ListTile(
contentPadding: EdgeInsets.all(4),
contentPadding: const EdgeInsets.all(4),
horizontalTitleGap: 8,
onTap: () async {
if (!await launchUrl(Uri.parse(baseUrl + '/storage/' + mediaData[index].toString()))) {
if (!await launchUrl(Uri.parse('$baseUrl/storage/${mediaData[index]}'))) {
throw Exception('Could not launch ${mediaData[index].toString()}');
}
},
leading: Icon(
leading: const Icon(
Icons.file_copy_outlined,
color: Colors.white,
),
trailing: Icon(
trailing: const Icon(
Icons.download_outlined,
color: Colors.white,
),
title: Text(
mediaData[index].toString().replaceAll('chat_files/', ''),
maxLines: 2,
style: TextStyle(
style: const TextStyle(
color: Colors.white,
fontSize: 12,
overflow: TextOverflow.ellipsis,
@@ -108,18 +108,18 @@ class ChatBubbleWidget extends StatelessWidget {
onTap: () {
context.pushTransparentRoute(
PhotoViewScreen(
imageUrls: mediaData.map((e) => baseUrl + '/storage/' + e.toString()).toList(),
imageUrls: mediaData.map((e) => '$baseUrl/storage/$e').toList(),
index: index,
),
);
},
child: Hero(
tag: baseUrl + '/storage/' + '${mediaData[index]}',
tag: '$baseUrl/storage/${mediaData[index]}',
transitionOnUserGestures: true,
child: ClipRRect(
borderRadius: BorderRadius.circular(16),
child: CachedNetworkImage(
imageUrl: baseUrl + '/storage/' + '${mediaData[index]}',
imageUrl: '$baseUrl/storage/${mediaData[index]}',
),
),
),
@@ -131,7 +131,7 @@ class ChatBubbleWidget extends StatelessWidget {
],
),
),
if (mediaData.isNotEmpty && text.isNotEmpty) SizedBox(height: 8),
if (mediaData.isNotEmpty && text.isNotEmpty) const SizedBox(height: 8),
if (text.isNotEmpty)
Text(
text,
@@ -146,7 +146,7 @@ class ChatBubbleWidget extends StatelessWidget {
padding: const EdgeInsets.only(left: 4, bottom: 4),
child: Text(
sendTime.format('hh:mm'),
style: TextStyle(
style: const TextStyle(
color: Color(0xFF7B8794),
height: 1,
fontSize: 10,

18
lib/features/chat/presentation/widgets/chat_entry_widget.dart
View File

@@ -8,7 +8,7 @@ import 'package:go_router/go_router.dart';
class ChatEntryWidget extends StatefulWidget {
final ChatRoom chatRoom;
ChatEntryWidget({
const ChatEntryWidget({
required this.chatRoom,
super.key,
});
@@ -29,10 +29,10 @@ class _ChatEntryWidgetState extends State<ChatEntryWidget> {
},
),
child: Ink(
padding: EdgeInsets.all(12),
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
color: Color(0xFFF6FAFF),
color: const Color(0xFFF6FAFF),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@@ -52,10 +52,10 @@ class _ChatEntryWidgetState extends State<ChatEntryWidget> {
Text(
widget.chatRoom.users.toChatUser.name.length <= 20
? widget.chatRoom.users.toChatUser.name
: widget.chatRoom.users.toChatUser.name.substring(0, 20) + '...',
: '${widget.chatRoom.users.toChatUser.name.substring(0, 20)}...',
style: theme.textTheme.titleMedium,
),
SizedBox(height: 8),
const SizedBox(height: 8),
if (widget.chatRoom.lastMessage != null)
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.5,
@@ -68,22 +68,22 @@ class _ChatEntryWidgetState extends State<ChatEntryWidget> {
),
],
),
Spacer(),
const Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
if (widget.chatRoom.lastMessage != null)
Padding(
padding: EdgeInsets.only(left: 8),
padding: const EdgeInsets.only(left: 8),
child: Text(
widget.chatRoom.lastMessage!.updatedAt.format('dd MMM', 'ru'),
style: theme.textTheme.bodyMedium,
),
),
SizedBox(height: 4),
const SizedBox(height: 4),
if (widget.chatRoom.unreadMessagesCount > 0)
Container(
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 6),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: appTheme.blueA400,

10
lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
View File

@@ -3,8 +3,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter/material.dart';
class ChatSearchBarWidget extends StatelessWidget {
ChatSearchBarWidget({
Key? key,
const ChatSearchBarWidget({
super.key,
this.alignment,
this.width,
this.scrollPadding,
@@ -27,7 +27,7 @@ class ChatSearchBarWidget extends StatelessWidget {
this.validator,
this.onChanged,
required this.onSuffixIconTap,
}) : super(key: key);
});
final Alignment? alignment;
@@ -107,7 +107,7 @@ class ChatSearchBarWidget extends StatelessWidget {
hintText: hintText ?? "",
hintStyle: hintStyle ?? CustomTextStyles.bodySmallMulishBluegray800,
prefixIcon: prefix ??
Padding(
const Padding(
padding: EdgeInsets.only(left: 12),
child: Icon(
Icons.search,
@@ -126,7 +126,7 @@ class ChatSearchBarWidget extends StatelessWidget {
),
),
isDense: true,
contentPadding: EdgeInsets.all(16),
contentPadding: const EdgeInsets.all(16),
fillColor: fillColor ?? appTheme.gray100,
filled: filled,
border: borderDecoration ??

90
lib/features/chat/presentation/widgets/chose_plan_date_widget.dart Normal file
View File

@@ -0,0 +1,90 @@
import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/calendar_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:flutter/material.dart';
class ChosePlanDateWidget extends StatefulWidget {
const ChosePlanDateWidget({super.key, required this.chatCubit});
final ChatRoomCubit chatCubit;
@override
State<ChosePlanDateWidget> createState() => _ChosePlanDateWidget();
}
class _ChosePlanDateWidget extends State<ChosePlanDateWidget> {
final startDate = [DateTime.now()];
@override
Widget build(BuildContext context) {
final s = S.of(context);
String? planName;
if (widget.chatCubit.state is ChatRoomStateLoaded) {
planName = (widget.chatCubit.state as ChatRoomStateLoaded).chatRoom.chosenPlan?.plan.name;
}
return Column(
mainAxisSize: MainAxisSize.min,
children: [
const SizedBox(height: 4),
const BottomSheetHandlerBar(),
const SizedBox(height: 12),
Text(
planName ?? '',
style: TextStyles.headingXLSemibold.copyWith(
color: appTheme.black,
),
),
const SizedBox(height: 12),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 25.0),
child: Text(
s.chose_plan_start_date_2,
textAlign: TextAlign.center,
style: TextStyles.textMMedium.copyWith(
color: appTheme.black,
),
),
),
const SizedBox(height: 12),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 16.0),
child: CustomDivider(),
),
CalendarWidget(
startDate: startDate,
),
Padding(
padding: const EdgeInsets.only(left: 16, right: 16, top: 16, bottom: 28),
child: CustomOutlinedButton(
onPressed: () async {
final result = await widget.chatCubit.choseStartPlanDate(startDate[0]);
if (result) {
showSuccessToast('Дата установлена');
if (!context.mounted) return;
Navigator.pop(context);
} else {
showErrorToast('Не удалось установить дату');
if (!context.mounted) return;
Navigator.pop(context);
}
},
height: 60,
text: s.confirm,
buttonTextStyle: TextStyles.textLSemibold.copyWith(
color: appTheme.whiteA700,
),
buttonStyle: ButtonStyle(
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
side: const WidgetStatePropertyAll(BorderSide.none),
),
),
),
],
);
}
}

43
lib/features/chat/presentation/widgets/notification_banner.dart
View File

@@ -1,8 +1,13 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chose_plan_date_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
class NotificationBanner extends StatelessWidget {
const NotificationBanner({super.key, required this.bannerType});
@@ -32,38 +37,52 @@ class NotificationBanner extends StatelessWidget {
BannerType.date => [
SizedBox(
width: size.width * 0.6,
child: Text(s.can_not_choose_start_date, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
child: Text(s.choose_plan_start_date, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
),
SizedBox(height: 12),
const SizedBox(height: 12),
GestureDetector(
onTap: () {},
child: Text(s.add_card, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
onTap: () {
final cubit = context.read<ChatRoomCubit>();
showModalBottomSheet(
context: context,
builder: (context) => ChosePlanDateWidget(
chatCubit: cubit,
),
SizedBox(height: 16),
);
},
child: Text(s.choose_date, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
),
const SizedBox(height: 16),
],
BannerType.card => [
SizedBox(
width: size.width * 0.6,
child: Text(s.can_not_choose_start_date, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
),
SizedBox(height: 12),
const SizedBox(height: 12),
GestureDetector(
onTap: () {},
child: Text(s.add_card, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
),
SizedBox(height: 16),
const SizedBox(height: 16),
],
BannerType.payment => [
SizedBox(
width: size.width * 0.6,
child: Text(s.can_not_choose_start_date, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
child: Text(s.tap_on_link_to_pay, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
),
SizedBox(height: 12),
const SizedBox(height: 12),
GestureDetector(
onTap: () {},
child: Text(s.add_card, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
onTap: () async {
final paymentLink = await context.read<ChatRoomCubit>().getPaymentLink();
if (paymentLink != null) {
if (!context.mounted) return;
GoRouter.of(context).push(PaymentScreen.path, extra: paymentLink);
}
},
child: Text(s.pay, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),
),
SizedBox(height: 16),
const SizedBox(height: 16),
],
},
),

26
lib/features/chat/presentation/widgets/order_card.dart
View File

@@ -33,8 +33,8 @@ class _OrderCardState extends State<OrderCard> {
};
final s = S.of(context);
return Container(
margin: EdgeInsets.symmetric(horizontal: 16),
padding: EdgeInsets.only(top: 8, bottom: 12, left: 8, right: 8),
margin: const EdgeInsets.symmetric(horizontal: 16),
padding: const EdgeInsets.only(top: 8, bottom: 12, left: 8, right: 8),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: appTheme.gray60004),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -47,7 +47,7 @@ class _OrderCardState extends State<OrderCard> {
ClipRRect(
borderRadius: BorderRadius.circular(12),
child: Image.network(
baseUrl + '/storage/' + widget.plan.image,
'$baseUrl/storage/${widget.plan.image}',
width: double.infinity,
fit: BoxFit.cover,
),
@@ -59,7 +59,7 @@ class _OrderCardState extends State<OrderCard> {
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration(
color: appTheme.blueA400,
borderRadius: BorderRadius.only(
borderRadius: const BorderRadius.only(
topRight: Radius.circular(12),
bottomRight: Radius.circular(12),
),
@@ -77,7 +77,7 @@ class _OrderCardState extends State<OrderCard> {
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration(
color: appTheme.greenA700,
borderRadius: BorderRadius.only(
borderRadius: const BorderRadius.only(
topRight: Radius.circular(12),
bottomRight: Radius.circular(12),
),
@@ -91,17 +91,17 @@ class _OrderCardState extends State<OrderCard> {
],
),
),
SizedBox(height: 12),
const SizedBox(height: 12),
Text(
'${widget.plan.name}',
widget.plan.name,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 12),
const SizedBox(height: 12),
Text(
'${s.option}: ${option?.short ?? ''}',
style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
if (option != null)
...option.items
.map(
@@ -114,11 +114,11 @@ class _OrderCardState extends State<OrderCard> {
),
),
)
.toList(),
,
if (widget.isCustomerView) ...[
SizedBox(height: 8),
const SizedBox(height: 8),
isLoading
? Loader()
? const Loader()
: GestureDetector(
onTap: () async {
setState(() => isLoading = true);
@@ -126,7 +126,7 @@ class _OrderCardState extends State<OrderCard> {
setState(() => isLoading = false);
},
child: Text(
'${s.cancel_order}',
s.cancel_order,
style: TextStyles.textSMedium.copyWith(color: appTheme.strongRed),
),
),

22
lib/features/chat/repositories/chat_repository.dart
View File

@@ -1,11 +1,11 @@
import 'dart:async';
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
import 'package:eatvio_app/features/chat/models/payment_model.dart';
import 'package:eatvio_app/features/chat/services/chat_service.dart';
import 'package:http_parser/http_parser.dart';
@@ -47,7 +47,7 @@ class ChatRepository {
await chatService.sendMessage(
id: chatId,
data: data,
media_data: multipartFiles.isEmpty ? null : multipartFiles,
mediaData: multipartFiles.isEmpty ? null : multipartFiles,
);
} catch (e) {
rethrow;
@@ -103,4 +103,22 @@ class ChatRepository {
rethrow;
}
}
Future<void> choseStartPlanDate({required int id, required Map<String, String> date}) async {
try {
await chatService.choseStartPlanDate(id: id, date: date);
} catch (e) {
rethrow;
}
}
Future<PaymentModel> getPaymentLink({
required int id,
}) async {
try {
return await chatService.getPaymentLink(id: id);
} catch (e) {
rethrow;
}
}
}

14
lib/features/chat/services/chat_service.dart
View File

@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
import 'package:eatvio_app/features/chat/models/payment_model.dart';
import 'package:retrofit/retrofit.dart';
part 'chat_service.g.dart';
@@ -26,7 +27,7 @@ abstract class ChatService {
Future<void> sendMessage({
@Path() required String id,
@Part() String? data,
@Part(name: 'media_data[]', contentType: 'multipart/form-data') List<MultipartFile>? media_data,
@Part(name: 'media_data[]', contentType: 'multipart/form-data') List<MultipartFile>? mediaData,
});
@GET('/api/chat/show/{id}/messages?page={page}')
@@ -50,4 +51,15 @@ abstract class ChatService {
Future<void> cancelChosenPlan({
@Path() required int id,
});
@POST('/api/chosen_plans/{id}/negotiate_contract_start')
Future<void> choseStartPlanDate({
@Path() required int id,
@Body() required Map<String, String> date,
});
@POST('/api/chosen_plans/{id}/start_payment_process')
Future<PaymentModel> getPaymentLink({
@Path() required int id,
});
}

56
lib/features/chat/services/chat_service.g.dart
View File

@@ -82,7 +82,7 @@ class _ChatService implements ChatService {
Future<void> sendMessage({
required String id,
String? data,
List<MultipartFile>? media_data,
List<MultipartFile>? mediaData,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
@@ -92,8 +92,8 @@ class _ChatService implements ChatService {
if (data != null) {
_data.fields.add(MapEntry('data', data));
}
if (media_data != null) {
_data.files.addAll(media_data.map((i) => MapEntry('media_data[]', i)));
if (mediaData != null) {
_data.files.addAll(mediaData.map((i) => MapEntry('media_data[]', i)));
}
final _options = _setStreamType<void>(
Options(
@@ -212,6 +212,56 @@ class _ChatService implements ChatService {
await _dio.fetch<void>(_options);
}
@override
Future<void> choseStartPlanDate({
required int id,
required Map<String, String> date,
}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
final _data = <String, dynamic>{};
_data.addAll(date);
final _options = _setStreamType<void>(
Options(method: 'POST', headers: _headers, extra: _extra)
.compose(
_dio.options,
'/api/chosen_plans/${id}/negotiate_contract_start',
queryParameters: queryParameters,
data: _data,
)
.copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
);
await _dio.fetch<void>(_options);
}
@override
Future<PaymentModel> getPaymentLink({required int id}) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _options = _setStreamType<PaymentModel>(
Options(method: 'POST', headers: _headers, extra: _extra)
.compose(
_dio.options,
'/api/chosen_plans/${id}/start_payment_process',
queryParameters: queryParameters,
data: _data,
)
.copyWith(baseUrl: _combineBaseUrls(_dio.options.baseUrl, baseUrl)),
);
final _result = await _dio.fetch<Map<String, dynamic>>(_options);
late PaymentModel _value;
try {
_value = PaymentModel.fromJson(_result.data!);
} on Object catch (e, s) {
errorLogger?.logError(e, s, _options);
rethrow;
}
return _value;
}
RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
if (T != dynamic &&
!(requestOptions.responseType == ResponseType.bytes ||

76
lib/features/complaining/models/complain_model.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'complain_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ComplainModel _$ComplainModelFromJson(Map<String, dynamic> json) {
return _ComplainModel.fromJson(json);
@@ -37,9 +36,8 @@ mixin _$ComplainModel {
/// @nodoc
abstract class $ComplainModelCopyWith<$Res> {
factory $ComplainModelCopyWith(
ComplainModel value,
$Res Function(ComplainModel) then,
) = _$ComplainModelCopyWithImpl<$Res, ComplainModel>;
ComplainModel value, $Res Function(ComplainModel) then) =
_$ComplainModelCopyWithImpl<$Res, ComplainModel>;
@useResult
$Res call({String? description, List<String> tags});
}
@@ -58,22 +56,20 @@ class _$ComplainModelCopyWithImpl<$Res, $Val extends ComplainModel>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? description = freezed, Object? tags = null}) {
return _then(
_value.copyWith(
description:
freezed == description
$Res call({
Object? description = freezed,
Object? tags = null,
}) {
return _then(_value.copyWith(
description: freezed == description
? _value.description
: description // ignore: cast_nullable_to_non_nullable
as String?,
tags:
null == tags
tags: null == tags
? _value.tags
: tags // ignore: cast_nullable_to_non_nullable
as List<String>,
)
as $Val,
);
) as $Val);
}
}
@@ -81,9 +77,8 @@ class _$ComplainModelCopyWithImpl<$Res, $Val extends ComplainModel>
abstract class _$$ComplainModelImplCopyWith<$Res>
implements $ComplainModelCopyWith<$Res> {
factory _$$ComplainModelImplCopyWith(
_$ComplainModelImpl value,
$Res Function(_$ComplainModelImpl) then,
) = __$$ComplainModelImplCopyWithImpl<$Res>;
_$ComplainModelImpl value, $Res Function(_$ComplainModelImpl) then) =
__$$ComplainModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String? description, List<String> tags});
@@ -94,39 +89,36 @@ class __$$ComplainModelImplCopyWithImpl<$Res>
extends _$ComplainModelCopyWithImpl<$Res, _$ComplainModelImpl>
implements _$$ComplainModelImplCopyWith<$Res> {
__$$ComplainModelImplCopyWithImpl(
_$ComplainModelImpl _value,
$Res Function(_$ComplainModelImpl) _then,
) : super(_value, _then);
_$ComplainModelImpl _value, $Res Function(_$ComplainModelImpl) _then)
: super(_value, _then);
/// Create a copy of ComplainModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? description = freezed, Object? tags = null}) {
return _then(
_$ComplainModelImpl(
description:
freezed == description
$Res call({
Object? description = freezed,
Object? tags = null,
}) {
return _then(_$ComplainModelImpl(
description: freezed == description
? _value.description
: description // ignore: cast_nullable_to_non_nullable
as String?,
tags:
null == tags
tags: null == tags
? _value._tags
: tags // ignore: cast_nullable_to_non_nullable
as List<String>,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ComplainModelImpl implements _ComplainModel {
const _$ComplainModelImpl({
this.description = null,
final List<String> tags = const [],
}) : _tags = tags;
const _$ComplainModelImpl(
{this.description = null, final List<String> tags = const []})
: _tags = tags;
factory _$ComplainModelImpl.fromJson(Map<String, dynamic> json) =>
_$$ComplainModelImplFromJson(json);
@@ -161,10 +153,7 @@ class _$ComplainModelImpl implements _ComplainModel {
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(
runtimeType,
description,
const DeepCollectionEquality().hash(_tags),
);
runtimeType, description, const DeepCollectionEquality().hash(_tags));
/// Create a copy of ComplainModel
/// with the given fields replaced by the non-null parameter values.
@@ -176,15 +165,16 @@ class _$ComplainModelImpl implements _ComplainModel {
@override
Map<String, dynamic> toJson() {
return _$$ComplainModelImplToJson(this);
return _$$ComplainModelImplToJson(
this,
);
}
}
abstract class _ComplainModel implements ComplainModel {
const factory _ComplainModel({
final String? description,
final List<String> tags,
}) = _$ComplainModelImpl;
const factory _ComplainModel(
{final String? description,
final List<String> tags}) = _$ComplainModelImpl;
factory _ComplainModel.fromJson(Map<String, dynamic> json) =
_$ComplainModelImpl.fromJson;

124
lib/features/complaining/presentation/complaining_bottom_sheet.dart
View File

@@ -31,28 +31,28 @@ class _ComplainingBottomSheetState extends State<ComplainingBottomSheet> {
return BlocProvider(
create: (context) => sl<ComplainingCubit>()..setContentTypeAndIdentifier(contentType: widget.complainedContentType, slug: widget.slug, id: widget.id),
child: Container(
padding: EdgeInsets.only(top: 8, bottom: 24, left: 16, right: 16),
decoration: BoxDecoration(
padding: const EdgeInsets.only(top: 8, bottom: 24, left: 16, right: 16),
decoration: const BoxDecoration(
borderRadius: BorderRadius.vertical(top: Radius.circular(12)),
),
child: BlocBuilder<ComplainingCubit, ComplainingState>(
builder: (context, state) {
final category = state.category;
if (state.wasSentSuccessfully == true) {
return _ComplaintSentWidget();
return const _ComplaintSentWidget();
} else if (state.wasSentSuccessfully == false) {
return _ComplaintFailedWidget();
return const _ComplaintFailedWidget();
}
if (category != null) {
return switch (category) {
ComplainType.spam => _SpamWidget(),
ComplainType.lawViolation => _LawViolationWidget(),
ComplainType.deception => _DeceptionWidget(),
ComplainType.violenceDndHostility => _ViolenceAndHostility(),
ComplainType.explicitImage => _ExplicitImageWidget(),
ComplainType.spam => const _SpamWidget(),
ComplainType.lawViolation => const _LawViolationWidget(),
ComplainType.deception => const _DeceptionWidget(),
ComplainType.violenceDndHostility => const _ViolenceAndHostility(),
ComplainType.explicitImage => const _ExplicitImageWidget(),
};
}
return _CategoryWidget();
return const _CategoryWidget();
},
),
),
@@ -69,19 +69,19 @@ class _CategoryWidget extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.complaint,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
Text(
s.complaint_question,
textAlign: TextAlign.center,
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
SizedBox(height: 24),
const SizedBox(height: 24),
...List.generate(
categories.length,
(index) => Column(
@@ -92,11 +92,11 @@ class _CategoryWidget extends StatelessWidget {
context.read<ComplainingCubit>().setCategory(categories[index]);
},
),
if (index != categories.length - 1) SizedBox(height: 20),
if (index != categories.length - 1) const SizedBox(height: 20),
],
),
),
SizedBox(height: 24),
const SizedBox(height: 24),
],
);
}
@@ -111,13 +111,13 @@ class _SpamWidget extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.spam,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -126,8 +126,8 @@ class _SpamWidget extends StatelessWidget {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
_ComplainButton(),
const SizedBox(height: 24),
const _ComplainButton(),
],
);
}
@@ -142,13 +142,13 @@ class _ExplicitImageWidget extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.explicitImages,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -157,8 +157,8 @@ class _ExplicitImageWidget extends StatelessWidget {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
_ComplainButton(),
const SizedBox(height: 24),
const _ComplainButton(),
],
);
}
@@ -197,13 +197,13 @@ class _LawViolationWidgetState extends State<_LawViolationWidget> {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.lawViolation,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -212,7 +212,7 @@ class _LawViolationWidgetState extends State<_LawViolationWidget> {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
const SizedBox(height: 24),
...tags.mapIndexed((index, element) {
return Row(
children: [
@@ -238,9 +238,9 @@ class _LawViolationWidgetState extends State<_LawViolationWidget> {
),
],
);
}).toList(),
}),
if (tags.last.$1) ...[
SizedBox(height: 12),
const SizedBox(height: 12),
CustomTextFormField(
hintText: s.type_here_your_complaint,
onChanged: (value) {
@@ -248,8 +248,8 @@ class _LawViolationWidgetState extends State<_LawViolationWidget> {
},
),
],
SizedBox(height: 20),
_ComplainButton(),
const SizedBox(height: 20),
const _ComplainButton(),
],
);
}
@@ -287,13 +287,13 @@ class _ViolenceAndHostilityState extends State<_ViolenceAndHostility> {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.lawViolation,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -302,7 +302,7 @@ class _ViolenceAndHostilityState extends State<_ViolenceAndHostility> {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
const SizedBox(height: 24),
...tags.mapIndexed((index, element) {
return Row(
children: [
@@ -327,9 +327,9 @@ class _ViolenceAndHostilityState extends State<_ViolenceAndHostility> {
),
],
);
}).toList(),
SizedBox(height: 20),
_ComplainButton(),
}),
const SizedBox(height: 20),
const _ComplainButton(),
],
);
}
@@ -369,13 +369,13 @@ class _DeceptionWidgetState extends State<_DeceptionWidget> {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.lawViolation,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -384,7 +384,7 @@ class _DeceptionWidgetState extends State<_DeceptionWidget> {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
const SizedBox(height: 24),
...tags.mapIndexed((index, element) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -406,7 +406,7 @@ class _DeceptionWidgetState extends State<_DeceptionWidget> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 8),
const SizedBox(height: 8),
Text(
element.$2,
style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
@@ -422,9 +422,9 @@ class _DeceptionWidgetState extends State<_DeceptionWidget> {
),
],
);
}).toList(),
SizedBox(height: 20),
_ComplainButton(),
}),
const SizedBox(height: 20),
const _ComplainButton(),
],
);
}
@@ -439,13 +439,13 @@ class _ComplaintSentWidget extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.complaint_sent,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -454,13 +454,13 @@ class _ComplaintSentWidget extends StatelessWidget {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
const SizedBox(height: 24),
CustomOutlinedButton(
text: s.ok,
height: 52,
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(
side: WidgetStatePropertyAll(BorderSide.none),
side: const WidgetStatePropertyAll(BorderSide.none),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
),
onPressed: () {
@@ -481,13 +481,13 @@ class _ComplaintFailedWidget extends StatelessWidget {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
BottomSheetHandlerBar(),
SizedBox(height: 20),
const BottomSheetHandlerBar(),
const SizedBox(height: 20),
Text(
s.could_not_send_complain,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
SizedBox(height: 8),
const SizedBox(height: 8),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.7,
child: Text(
@@ -496,13 +496,13 @@ class _ComplaintFailedWidget extends StatelessWidget {
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
),
),
SizedBox(height: 24),
const SizedBox(height: 24),
CustomOutlinedButton(
text: s.ok,
height: 52,
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(
side: WidgetStatePropertyAll(BorderSide.none),
side: const WidgetStatePropertyAll(BorderSide.none),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
),
onPressed: () {
@@ -523,14 +523,14 @@ class _ComplainButton extends StatelessWidget {
return BlocBuilder<ComplainingCubit, ComplainingState>(
builder: (context, state) {
if (state.isLoading) {
return Loader();
return const Loader();
}
return CustomOutlinedButton(
text: s.send_complain,
height: 52,
buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
buttonStyle: ButtonStyle(
side: WidgetStatePropertyAll(BorderSide.none),
side: const WidgetStatePropertyAll(BorderSide.none),
backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
),
onPressed: () async {
@@ -558,7 +558,7 @@ class _CategoryButton extends StatelessWidget {
category.getTranslatedText(),
style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
),
Spacer(),
const Spacer(),
SvgPicture.asset('assets/icons/right_arrow.svg'),
],
),

121
lib/features/complaining/presentation/cubit/complaining_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'complaining_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$ComplainingState {
@@ -35,19 +34,17 @@ mixin _$ComplainingState {
/// @nodoc
abstract class $ComplainingStateCopyWith<$Res> {
factory $ComplainingStateCopyWith(
ComplainingState value,
$Res Function(ComplainingState) then,
) = _$ComplainingStateCopyWithImpl<$Res, ComplainingState>;
ComplainingState value, $Res Function(ComplainingState) then) =
_$ComplainingStateCopyWithImpl<$Res, ComplainingState>;
@useResult
$Res call({
bool isLoading,
$Res call(
{bool isLoading,
bool? wasSentSuccessfully,
ComplainType? category,
ComplainedContent? contentType,
int? contentId,
String? contentSlug,
ComplainModel complainInfo,
});
ComplainModel complainInfo});
$ComplainModelCopyWith<$Res> get complainInfo;
}
@@ -75,46 +72,36 @@ class _$ComplainingStateCopyWithImpl<$Res, $Val extends ComplainingState>
Object? contentSlug = freezed,
Object? complainInfo = null,
}) {
return _then(
_value.copyWith(
isLoading:
null == isLoading
return _then(_value.copyWith(
isLoading: null == isLoading
? _value.isLoading
: isLoading // ignore: cast_nullable_to_non_nullable
as bool,
wasSentSuccessfully:
freezed == wasSentSuccessfully
wasSentSuccessfully: freezed == wasSentSuccessfully
? _value.wasSentSuccessfully
: wasSentSuccessfully // ignore: cast_nullable_to_non_nullable
as bool?,
category:
freezed == category
category: freezed == category
? _value.category
: category // ignore: cast_nullable_to_non_nullable
as ComplainType?,
contentType:
freezed == contentType
contentType: freezed == contentType
? _value.contentType
: contentType // ignore: cast_nullable_to_non_nullable
as ComplainedContent?,
contentId:
freezed == contentId
contentId: freezed == contentId
? _value.contentId
: contentId // ignore: cast_nullable_to_non_nullable
as int?,
contentSlug:
freezed == contentSlug
contentSlug: freezed == contentSlug
? _value.contentSlug
: contentSlug // ignore: cast_nullable_to_non_nullable
as String?,
complainInfo:
null == complainInfo
complainInfo: null == complainInfo
? _value.complainInfo
: complainInfo // ignore: cast_nullable_to_non_nullable
as ComplainModel,
)
as $Val,
);
) as $Val);
}
/// Create a copy of ComplainingState
@@ -131,21 +118,19 @@ class _$ComplainingStateCopyWithImpl<$Res, $Val extends ComplainingState>
/// @nodoc
abstract class _$$ComplainingStateImplCopyWith<$Res>
implements $ComplainingStateCopyWith<$Res> {
factory _$$ComplainingStateImplCopyWith(
_$ComplainingStateImpl value,
$Res Function(_$ComplainingStateImpl) then,
) = __$$ComplainingStateImplCopyWithImpl<$Res>;
factory _$$ComplainingStateImplCopyWith(_$ComplainingStateImpl value,
$Res Function(_$ComplainingStateImpl) then) =
__$$ComplainingStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
bool isLoading,
$Res call(
{bool isLoading,
bool? wasSentSuccessfully,
ComplainType? category,
ComplainedContent? contentType,
int? contentId,
String? contentSlug,
ComplainModel complainInfo,
});
ComplainModel complainInfo});
@override
$ComplainModelCopyWith<$Res> get complainInfo;
@@ -155,10 +140,9 @@ abstract class _$$ComplainingStateImplCopyWith<$Res>
class __$$ComplainingStateImplCopyWithImpl<$Res>
extends _$ComplainingStateCopyWithImpl<$Res, _$ComplainingStateImpl>
implements _$$ComplainingStateImplCopyWith<$Res> {
__$$ComplainingStateImplCopyWithImpl(
_$ComplainingStateImpl _value,
$Res Function(_$ComplainingStateImpl) _then,
) : super(_value, _then);
__$$ComplainingStateImplCopyWithImpl(_$ComplainingStateImpl _value,
$Res Function(_$ComplainingStateImpl) _then)
: super(_value, _then);
/// Create a copy of ComplainingState
/// with the given fields replaced by the non-null parameter values.
@@ -173,60 +157,50 @@ class __$$ComplainingStateImplCopyWithImpl<$Res>
Object? contentSlug = freezed,
Object? complainInfo = null,
}) {
return _then(
_$ComplainingStateImpl(
isLoading:
null == isLoading
return _then(_$ComplainingStateImpl(
isLoading: null == isLoading
? _value.isLoading
: isLoading // ignore: cast_nullable_to_non_nullable
as bool,
wasSentSuccessfully:
freezed == wasSentSuccessfully
wasSentSuccessfully: freezed == wasSentSuccessfully
? _value.wasSentSuccessfully
: wasSentSuccessfully // ignore: cast_nullable_to_non_nullable
as bool?,
category:
freezed == category
category: freezed == category
? _value.category
: category // ignore: cast_nullable_to_non_nullable
as ComplainType?,
contentType:
freezed == contentType
contentType: freezed == contentType
? _value.contentType
: contentType // ignore: cast_nullable_to_non_nullable
as ComplainedContent?,
contentId:
freezed == contentId
contentId: freezed == contentId
? _value.contentId
: contentId // ignore: cast_nullable_to_non_nullable
as int?,
contentSlug:
freezed == contentSlug
contentSlug: freezed == contentSlug
? _value.contentSlug
: contentSlug // ignore: cast_nullable_to_non_nullable
as String?,
complainInfo:
null == complainInfo
complainInfo: null == complainInfo
? _value.complainInfo
: complainInfo // ignore: cast_nullable_to_non_nullable
as ComplainModel,
),
);
));
}
}
/// @nodoc
class _$ComplainingStateImpl implements _ComplainingState {
_$ComplainingStateImpl({
this.isLoading = false,
_$ComplainingStateImpl(
{this.isLoading = false,
this.wasSentSuccessfully = null,
this.category = null,
this.contentType = null,
this.contentId = null,
this.contentSlug = null,
this.complainInfo = const ComplainModel(),
});
this.complainInfo = const ComplainModel()});
@override
@JsonKey()
@@ -277,16 +251,8 @@ class _$ComplainingStateImpl implements _ComplainingState {
}
@override
int get hashCode => Object.hash(
runtimeType,
isLoading,
wasSentSuccessfully,
category,
contentType,
contentId,
contentSlug,
complainInfo,
);
int get hashCode => Object.hash(runtimeType, isLoading, wasSentSuccessfully,
category, contentType, contentId, contentSlug, complainInfo);
/// Create a copy of ComplainingState
/// with the given fields replaced by the non-null parameter values.
@@ -295,21 +261,18 @@ class _$ComplainingStateImpl implements _ComplainingState {
@pragma('vm:prefer-inline')
_$$ComplainingStateImplCopyWith<_$ComplainingStateImpl> get copyWith =>
__$$ComplainingStateImplCopyWithImpl<_$ComplainingStateImpl>(
this,
_$identity,
);
this, _$identity);
}
abstract class _ComplainingState implements ComplainingState {
factory _ComplainingState({
final bool isLoading,
factory _ComplainingState(
{final bool isLoading,
final bool? wasSentSuccessfully,
final ComplainType? category,
final ComplainedContent? contentType,
final int? contentId,
final String? contentSlug,
final ComplainModel complainInfo,
}) = _$ComplainingStateImpl;
final ComplainModel complainInfo}) = _$ComplainingStateImpl;
@override
bool get isLoading;

296
lib/features/consultant/become_consultant/models/consultant_profile_model.freezed.dart
View File

@@ -12,12 +12,10 @@ part of 'consultant_profile_model.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
ConsultantProfileModel _$ConsultantProfileModelFromJson(
Map<String, dynamic> json,
) {
Map<String, dynamic> json) {
return _ConsultantProfileModel.fromJson(json);
}
@@ -45,29 +43,25 @@ mixin _$ConsultantProfileModel {
/// @nodoc
abstract class $ConsultantProfileModelCopyWith<$Res> {
factory $ConsultantProfileModelCopyWith(
ConsultantProfileModel value,
$Res Function(ConsultantProfileModel) then,
) = _$ConsultantProfileModelCopyWithImpl<$Res, ConsultantProfileModel>;
factory $ConsultantProfileModelCopyWith(ConsultantProfileModel value,
$Res Function(ConsultantProfileModel) then) =
_$ConsultantProfileModelCopyWithImpl<$Res, ConsultantProfileModel>;
@useResult
$Res call({
@JsonKey(name: 'has_medical_education', includeIfNull: false)
$Res call(
{@JsonKey(name: 'has_medical_education', includeIfNull: false)
bool? hasMedicalEducation,
@JsonKey(name: 'social_links', includeIfNull: false)
SocialLinksModel? socialLinks,
@JsonKey(name: 'cert_photos', includeIfNull: false) List<String>? photos,
@JsonKey(name: 'completed_courses', includeIfNull: false)
List<CertificatesModel>? certificates,
});
List<CertificatesModel>? certificates});
$SocialLinksModelCopyWith<$Res>? get socialLinks;
}
/// @nodoc
class _$ConsultantProfileModelCopyWithImpl<
$Res,
$Val extends ConsultantProfileModel
>
class _$ConsultantProfileModelCopyWithImpl<$Res,
$Val extends ConsultantProfileModel>
implements $ConsultantProfileModelCopyWith<$Res> {
_$ConsultantProfileModelCopyWithImpl(this._value, this._then);
@@ -86,31 +80,24 @@ class _$ConsultantProfileModelCopyWithImpl<
Object? photos = freezed,
Object? certificates = freezed,
}) {
return _then(
_value.copyWith(
hasMedicalEducation:
freezed == hasMedicalEducation
return _then(_value.copyWith(
hasMedicalEducation: freezed == hasMedicalEducation
? _value.hasMedicalEducation
: hasMedicalEducation // ignore: cast_nullable_to_non_nullable
as bool?,
socialLinks:
freezed == socialLinks
socialLinks: freezed == socialLinks
? _value.socialLinks
: socialLinks // ignore: cast_nullable_to_non_nullable
as SocialLinksModel?,
photos:
freezed == photos
photos: freezed == photos
? _value.photos
: photos // ignore: cast_nullable_to_non_nullable
as List<String>?,
certificates:
freezed == certificates
certificates: freezed == certificates
? _value.certificates
: certificates // ignore: cast_nullable_to_non_nullable
as List<CertificatesModel>?,
)
as $Val,
);
) as $Val);
}
/// Create a copy of ConsultantProfileModel
@@ -133,19 +120,18 @@ abstract class _$$ConsultantProfileModelImplCopyWith<$Res>
implements $ConsultantProfileModelCopyWith<$Res> {
factory _$$ConsultantProfileModelImplCopyWith(
_$ConsultantProfileModelImpl value,
$Res Function(_$ConsultantProfileModelImpl) then,
) = __$$ConsultantProfileModelImplCopyWithImpl<$Res>;
$Res Function(_$ConsultantProfileModelImpl) then) =
__$$ConsultantProfileModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: 'has_medical_education', includeIfNull: false)
$Res call(
{@JsonKey(name: 'has_medical_education', includeIfNull: false)
bool? hasMedicalEducation,
@JsonKey(name: 'social_links', includeIfNull: false)
SocialLinksModel? socialLinks,
@JsonKey(name: 'cert_photos', includeIfNull: false) List<String>? photos,
@JsonKey(name: 'completed_courses', includeIfNull: false)
List<CertificatesModel>? certificates,
});
List<CertificatesModel>? certificates});
@override
$SocialLinksModelCopyWith<$Res>? get socialLinks;
@@ -153,13 +139,13 @@ abstract class _$$ConsultantProfileModelImplCopyWith<$Res>
/// @nodoc
class __$$ConsultantProfileModelImplCopyWithImpl<$Res>
extends
_$ConsultantProfileModelCopyWithImpl<$Res, _$ConsultantProfileModelImpl>
extends _$ConsultantProfileModelCopyWithImpl<$Res,
_$ConsultantProfileModelImpl>
implements _$$ConsultantProfileModelImplCopyWith<$Res> {
__$$ConsultantProfileModelImplCopyWithImpl(
_$ConsultantProfileModelImpl _value,
$Res Function(_$ConsultantProfileModelImpl) _then,
) : super(_value, _then);
$Res Function(_$ConsultantProfileModelImpl) _then)
: super(_value, _then);
/// Create a copy of ConsultantProfileModel
/// with the given fields replaced by the non-null parameter values.
@@ -171,45 +157,39 @@ class __$$ConsultantProfileModelImplCopyWithImpl<$Res>
Object? photos = freezed,
Object? certificates = freezed,
}) {
return _then(
_$ConsultantProfileModelImpl(
hasMedicalEducation:
freezed == hasMedicalEducation
return _then(_$ConsultantProfileModelImpl(
hasMedicalEducation: freezed == hasMedicalEducation
? _value.hasMedicalEducation
: hasMedicalEducation // ignore: cast_nullable_to_non_nullable
as bool?,
socialLinks:
freezed == socialLinks
socialLinks: freezed == socialLinks
? _value.socialLinks
: socialLinks // ignore: cast_nullable_to_non_nullable
as SocialLinksModel?,
photos:
freezed == photos
photos: freezed == photos
? _value._photos
: photos // ignore: cast_nullable_to_non_nullable
as List<String>?,
certificates:
freezed == certificates
certificates: freezed == certificates
? _value._certificates
: certificates // ignore: cast_nullable_to_non_nullable
as List<CertificatesModel>?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$ConsultantProfileModelImpl implements _ConsultantProfileModel {
const _$ConsultantProfileModelImpl({
@JsonKey(name: 'has_medical_education', includeIfNull: false)
const _$ConsultantProfileModelImpl(
{@JsonKey(name: 'has_medical_education', includeIfNull: false)
this.hasMedicalEducation,
@JsonKey(name: 'social_links', includeIfNull: false) this.socialLinks,
@JsonKey(name: 'cert_photos', includeIfNull: false)
final List<String>? photos,
@JsonKey(name: 'completed_courses', includeIfNull: false)
final List<CertificatesModel>? certificates,
}) : _photos = photos,
final List<CertificatesModel>? certificates})
: _photos = photos,
_certificates = certificates;
factory _$ConsultantProfileModelImpl.fromJson(Map<String, dynamic> json) =>
@@ -258,10 +238,8 @@ class _$ConsultantProfileModelImpl implements _ConsultantProfileModel {
(identical(other.socialLinks, socialLinks) ||
other.socialLinks == socialLinks) &&
const DeepCollectionEquality().equals(other._photos, _photos) &&
const DeepCollectionEquality().equals(
other._certificates,
_certificates,
));
const DeepCollectionEquality()
.equals(other._certificates, _certificates));
}
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -271,8 +249,7 @@ class _$ConsultantProfileModelImpl implements _ConsultantProfileModel {
hasMedicalEducation,
socialLinks,
const DeepCollectionEquality().hash(_photos),
const DeepCollectionEquality().hash(_certificates),
);
const DeepCollectionEquality().hash(_certificates));
/// Create a copy of ConsultantProfileModel
/// with the given fields replaced by the non-null parameter values.
@@ -280,29 +257,28 @@ class _$ConsultantProfileModelImpl implements _ConsultantProfileModel {
@override
@pragma('vm:prefer-inline')
_$$ConsultantProfileModelImplCopyWith<_$ConsultantProfileModelImpl>
get copyWith =>
__$$ConsultantProfileModelImplCopyWithImpl<_$ConsultantProfileModelImpl>(
this,
_$identity,
);
get copyWith => __$$ConsultantProfileModelImplCopyWithImpl<
_$ConsultantProfileModelImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$ConsultantProfileModelImplToJson(this);
return _$$ConsultantProfileModelImplToJson(
this,
);
}
}
abstract class _ConsultantProfileModel implements ConsultantProfileModel {
const factory _ConsultantProfileModel({
@JsonKey(name: 'has_medical_education', includeIfNull: false)
const factory _ConsultantProfileModel(
{@JsonKey(name: 'has_medical_education', includeIfNull: false)
final bool? hasMedicalEducation,
@JsonKey(name: 'social_links', includeIfNull: false)
final SocialLinksModel? socialLinks,
@JsonKey(name: 'cert_photos', includeIfNull: false)
final List<String>? photos,
@JsonKey(name: 'completed_courses', includeIfNull: false)
final List<CertificatesModel>? certificates,
}) = _$ConsultantProfileModelImpl;
final List<CertificatesModel>? certificates}) =
_$ConsultantProfileModelImpl;
factory _ConsultantProfileModel.fromJson(Map<String, dynamic> json) =
_$ConsultantProfileModelImpl.fromJson;
@@ -358,18 +334,16 @@ mixin _$SocialLinksModel {
/// @nodoc
abstract class $SocialLinksModelCopyWith<$Res> {
factory $SocialLinksModelCopyWith(
SocialLinksModel value,
$Res Function(SocialLinksModel) then,
) = _$SocialLinksModelCopyWithImpl<$Res, SocialLinksModel>;
SocialLinksModel value, $Res Function(SocialLinksModel) then) =
_$SocialLinksModelCopyWithImpl<$Res, SocialLinksModel>;
@useResult
$Res call({
@JsonKey(name: 'vk_link', includeIfNull: false) String? vkLink,
$Res call(
{@JsonKey(name: 'vk_link', includeIfNull: false) String? vkLink,
@JsonKey(name: 'tg_link', includeIfNull: false) String? tgLink,
@JsonKey(name: 'fb_link', includeIfNull: false) String? fbLink,
@JsonKey(name: 'insta_link', includeIfNull: false) String? instaLink,
@JsonKey(name: 'personal_site_link', includeIfNull: false)
String? personalSiteLink,
});
String? personalSiteLink});
}
/// @nodoc
@@ -393,66 +367,55 @@ class _$SocialLinksModelCopyWithImpl<$Res, $Val extends SocialLinksModel>
Object? instaLink = freezed,
Object? personalSiteLink = freezed,
}) {
return _then(
_value.copyWith(
vkLink:
freezed == vkLink
return _then(_value.copyWith(
vkLink: freezed == vkLink
? _value.vkLink
: vkLink // ignore: cast_nullable_to_non_nullable
as String?,
tgLink:
freezed == tgLink
tgLink: freezed == tgLink
? _value.tgLink
: tgLink // ignore: cast_nullable_to_non_nullable
as String?,
fbLink:
freezed == fbLink
fbLink: freezed == fbLink
? _value.fbLink
: fbLink // ignore: cast_nullable_to_non_nullable
as String?,
instaLink:
freezed == instaLink
instaLink: freezed == instaLink
? _value.instaLink
: instaLink // ignore: cast_nullable_to_non_nullable
as String?,
personalSiteLink:
freezed == personalSiteLink
personalSiteLink: freezed == personalSiteLink
? _value.personalSiteLink
: personalSiteLink // ignore: cast_nullable_to_non_nullable
as String?,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$SocialLinksModelImplCopyWith<$Res>
implements $SocialLinksModelCopyWith<$Res> {
factory _$$SocialLinksModelImplCopyWith(
_$SocialLinksModelImpl value,
$Res Function(_$SocialLinksModelImpl) then,
) = __$$SocialLinksModelImplCopyWithImpl<$Res>;
factory _$$SocialLinksModelImplCopyWith(_$SocialLinksModelImpl value,
$Res Function(_$SocialLinksModelImpl) then) =
__$$SocialLinksModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({
@JsonKey(name: 'vk_link', includeIfNull: false) String? vkLink,
$Res call(
{@JsonKey(name: 'vk_link', includeIfNull: false) String? vkLink,
@JsonKey(name: 'tg_link', includeIfNull: false) String? tgLink,
@JsonKey(name: 'fb_link', includeIfNull: false) String? fbLink,
@JsonKey(name: 'insta_link', includeIfNull: false) String? instaLink,
@JsonKey(name: 'personal_site_link', includeIfNull: false)
String? personalSiteLink,
});
String? personalSiteLink});
}
/// @nodoc
class __$$SocialLinksModelImplCopyWithImpl<$Res>
extends _$SocialLinksModelCopyWithImpl<$Res, _$SocialLinksModelImpl>
implements _$$SocialLinksModelImplCopyWith<$Res> {
__$$SocialLinksModelImplCopyWithImpl(
_$SocialLinksModelImpl _value,
$Res Function(_$SocialLinksModelImpl) _then,
) : super(_value, _then);
__$$SocialLinksModelImplCopyWithImpl(_$SocialLinksModelImpl _value,
$Res Function(_$SocialLinksModelImpl) _then)
: super(_value, _then);
/// Create a copy of SocialLinksModel
/// with the given fields replaced by the non-null parameter values.
@@ -465,49 +428,41 @@ class __$$SocialLinksModelImplCopyWithImpl<$Res>
Object? instaLink = freezed,
Object? personalSiteLink = freezed,
}) {
return _then(
_$SocialLinksModelImpl(
vkLink:
freezed == vkLink
return _then(_$SocialLinksModelImpl(
vkLink: freezed == vkLink
? _value.vkLink
: vkLink // ignore: cast_nullable_to_non_nullable
as String?,
tgLink:
freezed == tgLink
tgLink: freezed == tgLink
? _value.tgLink
: tgLink // ignore: cast_nullable_to_non_nullable
as String?,
fbLink:
freezed == fbLink
fbLink: freezed == fbLink
? _value.fbLink
: fbLink // ignore: cast_nullable_to_non_nullable
as String?,
instaLink:
freezed == instaLink
instaLink: freezed == instaLink
? _value.instaLink
: instaLink // ignore: cast_nullable_to_non_nullable
as String?,
personalSiteLink:
freezed == personalSiteLink
personalSiteLink: freezed == personalSiteLink
? _value.personalSiteLink
: personalSiteLink // ignore: cast_nullable_to_non_nullable
as String?,
),
);
));
}
}
/// @nodoc
@JsonSerializable()
class _$SocialLinksModelImpl implements _SocialLinksModel {
const _$SocialLinksModelImpl({
@JsonKey(name: 'vk_link', includeIfNull: false) this.vkLink,
const _$SocialLinksModelImpl(
{@JsonKey(name: 'vk_link', includeIfNull: false) this.vkLink,
@JsonKey(name: 'tg_link', includeIfNull: false) this.tgLink,
@JsonKey(name: 'fb_link', includeIfNull: false) this.fbLink,
@JsonKey(name: 'insta_link', includeIfNull: false) this.instaLink,
@JsonKey(name: 'personal_site_link', includeIfNull: false)
this.personalSiteLink,
});
this.personalSiteLink});
factory _$SocialLinksModelImpl.fromJson(Map<String, dynamic> json) =>
_$$SocialLinksModelImplFromJson(json);
@@ -550,13 +505,7 @@ class _$SocialLinksModelImpl implements _SocialLinksModel {
@JsonKey(includeFromJson: false, includeToJson: false)
@override
int get hashCode => Object.hash(
runtimeType,
vkLink,
tgLink,
fbLink,
instaLink,
personalSiteLink,
);
runtimeType, vkLink, tgLink, fbLink, instaLink, personalSiteLink);
/// Create a copy of SocialLinksModel
/// with the given fields replaced by the non-null parameter values.
@@ -565,25 +514,25 @@ class _$SocialLinksModelImpl implements _SocialLinksModel {
@pragma('vm:prefer-inline')
_$$SocialLinksModelImplCopyWith<_$SocialLinksModelImpl> get copyWith =>
__$$SocialLinksModelImplCopyWithImpl<_$SocialLinksModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$SocialLinksModelImplToJson(this);
return _$$SocialLinksModelImplToJson(
this,
);
}
}
abstract class _SocialLinksModel implements SocialLinksModel {
const factory _SocialLinksModel({
@JsonKey(name: 'vk_link', includeIfNull: false) final String? vkLink,
const factory _SocialLinksModel(
{@JsonKey(name: 'vk_link', includeIfNull: false) final String? vkLink,
@JsonKey(name: 'tg_link', includeIfNull: false) final String? tgLink,
@JsonKey(name: 'fb_link', includeIfNull: false) final String? fbLink,
@JsonKey(name: 'insta_link', includeIfNull: false) final String? instaLink,
@JsonKey(name: 'insta_link', includeIfNull: false)
final String? instaLink,
@JsonKey(name: 'personal_site_link', includeIfNull: false)
final String? personalSiteLink,
}) = _$SocialLinksModelImpl;
final String? personalSiteLink}) = _$SocialLinksModelImpl;
factory _SocialLinksModel.fromJson(Map<String, dynamic> json) =
_$SocialLinksModelImpl.fromJson;
@@ -634,9 +583,8 @@ mixin _$CertificatesModel {
/// @nodoc
abstract class $CertificatesModelCopyWith<$Res> {
factory $CertificatesModelCopyWith(
CertificatesModel value,
$Res Function(CertificatesModel) then,
) = _$CertificatesModelCopyWithImpl<$Res, CertificatesModel>;
CertificatesModel value, $Res Function(CertificatesModel) then) =
_$CertificatesModelCopyWithImpl<$Res, CertificatesModel>;
@useResult
$Res call({String title, String date});
}
@@ -655,32 +603,29 @@ class _$CertificatesModelCopyWithImpl<$Res, $Val extends CertificatesModel>
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? title = null, Object? date = null}) {
return _then(
_value.copyWith(
title:
null == title
$Res call({
Object? title = null,
Object? date = null,
}) {
return _then(_value.copyWith(
title: null == title
? _value.title
: title // ignore: cast_nullable_to_non_nullable
as String,
date:
null == date
date: null == date
? _value.date
: date // ignore: cast_nullable_to_non_nullable
as String,
)
as $Val,
);
) as $Val);
}
}
/// @nodoc
abstract class _$$CertificatesModelImplCopyWith<$Res>
implements $CertificatesModelCopyWith<$Res> {
factory _$$CertificatesModelImplCopyWith(
_$CertificatesModelImpl value,
$Res Function(_$CertificatesModelImpl) then,
) = __$$CertificatesModelImplCopyWithImpl<$Res>;
factory _$$CertificatesModelImplCopyWith(_$CertificatesModelImpl value,
$Res Function(_$CertificatesModelImpl) then) =
__$$CertificatesModelImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String title, String date});
@@ -690,30 +635,28 @@ abstract class _$$CertificatesModelImplCopyWith<$Res>
class __$$CertificatesModelImplCopyWithImpl<$Res>
extends _$CertificatesModelCopyWithImpl<$Res, _$CertificatesModelImpl>
implements _$$CertificatesModelImplCopyWith<$Res> {
__$$CertificatesModelImplCopyWithImpl(
_$CertificatesModelImpl _value,
$Res Function(_$CertificatesModelImpl) _then,
) : super(_value, _then);
__$$CertificatesModelImplCopyWithImpl(_$CertificatesModelImpl _value,
$Res Function(_$CertificatesModelImpl) _then)
: super(_value, _then);
/// Create a copy of CertificatesModel
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? title = null, Object? date = null}) {
return _then(
_$CertificatesModelImpl(
title:
null == title
$Res call({
Object? title = null,
Object? date = null,
}) {
return _then(_$CertificatesModelImpl(
title: null == title
? _value.title
: title // ignore: cast_nullable_to_non_nullable
as String,
date:
null == date
date: null == date
? _value.date
: date // ignore: cast_nullable_to_non_nullable
as String,
),
);
));
}
}
@@ -755,21 +698,20 @@ class _$CertificatesModelImpl implements _CertificatesModel {
@pragma('vm:prefer-inline')
_$$CertificatesModelImplCopyWith<_$CertificatesModelImpl> get copyWith =>
__$$CertificatesModelImplCopyWithImpl<_$CertificatesModelImpl>(
this,
_$identity,
);
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$CertificatesModelImplToJson(this);
return _$$CertificatesModelImplToJson(
this,
);
}
}
abstract class _CertificatesModel implements CertificatesModel {
const factory _CertificatesModel({
required final String title,
required final String date,
}) = _$CertificatesModelImpl;
const factory _CertificatesModel(
{required final String title,
required final String date}) = _$CertificatesModelImpl;
factory _CertificatesModel.fromJson(Map<String, dynamic> json) =
_$CertificatesModelImpl.fromJson;

44
lib/features/consultant/become_consultant/models/consultant_profile_model.g.dart
View File

@@ -7,26 +7,24 @@ part of 'consultant_profile_model.dart';
// **************************************************************************
_$ConsultantProfileModelImpl _$$ConsultantProfileModelImplFromJson(
Map<String, dynamic> json,
) => _$ConsultantProfileModelImpl(
Map<String, dynamic> json) =>
_$ConsultantProfileModelImpl(
hasMedicalEducation: json['has_medical_education'] as bool?,
socialLinks:
json['social_links'] == null
socialLinks: json['social_links'] == null
? null
: SocialLinksModel.fromJson(
json['social_links'] as Map<String, dynamic>,
),
photos:
(json['cert_photos'] as List<dynamic>?)?.map((e) => e as String).toList(),
certificates:
(json['completed_courses'] as List<dynamic>?)
json['social_links'] as Map<String, dynamic>),
photos: (json['cert_photos'] as List<dynamic>?)
?.map((e) => e as String)
.toList(),
certificates: (json['completed_courses'] as List<dynamic>?)
?.map((e) => CertificatesModel.fromJson(e as Map<String, dynamic>))
.toList(),
);
Map<String, dynamic> _$$ConsultantProfileModelImplToJson(
_$ConsultantProfileModelImpl instance,
) => <String, dynamic>{
_$ConsultantProfileModelImpl instance) =>
<String, dynamic>{
if (instance.hasMedicalEducation case final value?)
'has_medical_education': value,
if (instance.socialLinks case final value?) 'social_links': value,
@@ -35,8 +33,8 @@ Map<String, dynamic> _$$ConsultantProfileModelImplToJson(
};
_$SocialLinksModelImpl _$$SocialLinksModelImplFromJson(
Map<String, dynamic> json,
) => _$SocialLinksModelImpl(
Map<String, dynamic> json) =>
_$SocialLinksModelImpl(
vkLink: json['vk_link'] as String?,
tgLink: json['tg_link'] as String?,
fbLink: json['fb_link'] as String?,
@@ -45,22 +43,26 @@ _$SocialLinksModelImpl _$$SocialLinksModelImplFromJson(
);
Map<String, dynamic> _$$SocialLinksModelImplToJson(
_$SocialLinksModelImpl instance,
) => <String, dynamic>{
_$SocialLinksModelImpl instance) =>
<String, dynamic>{
if (instance.vkLink case final value?) 'vk_link': value,
if (instance.tgLink case final value?) 'tg_link': value,
if (instance.fbLink case final value?) 'fb_link': value,
if (instance.instaLink case final value?) 'insta_link': value,
if (instance.personalSiteLink case final value?) 'personal_site_link': value,
if (instance.personalSiteLink case final value?)
'personal_site_link': value,
};
_$CertificatesModelImpl _$$CertificatesModelImplFromJson(
Map<String, dynamic> json,
) => _$CertificatesModelImpl(
Map<String, dynamic> json) =>
_$CertificatesModelImpl(
title: json['title'] as String,
date: json['date'] as String,
);
Map<String, dynamic> _$$CertificatesModelImplToJson(
_$CertificatesModelImpl instance,
) => <String, dynamic>{'title': instance.title, 'date': instance.date};
_$CertificatesModelImpl instance) =>
<String, dynamic>{
'title': instance.title,
'date': instance.date,
};

2
lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
View File

@@ -12,7 +12,7 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
RegisterConsultantCubit({
required this.consultantRepository,
}) : super(
RegisterConsultantState(
const RegisterConsultantState(
consultant: ConsultantProfileModel(
socialLinks: SocialLinksModel(),
hasMedicalEducation: true,

82
lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.freezed.dart
View File

@@ -12,8 +12,7 @@ part of 'register_consultant_state.dart';
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
);
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$RegisterConsultantState {
@@ -29,10 +28,9 @@ mixin _$RegisterConsultantState {
/// @nodoc
abstract class $RegisterConsultantStateCopyWith<$Res> {
factory $RegisterConsultantStateCopyWith(
RegisterConsultantState value,
$Res Function(RegisterConsultantState) then,
) = _$RegisterConsultantStateCopyWithImpl<$Res, RegisterConsultantState>;
factory $RegisterConsultantStateCopyWith(RegisterConsultantState value,
$Res Function(RegisterConsultantState) then) =
_$RegisterConsultantStateCopyWithImpl<$Res, RegisterConsultantState>;
@useResult
$Res call({ConsultantProfileModel consultant, bool acceptOffer});
@@ -40,10 +38,8 @@ abstract class $RegisterConsultantStateCopyWith<$Res> {
}
/// @nodoc
class _$RegisterConsultantStateCopyWithImpl<
$Res,
$Val extends RegisterConsultantState
>
class _$RegisterConsultantStateCopyWithImpl<$Res,
$Val extends RegisterConsultantState>
implements $RegisterConsultantStateCopyWith<$Res> {
_$RegisterConsultantStateCopyWithImpl(this._value, this._then);
@@ -56,22 +52,20 @@ class _$RegisterConsultantStateCopyWithImpl<
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? consultant = null, Object? acceptOffer = null}) {
return _then(
_value.copyWith(
consultant:
null == consultant
$Res call({
Object? consultant = null,
Object? acceptOffer = null,
}) {
return _then(_value.copyWith(
consultant: null == consultant
? _value.consultant
: consultant // ignore: cast_nullable_to_non_nullable
as ConsultantProfileModel,
acceptOffer:
null == acceptOffer
acceptOffer: null == acceptOffer
? _value.acceptOffer
: acceptOffer // ignore: cast_nullable_to_non_nullable
as bool,
)
as $Val,
);
) as $Val);
}
/// Create a copy of RegisterConsultantState
@@ -90,8 +84,8 @@ abstract class _$$RegisterConsultantStateImplCopyWith<$Res>
implements $RegisterConsultantStateCopyWith<$Res> {
factory _$$RegisterConsultantStateImplCopyWith(
_$RegisterConsultantStateImpl value,
$Res Function(_$RegisterConsultantStateImpl) then,
) = __$$RegisterConsultantStateImplCopyWithImpl<$Res>;
$Res Function(_$RegisterConsultantStateImpl) then) =
__$$RegisterConsultantStateImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({ConsultantProfileModel consultant, bool acceptOffer});
@@ -102,46 +96,40 @@ abstract class _$$RegisterConsultantStateImplCopyWith<$Res>
/// @nodoc
class __$$RegisterConsultantStateImplCopyWithImpl<$Res>
extends
_$RegisterConsultantStateCopyWithImpl<
$Res,
_$RegisterConsultantStateImpl
>
extends _$RegisterConsultantStateCopyWithImpl<$Res,
_$RegisterConsultantStateImpl>
implements _$$RegisterConsultantStateImplCopyWith<$Res> {
__$$RegisterConsultantStateImplCopyWithImpl(
_$RegisterConsultantStateImpl _value,
$Res Function(_$RegisterConsultantStateImpl) _then,
) : super(_value, _then);
$Res Function(_$RegisterConsultantStateImpl) _then)
: super(_value, _then);
/// Create a copy of RegisterConsultantState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({Object? consultant = null, Object? acceptOffer = null}) {
return _then(
_$RegisterConsultantStateImpl(
consultant:
null == consultant
$Res call({
Object? consultant = null,
Object? acceptOffer = null,
}) {
return _then(_$RegisterConsultantStateImpl(
consultant: null == consultant
? _value.consultant
: consultant // ignore: cast_nullable_to_non_nullable
as ConsultantProfileModel,
acceptOffer:
null == acceptOffer
acceptOffer: null == acceptOffer
? _value.acceptOffer
: acceptOffer // ignore: cast_nullable_to_non_nullable
as bool,
),
);
));
}
}
/// @nodoc
class _$RegisterConsultantStateImpl implements _RegisterConsultantState {
const _$RegisterConsultantStateImpl({
required this.consultant,
required this.acceptOffer,
});
const _$RegisterConsultantStateImpl(
{required this.consultant, required this.acceptOffer});
@override
final ConsultantProfileModel consultant;
@@ -174,15 +162,13 @@ class _$RegisterConsultantStateImpl implements _RegisterConsultantState {
@pragma('vm:prefer-inline')
_$$RegisterConsultantStateImplCopyWith<_$RegisterConsultantStateImpl>
get copyWith => __$$RegisterConsultantStateImplCopyWithImpl<
_$RegisterConsultantStateImpl
>(this, _$identity);
_$RegisterConsultantStateImpl>(this, _$identity);
}
abstract class _RegisterConsultantState implements RegisterConsultantState {
const factory _RegisterConsultantState({
required final ConsultantProfileModel consultant,
required final bool acceptOffer,
}) = _$RegisterConsultantStateImpl;
const factory _RegisterConsultantState(
{required final ConsultantProfileModel consultant,
required final bool acceptOffer}) = _$RegisterConsultantStateImpl;
@override
ConsultantProfileModel get consultant;

10
lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
View File

@@ -30,13 +30,13 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
@override
Widget build(BuildContext context) {
return SingleChildScrollView(
padding: EdgeInsets.only(bottom: 80, top: 16),
padding: const EdgeInsets.only(bottom: 80, top: 16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
child: Text(
'Дополнительные настройки',
style: TextStyle(
@@ -82,11 +82,11 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
required bool value,
}) {
return ListTile(
contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
onTap: onTap,
title: Text(
title,
style: TextStyle(
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w400,
height: 1,

10
lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
View File

@@ -14,16 +14,16 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Стать консультантом'),
title: const Text('Стать консультантом'),
automaticallyImplyLeading: false,
centerTitle: false,
leading: IconButton(
onPressed: () => GoRouter.of(context).pop(),
icon: Icon(Icons.close),
icon: const Icon(Icons.close),
),
),
body: Padding(
padding: const EdgeInsets.all(16),
body: const Padding(
padding: EdgeInsets.all(16),
child: Text(
'Чтобы стать консультантом необходимо пройти короткую регистрацию. Подготовьте свои дипломы и/или сертификаты в формате jpg, они Вам пригодятся для проверки и подтверждения. Также необходимо будет указать ссылки на Ваши соц. сети и указать тип лица (физ. лицо или юр. лицо). На данный момент доступна регистрация в качестве физ. лица.\n\nВнутри Итвио разница между обычным пользователем и консультантом заключается в дополнительных возможностях последнего создавать публичные диеты, рецепты и планы питания; участвовать в ежемесячных рейтингах.',
style: TextStyle(
@@ -46,7 +46,7 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
borderRadius: BorderRadius.circular(20),
color: appTheme.blueA400,
),
child: Center(
child: const Center(
child: Text(
'Начать регистрацию',
style: TextStyle(

14
lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
View File

@@ -52,12 +52,12 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
return SingleChildScrollView(
physics: const BouncingScrollPhysics(),
controller: scrollController,
padding: EdgeInsets.only(bottom: 80, right: 16, left: 16, top: 16),
padding: const EdgeInsets.only(bottom: 80, right: 16, left: 16, top: 16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
const Text(
'Добавьте дипломы\nи сертификаты',
style: TextStyle(
fontSize: 24,
@@ -68,7 +68,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
const SizedBox(height: 16),
ListView.separated(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => _diplomaInfo(diploma: diplomasList[index]),
separatorBuilder: (context, index) => Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
@@ -117,14 +117,14 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
Icons.keyboard_arrow_down_rounded,
color: Colors.grey.shade700,
),
contentPadding: EdgeInsets.symmetric(horizontal: 12),
contentPadding: const EdgeInsets.symmetric(horizontal: 12),
title: Text(
diploma.date?.format('dd MMMM yyyy', 'ru') ?? 'Дата выдачи',
style: TextStyle(
color: diploma.date == null ? Colors.grey.shade400 : Colors.black,
),
),
tileColor: Color(0xFFF6F6F6),
tileColor: const Color(0xFFF6F6F6),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
@@ -144,10 +144,10 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
height: 52,
width: 52,
decoration: BoxDecoration(
color: Color(0xFFF6F6F6),
color: const Color(0xFFF6F6F6),
borderRadius: BorderRadius.circular(20),
),
child: Icon(
child: const Icon(
Icons.delete_outline_rounded,
),
),

Some files were not shown because too many files have changed in this diff Show More