Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/core/common/widgets/dropdown_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ class DropdownText extends StatefulWidget {
required this.content,
this.maxLines = 2,
this.padding = const EdgeInsets.symmetric(horizontal: AnyStepSpacing.md16),
this.backgroundColor,
});

final Widget title;
final String content;
final int maxLines;
final EdgeInsetsGeometry padding;
final Color? backgroundColor;

@override
State<DropdownText> createState() => _DropdownTextState();
Expand All @@ -24,6 +26,7 @@ class _DropdownTextState extends State<DropdownText> {

@override
Widget build(BuildContext context) {
final bgColor = widget.backgroundColor ?? Theme.of(context).colorScheme.surfaceContainer;
return Padding(
padding: widget.padding,
child: Column(
Expand Down Expand Up @@ -62,10 +65,7 @@ class _DropdownTextState extends State<DropdownText> {
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Theme.of(context).scaffoldBackgroundColor.withAlpha(0),
Theme.of(context).scaffoldBackgroundColor,
],
colors: [bgColor.withAlpha(0), bgColor],
),
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/core/common/widgets/max_width_container.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class MaxWidthContainer extends StatelessWidget {
const MaxWidthContainer({
super.key,
required this.child,
this.maxWidth = 900, // tweak like Bootstrap's container
this.maxWidth = 720, // tweak like Bootstrap's container
this.padding = const .symmetric(horizontal: AnyStepSpacing.md16, vertical: 0),
this.alignment = Alignment.topCenter,
});
Expand Down
10 changes: 6 additions & 4 deletions lib/core/config/theme/colors.dart
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import 'dart:ui';

class AnyStepColors {
static const Color black = Color(0xFF000000);
static const Color black = Color(0xFF0C1821);
static const Color pureBlack = Color(0xFF000000);
static const Color gray = Color(0xFFB0B0B0);
static const Color grayDark = Color(0xFF28262C);
static const Color navyDark = Color(0xFF273043);
static const Color blueDeep = Color(0xFF14248A);
static const Color blueBright = Color(0xFF47A7ED);
static const Color blueBright20 = Color.fromRGBO(71, 167, 237, 0.2);
static const Color white = Color(0xFFFFFFFF);
static const Color lightSecondaryContainer = Color(0xFFFFFAFF);
static const Color lightTertiaryContainer = Color(0xFFF9F4F5);
static const Color white = Color(0xFFFFFCF9);
static const Color pureWhite = Color(0xFFFFFFFF);
static const Color lightSecondaryContainer = Color(0xFFF4F3EE);
static const Color lightTertiaryContainer = Color(0xFFEEEDE6);
static const Color error = Color(0xFFD62839);
static const Color errorDark = Color(0xFFBA1A1A);
static const Color success = Color(0xFF2E7D32);
Expand Down
20 changes: 15 additions & 5 deletions lib/core/config/theme/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class AnyStepTheme {
secondaryContainer: AnyStepColors.blueBright20,
onSecondary: AnyStepColors.white,
surface: AnyStepColors.white,
onSurface: AnyStepColors.black,
surfaceContainer: AnyStepColors.lightSecondaryContainer,
surfaceContainerHighest: AnyStepColors.lightTertiaryContainer,
error: AnyStepColors.error,
),
textTheme: _tightTextTheme(AnyStepColors.grayDark),
Expand All @@ -61,10 +64,14 @@ class AnyStepTheme {
colorScheme: ColorScheme.fromSeed(
seedColor: AnyStepColors.blueBright,
brightness: Brightness.dark,
surface: AnyStepColors.black,
onSurface: AnyStepColors.white,
surfaceContainer: AnyStepColors.grayDark,
surfaceContainerHighest: AnyStepColors.navyDark,
error: AnyStepColors.errorDark,
onError: AnyStepColors.white,
),
textTheme: _tightTextTheme(AnyStepColors.white).copyWith(
textTheme: _tightTextTheme(AnyStepColors.pureWhite).copyWith(
bodyMedium: AnyStepTextStyles.bodyMedium.copyWith(
color: AnyStepColors.lightTertiaryContainer,
),
Expand Down Expand Up @@ -93,8 +100,9 @@ class AnyStepTheme {
onPrimaryContainer: AnyStepColors.navyDark,
secondary: AnyStepColors.blueDeep,
secondaryContainer: AnyStepColors.blueBright20,
onSecondary: AnyStepColors.white,
surface: AnyStepColors.white,
onSecondary: AnyStepColors.pureWhite,
surface: AnyStepColors.pureWhite,
onSurface: AnyStepColors.pureBlack,
error: AnyStepColors.error,
),
textTheme: _tightTextTheme(AnyStepColors.grayDark),
Expand Down Expand Up @@ -122,7 +130,9 @@ class AnyStepTheme {
contrastLevel: 1.0,
brightness: Brightness.dark,
error: AnyStepColors.errorDark,
onError: AnyStepColors.white,
onError: AnyStepColors.pureWhite,
surface: AnyStepColors.pureBlack,
onSurface: AnyStepColors.pureWhite,
),
textTheme: _tightTextTheme(AnyStepColors.white).copyWith(
bodyMedium: AnyStepTextStyles.bodyMedium.copyWith(
Expand All @@ -137,7 +147,7 @@ class AnyStepTheme {
elevation: 0,
centerTitle: true,
backgroundColor: AnyStepColors.navyDark,
foregroundColor: AnyStepColors.white,
foregroundColor: AnyStepColors.pureWhite,
),
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import 'package:anystep/core/common/constants/spacing.dart';
import 'package:anystep/core/common/widgets/any_step_shimmer.dart';
import 'package:anystep/core/features/events/data/event_repository.dart';
import 'package:anystep/core/features/events/domain/event.dart';
import 'package:anystep/core/features/events/presentation/event_detail/event_detail_screen.dart';
import 'package:anystep/l10n/generated/app_localizations.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:table_calendar/table_calendar.dart';

class DashboardCalendarCard extends ConsumerStatefulWidget {
Expand Down Expand Up @@ -164,38 +166,44 @@ class _EventRow extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 10,
height: 10,
margin: const EdgeInsets.only(top: 6),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primary,
shape: BoxShape.circle,
final eventId = event.id;

return InkWell(
borderRadius: BorderRadius.circular(AnyStepSpacing.sm10),
onTap: eventId == null ? null : () => context.push(EventDetailScreen.getPath(eventId)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 10,
height: 10,
margin: const EdgeInsets.only(top: 6),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.primary,
shape: BoxShape.circle,
),
),
),
const SizedBox(width: AnyStepSpacing.sm8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
event.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: AnyStepSpacing.sm4),
Text(
'${event.startTime.toLocal().hour.toString().padLeft(2, '0')}:${event.startTime.toLocal().minute.toString().padLeft(2, '0')} • ${event.address?.city ?? ''}',
style: Theme.of(context).textTheme.bodySmall,
),
],
const SizedBox(width: AnyStepSpacing.sm8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
event.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(height: AnyStepSpacing.sm4),
Text(
'${event.startTime.toLocal().hour.toString().padLeft(2, '0')}:${event.startTime.toLocal().minute.toString().padLeft(2, '0')} • ${event.address?.city ?? ''}',
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
),
],
],
),
);
}
}