Refactor

carlosmacmar · carlosmacmar · commit 5421ffb6c1f6 · 2022-02-08T11:24:54.000+01:00
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,21 +1,15 @@
 PODS:
   - Flutter (1.0.0)
-  - shared_preferences_ios (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
-  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
-  shared_preferences_ios:
-    :path: ".symlinks/plugins/shared_preferences_ios/ios"
 
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -139,7 +139,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				8E38056DC33430AD9A2EB448 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -212,23 +211,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		8E38056DC33430AD9A2EB448 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/lib/features/github/data/datasources/issues_remote_data_source.dart b/lib/features/github/data/datasources/issues_remote_data_source.dart
@@ -7,18 +7,18 @@ import 'package:http/http.dart' as http;
 
 import '../../../../core/error/exceptions.dart';
 
-abstract class GithubRemoteDataSource {
+abstract class IssuesRemoteDataSource {
   /// Calls the https://api.github.com/ endpoint.
   ///
   /// Throws a [ServerException] for all error codes.
   Future<List<IssueModel>> getIssues(
       int page, FilterState filterState, SortOption sortOption);
 }
 
-class GithubRemoteDataSourceImpl implements GithubRemoteDataSource {
+class IssuesRemoteDataSourceImpl implements IssuesRemoteDataSource {
   final http.Client client;
 
-  GithubRemoteDataSourceImpl({required this.client});
+  IssuesRemoteDataSourceImpl({required this.client});
 
   @override
   Future<List<IssueModel>> getIssues(
diff --git a/lib/features/github/data/repositories/issues_repository_impl.dart b/lib/features/github/data/repositories/issues_repository_impl.dart
@@ -1,19 +1,19 @@
 import 'package:dartz/dartz.dart';
 import 'package:github_api_consumer/core/util/enums.dart';
-import 'package:github_api_consumer/features/github/data/datasources/github_remote_data_source.dart';
+import 'package:github_api_consumer/features/github/data/datasources/issues_remote_data_source.dart';
 import 'package:github_api_consumer/features/github/domain/entities/issue.dart';
-import 'package:github_api_consumer/features/github/domain/repositories/github_repository.dart';
+import 'package:github_api_consumer/features/github/domain/repositories/issues_repository.dart';
 
 import '../../../../core/error/failures.dart';
 import '../../../../core/error/exceptions.dart';
 import '../../../../core/network/network_info.dart';
 
-class GithubRepositoryImpl implements GithubRepository {
-  final GithubRemoteDataSource remoteDataSource;
-  // final GithubLocalDataSource localDataSource;
+class IssuesRepositoryImpl implements IssuesRepository {
+  final IssuesRemoteDataSource remoteDataSource;
+  // final IssuesLocalDataSource localDataSource;
   final NetworkInfo networkInfo;
 
-  GithubRepositoryImpl({
+  IssuesRepositoryImpl({
     required this.remoteDataSource,
     // @required this.localDataSource,
     required this.networkInfo,
diff --git a/lib/features/github/domain/repositories/issues_repository.dart b/lib/features/github/domain/repositories/issues_repository.dart
@@ -4,6 +4,6 @@ import 'package:github_api_consumer/features/github/domain/entities/issue.dart';
 
 import '../../../../core/error/failures.dart';
 
-abstract class GithubRepository {
+abstract class IssuesRepository {
   Future<Either<Failure, List<Issue>>> getIssues(int page, FilterState filterState, SortOption sortOption);
 }
diff --git a/lib/features/github/domain/usecases/get_issues.dart b/lib/features/github/domain/usecases/get_issues.dart
@@ -3,13 +3,13 @@ import 'package:equatable/equatable.dart';
 import 'package:github_api_consumer/core/util/enums.dart';
 import 'package:github_api_consumer/core/util/enums.dart';
 import 'package:github_api_consumer/features/github/domain/entities/issue.dart';
-import 'package:github_api_consumer/features/github/domain/repositories/github_repository.dart';
+import 'package:github_api_consumer/features/github/domain/repositories/issues_repository.dart';
 
 import '../../../../core/error/failures.dart';
 import '../../../../core/usecases/usecase.dart';
 
 class GetIssues implements UseCase<List<Issue>, Params> {
-  final GithubRepository repository;
+  final IssuesRepository repository;
 
   GetIssues(this.repository);
 
diff --git a/lib/features/github/presentation/bloc/issues/issues_cubit.dart b/lib/features/github/presentation/bloc/issues/issues_cubit.dart
@@ -1,12 +1,9 @@
-import 'dart:async';
-
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:github_api_consumer/core/error/failures.dart';
-import 'package:github_api_consumer/core/usecases/usecase.dart';
 import 'package:github_api_consumer/core/util/enums.dart';
 import 'package:github_api_consumer/features/github/domain/entities/issue.dart';
-import 'package:github_api_consumer/features/github/domain/usecases/get_all_issues.dart';
+import 'package:github_api_consumer/features/github/domain/usecases/get_issues.dart';
 
 part 'issues_state.dart';
 
@@ -15,12 +12,12 @@ const String SERVER_FAILURE_MESSAGE = 'Server Failure';
 class IssuesCubit extends Cubit<IssuesState> {
   IssuesCubit({required this.getIssuesUseCase}) : super(IssuesInitial());
 
+  final GetIssues getIssuesUseCase;
   int _page = 1;
   var _visitedIssuesList = <Issue>[];
   var _currentIssuesList = <Issue>[];
   FilterState _currentFilterState = FilterState.open;
   SortOption _currentSortOption = SortOption.created;
-  final GetIssues getIssuesUseCase;
 
   void getIssues() async {
     try {
diff --git a/lib/features/github/presentation/pages/issue_detail_page.dart b/lib/features/github/presentation/pages/issue_detail_page.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:github_api_consumer/features/github/domain/entities/issue.dart';
 
 class IssueDetailPage extends StatelessWidget {
diff --git a/lib/injector.dart b/lib/injector.dart
@@ -1,14 +1,13 @@
 import 'package:get_it/get_it.dart';
-import 'package:github_api_consumer/features/github/domain/repositories/github_repository.dart';
-import 'package:github_api_consumer/features/github/domain/usecases/get_all_issues.dart';
+import 'package:github_api_consumer/features/github/domain/repositories/issues_repository.dart';
+import 'package:github_api_consumer/features/github/domain/usecases/get_issues.dart';
 import 'package:github_api_consumer/features/github/presentation/bloc/issues/issues_cubit.dart';
 import 'package:http/http.dart' as http;
 import 'package:internet_connection_checker/internet_connection_checker.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 import 'core/network/network_info.dart';
-import 'features/github/data/datasources/github_remote_data_source.dart';
-import 'features/github/data/repositories/github_repository_impl.dart';
+import 'features/github/data/datasources/issues_remote_data_source.dart';
+import 'features/github/data/repositories/issues_repository_impl.dart';
 
 final injector = GetIt.instance;
 
@@ -24,25 +23,23 @@ Future<void> init() async {
   injector.registerLazySingleton(() => GetIssues(injector()));
 
   // Repository
-  injector.registerLazySingleton<GithubRepository>(
-    () => GithubRepositoryImpl(
+  injector.registerLazySingleton<IssuesRepository>(
+    () => IssuesRepositoryImpl(
       remoteDataSource: injector(),
       networkInfo: injector(),
     ),
   );
 
   // Data sources
-  injector.registerLazySingleton<GithubRemoteDataSource>(
-    () => GithubRemoteDataSourceImpl(client: injector()),
+  injector.registerLazySingleton<IssuesRemoteDataSource>(
+    () => IssuesRemoteDataSourceImpl(client: injector()),
   );
 
   //! Core
   injector
       .registerLazySingleton<NetworkInfo>(() => NetworkInfoImpl(injector()));
 
   //! External
-  // final sharedPreferences = await SharedPreferences.getInstance();
-  // injector.registerLazySingleton(() => sharedPreferences);
   injector.registerLazySingleton(() => http.Client());
   injector.registerLazySingleton(() => InternetConnectionChecker());
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:github_api_consumer/features/github/presentation/bloc/issues/issues_cubit.dart';
 import 'package:github_api_consumer/features/github/presentation/pages/display_issues_screen.dart';
-import 'features/github/domain/usecases/get_all_issues.dart';
+import 'features/github/domain/usecases/get_issues.dart';
 import 'injector.dart' as di;
 
 void main() {
diff --git a/pubspec.lock b/pubspec.lock
@@ -197,13 +197,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.2"
   file:
     dependency: transitive
     description:
@@ -235,11 +228,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -373,55 +361,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.5"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.3"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.0"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.2"
   pool:
     dependency: transitive
     description:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.0"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.2.4"
   provider:
     dependency: transitive
     description:
@@ -443,62 +389,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  shared_preferences:
-    dependency: "direct main"
-    description:
-      name: shared_preferences
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.12"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.10"
-  shared_preferences_ios:
-    dependency: transitive
-    description:
-      name: shared_preferences_ios
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.9"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.4"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.3"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.4"
   shelf:
     dependency: transitive
     description:
@@ -609,20 +499,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.10"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0"
   yaml:
     dependency: transitive
     description:
@@ -632,4 +508,4 @@ packages:
     version: "3.1.0"
 sdks:
   dart: ">=2.15.0 <3.0.0"
-  flutter: ">=2.5.0"
+  flutter: ">=1.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -23,8 +23,6 @@ dependencies:
   # Remote API
   internet_connection_checker: ^0.0.1+3
   http: ^0.13.4
-  # Local cache
-  shared_preferences: ^2.0.12
 
 dev_dependencies:
   flutter_test:
diff --git a/test/features/github/data/datasources/issues_remote_data_source_test.dart b/test/features/github/data/datasources/issues_remote_data_source_test.dart
diff --git a/test/features/github/data/datasources/issues_remote_data_source_test.mocks.dart b/test/features/github/data/datasources/issues_remote_data_source_test.mocks.dart
diff --git a/test/features/github/data/repositories/issues_repository_impl_test.dart b/test/features/github/data/repositories/issues_repository_impl_test.dart
diff --git a/test/features/github/data/repositories/issues_repository_impl_test.mocks.dart b/test/features/github/data/repositories/issues_repository_impl_test.mocks.dart
diff --git a/test/features/github/domain/usecases/get_issues_test.dart b/test/features/github/domain/usecases/get_issues_test.dart
diff --git a/test/features/github/domain/usecases/get_issues_test.mocks.dart b/test/features/github/domain/usecases/get_issues_test.mocks.dart

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ import 'package:github_api_consumer/features/github/domain/entities/issue.dart';`
`4`	`4`
`5`	`5`	`import '../../../../core/error/failures.dart';`
`6`	`6`
`7`		`-abstract class GithubRepository {`
	`7`	`+abstract class IssuesRepository {`
`8`	`8`	`Future<Either<Failure, List<Issue>>> getIssues(int page, FilterState filterState, SortOption sortOption);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'package:flutter/material.dart';`
`2`		`-import 'package:flutter/widgets.dart';`
`3`	`2`	`import 'package:github_api_consumer/features/github/domain/entities/issue.dart';`
`4`	`3`
`5`	`4`	`class IssueDetailPage extends StatelessWidget {`