Skip to content
Draft
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
6 changes: 5 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ org.gradle.jvmargs=-Xmx4g
android.useAndroidX=true
android.enableJetifier=true
android.enableAapt2Daemon=false
kotlin.daemon.jvm.options=-Xmx2g
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
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file added assets/images/flutter_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions assets/images/flutterconlogo_dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions assets/images/flutterconlogo_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion lib/common/utils/constants/app_assets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/common/utils/notification_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 8 additions & 8 deletions lib/common/widgets/app_bar/app_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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,
),
Expand All @@ -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,
),
Expand Down
6 changes: 3 additions & 3 deletions lib/common/widgets/app_bar/feedback_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FeedbackButton extends StatelessWidget {
onTap: () {
final profile = getIt<HiveRepository>().retrieveUser();
if (profile == null) {
GoRouter.of(context).goNamed(FlutterConRouter.signInRoute);
GoRouter.of(context).pushNamed(FlutterConRouter.signInRoute);
return;
}

Expand All @@ -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(
Expand All @@ -54,7 +54,7 @@ class FeedbackButton extends StatelessWidget {
const AppNavIcon(
'send',
height: 12,
color: ThemeColors.tealColor,
color: ThemeColors.flutterconMagenta,
),
],
),
Expand Down
4 changes: 2 additions & 2 deletions lib/common/widgets/app_bar/user_profile_icon.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class _UserProfileIconState extends State<UserProfileIcon> {
onTap: () {
final profile = getIt<HiveRepository>().retrieveUser();
if (profile == null) {
GoRouter.of(context).goNamed(FlutterConRouter.signInRoute);
GoRouter.of(context).pushNamed(FlutterConRouter.signInRoute);
return;
}

Expand Down Expand Up @@ -66,7 +66,7 @@ class _UserProfileIconState extends State<UserProfileIcon> {
alignment: Alignment.center,
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: ThemeColors.tealColor,
color: ThemeColors.flutterconMagenta,
),
child: ValueListenableBuilder<Object>(
valueListenable: Hive.box<dynamic>(
Expand Down
4 changes: 2 additions & 2 deletions lib/common/widgets/bottom_nav/bottom_nav_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ class _CustomBottomNavigationBarState extends State<CustomBottomNavigationBar> {
: 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),
Expand Down
5 changes: 4 additions & 1 deletion lib/common/widgets/personnel_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion lib/core/di/injectable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> configureDependencies() async {
getIt.initGetIt();
await getIt.allReady();
Expand Down
13 changes: 5 additions & 8 deletions lib/core/theme/theme_colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
37 changes: 19 additions & 18 deletions lib/core/theme/theme_data.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

import 'package:fluttercon/core/theme/theme_colors.dart';
Expand All @@ -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(),
Expand All @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion lib/features/about/ui/about_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class _AboutScreenState extends State<AboutScreen> {
final l10n = context.l10n;

return Scaffold(
backgroundColor: colorScheme.surface,
appBar: const CustomAppBar(selectedIndex: 3),
body: LayoutBuilder(
builder: (context, constraints) {
Expand Down
2 changes: 1 addition & 1 deletion lib/features/about/ui/organising_team_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Loading