made ui compliant with

TSEC-MAD-Club · Aug 23, 2023 · 59401a3 · 59401a3
1 parent e9e2f70
commit 59401a3
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 173 deletions.
diff --git a/lib/screens/main_screen/widget/card_display.dart b/lib/screens/main_screen/widget/card_display.dart
@@ -71,7 +71,7 @@ class _CardDisplayState extends ConsumerState<CardDisplay> {
             return const SliverToBoxAdapter(
               child: Center(
                 child: Text(
-                  "Unable to fetch timetable. Please check if you have entered your details properly.",
+                  "Unable to fetch timetable. Please check if you have entered your details correctly in the profile section.",
                   textAlign: TextAlign.center,
                 ),
               ),

diff --git a/lib/screens/profile_screen/profile_screen.dart b/lib/screens/profile_screen/profile_screen.dart
diff --git a/...screen/widgets/customTextWithDivider.dart → ...een/widgets/custom_text_with_divider.dart b/...screen/widgets/customTextWithDivider.dart → ...een/widgets/custom_text_with_divider.dart
@@ -40,7 +40,7 @@ class _CustomTextWithDividerState extends State<CustomTextWithDivider> {
           if (widget.showDivider) // Conditionally display the Divider
             Divider(
               thickness: 1,
-              color: Color(0xFF454545),
+              color: Theme.of(context).colorScheme.outline,
             ),
           // Divider(
           //   thickness: 1,

diff --git a/lib/screens/profile_screen/widgets/profile_text_field.dart b/lib/screens/profile_screen/widgets/profile_text_field.dart
@@ -54,9 +54,12 @@ class _ProfileTextFieldState extends State<ProfileTextField> {
             decoration: InputDecoration(
               enabledBorder: UnderlineInputBorder(
                 borderSide: BorderSide(
-                  color: Color(0xFF454545),
+                  color: Theme.of(context).colorScheme.outline,
                 ), // Change to your desired color
               ),
+              disabledBorder: UnderlineInputBorder(
+                  borderSide: BorderSide(
+                      color: Theme.of(context).colorScheme.inversePrimary)),
               labelStyle: const TextStyle(
                 color: Colors.grey,
               ),

diff --git a/lib/services/auth_service.dart b/lib/services/auth_service.dart
@@ -21,7 +21,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:tsec_app/models/student_model/student_model.dart';
 import 'package:tsec_app/provider/auth_provider.dart';
-import 'package:tsec_app/screens/profile_screen/widgets/customTextWithDivider.dart';
+import 'package:tsec_app/screens/profile_screen/widgets/custom_text_with_divider.dart';
 import 'package:tsec_app/screens/profile_screen/widgets/profile_screen_appbar.dart';
 import 'package:tsec_app/screens/profile_screen/widgets/profile_text_field.dart';
 import 'package:tsec_app/widgets/custom_scaffold.dart';

diff --git a/lib/services/timetable_service.dart b/lib/services/timetable_service.dart
@@ -32,7 +32,7 @@ class TimeTableService {
   Stream<Map<String, dynamic>?> getweekTimetable(String? data) {
     final d = data ?? NotificationType.yearBranchDivTopic;
     return _firestore
-        .collection('TimeTable')
+        .collection('TimeTable 2023')
         .doc(d)
         .snapshots()
         .map((doc) => doc.data());

diff --git a/lib/utils/themes.dart b/lib/utils/themes.dart
@@ -74,7 +74,15 @@ late final theme = ThemeData(
     displayColor: kBlack,
   ),
   fontFamily: "SF Pro Text",
-  colorScheme: ColorScheme.fromSwatch().copyWith(secondary: Colors.white),
+  colorScheme: ColorScheme.fromSwatch().copyWith(
+    secondary: Colors.white,
+    onPrimary: Color.fromARGB(255, 78, 73, 73),
+    inversePrimary: Color.fromARGB(255, 241, 241, 241),
+    primaryContainer: Colors.white,
+    secondaryContainer: Color(0xff00C62C),
+    onSecondaryContainer: Colors.black,
+    outline: Color(0xFFE0E0E0),
+  ),
 );
 
 late final darkTheme = ThemeData(
@@ -84,6 +92,7 @@ late final darkTheme = ThemeData(
   primaryColorDark: const Color(0xFF000000),
   shadowColor: const Color(0x00A9A9A9),
   cardColor: Colors.white70,
+  // textSecondaryColor: Color.fromARGB(255, 65, 60, 60),
   elevatedButtonTheme: _getElevatedButtonTheme(
     darkColor: kDarkModeDarkBlue,
     lightColor: kDarkModeLightBlue,
@@ -97,7 +106,15 @@ late final darkTheme = ThemeData(
     displayColor: kWhite,
   ),
   fontFamily: "SF Pro Text",
-  colorScheme: ColorScheme.fromSwatch().copyWith(secondary: kLightBlack),
+  colorScheme: ColorScheme.fromSwatch().copyWith(
+    secondary: kLightBlack,
+    onPrimary: Color.fromARGB(255, 171, 171, 171),
+    primaryContainer: Color(0xFF323232),
+    secondaryContainer: Color(0xff00C62C),
+    onSecondaryContainer: Colors.white,
+    outline: Color(0xFF454545),
+    inversePrimary: Color.fromARGB(255, 63, 63, 63),
+  ),
 );
 
 const _textTheme = TextTheme(