Skip to content

Commit 756411a

Browse files
authored
hamed/extract_dependency_injection_package (#248)
- extract dependency injection package
1 parent efe8d0a commit 756411a

File tree

260 files changed

+687
-692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+687
-692
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ APIInitializer().initialize();
1515
Establishing a connection to WebSocket needs an instance of the `ConnectionInformation` class for initializing API connection.
1616

1717
```dart
18-
final BaseAPI api = Injector.getInjector().get<BaseAPI>();
18+
final BaseAPI api = Injector().get<BaseAPI>();
1919
2020
api.connect(
2121
ConnectionInformation(
@@ -45,7 +45,7 @@ print(ping.succeeded);
4545
#### Calling method directly with `BaseAPI`
4646

4747
```dart
48-
final BaseAPI api = Injector.getInjector().get<BaseAPI>();
48+
final BaseAPI api = Injector().get<BaseAPI>();
4949
5050
final PingResponse response =
5151
await api.call(request: const PingRequest());

lib/api/api_initializer.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
2-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
2+
import 'package:deriv_dependency_injector/dependency_injector.dart';
33

44
/// API initializer class
55
class APIInitializer {
66
/// Initialize injector
7-
Injector initialize({required BaseAPI api}) => Injector.getInjector()
7+
Injector initialize({required BaseAPI api}) => Injector()
88
..map<BaseAPI>(
99
factoryFunction: (_) => api,
1010
isSingleton: true,

lib/api/manually/ohlc_response_result.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/api/response/forget_all_response_result.dart';
55
import 'package:flutter_deriv_api/basic_api/generated/forget_all_receive.dart';
66
import 'package:flutter_deriv_api/helpers/helpers.dart';
77
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
8-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
8+
import 'package:deriv_dependency_injector/dependency_injector.dart';
99

1010
import 'tick_base.dart';
1111

@@ -77,7 +77,7 @@ class OHLC extends TickBase {
7777
/// Open time
7878
final DateTime? openTime;
7979

80-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
80+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
8181

8282
/// Unsubscribes all OHLC.
8383
///

lib/api/manually/tick.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:flutter_deriv_api/basic_api/response.dart';
77
import 'package:flutter_deriv_api/helpers/helpers.dart';
88
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
99
import 'package:flutter_deriv_api/services/connection/call_manager/base_call_manager.dart';
10-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
10+
import 'package:deriv_dependency_injector/dependency_injector.dart';
1111

1212
import 'tick_base.dart';
1313

@@ -56,7 +56,7 @@ class Tick extends TickBase {
5656
/// Market value at the epoch
5757
final double? quote;
5858

59-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
59+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
6060

6161
/// Subscribes to a tick for given [TickRequest]
6262
///

lib/api/manually/tick_base.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/api/response/forget_response_result.dart';
55
import 'package:flutter_deriv_api/basic_api/generated/forget_receive.dart';
66
import 'package:flutter_deriv_api/helpers/helpers.dart';
77
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
8-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
8+
import 'package:deriv_dependency_injector/dependency_injector.dart';
99

1010
/// Spot price updates for a given symbol
1111
abstract class TickBaseModel extends APIBaseModel {
@@ -64,7 +64,7 @@ class TickBase extends TickBaseModel {
6464
/// Subscription information
6565
final SubscriptionModel? subscriptionInformation;
6666

67-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
67+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
6868

6969
/// Unsubscribes from tick stream
7070
///

lib/api/manually/tick_history_subscription.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import 'package:deriv_dependency_injector/dependency_injector.dart';
2+
13
import '../../basic_api/generated/forget_receive.dart';
24
import '../../helpers/helpers.dart';
35
import '../../services/connection/api_manager/base_api.dart';
4-
import '../../services/dependency_injector/injector.dart';
56
import '../exceptions/exceptions.dart';
67
import '../response/forget_response_result.dart';
78
import '../response/ticks_history_response_result.dart';
@@ -18,7 +19,7 @@ class TickHistorySubscription {
1819
/// The stream of the tick
1920
final Stream<TickBase?>? tickStream;
2021

21-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
22+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
2223

2324
/// Unsubscribes from tick history stream
2425
///

lib/api/response/active_symbols_response_result.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:flutter_deriv_api/basic_api/generated/active_symbols_receive.dar
77
import 'package:flutter_deriv_api/basic_api/generated/active_symbols_send.dart';
88
import 'package:flutter_deriv_api/helpers/helpers.dart';
99
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
10-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
10+
import 'package:deriv_dependency_injector/dependency_injector.dart';
1111

1212
/// Active symbols response model class.
1313
abstract class ActiveSymbolsResponseModel {
@@ -58,7 +58,7 @@ class ActiveSymbolsResponse extends ActiveSymbolsResponseModel {
5858
return resultMap;
5959
}
6060

61-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
61+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
6262

6363
/// Gets the list of active symbols.
6464
///
@@ -88,6 +88,7 @@ class ActiveSymbolsResponse extends ActiveSymbolsResponseModel {
8888
activeSymbols: activeSymbols ?? this.activeSymbols,
8989
);
9090
}
91+
9192
/// Active symbols item model class.
9293
abstract class ActiveSymbolsItemModel {
9394
/// Initializes Active symbols item model class .

lib/api/response/api_token_response_result.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:flutter_deriv_api/basic_api/generated/api_token_receive.dart';
77
import 'package:flutter_deriv_api/basic_api/generated/api_token_send.dart';
88
import 'package:flutter_deriv_api/helpers/helpers.dart';
99
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
10-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
10+
import 'package:deriv_dependency_injector/dependency_injector.dart';
1111

1212
/// Api token response model class.
1313
abstract class ApiTokenResponseModel {
@@ -48,7 +48,7 @@ class ApiTokenResponse extends ApiTokenResponseModel {
4848
return resultMap;
4949
}
5050

51-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
51+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
5252

5353
/// Creates an API tokens
5454
///
@@ -134,6 +134,7 @@ enum ScopesItemEnum {
134134
/// admin.
135135
admin,
136136
}
137+
137138
/// Api token model class.
138139
abstract class ApiTokenModel {
139140
/// Initializes Api token model class .
@@ -208,6 +209,7 @@ class ApiToken extends ApiTokenModel {
208209
tokens: tokens ?? this.tokens,
209210
);
210211
}
212+
211213
/// Tokens item model class.
212214
abstract class TokensItemModel {
213215
/// Initializes Tokens item model class .

lib/api/response/app_delete_response_result.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:flutter_deriv_api/basic_api/generated/app_delete_receive.dart';
77
import 'package:flutter_deriv_api/basic_api/generated/app_delete_send.dart';
88
import 'package:flutter_deriv_api/helpers/helpers.dart';
99
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
10-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
10+
import 'package:deriv_dependency_injector/dependency_injector.dart';
1111

1212
/// App delete response model class.
1313
abstract class AppDeleteResponseModel {
@@ -46,7 +46,7 @@ class AppDeleteResponse extends AppDeleteResponseModel {
4646
return resultMap;
4747
}
4848

49-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
49+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
5050

5151
/// Deletes the application by appId specified in [AppDeleteRequest.appDelete].
5252
///

lib/api/response/app_get_response_result.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import 'package:flutter_deriv_api/basic_api/generated/app_update_send.dart';
2020
import 'package:flutter_deriv_api/basic_api/generated/revoke_oauth_app_send.dart';
2121
import 'package:flutter_deriv_api/helpers/helpers.dart';
2222
import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
23-
import 'package:flutter_deriv_api/services/dependency_injector/injector.dart';
23+
import 'package:deriv_dependency_injector/dependency_injector.dart';
2424

2525
/// App get response model class.
2626
abstract class AppGetResponseModel {
@@ -61,7 +61,7 @@ class AppGetResponse extends AppGetResponseModel {
6161
return resultMap;
6262
}
6363

64-
static final BaseAPI _api = Injector.getInjector().get<BaseAPI>()!;
64+
static final BaseAPI _api = Injector().get<BaseAPI>()!;
6565

6666
/// Gets the information of the OAuth application specified by [appId] in [request]
6767
///
@@ -186,6 +186,7 @@ class AppGetResponse extends AppGetResponseModel {
186186
appGet: appGet ?? this.appGet,
187187
);
188188
}
189+
189190
/// App get model class.
190191
abstract class AppGetModel {
191192
/// Initializes App get model class .

0 commit comments

Comments
 (0)