17 changed files with 208 additions and 552 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,3 +1,3 @@
 {
-	"dart.flutterSdkPath": "C:\\tools\\flutter"
-}
+  "dart.flutterSdkPath": ".fvm/versions/3.27.0-0.2.pre"
+}
--- a/README.md
+++ b/README.md
@ -1,97 +1,16 @@
-<p align="center">
-  <img src="assets/logo.png" alt="SEALS Logo" width="200"/>
-</p>
+# english_learning

-# SEALS - Smart English Adaptive Learning System
+A new Flutter project.

-## Overview
+## Getting Started

-SEALS refers to a personalized approach to language education that adjusts to the individual learner's needs, pace, and skill level.
+This project is a starting point for a Flutter application.

-## System Requirements
+A few resources to get you started if this is your first Flutter project:

- Flutter version 3.19.0 or higher
- Dart version 3.3.0 or higher
- Android Studio / VS Code
- Android SDK version 23 (Android 7.0) or higher
- Minimum 2GB RAM
- 500MB free storage space
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)

-## Installation
-
-1. Clone the repository:
-
-```bash
-git clone https://gitlab.com/profile-image/kedaireka/polinema-adapative-learning/mobile-adaptive-learning.git
-```
-
-2. Navigate to project directory:
-
-```bash
-cd mobile-adaptive-learning
-```
-
-3. Install dependencies:
-
-```bash
-flutter pub get
-```
-
-4. Run the application:
-
-```bash
-flutter run
-```
-
-## Dependencies
-
-```yaml
-dependencies:
-  audioplayers: ^6.1.0
-  bootstrap_icons: ^1.11.3
-  cached_network_image: ^3.4.1
-  carousel_slider: ^5.0.0
-  cupertino_icons: ^1.0.8
-  dio: ^5.7.0
-  flick_video_player: ^0.9.0
-  flutter:
-    sdk: flutter
-  flutter_inappwebview: ^6.0.0
-  flutter_secure_storage: ^9.2.2
-  flutter_svg: ^2.0.10+1
-  flutter_widget_from_html: ^0.15.2
-  google_fonts: ^6.2.1
-  google_nav_bar: ^5.0.6
-  html: ^0.15.4
-  image_picker: ^1.1.2
-  intl: ^0.19.0
-  jwt_decoder: ^2.0.1
-  provider: ^6.1.2
-  shared_preferences: ^2.3.2
-  shimmer: ^3.0.0
-  video_player: ^2.9.1
-  youtube_player_flutter: ^9.1.1
-```
-
-### Build Release
-
-#### Android
-
-```bash
-# Generate Android App Bundle
-flutter build appbundle --release
-
-# Generate APK
-flutter build apk --release
-```
-
-## Development Team
-
- Naresh Pratista - Mobile App Developer - [nareshpratista.contact@gmail.com](mailto:nareshpratista.contact@gmail.com)
- Diah Putri Nofianti - UI/UX Designer - [diahputrinofianti@gmail.com](mailto:diahputrinofianti@gmail.com)
- Elang Putra Adam - Backend Developer - [elangptra17@gmail.com](mailto:elangptra17@gmail.com)
-
-## Acknowledgments
-
- [Flutter](https://flutter.dev/) - UI framework
- [Provider](https://pub.dev/packages/provider) - State management
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -1,12 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+<uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
    <application
        android:label="SEALS"
        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
-        android:usesCleartextTraffic="true"> 
+        android:icon="@mipmap/ic_launcher">
        <activity
            android:name=".MainActivity"
            android:exported="true"
--- a/lib/core/services/constants.dart
+++ b/lib/core/services/constants.dart
@ -1,3 +1,3 @@
-const String baseUrl = 'https://api.seals.id/';
+const String baseUrl = 'http://54.173.167.62/';

-const String mediaUrl = 'https://api.seals.id/api/uploads/';
+const String mediaUrl = 'http://54.173.167.62/api/uploads/';
--- a/lib/core/services/dio_client.dart
+++ b/lib/core/services/dio_client.dart
@ -9,7 +9,7 @@ class DioClient {
  DioClient() {
    _dio.options.baseUrl = baseUrl;
    _dio.options.connectTimeout = const Duration(seconds: 10);
-    _dio.options.receiveTimeout = const Duration(seconds: 30);
+    _dio.options.receiveTimeout = const Duration(seconds: 15);
  }

  Future<Response> refreshAccessToken(String refreshToken) async {
--- a/lib/core/widgets/back_handler.dart
+++ b/lib/core/widgets/back_handler.dart
@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-
-mixin BackHandlerMixin<T extends StatefulWidget> on State<T> {
-  DateTime? currentBackPressTime;
-
-  Future<bool> onWillPop() async {
-    DateTime now = DateTime.now();
-
-    if (currentBackPressTime == null ||
-        now.difference(currentBackPressTime!) > const Duration(seconds: 2)) {
-      currentBackPressTime = now;
-
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Press back again to exit'),
-          duration: Duration(seconds: 2),
-          backgroundColor: Colors.black87,
-          behavior: SnackBarBehavior.floating,
-          margin: EdgeInsets.all(16),
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(Radius.circular(8)),
-          ),
-        ),
-      );
-
-      return false;
-    }
-    return true;
-  }
-
-  Widget wrapWithBackHandler({required Widget child}) {
-    return WillPopScope(
-      onWillPop: onWillPop,
-      child: child,
-    );
-  }
-}
--- a/lib/core/widgets/custom_snackbar.dart
+++ b/lib/core/widgets/custom_snackbar.dart
@ -19,7 +19,7 @@ class CustomSnackBar {
        behavior: SnackBarBehavior.floating,
        margin: const EdgeInsets.all(16),
        duration: duration,
-        dismissDirection: DismissDirection.vertical,
+        dismissDirection: DismissDirection.horizontal,
        shape: RoundedRectangleBorder(
          borderRadius: BorderRadius.circular(10),
        ),
@ -46,7 +46,7 @@ class CustomSnackBar {
        behavior: behavior,
        margin: const EdgeInsets.all(16),
        duration: duration,
-        dismissDirection: DismissDirection.vertical,
+        dismissDirection: DismissDirection.horizontal,
        shape: RoundedRectangleBorder(
          borderRadius: BorderRadius.circular(10),
        ),
--- a/lib/features/history/models/history_model.dart
+++ b/lib/features/history/models/history_model.dart
@ -37,11 +37,8 @@ class HistoryModel {
  }

  String get formattedDate {
-    if (studentFinish == null) {
-      return 'N/A';
-    }
-
-    final wibDateTime = studentFinish!.add(const Duration(hours: 7));
-    return '${DateFormat('yyyy-MM-dd HH:mm').format(wibDateTime)} WIB';
+    return studentFinish != null
+        ? DateFormat('yyyy-MM-dd HH:mm').format(studentFinish!)
+        : 'N/A';
  }
 }
--- a/lib/features/history/screens/history_screen.dart
+++ b/lib/features/history/screens/history_screen.dart
@ -62,6 +62,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
    }
  }

