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

feat(registration): hide/show password

Browse Source
This commit is contained in:
Alex
2024-11-28 17:26:35 +03:00
parent 0d19fde557
commit ed850911eb
5 changed files with 223 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/features/diary/presentation/bloc/diary_cubit.dart
View File

@@ -128,12 +128,11 @@ class DiaryCubit extends Cubit<DiaryState> {
uploadPhotos({
required List<File> files,
required int diaryId,
required int mealId,
}) async {
await diaryRepository.uploadPhotos(
files: await ImageCompressUtility.compressFilesList(files),
diaryId: diaryId,
mealId: mealId,
mealId: selectedMeal,
);
await fetchDiary();
}
@@ -141,12 +140,11 @@ class DiaryCubit extends Cubit<DiaryState> {
deletePhoto({
required DiaryPhotoModel photo,
required int diaryId,
required int mealId,
}) async {
await diaryRepository.deletePhoto(
photo: photo,
diaryId: diaryId,
mealId: mealId,
mealId: selectedMeal,
);
await fetchDiary();
}

1
lib/features/diary/presentation/pages/diary_screen.dart
View File

@@ -28,6 +28,7 @@ class _DiaryScreenState extends State<DiaryScreen> {
toolbarHeight: 0,
),
body: SingleChildScrollView(
padding: const EdgeInsets.only(bottom: 16),
physics: const BouncingScrollPhysics(),
child: Column(
children: [

2
lib/features/diary/presentation/widgets/meal_widget.dart
View File

@@ -1,5 +1,6 @@
import 'package:eatvio_app/features/diary/presentation/widgets/add_product_button_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_button_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/photo_gallery_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/products_list_widget.dart';
import 'package:flutter/material.dart';
@@ -45,6 +46,7 @@ class _MealWidgetState extends State<MealWidget> {
ProductsListWidget(),
const SizedBox(height: 12),
AddProductButtonWidget(),
PhotoGalleryWidget(),
],
),
),

359
lib/features/diary/presentation/widgets/photo_gallery_widget.dart
View File

@@ -1,167 +1,192 @@
// import 'package:flutter/material.dart';
//
// class PhotoGalleryWidget extends StatefulWidget {
// const PhotoGalleryWidget({super.key});
//
// @override
// State<PhotoGalleryWidget> createState() => _PhotoGalleryWidgetState();
// }
//
// class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
// showImagePicker(DiaryDayModel diaryDay) {
// showCupertinoModalPopup<void>(
// context: context,
// builder: (context) => CupertinoActionSheet(
// actions: [
// CupertinoActionSheetAction(
// onPressed: () async {
// Navigator.of(context).pop();
// final picker = ImagePicker();
// XFile? image = await picker.pickImage(source: ImageSource.camera);
// if (image != null)
// diaryCubit.uploadPhotos(
// files: [File(image.path)],
// diaryId: diaryDay.id,
// mealId: diaryDay.meals[currentSelectedMealNumber - 1].id,
// date: _selectedDay.toString(),
// );
// },
// child: const Row(
// children: const [
// Icon(Icons.photo_camera),
// SizedBox(width: 8),
// Text('Фото'),
// ],
// ),
// ),
// CupertinoActionSheetAction(
// onPressed: () async {
// Navigator.of(context).pop();
// final picker = ImagePicker();
// List<XFile>? images = await picker.pickMultiImage();
// if (images.isNotEmpty)
// diaryCubit.uploadPhotos(
// files: images.map((f) => File(f.path)).toList(),
// diaryId: diaryDay.id,
// mealId: diaryDay.meals[currentSelectedMealNumber - 1].id,
// date: _selectedDay.toString(),
// );
// },
// child: const Row(
// children: const [
// Icon(Icons.photo),
// SizedBox(width: 8),
// Text('Галерея'),
// ],
// ),
// ),
// ],
// cancelButton: CupertinoActionSheetAction(
// onPressed: () => Navigator.of(context).pop(),
// isDestructiveAction: true,
// child: const Text('Отмена'),
// ),
// ),
// );
// }
//
// @override
// Widget build(BuildContext context) {
// return Column(
// mainAxisSize: MainAxisSize.min,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Stack(
// alignment: Alignment.topRight,
// children: [
// ClipRRect(
// borderRadius: BorderRadius.circular(12),
// child: CachedNetworkImage(
// imageUrl: baseUrl + '/storage/' + photos[currentSelectedPhotoIndex].path,
// ),
// ),
// Padding(
// padding: const EdgeInsets.all(12),
// child: IconButton.filled(
// style: IconButton.styleFrom(
// backgroundColor: Colors.white,
// elevation: 0,
// ),
// onPressed: () async {
// await diaryCubit.deletePhoto(
// photo: photos[currentSelectedPhotoIndex],
// diaryId: diaryDay.id,
// mealId: diaryDay.meals[currentSelectedMealNumber - 1].id,
// date: _selectedDay.toString(),
// );
// setState(() {
// if (currentSelectedPhotoIndex == photos.length - 1 && currentSelectedPhotoIndex != 0) {
// currentSelectedPhotoIndex = photos.length - 2;
// }
// });
// },
// icon: Icon(
// Icons.close_rounded,
// color: Colors.grey,
// ),
// ),
// ),
// ],
// ),
// const SizedBox(height: 8),
// SingleChildScrollView(
// physics: const BouncingScrollPhysics(),
// scrollDirection: Axis.horizontal,
// child: Row(
// mainAxisSize: MainAxisSize.min,
// mainAxisAlignment: MainAxisAlignment.start,
// children: [
// for (int i = 0; i < photos.length + 1; i++) ...[
// if (i == photos.length)
// Padding(
// padding: const EdgeInsets.only(left: 8),
// child: InkWell(
// onTap: () => _showImagePicker(diaryDay),
// borderRadius: BorderRadius.circular(8),
// child: Ink(
// height: 52,
// width: 52,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(8),
// color: Color(0xFFF1F2F6),
// ),
// child: Icon(
// Icons.add_rounded,
// color: appTheme.blueA400,
// ),
// ),
// ),
// ),
// if (i < photos.length)
// GestureDetector(
// onTap: () {
// setState(() {
// currentSelectedPhotoIndex = i;
// });
// },
// child: ClipRRect(
// borderRadius: BorderRadius.circular(8),
// child: SizedBox(
// height: 52,
// width: 52,
// child: CachedNetworkImage(
// imageUrl: baseUrl + '/storage/' + photos[i].path,
// fit: BoxFit.fitWidth,
// ),
// ),
// ),
// ),
// if (i < photos.length - 1) const SizedBox(width: 8),
// ],
// ],
// ),
// ),
// ],
// );
// }
// }
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:image_picker/image_picker.dart';
class PhotoGalleryWidget extends StatefulWidget {
const PhotoGalleryWidget({super.key});
@override
State<PhotoGalleryWidget> createState() => _PhotoGalleryWidgetState();
}
class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
int currentSelectedPhotoIndex = 0;
showImagePicker(DiaryDayModel diaryDay) {
showCupertinoModalPopup<void>(
context: context,
builder: (context) => CupertinoActionSheet(
actions: [
CupertinoActionSheetAction(
onPressed: () async {
Navigator.of(context).pop();
final picker = ImagePicker();
XFile? image = await picker.pickImage(source: ImageSource.camera);
if (image != null)
context.read<DiaryCubit>().uploadPhotos(
files: [File(image.path)],
diaryId: diaryDay.id,
);
},
child: const Row(
children: const [
Icon(Icons.photo_camera),
SizedBox(width: 8),
Text('Фото'),
],
),
),
CupertinoActionSheetAction(
onPressed: () async {
Navigator.of(context).pop();
final picker = ImagePicker();
List<XFile>? images = await picker.pickMultiImage();
if (images.isNotEmpty)
context.read<DiaryCubit>().uploadPhotos(
files: images.map((f) => File(f.path)).toList(),
diaryId: diaryDay.id,
);
},
child: const Row(
children: const [
Icon(Icons.photo),
SizedBox(width: 8),
Text('Галерея'),
],
),
),
],
cancelButton: CupertinoActionSheetAction(
onPressed: () => Navigator.of(context).pop(),
isDestructiveAction: true,
child: const Text('Отмена'),
),
),
);
}
@override
Widget build(BuildContext context) {
return BlocBuilder<DiaryCubit, DiaryState>(
builder: (context, state) {
if (state is DiaryStateLoaded) {
if (state.diary.meals[state.selectedMeal].photos.isEmpty) {
return GestureDetector(
onTap: () => showImagePicker(state.diary),
child: SvgPicture.asset(
width: MediaQuery.of(context).size.width - 32,
'assets/no_one_image_was_added.svg',
),
);
} else {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Stack(
alignment: Alignment.topRight,
children: [
ClipRRect(
borderRadius: BorderRadius.circular(12),
child: CachedNetworkImage(
imageUrl: baseUrl + '/storage/' + state.diary.meals[state.selectedMeal].photos[currentSelectedPhotoIndex].path,
),
),
Padding(
padding: const EdgeInsets.all(12),
child: IconButton.filled(
style: IconButton.styleFrom(
backgroundColor: Colors.white,
elevation: 0,
),
onPressed: () async {
await context.read<DiaryCubit>().deletePhoto(
photo: state.diary.meals[state.selectedMeal].photos[currentSelectedPhotoIndex],
diaryId: state.diary.id,
);
setState(() {
if (currentSelectedPhotoIndex == state.diary.meals[state.selectedMeal].photos.length - 1 && currentSelectedPhotoIndex != 0) {
currentSelectedPhotoIndex = state.diary.meals[state.selectedMeal].photos.length - 2;
}
});
},
icon: Icon(
Icons.close_rounded,
color: Colors.grey,
),
),
),
],
),
const SizedBox(height: 8),
SingleChildScrollView(
physics: const BouncingScrollPhysics(),
scrollDirection: Axis.horizontal,
child: Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
children: [
for (int i = 0; i < state.diary.meals[state.selectedMeal].photos.length + 1; i++) ...[
if (i == state.diary.meals[state.selectedMeal].photos.length)
Padding(
padding: const EdgeInsets.only(left: 8),
child: InkWell(
onTap: () => showImagePicker(state.diary),
borderRadius: BorderRadius.circular(8),
child: Ink(
height: 52,
width: 52,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Color(0xFFF1F2F6),
),
child: Icon(
Icons.add_rounded,
color: appTheme.blueA400,
),
),
),
),
if (i < state.diary.meals[state.selectedMeal].photos.length)
GestureDetector(
onTap: () {
setState(() {
currentSelectedPhotoIndex = i;
});
},
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: SizedBox(
height: 52,
width: 52,
child: CachedNetworkImage(
imageUrl: baseUrl + '/storage/' + state.diary.meals[state.selectedMeal].photos[i].path,
fit: BoxFit.fitWidth,
),
),
),
),
if (i < state.diary.meals[state.selectedMeal].photos.length - 1) const SizedBox(width: 8),
],
],
),
),
],
);
}
}
return const SizedBox.shrink();
},
);
}
}

