Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Username1548
2024-12-16 21:13:58 +07:00
32 changed files with 176 additions and 145 deletions

View File

@@ -69,7 +69,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
color: Colors.white,
border: Border(
top: BorderSide(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
),
),
),
@@ -293,9 +293,9 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
_iconButton(
icon: Icons.favorite_border_rounded,
text: totalLikes.toString(),
iconColor: isLiked ? Colors.red.withOpacity(0.8) : null,
backgroundColor: isLiked ? Colors.red.withOpacity(0.1) : null,
textColor: isLiked ? Colors.red.withOpacity(0.8) : null,
iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
onTap: () async {
setState(() {
isLiked = !isLiked;
@@ -338,7 +338,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
width: MediaQuery.of(context).size.width - 32,
height: 0.4,
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.2),
color: Colors.black.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(16),
),
),

View File

@@ -184,7 +184,7 @@ class _ChatScreenState extends State<ChatScreen> {
decoration: BoxDecoration(
border: Border(
top: BorderSide(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
),
),
),

View File

@@ -116,7 +116,7 @@ class ChatBubbleWidget extends StatelessWidget {
child: Text(
DateTime.parse(sendTime).format('hh:mm'),
style: TextStyle(
color: isCurrentUser ? Colors.white.withOpacity(0.4) : Color(0xFF323F4B).withOpacity(0.4),
color: isCurrentUser ? Colors.white.withValues(alpha: 0.4) : Color(0xFF323F4B).withValues(alpha: 0.4),
height: 1,
fontSize: 10,
),

View File

@@ -94,7 +94,7 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
),
trailing: CupertinoSwitch(
value: value,
activeColor: appTheme.blueA400,
activeTrackColor: appTheme.blueA400,
onChanged: (_) {
onTap();
},

View File

@@ -66,7 +66,7 @@ class _DietPreviewScreenState extends State<DietPreviewScreen> {
color: Colors.white,
border: Border(
top: BorderSide(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
),
),
),

View File

@@ -154,7 +154,7 @@ class _AddProductModalState extends State<AddProductModal> {
),
),
trailing: Icon(
Icons.keyboard_arrow_right_rounded,
Icons.add_rounded,
color: Colors.grey.shade400,
),
contentPadding: EdgeInsets.only(left: 12),

View File

@@ -109,7 +109,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
color: Colors.white,
border: Border(
top: BorderSide(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
),
),
),

View File

@@ -18,7 +18,7 @@ class FeedBlogPostModel with _$FeedBlogPostModel {
required String title,
@JsonKey(name: "total_likes") required int totalLikes,
@JsonKey(name: "total_views") required int totalViews,
@JsonKey(name: "total_comments") required int totalComments,
@JsonKey(name: "total_comments") int? totalComments,
@JsonKey(name: "was_liked_by_me") required bool wasLikedByMe,
}) = _FeedBlogPostModel;

View File

@@ -37,7 +37,7 @@ mixin _$FeedBlogPostModel {
@JsonKey(name: "total_views")
int get totalViews => throw _privateConstructorUsedError;
@JsonKey(name: "total_comments")
int get totalComments => throw _privateConstructorUsedError;
int? get totalComments => throw _privateConstructorUsedError;
@JsonKey(name: "was_liked_by_me")
bool get wasLikedByMe => throw _privateConstructorUsedError;
@@ -69,7 +69,7 @@ abstract class $FeedBlogPostModelCopyWith<$Res> {
String title,
@JsonKey(name: "total_likes") int totalLikes,
@JsonKey(name: "total_views") int totalViews,
@JsonKey(name: "total_comments") int totalComments,
@JsonKey(name: "total_comments") int? totalComments,
@JsonKey(name: "was_liked_by_me") bool wasLikedByMe});
$AuthorCopyWith<$Res> get author;
@@ -101,7 +101,7 @@ class _$FeedBlogPostModelCopyWithImpl<$Res, $Val extends FeedBlogPostModel>
Object? title = null,
Object? totalLikes = null,
Object? totalViews = null,
Object? totalComments = null,
Object? totalComments = freezed,
Object? wasLikedByMe = null,
}) {
return _then(_value.copyWith(
@@ -149,10 +149,10 @@ class _$FeedBlogPostModelCopyWithImpl<$Res, $Val extends FeedBlogPostModel>
? _value.totalViews
: totalViews // ignore: cast_nullable_to_non_nullable
as int,
totalComments: null == totalComments
totalComments: freezed == totalComments
? _value.totalComments
: totalComments // ignore: cast_nullable_to_non_nullable
as int,
as int?,
wasLikedByMe: null == wasLikedByMe
? _value.wasLikedByMe
: wasLikedByMe // ignore: cast_nullable_to_non_nullable
@@ -191,7 +191,7 @@ abstract class _$$FeedBlogPostModelImplCopyWith<$Res>
String title,
@JsonKey(name: "total_likes") int totalLikes,
@JsonKey(name: "total_views") int totalViews,
@JsonKey(name: "total_comments") int totalComments,
@JsonKey(name: "total_comments") int? totalComments,
@JsonKey(name: "was_liked_by_me") bool wasLikedByMe});
@override
@@ -222,7 +222,7 @@ class __$$FeedBlogPostModelImplCopyWithImpl<$Res>
Object? title = null,
Object? totalLikes = null,
Object? totalViews = null,
Object? totalComments = null,
Object? totalComments = freezed,
Object? wasLikedByMe = null,
}) {
return _then(_$FeedBlogPostModelImpl(
@@ -270,10 +270,10 @@ class __$$FeedBlogPostModelImplCopyWithImpl<$Res>
? _value.totalViews
: totalViews // ignore: cast_nullable_to_non_nullable
as int,
totalComments: null == totalComments
totalComments: freezed == totalComments
? _value.totalComments
: totalComments // ignore: cast_nullable_to_non_nullable
as int,
as int?,
wasLikedByMe: null == wasLikedByMe
? _value.wasLikedByMe
: wasLikedByMe // ignore: cast_nullable_to_non_nullable
@@ -297,7 +297,7 @@ class _$FeedBlogPostModelImpl implements _FeedBlogPostModel {
required this.title,
@JsonKey(name: "total_likes") required this.totalLikes,
@JsonKey(name: "total_views") required this.totalViews,
@JsonKey(name: "total_comments") required this.totalComments,
@JsonKey(name: "total_comments") this.totalComments,
@JsonKey(name: "was_liked_by_me") required this.wasLikedByMe});
factory _$FeedBlogPostModelImpl.fromJson(Map<String, dynamic> json) =>
@@ -332,7 +332,7 @@ class _$FeedBlogPostModelImpl implements _FeedBlogPostModel {
final int totalViews;
@override
@JsonKey(name: "total_comments")
final int totalComments;
final int? totalComments;
@override
@JsonKey(name: "was_liked_by_me")
final bool wasLikedByMe;
@@ -420,7 +420,7 @@ abstract class _FeedBlogPostModel implements FeedBlogPostModel {
required final String title,
@JsonKey(name: "total_likes") required final int totalLikes,
@JsonKey(name: "total_views") required final int totalViews,
@JsonKey(name: "total_comments") required final int totalComments,
@JsonKey(name: "total_comments") final int? totalComments,
@JsonKey(name: "was_liked_by_me") required final bool wasLikedByMe}) =
_$FeedBlogPostModelImpl;
@@ -456,7 +456,7 @@ abstract class _FeedBlogPostModel implements FeedBlogPostModel {
int get totalViews;
@override
@JsonKey(name: "total_comments")
int get totalComments;
int? get totalComments;
@override
@JsonKey(name: "was_liked_by_me")
bool get wasLikedByMe;

View File

@@ -20,7 +20,7 @@ _$FeedBlogPostModelImpl _$$FeedBlogPostModelImplFromJson(
title: json['title'] as String,
totalLikes: (json['total_likes'] as num).toInt(),
totalViews: (json['total_views'] as num).toInt(),
totalComments: (json['total_comments'] as num).toInt(),
totalComments: (json['total_comments'] as num?)?.toInt(),
wasLikedByMe: json['was_liked_by_me'] as bool,
);

View File

@@ -168,9 +168,9 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
FeedIconButton(
icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
text: totalLikes.toString(),
iconColor: isLiked ? Colors.red.withOpacity(0.8) : null,
backgroundColor: isLiked ? Colors.red.withOpacity(0.1) : null,
textColor: isLiked ? Colors.red.withOpacity(0.8) : null,
iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
onTap: () async {
setState(() {
isLiked = !isLiked;

View File

@@ -50,7 +50,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
return Container(
width: MediaQuery.of(context).size.width,
decoration: BoxDecoration(
color: widget.replyId == comment.id ? appTheme.blueA400.withOpacity(0.1) : Colors.white,
color: widget.replyId == comment.id ? appTheme.blueA400.withValues(alpha: 0.1) : Colors.white,
borderRadius: BorderRadius.circular(16),
),
child: Padding(

View File

@@ -1,10 +1,15 @@
// ignore_for_file: dead_code
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
import 'package:share_plus/share_plus.dart';
class RecipesWidget extends StatefulWidget {
final Recipes recipes;
@@ -46,72 +51,14 @@ class _RecipesWidgetState extends State<RecipesWidget> {
child: Wrap(
runSpacing: 8,
children: [
_iconButton(Icons.fastfood, '139.9 ккал'),
_iconButton('assets/icons/clock.svg', widget.recipes.cookingTime.toString() + ' минут'),
SizedBox(width: 8),
_iconButton(Icons.timer_rounded, widget.recipes.cookingTime.toString() + ' минут'),
_iconButton('assets/icons/steps.svg', widget.recipes.steps.length.toString() + ' этапов'),
SizedBox(width: 8),
_iconButton(Icons.fast_forward_rounded, widget.recipes.steps.length.toString() + ' этапов'),
_iconButton('assets/icons/calories.svg', '139.9 ккал'),
],
),
),
Positioned(
left: 8,
top: 8,
child: Container(
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.8),
borderRadius: BorderRadius.circular(16),
),
child: Row(
children: [
Icon(
Icons.favorite_rounded,
size: 16,
color: Colors.black,
),
SizedBox(width: 4),
Text(
'0',
style: TextStyle(
fontSize: 12,
color: Colors.black,
fontWeight: FontWeight.w400,
),
),
],
),
),
),
Positioned(
right: 8,
top: 8,
child: Container(
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.8),
borderRadius: BorderRadius.circular(16),
),
child: Row(
children: [
Icon(
Icons.visibility_rounded,
size: 16,
color: Colors.black,
),
SizedBox(width: 4),
Text(
'0',
style: TextStyle(
fontSize: 12,
color: Colors.black,
fontWeight: FontWeight.w400,
),
),
],
),
),
),
],
),
SizedBox(height: 12),
@@ -150,27 +97,96 @@ class _RecipesWidgetState extends State<RecipesWidget> {
),
),
SizedBox(height: 12),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Row(
children: [
FeedIconButton(
icon: true ? Icons.favorite_rounded : Icons.favorite_border_rounded,
text: widget.recipes.likesCount.toString(),
iconColor: true ? Colors.red.withValues(alpha: 0.8) : null,
backgroundColor: true ? Colors.red.withValues(alpha: 0.1) : null,
textColor: true ? Colors.red.withValues(alpha: 0.8) : null,
onTap: () async {
// setState(() {
// isLiked = !isLiked;
// isLiked ? totalLikes++ : totalLikes--;
// });
// isLiked
// ? await context.read<FeedCubit>().likePost(state.feedBlogPostList[widget.index].id)
// : await context.read<FeedCubit>().unlikedPost(state.feedBlogPostList[widget.index].id);
// await context.read<FeedCubit>().loadFeedBlogPostList();
},
),
SizedBox(width: 8),
FeedIconButton(
svgIcon: SvgPicture.asset(
'assets/icons/comment.svg',
height: 20,
width: 20,
colorFilter: ColorFilter.mode(
appTheme.gray600,
BlendMode.srcIn,
),
),
text: widget.recipes.commentsCount.toString(),
onTap: () => GoRouter.of(context).pushNamed(
'aboutRecipesScreen',
extra: widget.recipes,
),
),
SizedBox(width: 8),
FeedIconButton(
svgIcon: SvgPicture.asset(
height: 20,
width: 20,
'assets/icons/share.svg',
colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
),
onTap: () => Share.shareUri(
Uri.parse(
baseUrl + '/ru/blog_post/' + widget.recipes.id.toString(),
),
),
),
Spacer(),
Icon(
Icons.visibility_rounded,
size: 16,
color: appTheme.gray500,
),
SizedBox(width: 4),
Text(
widget.recipes.viewsCount.toString(),
style: TextStyle(
fontSize: 12,
color: appTheme.gray500,
fontWeight: FontWeight.w400,
),
),
],
),
),
SizedBox(height: 12),
],
),
),
);
}
_iconButton(IconData icon, [String? text]) {
_iconButton(String iconPath, [String? text]) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.8),
color: Colors.white.withValues(alpha: 0.8),
borderRadius: BorderRadius.circular(16),
),
height: 32,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
icon,
size: 16,
color: Colors.black,
SvgPicture.asset(
iconPath,
),
if (text != null) SizedBox(width: 8),
if (text != null)

