Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create custom appbar #45

Merged
merged 2 commits into from
Mar 23, 2024
Merged

create custom appbar #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9217cb7
create app bar
Alidantech Mar 22, 2024
9e9bd6d
create custom appbar
Alidantech Mar 23, 2024
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
1 change: 1 addition & 0 deletions devtools_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extensions:
Empty file added lib/config/constants/colors.dart
View file
Open in desktop
Empty file.
42 changes: 15 additions & 27 deletions lib/config/themes/dark.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
import 'package:flutter/material.dart';

ThemeData darkMode = ThemeData(
brightness: Brightness.dark,
colorScheme: ColorScheme.dark(
background: Colors.black,
primary: Colors.cyan.shade500,
secondary: Colors.cyan.shade800,
),

appBarTheme: AppBarTheme(
centerTitle: true,
backgroundColor: Colors.transparent,
elevation: 0),
bottomNavigationBarTheme: BottomNavigationBarThemeData(
unselectedItemColor: Colors.grey.shade400.withOpacity(0.8),
selectedItemColor: Colors.cyan.shade200,
selectedLabelStyle: TextStyle(fontWeight: FontWeight.bold, fontSize: 10),
selectedIconTheme: IconThemeData(size: 25),
unselectedIconTheme: IconThemeData(size: 20),
backgroundColor: Colors.cyan.shade500),
scaffoldBackgroundColor: Colors.grey.shade900,
cardTheme: CardTheme(color: Colors.black12),
shadowColor: Colors.black,
drawerTheme: DrawerThemeData(backgroundColor: Colors.black87),
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade500.withOpacity(0.9),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
),

primaryColor: Colors.green,
brightness: Brightness.dark,
colorScheme: ColorScheme.dark(
background: Colors.black,
primary: Colors.green.shade500,
secondary: Colors.green.shade800,
),
scaffoldBackgroundColor: Colors.grey.shade900,
cardTheme: CardTheme(color: Colors.black12),
shadowColor: Colors.black,
drawerTheme: DrawerThemeData(backgroundColor: Colors.black87),
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade500.withOpacity(0.9),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
),
);
33 changes: 6 additions & 27 deletions lib/config/themes/light.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,20 @@
import 'package:flutter/material.dart';

ThemeData lightMode = ThemeData(
primaryColor: Colors.cyan,
cardTheme: CardTheme(color: Colors.white, elevation: 1),
primaryColor: Colors.green,
cardTheme: CardTheme(color: Colors.grey.shade200, elevation: 1),
drawerTheme: DrawerThemeData(
backgroundColor: Colors.cyan.shade50,
backgroundColor: Colors.green.shade50,
),
scaffoldBackgroundColor: Colors.white,
brightness: Brightness.light,
colorScheme: ColorScheme.light(
background: Colors.grey.shade400,
primary: Colors.cyan,
secondary: Colors.cyan.shade50,
),
appBarTheme: AppBarTheme(
centerTitle: true,
backgroundColor: Colors.transparent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(50),
),
),
elevation: 0),
bottomNavigationBarTheme: BottomNavigationBarThemeData(
unselectedItemColor: Colors.black38,
selectedItemColor: Colors.cyan,
selectedLabelStyle: TextStyle(fontWeight: FontWeight.bold, fontSize: 10),
selectedIconTheme: IconThemeData(size: 25),
unselectedIconTheme: IconThemeData(size: 20),
elevation: 0,
mouseCursor: MaterialStateMouseCursor.textable,
enableFeedback: false,
type: BottomNavigationBarType.fixed,
backgroundColor: Colors.transparent,
primary: Colors.green,
secondary: Colors.green.shade50,
),
dialogTheme: DialogTheme(
backgroundColor: Colors.cyan.shade50.withOpacity(0.95),
backgroundColor: Colors.green.shade50.withOpacity(0.95),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
),
shadowColor: Colors.grey.shade200,
Expand Down
5 changes: 5 additions & 0 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void main() async {
FirebaseFirestore.instance.settings = Settings(
persistenceEnabled: true,
);


runApp(
MultiProvider(
Expand Down Expand Up @@ -58,6 +59,10 @@ class _OrganiserAppState extends State<OrganiserApp> {
themeProvider.themeData.brightness == Brightness.dark
? Brightness.light
: Brightness.dark,
statusBarBrightness: themeProvider.themeData.brightness == Brightness.dark
? Brightness.light
: Brightness.dark,
systemStatusBarContrastEnforced: false,
));
return MaterialApp(
theme: themeProvider.themeData,
Expand Down
159 changes: 82 additions & 77 deletions lib/views/pages/auth/account.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:Organiser/models/user.dart';
import 'package:Organiser/views/services/user_provider.dart';
import 'package:Organiser/views/widgets/common/back_button.dart';
import 'package:Organiser/views/widgets/common/custom_appbar.dart';
import 'package:Organiser/views/widgets/styled/account_page/user_actions.dart';
import 'package:Organiser/views/widgets/styled/account_page/user_details.dart';
import 'package:Organiser/views/widgets/styled/account_page/user_profile.dart';
Expand All @@ -10,93 +10,98 @@ import 'package:provider/provider.dart';
class AccountPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
extendBodyBehindAppBar: true,
appBar: AppBar(
leading: CustomBackButton(),
actions: [
IconButton(
icon: Icon(Icons.settings),
onPressed: () {},
),
],
),
body: Consumer<UserProvider>(
builder: (context, userProvider, _) {
final UserModel? user = userProvider.user;
if (user != null) {
return SingleChildScrollView(
return Consumer<UserProvider>(
builder: (context, userProvider, _) {
final UserModel? user = userProvider.user;
if (user != null) {
return Scaffold(
extendBodyBehindAppBar: true,
appBar: CustomAppBar(
title: Text(
'${user.fname ?? ""}'" "
'${user.lname ?? ""}',
),
actions: [
IconButton(
icon: Icon(Icons.settings),
onPressed: () {},
),
],
),
body: SingleChildScrollView(
child: Center(
child: Container(
margin: EdgeInsets.only(
top: MediaQuery.of(context).size.height * 0.08),
constraints: BoxConstraints(
maxWidth: 500,
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
UserProfileWidget(
fname: user.fname ?? "",
lname: user.lname ?? "",
image: user.profilePhotoUrl ?? "",
joinDate: user.createdAt ?? DateTime.now(),
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.05),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Personal Information',
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.start,
),
//edit button
IconButton(
padding: EdgeInsets.zero,
icon: Icon(Icons.edit),
onPressed: () {},
),
],
child: SafeArea(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
SizedBox(
height: 20,
),
UserProfileWidget(
image: user.profilePhotoUrl ?? "",
joinDate: user.createdAt ?? DateTime.now(),
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.02),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Personal Information',
style:
Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.start,
),
//edit button
IconButton(
padding: EdgeInsets.zero,
icon: Icon(Icons.edit),
onPressed: () {},
),
],
),
),
UserDetailsWidget(
email: user.email,
dob: user.dob ?? DateTime.now(),
username: user.username,
gender: user.gender ?? "",
),
),
UserDetailsWidget(
email: user.email,
dob: user.dob?.toIso8601String() ?? "",
username: user.username,
gender: user.gender ?? "",
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.02
SizedBox(
height: MediaQuery.of(context).size.height * 0.02),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Utilities',
style:
Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.start,
),
],
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Utilities',
style: Theme.of(context).textTheme.headlineSmall,
textAlign: TextAlign.start,
),
],
),
),
UserActionsWidget(),
],
UserActionsWidget(),
],
),
),
),
),
);
} else {
return CircularProgressIndicator();
}
},
),
),
);
} else {
return Center(child: CircularProgressIndicator());
}
},
);
}
}
8 changes: 3 additions & 5 deletions lib/views/pages/auth/add_user_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:io';
import 'package:Organiser/controllers/file_controller.dart';
import 'package:Organiser/models/user.dart';
import 'package:Organiser/views/pages/home/home_page.dart';
import 'package:Organiser/views/pages/landing_page.dart';
import 'package:Organiser/views/services/user_provider.dart';
import 'package:Organiser/views/widgets/common/auth/auth_buttons.dart';
import 'package:Organiser/views/widgets/common/auth/decorate.dart';
Expand Down Expand Up @@ -68,16 +68,14 @@ class _AddAccountInfoState extends State<AddAccountInfo> {
);

