fix: downloading files and extract

lib/core/constants/my_api.dart

@@ -6,6 +6,10 @@ class MyApi {
   static const Duration timeOut = Duration(seconds: 30);
   static const String contentType = 'application/json';
   static const String defaultError = 'An unexpected error has occurred.';
+  static const String noInternetError = 'Please check your internet connection.';
 
-  static const String baseUrl = 'https://api.BASE_URL.com';
+  static const String baseUrl = 'https://hadihoda.newhorizonco.uk/api';
+
+  static const String levels = '/quiz/optimized/levels/';
+  static const String files = '/quiz/optimized/download-all-files/';
 }

lib/core/constants/my_constants.dart

@@ -6,4 +6,6 @@ class MyConstants {
   static const String token = 'TOKEN';
   static const String theme = 'THEME';
   static const String levelBox = 'LEVEL_BOX';
+  static const String downloadCompleted = 'DOWNLOAD_COMPLETED';
+  static const String extractCompleted = 'EXTRACT_COMPLETED';
 }

lib/core/error_handler/error_handler.dart

@@ -10,7 +10,7 @@ class ErrorHandler {
   static void handleError(DioException e) {
     if (e.response == null) {
       throw MyException(
-        errorMessage: e.message ?? MyApi.defaultError,
+        errorMessage: MyApi.noInternetError,
         statusCode: e.response?.statusCode,
       );
     } else {

lib/core/routers/my_routes.dart

@@ -32,7 +32,7 @@ GoRouter get appPages => GoRouter(
       name: Routes.introPage,
       path: Routes.introPage,
       builder: (context, state) => BlocProvider(
-        create: (context) => IntroBloc(locator(), locator(), locator()),
+        create: (context) => IntroBloc(locator(), locator()),
         child: const IntroPage(),
       ),
     ),

lib/core/utils/local_storage.dart

@@ -11,7 +11,7 @@ class LocalStorage {
     _box = await SharedPreferences.getInstance();
   }
 
-  static Future<void> saveData({required String key, required dynamic value}) async {
+  static Future<void> saveData({required String key, required String value}) async {
     await _box.setString(key, value);
   }
 

lib/core/utils/storage_path.dart

@@ -3,9 +3,9 @@ import 'dart:io';
 import 'package:path_provider/path_provider.dart';
 
 class StoragePath {
-  static Directory applicationDir = Directory('');
+  static Directory documentDir = Directory('');
 
-  static Future<void> getApplicationDir() async {
-    applicationDir = await getApplicationDocumentsDirectory();
+  static Future<void> getDocumentDir() async {
+    documentDir = await getApplicationDocumentsDirectory();
   }
 }

lib/core/widgets/answer_box/answer_box.dart

@@ -24,7 +24,7 @@ class AnswerBox extends StatelessWidget {
             AnswerPictureBox(
               selected: selected ?? false,
               index: index,
-              image: '${StoragePath.applicationDir.path}/data/${answer
+              image: '${StoragePath.documentDir.path}/data/${answer
                   .imageId}${answer.imageInfo?.extension ?? '.png'}',
             ),
             Positioned(

lib/features/intro/data/datasource/intro_datasource.dart

@@ -1,21 +1,16 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter/services.dart';
 import 'package:flutter_archive/flutter_archive.dart';
+import 'package:hadi_hoda_flutter/core/constants/my_api.dart';
 import 'package:hadi_hoda_flutter/core/constants/my_constants.dart';
 import 'package:hadi_hoda_flutter/core/error_handler/my_exception.dart';
 import 'package:hadi_hoda_flutter/core/network/http_request.dart';
-import 'package:hadi_hoda_flutter/core/response/base_response.dart';
-import 'package:hadi_hoda_flutter/features/level/data/model/level_model.dart';
-import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart';
-import 'package:hive/hive.dart';
-import 'package:path_provider/path_provider.dart';
+import 'package:hadi_hoda_flutter/core/utils/local_storage.dart';
+import 'package:hadi_hoda_flutter/core/utils/storage_path.dart';
 
 abstract class IIntroDatasource {
-  Future<void> saveLevels();
-  Future<void> extractData();
+  Future<void> getFiles();
   Stream<double> loadingStream();
 }
 
@@ -26,62 +21,48 @@ class IntroDatasourceImpl implements IIntroDatasource {
   IntroDatasourceImpl(this.httpRequest);
 
   @override
-  Future<void> saveLevels() async {
-    try {
-      final Box<LevelEntity> levelBox = Hive.box(MyConstants.levelBox);
-      if (levelBox.isEmpty) {
-        final String levelAssets = await rootBundle.loadString(
-          'assets/json/levels.json',
-        );
-        final dynamic response = jsonDecode(levelAssets);
-        final List<LevelEntity> levelList = BaseResponse.getDataList<LevelEntity>(
-           response?['result'],
-           (json) => LevelModel.fromJson(json),
-        );
+  Future<void> getFiles() async {
+    final String filePath = '${StoragePath.documentDir.path}/files.zip';
 
-        await levelBox.addAll(levelList);
-      }
-    } catch (e) {
-      throw MyException(errorMessage: '$e');
-    }
+    if (LocalStorage.readData(key: MyConstants.downloadCompleted) != 'true') {
+      await httpRequest.download(
+        urlPath: MyApi.files,
+        savePath: filePath,
+        onReceive: (count, total) {
+          double percent = ((count / total) * 100);
+          streamController.add(percent);
+        },
+      ).then((value) async {
+        await LocalStorage.saveData(
+          key: MyConstants.downloadCompleted,
+          value: 'true',
+        );
+      });
     }
 
-  @override
-  Future<void> extractData() async {
     try{
-      final Directory dir = await getApplicationDocumentsDirectory();
-      final File file = File('${dir.path}/data.zip');
-      if (!(await file.exists())) {
-        final ByteData assetFile = await rootBundle.load('assets/data/data.zip');
-        await file.create(recursive: true);
-        await file.writeAsBytes(
-          assetFile.buffer.asUint8List(
-            assetFile.offsetInBytes,
-            assetFile.lengthInBytes,
-          ),
-          flush: true,
-        );
-
+      if (LocalStorage.readData(key: MyConstants.extractCompleted) != 'true') {
+        final File file = File(filePath);
         await ZipFile.extractToDirectory(
           zipFile: file,
-          destinationDir: dir,
+          destinationDir: StoragePath.documentDir,
           onExtracting: (zipEntry, progress) {
             streamController.add(progress);
             return ZipFileOperation.includeItem;
           },
-        );
-
+        ).then((value) async {
+          await Future.wait([
+            LocalStorage.saveData(
+              key: MyConstants.extractCompleted,
+              value: 'true',
+            ),
+            file.delete(recursive: true),
+          ]);
+        });
       } else {
-        streamController.add(20);
-        await Future.delayed(Duration(milliseconds: 150));
-        streamController.add(40);
-        await Future.delayed(Duration(milliseconds: 150));
-        streamController.add(60);
-        await Future.delayed(Duration(milliseconds: 150));
-        streamController.add(80);
+        streamController.add(50);
         await Future.delayed(Duration(milliseconds: 150));
         streamController.add(100);
-        await Future.delayed(Duration(milliseconds: 150));
       }
     } catch (e){
       throw MyException(errorMessage: '$e');

lib/features/intro/data/repository_impl/intro_repository_impl.dart

@@ -11,25 +11,9 @@ class IntroRepositoryImpl implements IIntroRepository {
   const IntroRepositoryImpl(this.datasource);
 
   @override
-  Future<DataState<NoParams, MyException>> saveLevels() async {
+  Future<DataState<NoParams, MyException>> getFiles() async {
     try {
-      await datasource.saveLevels();
-      return DataState.success(NoParams());
-    } on MyException catch (e) {
-      return DataState.error(e);
-    } catch (e) {
-      if (kDebugMode) {
-        rethrow;
-      } else {
-        return DataState.error(MyException(errorMessage: '$e'));
-      }
-    }
-  }
-
-  @override
-  Future<DataState<NoParams, MyException>> extractData() async {
-    try {
-      await datasource.extractData();
+      await datasource.getFiles();
       return DataState.success(NoParams());
     } on MyException catch (e) {
       return DataState.error(e);

lib/features/intro/domain/repository/intro_repository.dart

@@ -3,7 +3,6 @@ import 'package:hadi_hoda_flutter/core/params/no_params.dart';
 import 'package:hadi_hoda_flutter/core/utils/data_state.dart';
 
 abstract class IIntroRepository {
-  Future<DataState<NoParams, MyException>> saveLevels();
-  Future<DataState<NoParams, MyException>> extractData();
+  Future<DataState<NoParams, MyException>> getFiles();
   Stream<double> loadingStream();
 }

lib/features/intro/domain/usecases/extract_data_usecase.dart

@@ -1,16 +0,0 @@
-import 'package:hadi_hoda_flutter/core/error_handler/my_exception.dart';
-import 'package:hadi_hoda_flutter/core/params/no_params.dart';
-import 'package:hadi_hoda_flutter/core/usecase/usecase.dart';
-import 'package:hadi_hoda_flutter/core/utils/data_state.dart';
-import 'package:hadi_hoda_flutter/features/intro/domain/repository/intro_repository.dart';
-
-class ExtractDataUseCase implements UseCase<NoParams, NoParams> {
-  final IIntroRepository repository;
-
-  const ExtractDataUseCase(this.repository);
-
-  @override
-  Future<DataState<NoParams, MyException>> call(NoParams params) {
-    return repository.extractData();
-  }
-}

lib/features/intro/domain/usecases/save_levels_usecase.dart → lib/features/intro/domain/usecases/get_files_usecase.dart

@@ -4,13 +4,13 @@ import 'package:hadi_hoda_flutter/core/usecase/usecase.dart';
 import 'package:hadi_hoda_flutter/core/utils/data_state.dart';
 import 'package:hadi_hoda_flutter/features/intro/domain/repository/intro_repository.dart';
 
-class SaveLevelsUseCase implements UseCase<NoParams, NoParams> {
+class GetFilesUseCase implements UseCase<NoParams, NoParams> {
   final IIntroRepository repository;
 
-  const SaveLevelsUseCase(this.repository);
+  const GetFilesUseCase(this.repository);
 
   @override
   Future<DataState<NoParams, MyException>> call(NoParams params) {
-    return repository.saveLevels();
+    return repository.getFiles();
   }
 }

lib/features/intro/presentation/bloc/intro_bloc.dart

@@ -1,30 +1,26 @@
 import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hadi_hoda_flutter/core/params/no_params.dart';
 import 'package:hadi_hoda_flutter/core/routers/my_routes.dart';
+import 'package:hadi_hoda_flutter/core/status/base_status.dart';
 import 'package:hadi_hoda_flutter/core/utils/context_provider.dart';
-import 'package:hadi_hoda_flutter/features/intro/domain/usecases/extract_data_usecase.dart';
+import 'package:hadi_hoda_flutter/features/intro/domain/usecases/get_files_usecase.dart';
 import 'package:hadi_hoda_flutter/features/intro/domain/usecases/loading_stream_usecase.dart';
-import 'package:hadi_hoda_flutter/features/intro/domain/usecases/save_levels_usecase.dart';
 import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_event.dart';
 import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_state.dart';
 
 class IntroBloc extends Bloc<IntroEvent, IntroState> {
   /// ------------constructor------------
-  IntroBloc(
-      this._saveLevelsUseCase,
-      this._extractDataUseCase,
-      this._loadingStreamUseCase,
-      ) : super(const IntroState()) {
-    on<SaveLevelsEvent>(_saveLevelsEvent);
-    on<ExtractDataEvent>(_extractDataEvent);
+  IntroBloc(this._getFilesUseCase, this._loadingStreamUseCase)
+    : super(const IntroState()) {
+    on<GetFilesEvent>(_getFilesEvent);
     loadingStream = _loadingStreamUseCase();
   }
 
   /// ------------UseCases------------
-  final SaveLevelsUseCase _saveLevelsUseCase;
-  final ExtractDataUseCase _extractDataUseCase;
+  final GetFilesUseCase _getFilesUseCase;
   final LoadingStreamUseCase _loadingStreamUseCase;
 
   /// ------------Variables------------
@@ -35,36 +31,23 @@ class IntroBloc extends Bloc<IntroEvent, IntroState> {
   /// ------------Functions------------
 
   /// ------------Api Calls------------
-  FutureOr<void> _saveLevelsEvent(SaveLevelsEvent event,
-      Emitter<IntroState> emit) async {
-    await _saveLevelsUseCase(NoParams()).then(
-      (value) {
-        value.fold(
-            (data) async {
-
-              add(ExtractDataEvent());
-            },
-            (error) {},
-        );
-      },
-    );
-  }
-
-  FutureOr<void> _extractDataEvent(ExtractDataEvent event,
-      Emitter<IntroState> emit) async {
-    await _extractDataUseCase(NoParams()).then(
-          (value) {
+  FutureOr<void> _getFilesEvent(
+    GetFilesEvent event,
+    Emitter<IntroState> emit,
+  ) async {
+    await _getFilesUseCase(NoParams()).then((value) {
       value.fold(
         (data) async {
           await Future.delayed(
-                  Duration(seconds: 1), () {
+            Duration(milliseconds: 300), () {
               ContextProvider.context!.goNamed(Routes.homePage);
             },
           );
         },
-              (error) {},
-        );
+        (error) {
+          emit(state.copyWith(getFilesStatus: BaseError(error.errorMessage)));
         },
       );
+    });
   }
 }

lib/features/intro/presentation/bloc/intro_event.dart

@@ -1,6 +1,4 @@
 sealed class IntroEvent {
   const IntroEvent();
 }
-
-class SaveLevelsEvent extends IntroEvent {}
-class ExtractDataEvent extends IntroEvent {}
+class GetFilesEvent extends IntroEvent {}

lib/features/intro/presentation/bloc/intro_state.dart

@@ -1,15 +1,15 @@
 import 'package:hadi_hoda_flutter/core/status/base_status.dart';
 
 class IntroState {
-  final BaseStatus getIntroStatus;
+  final BaseStatus getFilesStatus;
 
-  const IntroState({this.getIntroStatus = const BaseInit()});
+  const IntroState({this.getFilesStatus = const BaseInit()});
 
   IntroState copyWith({
-    BaseStatus? getIntroStatus,
+    BaseStatus? getFilesStatus,
   }) {
     return IntroState(
-      getIntroStatus: getIntroStatus ?? this.getIntroStatus,
+      getFilesStatus: getFilesStatus ?? this.getFilesStatus,
     );
   }
 }

lib/features/intro/presentation/ui/intro_page.dart

@@ -16,11 +16,10 @@ class IntroPage extends StatefulWidget {
 }
 
 class _IntroPageState extends State<IntroPage> {
-
   @override
   void initState() {
     super.initState();
-    context.read<IntroBloc>().add(SaveLevelsEvent());
+    context.read<IntroBloc>().add(GetFilesEvent());
   }
 
   @override
@@ -33,7 +32,10 @@ class _IntroPageState extends State<IntroPage> {
           gradient: LinearGradient(
             begin: Alignment.topCenter,
             end: Alignment.bottomCenter,
-            colors: [Color(0XFF00154C), Color(0XFF150532)],
+            colors: [
+              Color(0XFF00154C),
+              Color(0XFF150532),
+            ],
           ),
           image: DecorationImage(
             image: AssetImage(MyAssets.pattern),
@@ -47,19 +49,26 @@ class _IntroPageState extends State<IntroPage> {
         ),
         child: Stack(
           alignment: Alignment.center,
-          children: [_image(), _loading(context)],
+          children: [
+            _image(),
+            _loading(context),
+          ],
         ),
       ),
     );
   }
 
-  MyImage _image() => MyImage(image: MyAssets.hadiHoda, size: 200);
+  MyImage _image() {
+    return MyImage(
+      image: MyAssets.hadiHoda,
+      size: 200,
+    );
+  }
 
   Positioned _loading(BuildContext context) {
     return Positioned(
-      bottom: MediaQuery.viewPaddingOf(context).bottom + MySpaces.s10,
+      bottom: MediaQuery.viewPaddingOf(context).bottom + MySpaces.s16,
       child: IntroLoadingWidget(
-        percent: 80,
         loadingStream: context.read<IntroBloc>().loadingStream,
       ),
     );

lib/features/intro/presentation/ui/widgets/intro_loading_widget.dart

@@ -6,11 +6,9 @@ import 'package:hadi_hoda_flutter/common_ui/resources/my_text_style.dart';
 class IntroLoadingWidget extends StatelessWidget {
   const IntroLoadingWidget({
     super.key,
-    this.percent,
     this.loadingStream,
   });
 
-  final double? percent;
   final Stream<double>? loadingStream;
 
   @override

lib/init_bindings.dart

@@ -10,9 +10,8 @@ import 'package:hadi_hoda_flutter/features/home/domain/usecases/get_home_usecase
 import 'package:hadi_hoda_flutter/features/intro/data/datasource/intro_datasource.dart';
 import 'package:hadi_hoda_flutter/features/intro/data/repository_impl/intro_repository_impl.dart';
 import 'package:hadi_hoda_flutter/features/intro/domain/repository/intro_repository.dart';
-import 'package:hadi_hoda_flutter/features/intro/domain/usecases/extract_data_usecase.dart';
+import 'package:hadi_hoda_flutter/features/intro/domain/usecases/get_files_usecase.dart';
 import 'package:hadi_hoda_flutter/features/intro/domain/usecases/loading_stream_usecase.dart';
-import 'package:hadi_hoda_flutter/features/intro/domain/usecases/save_levels_usecase.dart';
 import 'package:hadi_hoda_flutter/features/level/data/datasource/level_datasource.dart';
 import 'package:hadi_hoda_flutter/features/level/data/repository_impl/level_repository_impl.dart';
 import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart';
@@ -47,8 +46,7 @@ void initBindings() {
   /// Intro Feature
   locator.registerLazySingleton<IIntroDatasource>(() => IntroDatasourceImpl(locator()));
   locator.registerLazySingleton<IIntroRepository>(() => IntroRepositoryImpl(locator()));
-  locator.registerLazySingleton<SaveLevelsUseCase>(() => SaveLevelsUseCase(locator()));
-  locator.registerLazySingleton<ExtractDataUseCase>(() => ExtractDataUseCase(locator()));
+  locator.registerLazySingleton<GetFilesUseCase>(() => GetFilesUseCase(locator()));
   locator.registerLazySingleton<LoadingStreamUseCase>(() => LoadingStreamUseCase(locator()));
 
   /// Home Feature

lib/main.dart

@@ -14,8 +14,8 @@ Future<void> main() async {
   initBindings();
   await Future.wait([
     LocalStorage.init(),
+    StoragePath.getDocumentDir(),
     initDataBase(),
-    StoragePath.getApplicationDir(),
   ]);
   AuthStorage.loadData();
   runApp(const MainApp());