Skip to content

Darkmode (conflicts resolved) #86

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Darkmode (conflicts resolved) #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5da455c
dark mode feature
vamzx May 14, 2024
ec7d860
dark mode feature
vamzx May 14, 2024
6d71531
dark mode feature
vamzx May 18, 2024
d31bbe5
Merge branch 'main' into darkmode
vamzx May 18, 2024
1636183
Merge branch 'main' into darkmode
vamzx May 19, 2024
eeadf3a
Merge branch 'main' into darkmode
vamzx May 25, 2024
187484c
Merge branch 'main' into darkmode
vamzx Aug 10, 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
9 changes: 8 additions & 1 deletion app/.flutter-plugins-dependencies
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 19 additions & 7 deletions app/lib/common_widget/custom_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import 'package:flutter/material.dart';
Widget CustomButton(
String title,
IconData icon,
VoidCallback onTap,
double screenWidth,
BuildContext context,
) {
final ThemeData theme = Theme.of(context);
final Color primaryColor = theme.colorScheme.primary;
final Color secondaryColor = theme.colorScheme.secondary;

Widget CustomButton(String title, IconData icon, VoidCallback onTap,
double screenWidth, BuildContext context) {
return Padding(
padding: const EdgeInsets.only(top: 10, left: 30, right: 30, bottom: 10),
child: GestureDetector(
Expand All @@ -12,24 +20,28 @@ Widget CustomButton(String title, IconData icon, VoidCallback onTap,
width: screenWidth * 0.90 - 30,
height: 50,
decoration: BoxDecoration(
color: const Color.fromARGB(255, 129, 129, 129).withOpacity(0.1),
color: theme.colorScheme.background,
borderRadius: BorderRadius.circular(30),
gradient: const LinearGradient(
colors: [Colors.blue, Colors.red, Colors.green],
gradient: LinearGradient(
colors: [
primaryColor,
primaryColor.withOpacity(0.8), // Adjust opacity for gradient
primaryColor.withOpacity(0.6), // Adjust opacity for gradient
],
),
),
child: Row(
children: [
const SizedBox(width: 50),
Icon(icon, color: Theme.of(context).colorScheme.secondary),
Icon(icon, color: secondaryColor),
const SizedBox(width: 30),
Expanded(
child: Text(
title,
softWrap: false,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
color: secondaryColor,
fontSize: 20,
),
),
Expand Down
33 changes: 18 additions & 15 deletions app/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:examtime/screens/auth_screen/signin.dart';
import 'package:examtime/screens/auth_screen/signup.dart';
import 'package:examtime/screens/discussion/discussion.dart';
import 'package:examtime/screens/landing_screen/dashboard.dart';
import 'package:examtime/screens/liked_notes/liked.dart';
import 'package:examtime/screens/profile/profile.dart';
import 'package:examtime/screens/request_notes/request.dart';
import 'package:examtime/services/SharedServices/Preferences.dart';
import 'package:examtime/services/SharedServices/Sharedservices.dart';
import 'package:examtime/screens/request_notes/request.dart';
import 'package:examtime/services/notification_service.dart';
import 'package:examtime/theme/theme_provider.dart';
import 'package:flutter/material.dart';
import 'package:examtime/screens/landing_screen/dashboard.dart';
import 'package:examtime/screens/liked_notes/liked.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:examtime/screens/auth_screen/signin.dart';
import 'package:examtime/screens/auth_screen/signup.dart';
import 'package:examtime/screens/profile/profile.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:provider/provider.dart';
import 'package:examtime/screens/request_notes/request.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:examtime/screens/auth_screen/otp.dart';
import 'helpers/ThemeProvider.dart';
Expand All @@ -24,10 +26,11 @@ void main() async {
await LocalNotificationService().init();
preferences = await SharedPreferences.getInstance();
runApp(
ChangeNotifierProvider(create: (context)=>ThemeProvider(),
child: const MyApp()
)
);

ChangeNotifierProvider(create: (context) => ThemeProvider(),
child: const MyApp(),
)
);
}

Future<void> backgroundHandler() async {
Expand Down Expand Up @@ -116,9 +119,9 @@ class MyApp extends StatelessWidget {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: 'ExamTime',
theme: lightTheme,
darkTheme: darkTheme,
themeMode: themeProvider.themeMode,
//themeMode: ThemeMode.system,
theme: Provider.of<ThemeProvider>(context).themeData,

initialRoute: '/',
routes: {
'/': (context) => const LoadingScreen(),
Expand Down Expand Up @@ -186,7 +189,7 @@ class _LoadingScreenState extends State<LoadingScreen>
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: _backgroundColorAnimation.value ?? Colors.white,
backgroundColor: Theme.of(context).colorScheme.background,
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
Expand Down
Loading