Merge pull request #277 from Eldar2021/ai/home-package

Implement Home Repo Package

app/lib/app/presentation/view/app_view.dart

@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:loader_overlay/loader_overlay.dart';
+import 'package:mq_home_repository/mq_home_repository.dart';
 import 'package:mq_remote_client/mq_remote_client.dart';
 import 'package:mq_remote_config/mq_remote_config.dart';
 import 'package:mq_storage/mq_storage.dart';
@@ -79,15 +80,13 @@ class MyApp extends StatelessWidget {
         ),
         BlocProvider(
           create: (context) => HomeCubit(
-            GetHomeDataUseCase(
-              HomeRepositoryImpl(
-                isMockData
-                    ? const HomeLocalDataSourceMock()
-                    : HomeLocalDataSourceImpl(context.read<PreferencesStorage>()),
-                isMockData
-                    ? const HomeRemoteDataSourceMock()
-                    : HomeRemoteDataSourceImpl(context.read<MqRemoteClient>()),
-              ),
+            MqHomeRepositoryImpl(
+              isMockData
+                  ? const MqHomeLocalDataSourceMock()
+                  : MqHomeLocalDataSourceImpl(context.read<PreferencesStorage>()),
+              isMockData
+                  ? const MqHomeRemoteDataSourceMock()
+                  : MqHomeRemoteDataSourceImpl(context.read<MqRemoteClient>()),
             ),
           ),
         ),

app/lib/constants/api/api_const.dart

@@ -16,7 +16,6 @@ class ApiConst {
   String get loginWithApple => '$_getDomain/api/v1/accounts/apple/';
   String get deleteProfile => '$_getDomain/api/v1/accounts/profile/delete_my_account/';
   String putProfile(String userId) => '$_getDomain/api/v1/accounts/profile/$userId/';
-  String get hatimDashBoard => '$_getDomain/api/v1/hatim/dashboard';
   String get joinToHatim => '$_getDomain/api/v1/hatim/join_to_hatim';
   String getSocket(String token) => '$socketBase/?token=$token';
 

app/lib/main.dart

@@ -75,7 +75,9 @@ Future<void> main({AppConfig? appConfig}) async {
         RepositoryProvider<MqRemoteConfig>(create: (context) => remoteConfig),
         RepositoryProvider<MqRemoteClient>(
           create: (context) => MqRemoteClient(
-            dio: Dio(),
+            dio: Dio(
+              BaseOptions(baseUrl: ApiConst.domain),
+            ),
             network: context.read<NetworkClient>(),
             language: () => storage.readString(key: StorageKeys.localeKey),
             token: () => storage.readString(key: StorageKeys.tokenKey),

app/lib/modules/home/presentation/cubit/home_cubit.dart → app/lib/modules/home/cubit/home_cubit.dart

@@ -2,19 +2,19 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:mq_crashlytics/mq_crashlytics.dart';
+import 'package:mq_home_repository/mq_home_repository.dart';
 import 'package:my_quran/core/core.dart';
-import 'package:my_quran/modules/modules.dart';
 
 part 'home_state.dart';
 
 class HomeCubit extends Cubit<HomeState> {
-  HomeCubit(this.getHomeDataUseCase) : super(const HomeState());
+  HomeCubit(this.homeRepository) : super(const HomeState());
 
-  final GetHomeDataUseCase getHomeDataUseCase;
+  final MqHomeRepository homeRepository;
 
   Future<void> getData() async {
     try {
-      final homeModel = await getHomeDataUseCase.execute();
+      final homeModel = await homeRepository.getData();
       emit(HomeState(status: FetchStatus.success, homeModel: homeModel));
     } catch (e, s) {
       MqCrashlytics.report(e, s);

app/lib/modules/home/presentation/cubit/home_state.dart → app/lib/modules/home/cubit/home_state.dart

@@ -7,7 +7,7 @@ final class HomeState extends Equatable {
     this.homeModel,
   });
 
-  final HomeEntity? homeModel;
+  final MqHomeEntity? homeModel;
   final FetchStatus status;
 
   @override

app/lib/modules/home/home.dart

@@ -1,3 +1,4 @@
-export 'data/data.dart';
-export 'domain/domain.dart';
-export 'presentation/presentation.dart';
+export 'cubit/home_cubit.dart';
+export 'cubit/location_cubit.dart';
+export 'view/home_view.dart';
+export 'widgets/pray_time_widget.dart';

app/pubspec.lock

@@ -944,6 +944,13 @@ packages:
       relative: true
     source: path
     version: "0.1.0+1"
+  mq_home_repository:
+    dependency: "direct main"
+    description:
+      path: "../packages/mq_home_repository"
+      relative: true
+    source: path
+    version: "0.1.0+1"
   mq_remote_client:
     dependency: "direct main"
     description:

app/pubspec.yaml

@@ -77,6 +77,8 @@ dependencies:
     path: ../packages/mq_analytics
   mq_remote_config:
     path: ../packages/mq_remote_config
+  mq_home_repository:
+    path: ../packages/mq_home_repository
 
 dev_dependencies:
   flutter_test:

app/pubspec_overrides.yaml

@@ -1,4 +1,4 @@
-# melos_managed_dependency_overrides: mq_ci_keys,mq_storage,mq_either,mq_analytics,mq_crashlytics,mq_remote_config
+# melos_managed_dependency_overrides: mq_ci_keys,mq_storage,mq_either,mq_analytics,mq_crashlytics,mq_remote_config,mq_home_repository
 dependency_overrides:
   mq_analytics:
     path: ../packages/mq_analytics
@@ -8,6 +8,8 @@ dependency_overrides:
     path: ../packages/mq_crashlytics
   mq_either:
     path: ../packages/mq_either
+  mq_home_repository:
+    path: ../packages/mq_home_repository
   mq_remote_client:
     path: ../packages/mq_remote_client
   mq_remote_config:

app/test/helpers/pump_app.dart

@@ -1,5 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:mq_home_repository/mq_home_repository.dart';
 import 'package:mq_remote_config/mq_remote_config.dart';
 
 import 'package:my_quran/app/app.dart';
@@ -17,7 +18,7 @@ extension PumpApp on WidgetTester {
     GoogleSignInUseCase googleSignInUseCase,
     AppleSignInUseCase appleSignInUseCase,
     SerUserDataUseCase setUserDataUseCase,
-    HomeRepository homeRepo,
+    MqHomeRepository homeRepo,
     PatchGenderUseCase patchGenderUseCase,
     PatchLocaleCodeUseCase patchLocaleCodeUseCase,
     LogoutUseCase logoutUseCase,
@@ -58,7 +59,7 @@ extension PumpApp on WidgetTester {
               ),
             ),
             BlocProvider(
-              create: (context) => HomeCubit(GetHomeDataUseCase(homeRepo)),
+              create: (context) => HomeCubit(homeRepo),
             ),
             BlocProvider(
               create: (context) => RemoteConfigCubit(

app/test/mocks/app_mocks.dart

@@ -1,13 +1,13 @@
 import 'dart:async';
 
+import 'package:mq_home_repository/mq_home_repository.dart';
 import 'package:mq_remote_client/mq_remote_client.dart';
 import 'package:mq_remote_config/mq_remote_config.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 import 'package:mocktail/mocktail.dart';
 import 'package:mq_storage/mq_storage.dart';
 import 'package:my_quran/core/core.dart';
-import 'package:my_quran/modules/modules.dart';
 
 final class MockPreferencesStorage extends Mock implements PreferencesStorage {}
 
@@ -23,10 +23,10 @@ final class MockPackageInfo extends Mock implements PackageInfo {
   String get buildNumber => '10';
 }
 
-final class MockHomeRepositoryImpl implements HomeRepository {
+final class MockHomeRepositoryImpl implements MqHomeRepository {
   @override
-  Future<HomeEntity> getData() async {
-    return const HomeEntity(allDoneHatims: 8, allDonePages: 5325, donePages: 634);
+  Future<MqHomeEntity> getData() async {
+    return const MqHomeEntity(allDoneHatims: 8, allDonePages: 5325, donePages: 634);
   }
 }
 

packages/mq_home_repository/README.md

@@ -0,0 +1 @@
+# Mq Home Repository Package

packages/mq_home_repository/analysis_options.yaml

@@ -0,0 +1,10 @@
+analyzer:
+  errors:
+    one_member_abstracts: ignore
+include: package:very_good_analysis/analysis_options.6.0.0.yaml
+
+linter:
+  rules:
+    public_member_api_docs: false
+    lines_longer_than_80_chars: false
+    sort_pub_dependencies: false

packages/mq_home_repository/lib/mq_home_repository.dart

@@ -0,0 +1,4 @@
+/// MQ Home Repository Package
+library mq_home_repository;
+
+export 'src/src.dart';

app/lib/modules/home/domain/entity/home_entity.dart → packages/mq_home_repository/lib/src/entity/mq_home_entity.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 @immutable
-final class HomeEntity {
-  const HomeEntity({
+final class MqHomeEntity {
+  const MqHomeEntity({
     required this.allDoneHatims,
     required this.allDonePages,
     required this.donePages,

app/lib/modules/home/data/model/home_model_response.dart → packages/mq_home_repository/lib/src/model/mq_home_model_response.dart

@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-part 'home_model_response.g.dart';
+part 'mq_home_model_response.g.dart';
 
 @JsonSerializable()
 @immutable
-final class HomeModelResponse {
-  const HomeModelResponse({
+final class MqHomeModelResponse {
+  const MqHomeModelResponse({
     required this.allDoneHatims,
     required this.allDonePages,
     required this.donePages,
   });
 
-  factory HomeModelResponse.fromJson(Map<String, dynamic> json) => _$HomeModelResponseFromJson(json);
+  factory MqHomeModelResponse.fromJson(Map<String, dynamic> json) => _$HomeModelResponseFromJson(json);
   Map<String, dynamic> toJson() => _$HomeModelResponseToJson(this);
 
   final int allDoneHatims;

packages/mq_home_repository/lib/src/repository/mq_home_repository.dart

@@ -0,0 +1,5 @@
+import 'package:mq_home_repository/mq_home_repository.dart';
+
+abstract interface class MqHomeRepository {
+  Future<MqHomeEntity> getData();
+}