Skip to content

Commit

Permalink
bedtime background color fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MaikelStuivenberg committed Nov 13, 2024
1 parent 4460bf4 commit 2c84063
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ import 'package:givt_app/features/family/features/profiles/models/profile.dart';
import 'package:givt_app/features/family/shared/design/components/components.dart';
import 'package:givt_app/features/family/shared/design/components/content/avatar_widget.dart';
import 'package:givt_app/features/family/shared/design/components/content/models/avatar_uimodel.dart';
import 'package:givt_app/features/family/shared/widgets/loading/custom_progress_indicator.dart';
import 'package:givt_app/features/family/shared/widgets/texts/shared_texts.dart';
import 'package:givt_app/features/family/utils/family_app_theme.dart';
import 'package:givt_app/shared/models/analytics_event.dart';
import 'package:givt_app/shared/widgets/base/base_state_consumer.dart';
import 'package:givt_app/shared/widgets/common_icons.dart';
import 'package:givt_app/shared/widgets/extensions/route_extensions.dart';
import 'package:givt_app/shared/widgets/fun_scaffold.dart';
import 'package:go_router/go_router.dart';

class SetupBedtimeScreen extends StatefulWidget {
Expand Down Expand Up @@ -53,6 +56,10 @@ class _SetupBedtimeScreenState extends State<SetupBedtimeScreen> {
canPop: false,
child: BaseStateConsumer<dynamic, Bedtime>(
cubit: _cubit,
onLoading: (context) => const FunScaffold(
backgroundColor: FamilyAppTheme.secondary10,
body: CustomCircularProgressIndicator(),
),
onCustom: (context, bedtime) {
if (isLast) {
context.goNamed(FamilyPages.profileSelection.name);
Expand All @@ -74,7 +81,7 @@ class _SetupBedtimeScreenState extends State<SetupBedtimeScreen> {
onInitial: (context) {
return Material(
child: ColoredBox(
color: Colors.black,
color: FamilyAppTheme.secondary10,
child: Stack(children: [
//to do animate city before page navigation
cityAtBottom(width, height),
Expand Down
1 change: 1 addition & 0 deletions lib/features/family/utils/family_app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class FamilyAppTheme extends ThemeExtension<FamilyAppTheme> {
static const primary98 = Color(0xFFE9FFED);
static const primary99 = Color(0xFFF5FFF5);

static const secondary10 = Color(0xFF002020);
static const secondary20 = Color(0xFF003737);
static const secondary30 = Color(0xFF004F50);
static const secondary40 = Color(0xFF00696A);
Expand Down

0 comments on commit 2c84063

Please sign in to comment.