forked from eatvio/eatvio_app
fix(socail,diets): Issue-180+691
This commit is contained in:
@@ -1,13 +1,8 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
import 'package:eatvio_app/core/enums/complained_content.dart';
|
|
||||||
import 'package:eatvio_app/core/enums/product_type.dart';
|
import 'package:eatvio_app/core/enums/product_type.dart';
|
||||||
import 'package:eatvio_app/core/utils/localization_utils.dart';
|
import 'package:eatvio_app/core/utils/localization_utils.dart';
|
||||||
import 'package:eatvio_app/core/utils/string_extentions.dart';
|
|
||||||
import 'package:eatvio_app/core/widgets/bookmark_button.dart';
|
|
||||||
import 'package:eatvio_app/core/widgets/custom_divider.dart';
|
import 'package:eatvio_app/core/widgets/custom_divider.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_popup.dart';
|
|
||||||
import 'package:eatvio_app/core/widgets/info_row.dart';
|
import 'package:eatvio_app/core/widgets/info_row.dart';
|
||||||
import 'package:eatvio_app/features/diets/presentation/widgets/author_card.dart';
|
import 'package:eatvio_app/features/diets/presentation/widgets/author_card.dart';
|
||||||
import 'package:eatvio_app/core/widgets/cpfc_container.dart';
|
import 'package:eatvio_app/core/widgets/cpfc_container.dart';
|
||||||
@@ -36,20 +31,11 @@ class DietPreviewScreen extends StatefulWidget {
|
|||||||
|
|
||||||
class _DietPreviewScreenState extends State<DietPreviewScreen> {
|
class _DietPreviewScreenState extends State<DietPreviewScreen> {
|
||||||
final ScrollController scrollController = ScrollController();
|
final ScrollController scrollController = ScrollController();
|
||||||
final textEditingController = TextEditingController();
|
|
||||||
bool isMoreOptionsVisible = false;
|
|
||||||
late final Uint8List imageData;
|
late final Uint8List imageData;
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
imageData = base64.decode(widget.diet.image);
|
imageData = base64.decode(widget.diet.image);
|
||||||
scrollController.addListener(() {
|
|
||||||
if (isMoreOptionsVisible) {
|
|
||||||
setState(() {
|
|
||||||
isMoreOptionsVisible = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -58,86 +44,6 @@ class _DietPreviewScreenState extends State<DietPreviewScreen> {
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: appTheme.gray100,
|
backgroundColor: appTheme.gray100,
|
||||||
resizeToAvoidBottomInset: true,
|
resizeToAvoidBottomInset: true,
|
||||||
bottomSheet: Container(
|
|
||||||
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: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: BookmarkButton(
|
|
||||||
isFavorite: widget.diet.isFavorite,
|
|
||||||
onTap: () {},
|
|
||||||
width: 52,
|
|
||||||
height: 52,
|
|
||||||
size: 24,
|
|
||||||
shape: BoxShape.circle,
|
|
||||||
color: appTheme.gray50,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: SizedBox(
|
|
||||||
child: TextFormField(
|
|
||||||
textCapitalization: TextCapitalization.sentences,
|
|
||||||
onChanged: (_) {
|
|
||||||
setState(() {});
|
|
||||||
},
|
|
||||||
controller: textEditingController,
|
|
||||||
maxLines: 5,
|
|
||||||
minLines: 1,
|
|
||||||
keyboardType: TextInputType.multiline,
|
|
||||||
style: TextStyles.textMMedium.copyWith(color: appTheme.black),
|
|
||||||
decoration: InputDecoration(
|
|
||||||
isDense: true,
|
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
|
||||||
hintText: s.comment.capitalize(),
|
|
||||||
hintStyle: TextStyles.textMMedium.copyWith(color: appTheme.lightGray600),
|
|
||||||
filled: true,
|
|
||||||
border: OutlineInputBorder(
|
|
||||||
borderRadius: BorderRadius.circular(16),
|
|
||||||
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
|
|
||||||
),
|
|
||||||
enabledBorder: OutlineInputBorder(
|
|
||||||
borderRadius: BorderRadius.circular(16),
|
|
||||||
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
|
|
||||||
),
|
|
||||||
focusedBorder: OutlineInputBorder(
|
|
||||||
borderRadius: BorderRadius.circular(16),
|
|
||||||
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
GestureDetector(
|
|
||||||
onTap: () {},
|
|
||||||
child: Container(
|
|
||||||
decoration: BoxDecoration(color: textEditingController.text.length > 2 ? appTheme.blueA400 : appTheme.gray50, shape: BoxShape.circle),
|
|
||||||
height: 32,
|
|
||||||
width: 32,
|
|
||||||
child: Icon(Icons.send_rounded, size: 18, color: textEditingController.text.length > 2 ? appTheme.whiteA700 : appTheme.black),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
centerTitle: true,
|
centerTitle: true,
|
||||||
title: Text(
|
title: Text(
|
||||||
@@ -148,15 +54,7 @@ class _DietPreviewScreenState extends State<DietPreviewScreen> {
|
|||||||
softWrap: true,
|
softWrap: true,
|
||||||
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
|
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
|
||||||
),
|
),
|
||||||
actions: [
|
actions: const [],
|
||||||
CustomPopup(
|
|
||||||
isAuthor: widget.diet.author.authorIsMe,
|
|
||||||
path: 'diet/${widget.diet.slug}',
|
|
||||||
complainedContentType: ComplainedContent.diet,
|
|
||||||
userSlug: widget.diet.author.authorSlug,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 16),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
body: SingleChildScrollView(
|
body: SingleChildScrollView(
|
||||||
controller: scrollController,
|
controller: scrollController,
|
||||||
|
|||||||
@@ -71,13 +71,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
physics: const BouncingScrollPhysics(),
|
physics: const BouncingScrollPhysics(),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
|
_oauthAccounts(state, settingsCubit),
|
||||||
|
const SizedBox(height: 12),
|
||||||
_additionalInfo(state),
|
_additionalInfo(state),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
_notifications(state),
|
_notifications(state),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
_becomeConsultantButton(state),
|
_becomeConsultantButton(state),
|
||||||
_deleteAccountButton(state, settingsCubit),
|
_deleteAccountButton(state, settingsCubit),
|
||||||
_oauthAccounts(state, settingsCubit),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user