Merge branch 'exercise-bug' into 'master'

Refactor ExerciseProvider and update LevelCard and DownResultWidget UI

See merge request profile-image/kedaireka/polinema-adapative-learning/mobile-adaptive-learning!10

lib/features/learning/modules/exercises/providers/exercise_provider.dart

@@ -253,10 +253,16 @@ class ExerciseProvider extends ChangeNotifier {
     return _answers[index].isNotEmpty;
   }
 
+  void _resetReviewState() {
+    _reviewData = null;
+    _reviewExercises = [];
+  }
+
   // API methods
   Future<void> fetchExercises(String levelId) async {
     _isLoading = true;
     _currentExerciseIndex = 0;
+    _resetReviewState();
     notifyListeners();
 
     try {
@@ -460,17 +466,31 @@ class ExerciseProvider extends ChangeNotifier {
 
   void updateFrom(ExerciseProvider? previous) {
     if (previous != null) {
-      _exercises = previous._exercises;
+      // Only copy non-review related state
-      _matchingAnswers = previous._matchingAnswers;
+      if (!previous._reviewExercises.isNotEmpty) {
-      _answers = previous._answers;
+        // If we're not coming from a review state
-      _leftColors = previous._leftColors;
+        _exercises = previous._exercises;
-      _rightColors = previous._rightColors;
+        _matchingAnswers = previous._matchingAnswers;
-      _currentExerciseIndex = previous._currentExerciseIndex;
+        _answers = previous._answers;
-      _isLoading = previous._isLoading;
+        _leftColors = previous._leftColors;
-      _nameTopic = previous._nameTopic;
+        _rightColors = previous._rightColors;
-      _nameLevel = previous._nameLevel;
+        _currentExerciseIndex = previous._currentExerciseIndex;
-      _studentLearningId = previous._studentLearningId;
+        _nameTopic = previous._nameTopic;
-      _reviewData = previous._reviewData;
+        _nameLevel = previous._nameLevel;
+        _studentLearningId = previous._studentLearningId;
+      } else {
+        // If we are coming from a review state, reset everything
+        _exercises = [];
+        _matchingAnswers = {};
+        _answers = [];
+        _leftColors = [];
+        _rightColors = [];
+        _currentExerciseIndex = 0;
+        _nameTopic = '';
+        _nameLevel = '';
+        _studentLearningId = previous._studentLearningId;
+      }
+      _isLoading = false;
     }
   }
 }

lib/features/learning/modules/level/widgets/level_card.dart

@@ -42,7 +42,7 @@ class LevelCard extends StatelessWidget {
         ),
         child: Stack(
           children: [
-            if (isCompleted)
+            if (isAllowed && score > 0)
               Positioned(
                 right: -23,
                 bottom: 4,
@@ -122,18 +122,14 @@ class LevelCard extends StatelessWidget {
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 8.0),
                       child: CustomButton(
-                        text: isCompleted
+                        text: isAllowed ? 'Learn Now' : 'Locked',
-                            ? 'Finished'
-                            : (isAllowed ? 'Learn Now' : 'Locked'),
                         textStyle:
                             isAllowed ? null : AppTextStyles.disableTextStyle,
                         width: double.infinity,
                         height: 36,
-                        color: isCompleted
+                        color: isAllowed
-                            ? Colors.green
+                            ? AppColors.yellowButtonColor
-                            : (isAllowed
+                            : AppColors.cardButtonColor,
-                                ? AppColors.yellowButtonColor
-                                : AppColors.cardButtonColor),
                         onPressed: isAllowed
                             ? () {
                                 Navigator.push(

lib/features/learning/modules/result/widgets/down_result_widget.dart

@@ -58,7 +58,7 @@ class DownResultWidget extends StatelessWidget {
         ),
         const SizedBox(height: 8),
         Text(
-          'Level $nextLevel',
+          '$nextLevel',
           style: AppTextStyles.redTextStyle
               .copyWith(fontSize: 20, fontWeight: FontWeight.w900),
         ),