View File

@@ -108,7 +108,7 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
color: Colors.white,
border: Border(
top: BorderSide(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
),
),
),

View File

@@ -811,7 +811,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
child: Text(
text,
style: TextStyle(
color: Colors.black.withOpacity(0.4),
color: Colors.black.withValues(alpha: 0.4),
height: 1,
),
),
@@ -1044,7 +1044,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
padding: EdgeInsets.all(8),
width: (MediaQuery.of(context).size.width - 40) / 2,
decoration: BoxDecoration(
color: appTheme.blueA400.withOpacity(0.1),
color: appTheme.blueA400.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(16),
),
child: Text(
@@ -1150,7 +1150,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
_choiceIntervalChipWidget(int index) {
return ChoiceChip(
selectedColor: Colors.grey.withOpacity(0.1),
selectedColor: Colors.grey.withValues(alpha: 0.1),
pressElevation: 0,
showCheckmark: false,
side: BorderSide.none,

View File

@@ -154,9 +154,9 @@ class _CircumferenceChartWidgetState extends State<CircumferenceChartWidget> {
labelStyle: TextStyle(
color: Colors.grey,
),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withValues(alpha: 0.3)),
axisLine: AxisLine(
color: Colors.grey.withOpacity(0.3),
color: Colors.grey.withValues(alpha: 0.3),
width: 0.4,
),
),
@@ -309,7 +309,7 @@ class _CircumferenceChartWidgetState extends State<CircumferenceChartWidget> {
borderColor: seriesColor1,
gradient: LinearGradient(
colors: [
seriesColor1.withOpacity(0.14),
seriesColor1.withValues(alpha: 0.14),
Colors.transparent,
],
begin: Alignment.topCenter,
@@ -334,7 +334,7 @@ class _CircumferenceChartWidgetState extends State<CircumferenceChartWidget> {
borderColor: seriesColor2,
gradient: LinearGradient(
colors: [
seriesColor2.withOpacity(0.14),
seriesColor2.withValues(alpha: 0.14),
Colors.transparent,
],
begin: Alignment.topCenter,
@@ -359,7 +359,7 @@ class _CircumferenceChartWidgetState extends State<CircumferenceChartWidget> {
borderColor: seriesColor3,
gradient: LinearGradient(
colors: [
seriesColor3.withOpacity(0.14),
seriesColor3.withValues(alpha: 0.14),
Colors.transparent,
],
begin: Alignment.topCenter,

View File

@@ -22,14 +22,14 @@ class ImtChartWidget extends StatelessWidget {
child: Row(
children: [
if (weightPoints.length > 0)
Text(
'${weightPoints.last.bmi.toStringAsFixed(2)}',
style: TextStyle(
color: Colors.black,
fontSize: 40,
fontWeight: FontWeight.w500,
Text(
'${weightPoints.last.bmi.toStringAsFixed(2)}',
style: TextStyle(
color: Colors.black,
fontSize: 40,
fontWeight: FontWeight.w500,
),
),
),
if (weightPoints.length > 1)
weightPoints.last.bmi > weightPoints[weightPoints.length - 2].bmi
? Icon(
@@ -66,9 +66,9 @@ class ImtChartWidget extends StatelessWidget {
labelStyle: TextStyle(
color: Colors.grey,
),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withValues(alpha: 0.3)),
axisLine: AxisLine(
color: Colors.grey.withOpacity(0.3),
color: Colors.grey.withValues(alpha: 0.3),
width: 0.4,
),
),
@@ -99,7 +99,7 @@ class ImtChartWidget extends StatelessWidget {
borderColor: appTheme.blueA400,
gradient: LinearGradient(
colors: [
appTheme.blueA400.withOpacity(0.14),
appTheme.blueA400.withValues(alpha: 0.14),
Colors.transparent,
],
begin: Alignment.topCenter,

View File

@@ -166,9 +166,9 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
FeedIconButton(
icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
text: totalLikes.toString(),
iconColor: isLiked ? Colors.red.withOpacity(0.8) : null,
backgroundColor: isLiked ? Colors.red.withOpacity(0.1) : null,
textColor: isLiked ? Colors.red.withOpacity(0.8) : null,
iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
onTap: () async {
setState(() {
isLiked = !isLiked;
@@ -178,9 +178,9 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
? await context.read<FeedCubit>().likePost(state.blogPosts[widget.index].id)
: await context.read<FeedCubit>().unlikedPost(state.blogPosts[widget.index].id);
await widget.profileCubit.updateFeedBlogPostList(
state.blogPosts[widget.index],
isLiked ? false : true,
);
state.blogPosts[widget.index],
isLiked ? false : true,
);
},
),
SizedBox(width: 8),

View File

@@ -59,12 +59,12 @@ class _WeightChartWidgetState extends State<WeightChartWidget> {
? Icon(
Icons.arrow_drop_up,
size: 40,
color: Colors.grey.withOpacity(0.4),
color: Colors.grey.withValues(alpha: 0.4),
)
: Icon(
Icons.arrow_drop_down,
size: 40,
color: Colors.grey.withOpacity(0.4),
color: Colors.grey.withValues(alpha: 0.4),
),
],
),
@@ -93,9 +93,9 @@ class _WeightChartWidgetState extends State<WeightChartWidget> {
labelStyle: TextStyle(
color: Colors.grey,
),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withOpacity(0.3)),
majorGridLines: MajorGridLines(dashArray: [1], color: Colors.grey.withValues(alpha: 0.3)),
axisLine: AxisLine(
color: Colors.grey.withOpacity(0.3),
color: Colors.grey.withValues(alpha: 0.3),
width: 0.4,
),
),
@@ -227,7 +227,7 @@ class _WeightChartWidgetState extends State<WeightChartWidget> {
borderColor: appTheme.blueA400,
gradient: LinearGradient(
colors: [
appTheme.blueA400.withOpacity(0.14),
appTheme.blueA400.withValues(alpha: 0.14),
Colors.transparent,
],
begin: Alignment.topCenter,

View File

@@ -55,7 +55,7 @@ class _AboutRecipesScreenState extends State<AboutRecipesScreen> {
color: Colors.white,
border: Border(
top: BorderSide(
color: Colors.black.withOpacity(0.1),
color: Colors.black.withValues(alpha: 0.1),
),
),
),

View File

@@ -216,7 +216,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
title: 'Уведомление о новых обновлениях',
trailing: CupertinoSwitch(
value: updatesNotificationsSwitchState,
activeColor: appTheme.blueA400,
activeTrackColor: appTheme.blueA400,
onChanged: (newValue) {
setState(() {
updatesNotificationsSwitchState = newValue;
@@ -245,7 +245,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
title: 'Напоминание о заполнении дневника',
trailing: CupertinoSwitch(
value: fillDiaryNotificationsSwitchState,
activeColor: appTheme.blueA400,
activeTrackColor: appTheme.blueA400,
onChanged: (newValue) {
setState(() {
fillDiaryNotificationsSwitchState = newValue;
@@ -274,7 +274,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
title: 'Указывать “настроение” в заполнение дневника',
trailing: CupertinoSwitch(
value: moodSwitchState,
activeColor: appTheme.blueA400,
activeTrackColor: appTheme.blueA400,
onChanged: (newValue) {
setState(() {
moodSwitchState = newValue;
@@ -303,7 +303,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
title: 'Указывать “отход ко сну” в заполнение дневника',
trailing: CupertinoSwitch(
value: bedTimeSwitchState,
activeColor: appTheme.blueA400,
activeTrackColor: appTheme.blueA400,
onChanged: (newValue) {
setState(() {
bedTimeSwitchState = newValue;