28
lib/features/registration/presentation/pages/credentials_screen.dart
View File

@@ -21,6 +21,8 @@ class _CredentialsScreenState extends State<CredentialsScreen> {
final passwordConfirmationController = TextEditingController();
bool hidePassword = true;
@override
void initState() {
super.initState();
@@ -55,10 +57,21 @@ class _CredentialsScreenState extends State<CredentialsScreen> {
Text(s.password),
SizedBox(height: 4),
CustomTextFormField(
obscureText: true,
obscureText: hidePassword,
controller: passwordController,
hintText: 'Введите пароль',
textInputAction: TextInputAction.next,
suffix: IconButton(
onPressed: () {
setState(() {
hidePassword = !hidePassword;
});
},
icon: Icon(
hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined,
color: Colors.grey,
),
),
onChanged: (newValue) {
final registrationCubit = context.read<RegistrationCubit>();
registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(password: newValue));
@@ -68,10 +81,21 @@ class _CredentialsScreenState extends State<CredentialsScreen> {
Text(s.password_confirmation),
SizedBox(height: 4),
CustomTextFormField(
obscureText: true,
obscureText: hidePassword,
controller: passwordConfirmationController,
textInputAction: TextInputAction.done,
hintText: 'Подтвердите пароль',
suffix: IconButton(
onPressed: () {
setState(() {
hidePassword = !hidePassword;
});
},
icon: Icon(
hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined,
color: Colors.grey,
),
),
onChanged: (newValue) {
final registrationCubit = context.read<RegistrationCubit>();
registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(passwordConfirmation: newValue));