diff --git a/android/gradle.properties b/android/gradle.properties index 76272376..ac4727e0 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,4 +2,8 @@ org.gradle.jvmargs=-Xmx4g android.useAndroidX=true android.enableJetifier=true android.enableAapt2Daemon=false -kotlin.daemon.jvm.options=-Xmx2g \ No newline at end of file +kotlin.daemon.jvm.options=-Xmx2g +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8f3239ab..4cc8c0b0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/assets/images/flutter_icon.png b/assets/images/flutter_icon.png new file mode 100644 index 00000000..c47b3334 Binary files /dev/null and b/assets/images/flutter_icon.png differ diff --git a/assets/images/flutterconlogo_dark.svg b/assets/images/flutterconlogo_dark.svg new file mode 100644 index 00000000..1ba8acf7 --- /dev/null +++ b/assets/images/flutterconlogo_dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/images/flutterconlogo_light.svg b/assets/images/flutterconlogo_light.svg new file mode 100644 index 00000000..288495ea --- /dev/null +++ b/assets/images/flutterconlogo_light.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/common/utils/constants/app_assets.dart b/lib/common/utils/constants/app_assets.dart index 8741ed2e..213630d8 100644 --- a/lib/common/utils/constants/app_assets.dart +++ b/lib/common/utils/constants/app_assets.dart @@ -49,7 +49,8 @@ class AppAssets { static const aboutIcon = 'assets/images/about_icon.png'; static const lockIcon = 'assets/images/lock_icon.png'; static const playIcon = 'assets/images/play_icon.png'; - static const flutterConKeLogo = 'assets/images/flutterconke_logo.png'; + static const flutterConLogoLight = 'assets/images/flutterconlogo_light.svg'; + static const flutterConLogoDark = 'assets/images/flutterconlogo_dark.svg'; static const flutterConBanner = 'assets/images/flutterconke_banner.png'; static const smileyIcon = 'assets/images/smiley.png'; diff --git a/lib/common/utils/notification_service.dart b/lib/common/utils/notification_service.dart index 33770577..d0961e41 100644 --- a/lib/common/utils/notification_service.dart +++ b/lib/common/utils/notification_service.dart @@ -15,7 +15,7 @@ class NotificationService { channelKey: 'session_channel', channelName: 'Session notifications', channelDescription: 'Notification channel for bookmarked sessions', - defaultColor: ThemeColors.blueDroidconColor, + defaultColor: ThemeColors.flutterconBlue, ledColor: Colors.white, playSound: true, enableVibration: true, diff --git a/lib/common/widgets/app_bar/app_bar.dart b/lib/common/widgets/app_bar/app_bar.dart index 4943884f..4897230b 100644 --- a/lib/common/widgets/app_bar/app_bar.dart +++ b/lib/common/widgets/app_bar/app_bar.dart @@ -32,17 +32,17 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { final l10n = context.l10n; return AppBar( automaticallyImplyLeading: false, - surfaceTintColor: colorScheme.surface, - backgroundColor: colorScheme.surface, + surfaceTintColor: Theme.of(context).scaffoldBackgroundColor, + backgroundColor: Theme.of(context).scaffoldBackgroundColor, title: Row( children: [ GestureDetector( onTap: () {}, - child: Image.asset( + child: SvgPicture.asset( isLightMode - ? AppAssets.flutterConKeLogo - : AppAssets.flutterConKeLogo, - scale: 4.5, + ? AppAssets.flutterConLogoLight + : AppAssets.flutterConLogoDark, + height: 32, ), ), const Spacer(), @@ -58,7 +58,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { AppAssets.listAltIcon, colorFilter: ColorFilter.mode( selectedScheduleIndex == 0 - ? ThemeColors.blueColor + ? ThemeColors.flutterconBlue : Colors.grey, BlendMode.srcIn, ), @@ -71,7 +71,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { AppAssets.viewAgendaIcon, colorFilter: ColorFilter.mode( selectedScheduleIndex == 1 - ? ThemeColors.blueColor + ? ThemeColors.flutterconBlue : Colors.grey, BlendMode.srcIn, ), diff --git a/lib/common/widgets/app_bar/feedback_button.dart b/lib/common/widgets/app_bar/feedback_button.dart index 1a2c162d..92140f21 100644 --- a/lib/common/widgets/app_bar/feedback_button.dart +++ b/lib/common/widgets/app_bar/feedback_button.dart @@ -23,7 +23,7 @@ class FeedbackButton extends StatelessWidget { onTap: () { final profile = getIt().retrieveUser(); if (profile == null) { - GoRouter.of(context).goNamed(FlutterConRouter.signInRoute); + GoRouter.of(context).pushNamed(FlutterConRouter.signInRoute); return; } @@ -33,7 +33,7 @@ class FeedbackButton extends StatelessWidget { height: 30, width: 127, decoration: BoxDecoration( - color: ThemeColors.tealColor.withValues(alpha: 0.21), + color: ThemeColors.flutterconMagenta.withValues(alpha: 0.21), borderRadius: const BorderRadius.all(Radius.circular(10)), ), child: Row( @@ -54,7 +54,7 @@ class FeedbackButton extends StatelessWidget { const AppNavIcon( 'send', height: 12, - color: ThemeColors.tealColor, + color: ThemeColors.flutterconMagenta, ), ], ), diff --git a/lib/common/widgets/app_bar/user_profile_icon.dart b/lib/common/widgets/app_bar/user_profile_icon.dart index 696eba23..4bcc0e1e 100644 --- a/lib/common/widgets/app_bar/user_profile_icon.dart +++ b/lib/common/widgets/app_bar/user_profile_icon.dart @@ -29,7 +29,7 @@ class _UserProfileIconState extends State { onTap: () { final profile = getIt().retrieveUser(); if (profile == null) { - GoRouter.of(context).goNamed(FlutterConRouter.signInRoute); + GoRouter.of(context).pushNamed(FlutterConRouter.signInRoute); return; } @@ -66,7 +66,7 @@ class _UserProfileIconState extends State { alignment: Alignment.center, decoration: const BoxDecoration( shape: BoxShape.circle, - color: ThemeColors.tealColor, + color: ThemeColors.flutterconMagenta, ), child: ValueListenableBuilder( valueListenable: Hive.box( diff --git a/lib/common/widgets/bottom_nav/bottom_nav_bar.dart b/lib/common/widgets/bottom_nav/bottom_nav_bar.dart index 749e1287..18315ff6 100644 --- a/lib/common/widgets/bottom_nav/bottom_nav_bar.dart +++ b/lib/common/widgets/bottom_nav/bottom_nav_bar.dart @@ -91,9 +91,9 @@ class _CustomBottomNavigationBarState extends State { : null, child: BottomNavigationBar( type: BottomNavigationBarType.fixed, - backgroundColor: colorScheme.surface, + backgroundColor: Theme.of(context).scaffoldBackgroundColor, currentIndex: widget.selectedIndex, - selectedItemColor: ThemeColors.orangeDroidconColor, + selectedItemColor: ThemeColors.flutterconMagenta, unselectedItemColor: colorScheme.onSurface, unselectedLabelStyle: const TextStyle(fontSize: 12), selectedLabelStyle: const TextStyle(fontSize: 12), diff --git a/lib/common/widgets/personnel_widget.dart b/lib/common/widgets/personnel_widget.dart index c3684e6e..55db24ca 100644 --- a/lib/common/widgets/personnel_widget.dart +++ b/lib/common/widgets/personnel_widget.dart @@ -31,7 +31,10 @@ class PersonnelWidget extends StatelessWidget { maxWidth: MediaQuery.sizeOf(context).width / 4.5, ), decoration: BoxDecoration( - border: Border.all(color: ThemeColors.tealColor, width: 2), + border: Border.all( + color: ThemeColors.flutterconMagenta, + width: 2, + ), borderRadius: Corners.s12Border, ), child: ClipRRect( diff --git a/lib/core/di/injectable.dart b/lib/core/di/injectable.dart index e2c46a79..c768c3ce 100644 --- a/lib/core/di/injectable.dart +++ b/lib/core/di/injectable.dart @@ -6,7 +6,7 @@ import 'package:isar_community/isar.dart'; final getIt = GetIt.instance; late Isar localDB; -@InjectableInit(initializerName: 'initGetIt', generateForDir: ['lib']) +@InjectableInit(initializerName: 'initGetIt') Future configureDependencies() async { getIt.initGetIt(); await getIt.allReady(); diff --git a/lib/core/theme/theme_colors.dart b/lib/core/theme/theme_colors.dart index 644a0177..0c04bd8e 100644 --- a/lib/core/theme/theme_colors.dart +++ b/lib/core/theme/theme_colors.dart @@ -4,17 +4,14 @@ class ThemeColors { ThemeColors._(); static const Color lightGrayBackgroundColor = Color(0xffF5F5F5); - static const Color blueDroidconColor = Color(0xff000CEB); - static const Color orangeDroidconColor = Color(0xffFF6E4D); - static const Color greyDarkThemeBackground = Color(0xff20201E); + static const Color greyDarkThemeBackground = Color(0xff000000); static const Color greyTextColor = Color(0xff707070); static const Color lightGreyTextColor = Color(0xffC3C3C3); - static const Color blueGreenDroidconColor = Color(0xff00E2C3); - static const Color blueColor = Color(0xff000CEB); - static const Color orangeColor = Color(0xffFF6E4D); - static const Color blackColor = Color(0xff20201E); - static const Color tealColor = Color(0xff00E2C3); + static const Color blackColor = Color(0xff000000); static const Color lightGrayColor = Color(0xffF5F5F5); static const Color greyAccentColor = Color(0xffB1B1B1); + + static const Color flutterconBlue = Color(0xff008BFF); + static const Color flutterconMagenta = Color(0xffF73EDE); } diff --git a/lib/core/theme/theme_data.dart b/lib/core/theme/theme_data.dart index d84397e5..3c757e79 100644 --- a/lib/core/theme/theme_data.dart +++ b/lib/core/theme/theme_data.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:fluttercon/core/theme/theme_colors.dart'; @@ -23,24 +24,24 @@ class AppTheme { scaffoldBackgroundColor: Colors.white, colorScheme: const ColorScheme( brightness: Brightness.light, - primary: ThemeColors.blueDroidconColor, - primaryContainer: ThemeColors.blueDroidconColor, + primary: ThemeColors.flutterconBlue, + primaryContainer: ThemeColors.flutterconBlue, onPrimary: Colors.white, - secondary: ThemeColors.blueGreenDroidconColor, + secondary: ThemeColors.flutterconMagenta, secondaryContainer: ThemeColors.lightGrayColor, - onSecondary: Colors.black, + onSecondary: Colors.white, surface: Colors.white, - onSurface: Colors.black, + onSurface: Color(0xff20201E), error: Colors.red, onError: Colors.white, ), appBarTheme: const AppBarTheme( backgroundColor: Colors.white, - foregroundColor: ThemeColors.blueDroidconColor, + foregroundColor: ThemeColors.flutterconBlue, ), navigationBarTheme: const NavigationBarThemeData( backgroundColor: Colors.white, - indicatorColor: ThemeColors.blueDroidconColor, + indicatorColor: ThemeColors.flutterconBlue, elevation: 3, ), textTheme: GoogleFonts.montserratTextTheme(), @@ -55,27 +56,27 @@ class AppTheme { static ThemeData darkTheme() { return ThemeData( - scaffoldBackgroundColor: ThemeColors.greyDarkThemeBackground, + scaffoldBackgroundColor: ThemeColors.blackColor, colorScheme: const ColorScheme( brightness: Brightness.dark, - primary: ThemeColors.blueGreenDroidconColor, - primaryContainer: ThemeColors.blueDroidconColor, - onPrimary: Colors.black, - secondary: ThemeColors.blueDroidconColor, - secondaryContainer: Colors.black, + primary: ThemeColors.flutterconBlue, + primaryContainer: ThemeColors.flutterconBlue, + onPrimary: Colors.white, + secondary: ThemeColors.flutterconMagenta, + secondaryContainer: Color(0xff191D1D), onSecondary: Colors.white, - surface: ThemeColors.blackColor, + surface: Color(0xff20201E), onSurface: Colors.white, error: Colors.red, onError: Colors.white, ), appBarTheme: const AppBarTheme( - backgroundColor: ThemeColors.greyDarkThemeBackground, - foregroundColor: ThemeColors.blueDroidconColor, + backgroundColor: ThemeColors.blackColor, + foregroundColor: ThemeColors.flutterconBlue, ), navigationBarTheme: const NavigationBarThemeData( - backgroundColor: Colors.black, - indicatorColor: ThemeColors.blueDroidconColor, + backgroundColor: ThemeColors.blackColor, + indicatorColor: ThemeColors.flutterconBlue, elevation: 3, ), textTheme: GoogleFonts.montserratTextTheme(), diff --git a/lib/features/about/ui/about_screen.dart b/lib/features/about/ui/about_screen.dart index ef651a10..6e5ea79c 100644 --- a/lib/features/about/ui/about_screen.dart +++ b/lib/features/about/ui/about_screen.dart @@ -30,7 +30,6 @@ class _AboutScreenState extends State { final l10n = context.l10n; return Scaffold( - backgroundColor: colorScheme.surface, appBar: const CustomAppBar(selectedIndex: 3), body: LayoutBuilder( builder: (context, constraints) { diff --git a/lib/features/about/ui/organising_team_details.dart b/lib/features/about/ui/organising_team_details.dart index 8c98bdb2..1b9e3cce 100644 --- a/lib/features/about/ui/organising_team_details.dart +++ b/lib/features/about/ui/organising_team_details.dart @@ -88,7 +88,7 @@ class OranisingTeamMemberDetailsPage extends StatelessWidget { const SizedBox(height: 60), AutoSizeText( organiser.designation, - style: const TextStyle(color: ThemeColors.orangeColor), + style: const TextStyle(color: ThemeColors.flutterconMagenta), ), AutoSizeText( organiser.name, diff --git a/lib/features/auth/ui/sign_in.dart b/lib/features/auth/ui/sign_in.dart index 8024cd81..41666f1b 100644 --- a/lib/features/auth/ui/sign_in.dart +++ b/lib/features/auth/ui/sign_in.dart @@ -2,6 +2,7 @@ import 'package:auth_buttons/auth_buttons.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:fluttercon/common/repository/firebase_repository.dart'; import 'package:fluttercon/common/utils/constants/app_assets.dart'; import 'package:fluttercon/common/utils/misc.dart'; @@ -45,7 +46,18 @@ class SignInScreen extends StatelessWidget { ); }, child: Scaffold( - backgroundColor: colorScheme.surface, + appBar: AppBar( + backgroundColor: Colors.transparent, + elevation: 0, + leading: IconButton( + icon: Icon(Icons.arrow_back, color: colorScheme.onSurface), + onPressed: () { + if (GoRouter.of(context).canPop()) { + GoRouter.of(context).pop(); + } + }, + ), + ), body: SafeArea( child: Center( child: Padding( @@ -81,8 +93,11 @@ class SignInScreen extends StatelessWidget { loading: () => const Center( child: CircularProgressIndicator(), ), - orElse: () => const Image( - image: AssetImage(AppAssets.flutterConKeLogo), + orElse: () => SvgPicture.asset( + isLightMode + ? AppAssets.flutterConLogoLight + : AppAssets.flutterConLogoDark, + height: 50, ), ); }, diff --git a/lib/features/home/ui/speaker_details/speaker_details.dart b/lib/features/home/ui/speaker_details/speaker_details.dart index bdef28a0..746ff287 100644 --- a/lib/features/home/ui/speaker_details/speaker_details.dart +++ b/lib/features/home/ui/speaker_details/speaker_details.dart @@ -90,14 +90,16 @@ class SpeakerDetailsPage extends StatelessWidget { children: [ const Flexible( child: Icon( - Icons.android_outlined, - color: ThemeColors.orangeColor, + Icons.flutter_dash, + color: ThemeColors.flutterconMagenta, ), ), const SizedBox(width: 8), AutoSizeText( l10n.speaker, - style: const TextStyle(color: ThemeColors.orangeColor), + style: const TextStyle( + color: ThemeColors.flutterconMagenta, + ), ), ], ), diff --git a/lib/features/home/widgets/search_bar.dart b/lib/features/home/widgets/search_bar.dart index 6bdc305d..ba68dab5 100644 --- a/lib/features/home/widgets/search_bar.dart +++ b/lib/features/home/widgets/search_bar.dart @@ -68,7 +68,7 @@ class _SearchBarWidgetState extends State { decoration: BoxDecoration( color: colorScheme.surface, borderRadius: BorderRadius.circular(35), - border: Border.all(color: ThemeColors.blueDroidconColor), + border: Border.all(color: ThemeColors.flutterconBlue), ), child: Row( children: [ @@ -106,7 +106,7 @@ class _SearchBarWidgetState extends State { error: (message) => Center( child: AutoSizeText( message, - style: const TextStyle(color: ThemeColors.orangeDroidconColor), + style: const TextStyle(color: ThemeColors.flutterconMagenta), ), ), ); diff --git a/lib/features/home/widgets/sessions_card.dart b/lib/features/home/widgets/sessions_card.dart index 9f1a1684..d15c47fc 100644 --- a/lib/features/home/widgets/sessions_card.dart +++ b/lib/features/home/widgets/sessions_card.dart @@ -63,7 +63,7 @@ class _SessionsCardState extends State { decoration: BoxDecoration( color: (isLightMode - ? ThemeColors.blueColor + ? ThemeColors.flutterconBlue : ThemeColors.lightGrayColor) .withValues(alpha: .11), borderRadius: BorderRadius.circular(50), diff --git a/lib/features/home/widgets/speaker_grid_tile.dart b/lib/features/home/widgets/speaker_grid_tile.dart index 4594750a..b2fb0b91 100644 --- a/lib/features/home/widgets/speaker_grid_tile.dart +++ b/lib/features/home/widgets/speaker_grid_tile.dart @@ -30,7 +30,10 @@ class SpeakerGridTile extends StatelessWidget { maxWidth: MediaQuery.sizeOf(context).width / 4.5, ), decoration: BoxDecoration( - border: Border.all(color: ThemeColors.tealColor, width: 2), + border: Border.all( + color: ThemeColors.flutterconMagenta, + width: 2, + ), borderRadius: Corners.s12Border, ), child: ClipRRect( @@ -83,7 +86,7 @@ class SpeakerGridTile extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), side: const BorderSide( - color: ThemeColors.blueGreenDroidconColor, + color: ThemeColors.flutterconMagenta, width: 2, ), backgroundColor: colorScheme.surface, @@ -91,7 +94,7 @@ class SpeakerGridTile extends StatelessWidget { child: AutoSizeText( l10n.details.toUpperCase(), style: const TextStyle( - color: ThemeColors.blueGreenDroidconColor, + color: ThemeColors.flutterconMagenta, fontWeight: FontWeight.bold, ), ), diff --git a/lib/features/home/widgets/speaker_home_card.dart b/lib/features/home/widgets/speaker_home_card.dart index c68a4ba2..158c3ca9 100644 --- a/lib/features/home/widgets/speaker_home_card.dart +++ b/lib/features/home/widgets/speaker_home_card.dart @@ -37,7 +37,7 @@ class _SpeakerCardState extends State { l10n.speakers, style: Theme.of(context).textTheme.titleLarge!.copyWith( color: isLightMode - ? ThemeColors.blueDroidconColor + ? ThemeColors.flutterconBlue : colorScheme.onSurface, fontWeight: FontWeight.bold, ), @@ -57,7 +57,7 @@ class _SpeakerCardState extends State { decoration: BoxDecoration( color: (isLightMode - ? ThemeColors.blueColor + ? ThemeColors.flutterconBlue : ThemeColors.lightGrayColor) .withValues(alpha: .11), borderRadius: BorderRadius.circular(50), @@ -122,7 +122,7 @@ class _SpeakerCardState extends State { message, style: Theme.of(context).textTheme.titleMedium?.copyWith( fontWeight: FontWeight.bold, - color: ThemeColors.blueColor, + color: ThemeColors.flutterconBlue, fontSize: 18, ), ), diff --git a/lib/features/sessions/ui/session_details/session_details.dart b/lib/features/sessions/ui/session_details/session_details.dart index e708fed8..7bdf3c2b 100644 --- a/lib/features/sessions/ui/session_details/session_details.dart +++ b/lib/features/sessions/ui/session_details/session_details.dart @@ -54,14 +54,16 @@ class SessionDetailsPage extends StatelessWidget { children: [ const Flexible( child: Icon( - Icons.android_outlined, - color: ThemeColors.orangeColor, + Icons.flutter_dash, + color: ThemeColors.flutterconMagenta, ), ), const SizedBox(width: 8), AutoSizeText( l10n.speaker, - style: const TextStyle(color: ThemeColors.orangeColor), + style: const TextStyle( + color: ThemeColors.flutterconMagenta, + ), ), ], ), @@ -108,7 +110,7 @@ class SessionDetailsPage extends StatelessWidget { ? Icons.star_rate_rounded : Icons.star_border_outlined, color: status == BookmarkStatus.bookmarked - ? ThemeColors.orangeColor + ? ThemeColors.flutterconMagenta : colorScheme.primary, size: 32, ), @@ -129,7 +131,7 @@ class SessionDetailsPage extends StatelessWidget { ? Icons.star_rate_rounded : Icons.star_border_outlined, color: session.isBookmarked - ? ThemeColors.orangeColor + ? ThemeColors.flutterconMagenta : colorScheme.primary, size: 32, ), @@ -215,7 +217,7 @@ class SessionDetailsPage extends StatelessWidget { ), floatingActionButton: FloatingActionButton( shape: const CircleBorder(), - backgroundColor: ThemeColors.orangeColor, + backgroundColor: ThemeColors.flutterconMagenta, child: BlocBuilder( builder: (context, state) => state.maybeWhen( orElse: () => Transform.flip( diff --git a/lib/features/sessions/ui/sessions_screen.dart b/lib/features/sessions/ui/sessions_screen.dart index cdc29a89..cf99259e 100644 --- a/lib/features/sessions/ui/sessions_screen.dart +++ b/lib/features/sessions/ui/sessions_screen.dart @@ -127,10 +127,12 @@ class _SessionsScreenState extends State }, trackOutlineWidth: WidgetStateProperty.all(1), trackColor: WidgetStateProperty.all( - Colors.black, + ThemeColors.flutterconBlue, ), - activeTrackColor: ThemeColors.orangeColor, - activeThumbColor: ThemeColors.orangeColor, + activeTrackColor: + ThemeColors.flutterconMagenta, + activeThumbColor: + ThemeColors.flutterconMagenta, thumbColor: WidgetStateProperty.all( Colors.white, ), diff --git a/lib/features/sessions/ui/widgets/compact_view_card.dart b/lib/features/sessions/ui/widgets/compact_view_card.dart index 149dfedf..d9f3dabc 100644 --- a/lib/features/sessions/ui/widgets/compact_view_card.dart +++ b/lib/features/sessions/ui/widgets/compact_view_card.dart @@ -82,10 +82,7 @@ class CompactViewCard extends StatelessWidget { Row( children: [ Flexible( - child: Icon( - Icons.android_outlined, - color: colorScheme.primary, - ), + child: Icon(Icons.flutter_dash, color: colorScheme.primary), ), const SizedBox(width: 8), Flexible( @@ -141,7 +138,7 @@ class CompactViewCard extends StatelessWidget { ? Icons.star_rate_rounded : Icons.star_border_outlined, color: session.isBookmarked - ? ThemeColors.orangeColor + ? ThemeColors.flutterconMagenta : colorScheme.primary, size: 32, ), @@ -165,7 +162,7 @@ class CompactViewCard extends StatelessWidget { ? Icons.star_rate_rounded : Icons.star_border_outlined, color: session.isBookmarked - ? ThemeColors.orangeColor + ? ThemeColors.flutterconMagenta : colorScheme.primary, size: 32, ), diff --git a/lib/features/sessions/ui/widgets/day_sessions_view.dart b/lib/features/sessions/ui/widgets/day_sessions_view.dart index 07384046..f77b8889 100644 --- a/lib/features/sessions/ui/widgets/day_sessions_view.dart +++ b/lib/features/sessions/ui/widgets/day_sessions_view.dart @@ -37,20 +37,20 @@ class DaySessionsView extends StatelessWidget { afterLineStyle: LineStyle( thickness: 2, color: randomizeColor - ? ThemeColors.orangeColor - : ThemeColors.blueGreenDroidconColor, + ? ThemeColors.flutterconMagenta + : ThemeColors.flutterconMagenta, ), beforeLineStyle: LineStyle( thickness: 2, color: randomizeColor - ? ThemeColors.orangeColor - : ThemeColors.blueGreenDroidconColor, + ? ThemeColors.flutterconMagenta + : ThemeColors.flutterconMagenta, ), indicatorStyle: IndicatorStyle( width: 8, color: randomizeColor - ? ThemeColors.orangeColor - : ThemeColors.blueGreenDroidconColor, + ? ThemeColors.flutterconMagenta + : ThemeColors.flutterconMagenta, ), ), ), diff --git a/lib/features/sessions/ui/widgets/day_tab_view.dart b/lib/features/sessions/ui/widgets/day_tab_view.dart index ce9c9df1..c293c8c3 100644 --- a/lib/features/sessions/ui/widgets/day_tab_view.dart +++ b/lib/features/sessions/ui/widgets/day_tab_view.dart @@ -27,8 +27,8 @@ class DayTabView extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), color: isActive - ? ThemeColors.orangeDroidconColor - : ThemeColors.blueGreenDroidconColor.withValues(alpha: .1), + ? ThemeColors.flutterconMagenta + : ThemeColors.flutterconMagenta.withValues(alpha: .1), ), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4), child: Column( diff --git a/lib/features/sessions/ui/widgets/schedule_view_card.dart b/lib/features/sessions/ui/widgets/schedule_view_card.dart index 81756cb7..c6ac3601 100644 --- a/lib/features/sessions/ui/widgets/schedule_view_card.dart +++ b/lib/features/sessions/ui/widgets/schedule_view_card.dart @@ -106,7 +106,7 @@ class ScheduleViewCard extends StatelessWidget { margin: const EdgeInsets.only(right: 8), decoration: BoxDecoration( border: Border.all( - color: ThemeColors.tealColor, + color: ThemeColors.flutterconMagenta, width: 2, ), borderRadius: Corners.s12Border, @@ -161,7 +161,7 @@ class ScheduleViewCard extends StatelessWidget { ? Icons.star_rate_rounded : Icons.star_border_outlined, color: status == BookmarkStatus.bookmarked - ? ThemeColors.orangeColor + ? ThemeColors.flutterconMagenta : colorScheme.primary, size: 32, ), @@ -182,7 +182,7 @@ class ScheduleViewCard extends StatelessWidget { ? Icons.star_rate_rounded : Icons.star_border_outlined, color: session.isBookmarked - ? ThemeColors.orangeColor + ? ThemeColors.flutterconMagenta : colorScheme.primary, size: 32, ), diff --git a/lib/features/splash/splash_screen.dart b/lib/features/splash/splash_screen.dart index 6b03c9c7..9491540c 100644 --- a/lib/features/splash/splash_screen.dart +++ b/lib/features/splash/splash_screen.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:fluttercon/common/utils/constants/app_assets.dart'; -import 'package:fluttercon/common/utils/misc.dart'; import 'package:fluttercon/common/utils/router.dart'; import 'package:go_router/go_router.dart'; @@ -28,11 +27,9 @@ class _SplashScreenState extends State { @override Widget build(BuildContext context) { - final (_, colorScheme) = Misc.getTheme(context); - return Scaffold( - backgroundColor: colorScheme.surface, - body: const Center( - child: Image(image: AssetImage(AppAssets.imgDroidcon)), + return const Scaffold( + body: SafeArea( + child: Center(child: Image(image: AssetImage(AppAssets.imgDroidcon))), ), ); } diff --git a/pubspec.lock b/pubspec.lock index 7834be72..03a492af 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" checked_yaml: dependency: transitive description: @@ -881,26 +881,26 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.19" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.13.0" meta: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.18.0" mime: dependency: transitive description: @@ -1262,10 +1262,10 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.11" time: dependency: transitive description: @@ -1531,5 +1531,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=3.9.0 <4.0.0" + dart: ">=3.10.0-0 <4.0.0" flutter: ">=3.29.0"