+  // Tambahkan method untuk shimmer loading
  Widget _buildShimmerLoading() {
    return ListView.builder(
      itemCount: 5,
@ -129,20 +130,24 @@ class _HistoryScreenState extends State<HistoryScreen> {
  }

  Widget _buildContent(BuildContext context, HistoryProvider historyProvider) {
+    // Prioritaskan initial loading
    if (_isInitialLoading || historyProvider.isLoading) {
      return _buildShimmerLoading();
    }

+    // Tangani error
    if (historyProvider.error != null) {
      return isNotFoundError(historyProvider.error!)
          ? _buildEmptyState(context)
          : _buildErrorState(context, historyProvider.error!);
    }

+    // Tampilkan empty state jika tidak ada history
    if (historyProvider.historyModel.isEmpty) {
      return _buildEmptyState(context);
    }

+    // Tampilkan daftar history dengan refresh indicator
    return RefreshIndicator(
      onRefresh: _refreshHistory,
      child: AnimatedSwitcher(
@ -234,54 +239,46 @@ class _HistoryScreenState extends State<HistoryScreen> {
  }

  Widget _buildEmptyState(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: _refreshHistory,
-      child: ListView(
-        physics: const AlwaysScrollableScrollPhysics(),
-        children: [
-          Container(
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(12),
-              color: AppColors.whiteColor,
-            ),
-            child: Padding(
-              padding: const EdgeInsets.all(16.0),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    'Still New?',
-                    style: AppTextStyles.blackTextStyle.copyWith(
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  Text(
-                    'Begin your journey!',
-                    style: AppTextStyles.disableTextStyle.copyWith(
-                      fontSize: 14,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  const SizedBox(height: 16),
-                  SvgPicture.asset(
-                    'lib/features/history/assets/images/is_empty_illustration.svg',
-                    width: 160,
-                  ),
-                  const SizedBox(height: 32),
-                  GlobalButton(
-                    text: 'Explore',
-                    backgroundColor: AppColors.yellowButtonColor,
-                    textColor: AppColors.blackColor,
-                    onPressed: () {
-                      HomeScreen.navigateToTab(context, 1);
-                    },
-                  ),
-                ],
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(12),
+        color: AppColors.whiteColor,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(
+              'Still New?',
+              style: AppTextStyles.blackTextStyle.copyWith(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
              ),
            ),
-          ),
-        ],
+            Text(
+              'Begin your journey!',
+              style: AppTextStyles.disableTextStyle.copyWith(
+                fontSize: 14,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+            const SizedBox(height: 16),
+            SvgPicture.asset(
+              'lib/features/history/assets/images/is_empty_illustration.svg',
+              width: 160,
+            ),
+            const SizedBox(height: 32),
+            GlobalButton(
+              text: 'Explore',
+              backgroundColor: AppColors.yellowButtonColor,
+              textColor: AppColors.blackColor,
+              onPressed: () {
+                HomeScreen.navigateToTab(context, 1);
+              },
+            ),
+          ],
+        ),
      ),
    );
  }
--- a/lib/features/home/screens/home_screen.dart
+++ b/lib/features/home/screens/home_screen.dart
@ -1,6 +1,5 @@
 import 'package:bootstrap_icons/bootstrap_icons.dart';
 import 'package:carousel_slider/carousel_slider.dart';
-import 'package:english_learning/core/widgets/back_handler.dart';
 import 'package:english_learning/core/widgets/custom_button.dart';
 import 'package:english_learning/features/auth/provider/user_provider.dart';
 import 'package:english_learning/features/history/provider/history_provider.dart';
@ -40,7 +39,7 @@ class HomeScreen extends StatefulWidget {
  }
 }

-class _HomeScreenState extends State<HomeScreen> with BackHandlerMixin {
+class _HomeScreenState extends State<HomeScreen> {
  final PageController _pageController = PageController();
  int _selectedIndex = 0;

@ -60,84 +59,83 @@ class _HomeScreenState extends State<HomeScreen> with BackHandlerMixin {

  @override
  Widget build(BuildContext context) {
-    return wrapWithBackHandler(
-      child: DefaultTabController(
-        length: 4,
-        child: Scaffold(
-          body: Container(
-            color: AppColors.bgSoftColor,
-            child: PageView(
-              physics: const NeverScrollableScrollPhysics(),
-              controller: _pageController,
-              children: _screens,
-              onPageChanged: (index) {
-                setState(() {
-                  _selectedIndex = index;
-                });
-              },
+    return DefaultTabController(
+      length: 4,
+      child: Scaffold(
+        body: Container(
+          color: AppColors.bgSoftColor,
+          child: PageView(
+            physics: const NeverScrollableScrollPhysics(),
+            controller: _pageController,
+            children: _screens,
+            onPageChanged: (index) {
+              setState(() {
+                _selectedIndex = index;
+              });
+            },
+          ),
+        ),
+        bottomNavigationBar: Container(
+          decoration: BoxDecoration(
+            gradient: AppColors.gradientTheme,
+            borderRadius: const BorderRadius.only(
+              topLeft: Radius.circular(20),
+              topRight: Radius.circular(20),
            ),
          ),
-          bottomNavigationBar: Container(
-            decoration: BoxDecoration(
-              gradient: AppColors.gradientTheme,
-              borderRadius: const BorderRadius.only(
-                topLeft: Radius.circular(20),
-                topRight: Radius.circular(20),
-              ),
+          child: Padding(
+            padding: const EdgeInsets.only(
+              top: 20,
+              bottom: 24,
+              left: 16,
+              right: 16,
            ),
-            child: Padding(
-              padding: const EdgeInsets.only(
-                top: 20,
-                bottom: 24,
-                left: 16,
-                right: 16,
-              ),
-              child: GNav(
-                activeColor: AppColors.blueColor,
-                tabBackgroundColor: AppColors.whiteColor,
-                tabBorderRadius: 100,
-                color: AppColors.whiteColor,
-                iconSize: 20,
-                gap: 8,
-                selectedIndex: _selectedIndex,
-                onTabChange: (index) async {
-                  if (index == 2 && _selectedIndex != 2) {
-                    final historyProvider =
-                        Provider.of<HistoryProvider>(context, listen: false);
-                    final userProvider =
-                        Provider.of<UserProvider>(context, listen: false);
+            child: GNav(
+              activeColor: AppColors.blueColor,
+              tabBackgroundColor: AppColors.whiteColor,
+              tabBorderRadius: 100,
+              color: AppColors.whiteColor,
+              iconSize: 20,
+              gap: 8,
+              selectedIndex: _selectedIndex,
+              onTabChange: (index) async {
+                if (index == 2 && _selectedIndex != 2) {
+                  // Only if switching TO history tab
+                  final historyProvider =
+                      Provider.of<HistoryProvider>(context, listen: false);
+                  final userProvider =
+                      Provider.of<UserProvider>(context, listen: false);

-                    if (!historyProvider.isInitialized) {
-                      await historyProvider
-                          .loadInitialData(userProvider.jwtToken!);
-                    }
+                  if (!historyProvider.isInitialized) {
+                    await historyProvider
+                        .loadInitialData(userProvider.jwtToken!);
                  }
+                }

-                  navigateToTab(index);
-                },
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 8,
-                ),
-                tabs: const [
-                  GButton(
-                    icon: BootstrapIcons.house,
-                    text: 'Home',
-                  ),
-                  GButton(
-                    icon: BootstrapIcons.book,
-                    text: 'Learning',
-                  ),
-                  GButton(
-                    icon: BootstrapIcons.clock_history,
-                    text: 'History',
-                  ),
-                  GButton(
-                    icon: BootstrapIcons.gear,
-                    text: 'Settings',
-                  ),
-                ],
+                navigateToTab(index);
+              },
+              padding: const EdgeInsets.symmetric(
+                horizontal: 16,
+                vertical: 8,
              ),
+              tabs: const [
+                GButton(
+                  icon: BootstrapIcons.house,
+                  text: 'Home',
+                ),
+                GButton(
+                  icon: BootstrapIcons.book,
+                  text: 'Learning',
+                ),
+                GButton(
+                  icon: BootstrapIcons.clock_history,
+                  text: 'History',
+                ),
+                GButton(
+                  icon: BootstrapIcons.gear,
+                  text: 'Settings',
+                ),
+              ],
            ),
          ),
        ),
@ -171,8 +169,10 @@ class _HomeContentState extends State<HomeContent> {
        Provider.of<CompletedTopicsProvider>(context, listen: false);

    try {
+      // Reset data sebelum fetch
      completedTopicsProvider.resetData();

+      // Fetch completed topics
      await completedTopicsProvider
          .fetchCompletedTopics(userProvider.jwtToken!);
    } catch (e) {
--- a/lib/features/learning/modules/result/assets/images/result_stay_illustration.svg
+++ b/lib/features/learning/modules/result/assets/images/result_stay_illustration.svg
--- a/lib/features/learning/modules/result/screens/result_screen.dart
+++ b/lib/features/learning/modules/result/screens/result_screen.dart
@ -1,7 +1,6 @@
 import 'package:english_learning/features/learning/modules/result/widgets/complete_result_widget.dart';
 import 'package:english_learning/features/learning/modules/result/widgets/down_result_widget.dart';
 import 'package:english_learning/features/learning/modules/result/widgets/jump_result_widget.dart';
-import 'package:english_learning/features/learning/modules/result/widgets/stay_result_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:english_learning/core/utils/styles/theme.dart';

@ -27,49 +26,8 @@ class ResultScreen extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    Widget buildResultWidget() {
-      if (isCompleted) {
-        return CompleteResultWidget(
-          currentLevel: currentLevel,
-          score: score,
-          stdLearningId: stdLearningId ?? '',
-          topicId: topicId,
-          topicTitle: topicTitle,
-        );
-      }
-
-      if (currentLevel == nextLevel) {
-        return StayResultWidget(
-          nextLevel: nextLevel,
-          score: score,
-          stdLearningId: stdLearningId ?? '',
-          topicId: topicId,
-          topicTitle: topicTitle,
-        );
-      }
-
-      // Menggunakan compareTo untuk membandingkan level
-      final currentLevelNum = _extractLevelNumber(currentLevel);
-      final nextLevelNum = _extractLevelNumber(nextLevel);
-
-      if (currentLevelNum < nextLevelNum) {
-        return JumpResultWidget(
-          nextLevel: nextLevel,
-          score: score,
-          stdLearningId: stdLearningId ?? '',
-          topicId: topicId,
-          topicTitle: topicTitle,
-        );
-      } else {
-        return DownResultWidget(
-          nextLevel: nextLevel,
-          score: score,
-          stdLearningId: stdLearningId ?? '',
-          topicId: topicId,
-          topicTitle: topicTitle,
-        );
-      }
-    }
+    // final mediaQuery = MediaQuery.of(context);
+    // final screenHeight = mediaQuery.size.height;

    return Scaffold(
      backgroundColor: AppColors.bgSoftColor,
@ -78,19 +36,33 @@ class ResultScreen extends StatelessWidget {
        child: Column(
          mainAxisAlignment: MainAxisAlignment.center,
          children: [
-            buildResultWidget(),
+            if (isCompleted)
+              CompleteResultWidget(
+                currentLevel: currentLevel,
+                score: score,
+                stdLearningId: stdLearningId ?? '',
+                topicId: topicId, // Tambahkan ini
+                topicTitle: topicTitle, // Tambahkan ini
+              )
+            else if (nextLevel != currentLevel)
+              JumpResultWidget(
+                nextLevel: nextLevel,
+                score: score,
+                stdLearningId: stdLearningId ?? '',
+                topicId: topicId, // Tambahkan ini
+                topicTitle: topicTitle, // Tambahkan ini
+              )
+            else
+              DownResultWidget(
+                nextLevel: nextLevel,
+                score: score,
+                stdLearningId: stdLearningId ?? '',
+                topicId: topicId, // Tambahkan ini
+                topicTitle: topicTitle, // Tambahkan ini
+              ),
          ],
        ),
      ),
    );
  }
-
-  int _extractLevelNumber(String level) {
-    final regex = RegExp(r'\d+');
-    final match = regex.firstMatch(level);
-    if (match != null) {
-      return int.parse(match.group(0)!);
-    }
-    return 0;
-  }
 }
--- a/lib/features/learning/modules/result/widgets/complete_result_widget.dart
+++ b/lib/features/learning/modules/result/widgets/complete_result_widget.dart
@ -38,16 +38,23 @@ class CompleteResultWidget extends StatelessWidget {
        ),
        const SizedBox(height: 24),
        Text(
-          'You conquered LEVEL $currentLevel with a $score/100! You\'re a rock star!',
-          style: AppTextStyles.tetriaryTextStyle.copyWith(
+          'Congratulations!',
+          style: AppTextStyles.disableTextStyle.copyWith(
+            fontSize: 14,
+            fontWeight: FontWeight.w400,
+          ),
+        ),
+        const SizedBox(height: 12),
+        Text(
+          'Way to go! You conquered LEVEL $currentLevel with a $score/100! You\'re a rock star!',
+          style: AppTextStyles.disableTextStyle.copyWith(
            fontSize: 14,
            fontWeight: FontWeight.w400,
          ),
-          textAlign: TextAlign.center,
        ),
        const SizedBox(height: 24),
        GlobalButton(
-          text: 'Topic Finished!',
+          text: 'Discover More',
          onPressed: () {
            Navigator.pushReplacement(
              context,
--- a/lib/features/learning/modules/result/widgets/down_result_widget.dart
+++ b/lib/features/learning/modules/result/widgets/down_result_widget.dart
@ -55,15 +55,12 @@ class DownResultWidget extends StatelessWidget {
            fontSize: 14,
            fontWeight: FontWeight.w400,
          ),
-          textAlign: TextAlign.center,
        ),
        const SizedBox(height: 8),
        Text(
          '$nextLevel',
-          style: AppTextStyles.redTextStyle.copyWith(
-            fontSize: 20,
-            fontWeight: FontWeight.w900,
-          ),
+          style: AppTextStyles.redTextStyle
+              .copyWith(fontSize: 20, fontWeight: FontWeight.w900),
        ),
        const SizedBox(height: 24),
        GlobalButton(
@ -74,8 +71,8 @@ class DownResultWidget extends StatelessWidget {
              MaterialPageRoute(
                builder: (context) => FeedbackScreen(
                  stdLearningId: stdLearningId,
-                  topicId: topicId,
-                  topicTitle: topicTitle,
+                  topicId: topicId, // Tambahkan ini
+                  topicTitle: topicTitle, // Tambahkan ini
                ),
              ),
            );
--- a/lib/features/learning/modules/result/widgets/jump_result_widget.dart
+++ b/lib/features/learning/modules/result/widgets/jump_result_widget.dart
@ -51,11 +51,10 @@ class JumpResultWidget extends StatelessWidget {
        const SizedBox(height: 24),
        Text(
          'Great job! You can jump to ...',
-          style: AppTextStyles.tetriaryTextStyle.copyWith(
+          style: AppTextStyles.disableTextStyle.copyWith(
            fontSize: 14,
            fontWeight: FontWeight.w400,
          ),
-          textAlign: TextAlign.center,
        ),
        const SizedBox(height: 8),
        Text(
@ -72,8 +71,8 @@ class JumpResultWidget extends StatelessWidget {
              MaterialPageRoute(
                builder: (context) => FeedbackScreen(
                  stdLearningId: stdLearningId,
-                  topicId: topicId,
-                  topicTitle: topicTitle,
+                  topicId: topicId, // Tambahkan ini
+                  topicTitle: topicTitle, // Tambahkan ini
                ),
              ),
            );
--- a/lib/features/learning/modules/result/widgets/stay_result_widget.dart
+++ b/lib/features/learning/modules/result/widgets/stay_result_widget.dart
@ -1,87 +0,0 @@
-import 'package:english_learning/core/utils/styles/theme.dart';
-import 'package:english_learning/core/widgets/global_button.dart';
-import 'package:english_learning/features/learning/modules/feedback/screens/feedback_screen.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-
-class StayResultWidget extends StatelessWidget {
-  final String? nextLevel;
-  final int? score;
-  final String stdLearningId;
-  final String topicId;
-  final String topicTitle;
-
-  const StayResultWidget({
-    super.key,
-    required this.nextLevel,
-    required this.score,
-    required this.stdLearningId,
-    required this.topicId,
-    required this.topicTitle,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Text(
-              'Your Result',
-              style: AppTextStyles.blackTextStyle.copyWith(
-                fontSize: 25,
-                fontWeight: FontWeight.w900,
-              ),
-            ),
-            Text(
-              '$score/100',
-              style: AppTextStyles.blackTextStyle.copyWith(
-                fontSize: 20,
-                fontWeight: FontWeight.w900,
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(height: 24),
-        SvgPicture.asset(
-          'lib/features/learning/modules/result/assets/images/result_stay_illustration.svg',
-          width: 259,
-        ),
-        const SizedBox(height: 24),
-        Text(
-          'Learning is a journey, let\'s explore this level further to deepen your knowledge.',
-          style: AppTextStyles.tetriaryTextStyle.copyWith(
-            fontSize: 14,
-            fontWeight: FontWeight.w400,
-          ),
-          textAlign: TextAlign.center,
-        ),
-        const SizedBox(height: 8),
-        Text(
-          '$nextLevel',
-          style: AppTextStyles.blackTextStyle.copyWith(
-            fontSize: 20,
-            fontWeight: FontWeight.w900,
-          ),
-        ),
-        const SizedBox(height: 24),
-        GlobalButton(
-          text: 'Continue',
-          onPressed: () {
-            Navigator.pushReplacement(
-              context,
-              MaterialPageRoute(
-                builder: (context) => FeedbackScreen(
-                  stdLearningId: stdLearningId,
-                  topicId: topicId, // Tambahkan ini
-                  topicTitle: topicTitle, // Tambahkan ini
-                ),
-              ),
-            );
-          },
-        )
-      ],
-    );
-  }
-}
--- a/lib/features/learning/screens/learning_screen.dart
+++ b/lib/features/learning/screens/learning_screen.dart
@ -35,7 +35,8 @@ class _LearningScreenState extends State<LearningScreen>
        Provider.of<SectionProvider>(context, listen: false);

    try {
-      sectionProvider.resetData();
+      // Reset data sebelum fetch
+      sectionProvider.resetData(); // Tambahkan method ini di SectionProvider

      final token = await userProvider.getValidToken();
      if (token != null) {
@ -60,6 +61,26 @@ class _LearningScreenState extends State<LearningScreen>
    }
  }

+  // Future<void> _refreshSections() async {
+  //   final userProvider = Provider.of<UserProvider>(context, listen: false);
+  //   final sectionProvider =
+  //       Provider.of<SectionProvider>(context, listen: false);
+
+  //   try {
+  //     final token = await userProvider.getValidToken();
+  //     if (token != null) {
+  //       await sectionProvider.fetchSections(token);
+  //     }
+  //   } catch (e) {
+  //     ScaffoldMessenger.of(context).showSnackBar(
+  //       SnackBar(
+  //         content: Text('Failed to refresh sections: $e'),
+  //         backgroundColor: Colors.red,
+  //       ),
+  //     );
+  //   }
+  // }
+
  Widget _buildErrorWidget(String error) {
    return Container(
      padding: const EdgeInsets.all(16),
@ -130,6 +151,7 @@ class _LearningScreenState extends State<LearningScreen>
              Expanded(
                child: Consumer<SectionProvider>(
                  builder: (context, sectionProvider, _) {
+                    // Prioritaskan loading state
                    if (_isInitialLoading || sectionProvider.isLoading) {
                      return ListView.builder(
                        padding: const EdgeInsets.only(top: 8),
@ -139,10 +161,12 @@ class _LearningScreenState extends State<LearningScreen>
                      );
                    }

+                    // Tampilkan error jika ada
                    if (sectionProvider.error != null) {
                      return _buildErrorWidget(sectionProvider.error!);
                    }

+                    // Tampilkan sections atau pesan jika kosong
                    if (sectionProvider.sections.isEmpty) {
                      return RefreshIndicator(
                        onRefresh: _initializeSections,
@ -178,6 +202,7 @@ class _LearningScreenState extends State<LearningScreen>
                      );
                    }

+                    // Tampilkan daftar sections
                    return RefreshIndicator(
                      onRefresh: _initializeSections,
                      child: ListView.builder(