// Use UserProvider to create the user
userProvider.createUser(user);
await userProvider.createUser(user);

CustomSnackbar.show(context, 'success', 'Account created successfully.');

// Navigate to the next screen
Navigator.pop(context);

// Navigate to the next screen
Navigator.pushReplacement(
context, MaterialPageRoute(builder: (context) => HomePage()));
context, MaterialPageRoute(builder: (context) => LandingPage()));
}
}

Expand Down
5 changes: 1 addition & 4 deletions lib/views/pages/auth/forgot_pwd.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
},
(user) {
if (user != null) {
// Navigator.pushReplacement(
// context,
// MaterialPageRoute(builder: (context) => AddAccountInfo(user: user)),
// );
Navigator.pop(context);
}
},
);
Expand Down
15 changes: 10 additions & 5 deletions lib/views/pages/auth/signin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:Organiser/controllers/auth/signin_controller.dart';
import 'package:Organiser/views/pages/auth/forgot_pwd.dart';
import 'package:Organiser/views/pages/home/home_page.dart';
import 'package:Organiser/views/pages/landing_page.dart';
import 'package:Organiser/views/services/user_provider.dart';
import 'package:Organiser/views/widgets/common/auth/decorate.dart';
import 'package:Organiser/views/widgets/common/auth/social_signin.dart';
import 'package:flutter/material.dart';
Expand All @@ -23,12 +24,14 @@ class _SignInScreenState extends State<SignInScreen> {

SignInController _signInController = SignInController();

UserProvider userProvider = UserProvider();

String? _errorText;
@override
void initState() {
super.initState();

// Add listeners to the text controllers
// Add listeners to the text controllers
_emailController.addListener(() {
setState(() {
_errorText = null;
Expand All @@ -42,7 +45,7 @@ class _SignInScreenState extends State<SignInScreen> {
});
}

// Method to submit the form
// Method to submit the form
void _submitForm() async {
if (_formKey.currentState!.validate()) {
final result = await _signInController.signIn(
Expand All @@ -56,18 +59,20 @@ class _SignInScreenState extends State<SignInScreen> {
_errorText = errorMessage;
});
},
(signedIn) {
(signedIn) async {
if (signedIn == true) {
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) => HomePage()),
MaterialPageRoute(builder: (context) => LandingPage()),
);
}
},
);
}
}



@override
void dispose() {
_emailController.dispose();
Expand Down
Loading