Merge pull request #53 from Nesvier-Tech/dev-led

design: changed to maroon
Nesvier-Tech · May 8, 2024 · 55fe8bd · 55fe8bd
2 parents 7968954 + ecac4a3
commit 55fe8bd
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 79 deletions.
diff --git a/lib/constants/colors/app_colors.dart b/lib/constants/colors/app_colors.dart
@@ -11,7 +11,7 @@ class AppColors {
   static const Color primaryColor = maroon;
 
   // Digital identity colors of UP.
-  static const maroon = Color(0xff76090c);
+  static const maroon = Color(0xff800000);
   static const green = Color(0xff0a4424);
   static const yellow = Color(0xfff5ab29);
   static const brownOlive = Color(0xff7c6028);

diff --git a/lib/features/profile/presentation/screens/profile_screen.dart b/lib/features/profile/presentation/screens/profile_screen.dart
@@ -28,7 +28,7 @@ class ProfileScreen extends StatelessWidget {
           ),
         ),
         centerTitle: true,
-        backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+        backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
         actions: <Widget>[
           // Triple dot menu.
           PopupMenuButton<String>(
@@ -102,7 +102,7 @@ class ProfileScreen extends StatelessWidget {
                     height: 260,
                     width: double.infinity,
                     decoration: const BoxDecoration(
-                      color: Color.fromRGBO(207, 0, 15, 1),
+                      color: Color.fromRGBO(128, 0, 0, 1),
                       //shape: BoxShape.circle,
                     ),
                   ),
@@ -207,7 +207,7 @@ class ProfileScreen extends StatelessWidget {
                                 style: ButtonStyle(
                                   backgroundColor:
                                       MaterialStateProperty.all<Color>(
-                                    const Color.fromRGBO(207, 0, 15, 1),
+                                    const Color.fromRGBO(128, 0, 0, 1),
                                   ),
                                 ),
                                 child: const Text(
@@ -228,7 +228,7 @@ class ProfileScreen extends StatelessWidget {
                                       style: ButtonStyle(
                                         backgroundColor:
                                             MaterialStateProperty.all<Color>(
-                                          const Color.fromRGBO(207, 0, 15, 1),
+                                          const Color.fromRGBO(128, 0, 0, 1),
                                         ),
                                       ),
                                       child: const Text(

diff --git a/lib/features/profile/presentation/screens/view_all_questions_screen.dart b/lib/features/profile/presentation/screens/view_all_questions_screen.dart
@@ -21,12 +21,12 @@ class _ViewAllQuestionsScreenState extends State<ViewAllQuestionsScreen> {
           'All Questions',
           style: TextStyle(
             fontWeight: FontWeight.bold,
-            color: Color.fromRGBO(207, 0, 15, 1),
+            color: Color.fromRGBO(128, 0, 0, 1),
           ),
         ),
         leading: IconButton(
-          icon: const Icon(Icons.arrow_back,
-              color: Color.fromRGBO(207, 0, 15, 1)),
+          icon:
+              const Icon(Icons.arrow_back, color: Color.fromRGBO(128, 0, 0, 1)),
           onPressed: () {
             Navigator.of(buildContext).pop();
           },
@@ -93,7 +93,7 @@ class AllQuestionsSubjectDisplay extends StatelessWidget {
             style: const TextStyle(
               fontWeight: FontWeight.bold,
               fontSize: 20,
-              color: Color.fromRGBO(207, 0, 15, 1),
+              color: Color.fromRGBO(128, 0, 0, 1),
             ),
           ),
         ),
@@ -102,7 +102,7 @@ class AllQuestionsSubjectDisplay extends StatelessWidget {
             decoration: BoxDecoration(
               border: Border.all(
                 color: const Color.fromRGBO(
-                    207, 0, 15, 1), // Set your desired color here
+                    128, 0, 0, 1), // Set your desired color here
                 width: 2.0, // Set your desired width here
               ),
             ),

diff --git a/lib/features/profile/presentation/screens/view_questions_screen.dart b/lib/features/profile/presentation/screens/view_questions_screen.dart
@@ -21,12 +21,12 @@ class _ViewQuestionsScreenState extends State<ViewQuestionsScreen> {
           'My Questions',
           style: TextStyle(
             fontWeight: FontWeight.bold,
-            color: Color.fromRGBO(207, 0, 15, 1),
+            color: Color.fromRGBO(128, 0, 0, 1),
           ),
         ),
         leading: IconButton(
-          icon: const Icon(Icons.arrow_back,
-              color: Color.fromRGBO(207, 0, 15, 1)),
+          icon:
+              const Icon(Icons.arrow_back, color: Color.fromRGBO(128, 0, 0, 1)),
           onPressed: () {
             Navigator.of(buildContext).pop();
           },
@@ -51,7 +51,7 @@ class _ViewQuestionsScreenState extends State<ViewQuestionsScreen> {
                     'No questions yet',
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
-                      color: Color.fromRGBO(207, 0, 15, 1),
+                      color: Color.fromRGBO(128, 0, 0, 1),
                     ),
                   ),
                 );

diff --git a/lib/features/quiz_mode/presentation/pages/finished_quiz_page.dart b/lib/features/quiz_mode/presentation/pages/finished_quiz_page.dart
@@ -22,10 +22,10 @@ class FinishedQuizPage extends StatelessWidget {
         ((score / subjectQuestionsMap[subject]!.length) * 100).round();
 
     return Scaffold(
-      backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+      backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
       appBar: AppBar(
           automaticallyImplyLeading: false,
-          backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+          backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
           title: Center(
             child: Text('Quiz Results',
                 style: TextStyle(
@@ -55,7 +55,7 @@ class FinishedQuizPage extends StatelessWidget {
                         ),
                       ),
                       backgroundColor: MaterialStateProperty.all(
-                        const Color.fromRGBO(207, 0, 15, 1),
+                        const Color.fromRGBO(128, 0, 0, 1),
                       ),
                     ),
                     child: Text(
@@ -90,7 +90,7 @@ class FinishedQuizPage extends StatelessWidget {
                         ),
                       ),
                       backgroundColor: MaterialStateProperty.all(
-                        const Color.fromRGBO(207, 0, 15, 1),
+                        const Color.fromRGBO(128, 0, 0, 1),
                       ),
                     ),
                     child: Text(

diff --git a/lib/features/quiz_mode/presentation/pages/quiz_page.dart b/lib/features/quiz_mode/presentation/pages/quiz_page.dart
@@ -36,14 +36,14 @@ class _QuizPageState extends State<QuizPage> {
       child: Builder(
         builder: (builderContext) {
           return Scaffold(
-            backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+            backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
             appBar: AppBar(
               title: Text('${Question.SUBJ2string(subject)} Quiz',
                   style: TextStyle(
                     fontWeight: FontWeight.bold,
                     color: Colors.white,
                   )),
-              backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+              backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
               leading: IconButton(
                 icon: Icon(Icons.arrow_back, color: Colors.white),
                 onPressed: () {
@@ -104,7 +104,7 @@ class _QuizPageState extends State<QuizPage> {
                                     style: TextStyle(
                                         fontWeight: FontWeight.bold,
                                         color: const Color.fromRGBO(
-                                            207, 0, 15, 1))),
+                                            128, 0, 0, 1))),
                               ),
                             ),
                             Container(height: 20),

diff --git a/lib/features/quiz_mode/presentation/pages/solutions_quiz_page.dart b/lib/features/quiz_mode/presentation/pages/solutions_quiz_page.dart
@@ -26,9 +26,9 @@ class _SolutionsQuizPageState extends State<SolutionsQuizPage> {
         extraMap['subjectQuestionsMap'] as Map<SUBJ, List<QuizCardCubit>>;
 
     return Scaffold(
-      backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+      backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
       appBar: AppBar(
-        backgroundColor: const Color.fromRGBO(207, 0, 15, 1),
+        backgroundColor: const Color.fromRGBO(128, 0, 0, 1),
         automaticallyImplyLeading: false,
         leading: IconButton(
           icon: Icon(

diff --git a/...e/presentation/widgets/finished_quiz_page_widgets/confirm_back_to_quiz_page_dialogue.dart b/...e/presentation/widgets/finished_quiz_page_widgets/confirm_back_to_quiz_page_dialogue.dart
@@ -18,7 +18,7 @@ class ConfirmBackToQuizPageDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 "Take Again",
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();
@@ -28,7 +28,7 @@ class ConfirmBackToQuizPageDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Continue Reviewing',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();

diff --git a/...atures/quiz_mode/presentation/widgets/quiz_page_widgets/confirm_cancel_quiz_dialogue.dart b/...atures/quiz_mode/presentation/widgets/quiz_page_widgets/confirm_cancel_quiz_dialogue.dart
@@ -17,7 +17,7 @@ class ConfirmCancelQuizDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Go Back',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();
@@ -27,7 +27,7 @@ class ConfirmCancelQuizDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Continue Quiz',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();

diff --git a/...atures/quiz_mode/presentation/widgets/quiz_page_widgets/confirm_submit_quiz_dialogue.dart b/...atures/quiz_mode/presentation/widgets/quiz_page_widgets/confirm_submit_quiz_dialogue.dart
@@ -22,7 +22,7 @@ class ConfirmSubmitQuizDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Go Back',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();
@@ -31,7 +31,7 @@ class ConfirmSubmitQuizDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Submit Quiz',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 final SUBJ subject = quizBloc.subject;

diff --git a/...tures/quiz_mode/presentation/widgets/quiz_page_widgets/confirm_timeout_quiz_dialogue.dart b/...tures/quiz_mode/presentation/widgets/quiz_page_widgets/confirm_timeout_quiz_dialogue.dart
@@ -21,7 +21,7 @@ class ConfirmTimeoutQuizDialogue extends StatelessWidget {
             child: Text(
               'Submit Quiz',
               style: TextStyle(
-                color: Color.fromRGBO(207, 0, 15, 1),
+                color: Color.fromRGBO(128, 0, 0, 1),
               ),
             ),
           ),

diff --git a/lib/features/quiz_mode/presentation/widgets/quiz_page_widgets/timer_display.dart b/lib/features/quiz_mode/presentation/widgets/quiz_page_widgets/timer_display.dart
@@ -40,17 +40,17 @@ class _CountdownTimerState extends State<CountdownTimer> {
       controller: CountDownController(),
       width: MediaQuery.of(context).size.width / 6,
       height: MediaQuery.of(context).size.height / 6,
-      ringColor: Color.fromRGBO(207, 0, 15, 1).withOpacity(0.0),
+      ringColor: Color.fromRGBO(128, 0, 0, 1).withOpacity(0.0),
       ringGradient: null,
-      fillColor: Color.fromRGBO(207, 0, 15, 1).withOpacity(0.5),
+      fillColor: Color.fromRGBO(128, 0, 0, 1).withOpacity(0.5),
       fillGradient: null,
       backgroundColor: Colors.white.withOpacity(0.3),
       backgroundGradient: null,
       strokeWidth: 5.0,
       strokeCap: StrokeCap.round,
       textStyle: TextStyle(
           fontSize: 20.0,
-          color: Color.fromRGBO(207, 0, 15, 1).withOpacity(0.7),
+          color: Color.fromRGBO(128, 0, 0, 1).withOpacity(0.7),
           fontWeight: FontWeight.bold),
       textFormat: CountdownTextFormat.S,
       isReverse: true,

diff --git a/lib/features/quiz_mode/presentation/widgets/quiz_widgets/question_card_choices_display.dart b/lib/features/quiz_mode/presentation/widgets/quiz_widgets/question_card_choices_display.dart
@@ -102,10 +102,10 @@ class ChoiceButton extends StatelessWidget {
       color = isCorrectAnswer
           ? Colors.green
           : isChosen
-              ? Color.fromRGBO(207, 0, 15, 1)
+              ? Color.fromRGBO(128, 0, 0, 1)
               : Colors.white;
     } else if (isChosen) {
-      color = Color.fromRGBO(207, 0, 15, 1);
+      color = Color.fromRGBO(128, 0, 0, 1);
     }
 
     return Container(
@@ -119,15 +119,15 @@ class ChoiceButton extends StatelessWidget {
           backgroundColor: MaterialStateProperty.all(isRevealed
               ? color
               : isChosen
-                  ? const Color.fromRGBO(207, 0, 15, 1)
+                  ? const Color.fromRGBO(128, 0, 0, 1)
                   : Colors.white),
           shape: MaterialStateProperty.all<RoundedRectangleBorder>(
             RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(10.0),
               side: BorderSide(
                 color: isRevealed && isCorrectAnswer
                     ? Colors.green
-                    : const Color.fromRGBO(207, 0, 15, 1),
+                    : const Color.fromRGBO(128, 0, 0, 1),
               ),
             ),
           ),
@@ -179,7 +179,7 @@ class TextMarkdown extends StatelessWidget {
           fontSize: 15.0,
           color: isChosen || (isRevealed && isCorrectAnswer)
               ? Colors.white
-              : Color.fromRGBO(207, 0, 15, 1),
+              : Color.fromRGBO(128, 0, 0, 1),
           fontWeight: FontWeight.bold,
         ),
       ),

diff --git a/...atures/quiz_mode/presentation/widgets/ready_quiz_page_widgets/choose_subject_display.dart b/...atures/quiz_mode/presentation/widgets/ready_quiz_page_widgets/choose_subject_display.dart
@@ -81,7 +81,7 @@ Container buildElevatedButton(
               ),
             ),
             backgroundColor: MaterialStateProperty.all(
-              const Color.fromRGBO(207, 0, 15, 1),
+              const Color.fromRGBO(128, 0, 0, 1),
             ),
           ),
           child: Row(

diff --git a/...tures/quiz_mode/presentation/widgets/ready_quiz_page_widgets/subject_chosen_dialogue.dart b/...tures/quiz_mode/presentation/widgets/ready_quiz_page_widgets/subject_chosen_dialogue.dart
@@ -24,7 +24,7 @@ class SubjectChosenDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Go Back',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();
@@ -33,7 +33,7 @@ class SubjectChosenDialogue extends StatelessWidget {
             TextButton(
               child: const Text(
                 'Start',
-                style: TextStyle(color: Color.fromRGBO(207, 0, 15, 1)),
+                style: TextStyle(color: Color.fromRGBO(128, 0, 0, 1)),
               ),
               onPressed: () {
                 Navigator.of(context).pop();

diff --git a/...ures/quiz_mode/presentation/widgets/solution_quiz_page_widgets/solution_card_display.dart b/...ures/quiz_mode/presentation/widgets/solution_quiz_page_widgets/solution_card_display.dart
@@ -42,14 +42,14 @@ class _SolutionCardDisplayState extends State<SolutionCardDisplay> {
                 children: [
                   Icon(
                     Icons.arrow_back_ios_new,
-                    color: const Color.fromRGBO(207, 0, 15, 1),
+                    color: const Color.fromRGBO(128, 0, 0, 1),
                     size: 12,
                   ),
                   Text(
                     "  Swipe",
                     style: TextStyle(
                         fontSize: 11,
-                        color: const Color.fromRGBO(207, 0, 15, 1)),
+                        color: const Color.fromRGBO(128, 0, 0, 1)),
                   ),
                 ],
               ),
@@ -117,7 +117,7 @@ class _SolutionCardDisplayState extends State<SolutionCardDisplay> {
                       ),
                     ),
                     backgroundColor: MaterialStateProperty.all<Color>(
-                        const Color.fromRGBO(207, 0, 15, 1)),
+                        const Color.fromRGBO(128, 0, 0, 1)),
                   ),
                   child: Text("Comments",
                       style: TextStyle(
@@ -148,7 +148,7 @@ class TextTitle extends StatelessWidget {
           style: TextStyle(
             fontSize: 20.0,
             fontWeight: FontWeight.bold,
-            color: const Color.fromRGBO(207, 0, 15, 1),
+            color: const Color.fromRGBO(128, 0, 0, 1),
           )),
     );
   }

diff --git a/lib/features/quiz_upload/presentation/pages/upload_questions_page.dart b/lib/features/quiz_upload/presentation/pages/upload_questions_page.dart
@@ -29,7 +29,7 @@ class _UploadQuestionPageState extends State<UploadQuestionPage> {
             if (state is QuizInputPageQuestionsAdd) {
               return Scaffold(
                 appBar: AppBar(
-                  backgroundColor: Color.fromRGBO(207, 0, 15, 1),
+                  backgroundColor: Color.fromRGBO(128, 0, 0, 1),
                   title: const Center(
                     child: Text('Upload Questions',
                         style: TextStyle(
@@ -50,8 +50,8 @@ class _UploadQuestionPageState extends State<UploadQuestionPage> {
                               ),
                             ),
                             child: TabBar(
-                              indicatorColor: Color.fromRGBO(207, 0, 15, 1),
-                              labelColor: Color.fromRGBO(207, 0, 15, 1),
+                              indicatorColor: Color.fromRGBO(128, 0, 0, 1),
+                              labelColor: Color.fromRGBO(128, 0, 0, 1),
                               unselectedLabelColor: Colors.white,
                               indicatorSize: TabBarIndicatorSize.tab,
                               indicator: BoxDecoration(
@@ -97,7 +97,7 @@ class _UploadQuestionPageState extends State<UploadQuestionPage> {
                 ),
                 body: Container(
                   decoration: BoxDecoration(
-                    color: Color.fromRGBO(207, 0, 15, 1),
+                    color: Color.fromRGBO(128, 0, 0, 1),
                   ),
                   child: Container(
                     margin: EdgeInsets.only(top: 10.0),

diff --git a/lib/features/quiz_upload/presentation/pages/upload_success_page.dart b/lib/features/quiz_upload/presentation/pages/upload_success_page.dart
@@ -30,7 +30,7 @@ class _UploadSuccessPageState extends State<UploadSuccessPage> {
             ..uploadQuiz(),
       child: Scaffold(
         appBar: AppBar(
-          backgroundColor: Color.fromRGBO(207, 0, 15, 1),
+          backgroundColor: Color.fromRGBO(128, 0, 0, 1),
           automaticallyImplyLeading: false,
           title: const Center(
             child: Text('Upload Questions',