diff --git a/lib/data/network/currencyApi.dart b/lib/data/network/currencyApi.dart index 1523eec..1b1a323 100644 --- a/lib/data/network/currencyApi.dart +++ b/lib/data/network/currencyApi.dart @@ -1,6 +1,5 @@ import 'package:dio/dio.dart'; import 'package:easy_cc_flutter/data/network/app_dio.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:retrofit/retrofit.dart'; @@ -11,10 +10,11 @@ part 'currencyApi.g.dart'; @RestApi(baseUrl: "https://free.currencyconverterapi.com/api/v3/") abstract class CurrencyApi { factory CurrencyApi(Dio dio) = _CurrencyApi; + static const api = String.fromEnvironment('currencyApiKey'); static CurrencyApi create() { final dio = AppDio.createDio(); - dio.options.queryParameters.addAll({"apiKey": dotenv.env['apiKey']!}); + dio.options.queryParameters.addAll({"apiKey": api}); return _CurrencyApi(dio); } diff --git a/lib/main.dart b/lib/main.dart index b159706..dce73c6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:logger/logger.dart'; import 'Home.dart'; @@ -13,7 +12,6 @@ var logger = Logger( void main() async { WidgetsFlutterBinding.ensureInitialized(); setupLocator(); - await dotenv.load(); await locator().init(); runApp(const MyApp()); } diff --git a/pubspec.lock b/pubspec.lock index d576ccc..4c96acc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -209,13 +209,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_dotenv: - dependency: "direct main" - description: - name: flutter_dotenv - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.2" flutter_lints: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 6e3d8f1..614156a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,7 +46,6 @@ dependencies: get_it: ^7.2.0 retrofit: ^3.0.1+1 logger: ^1.1.0 - flutter_dotenv: ^5.0.2 mockito: ^5.3.2 dev_dependencies: diff --git a/test/unit_test/repository_test.dart b/test/unit_test/repository_test.dart index aae9c06..53b2a30 100644 --- a/test/unit_test/repository_test.dart +++ b/test/unit_test/repository_test.dart @@ -8,7 +8,6 @@ import 'package:easy_cc_flutter/data/prefs/CurrencyPair.dart'; import 'package:easy_cc_flutter/data/prefs/PreferenceProvider.dart'; import 'package:easy_cc_flutter/data/repository/RepositoryImpl.dart'; import 'package:easy_cc_flutter/locator.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; @@ -37,9 +36,8 @@ void main() { const String fromCurrency = "AUD - Australian Dollar"; const String toCurrency = "GBP - British Pound Sterling"; - setUpAll(() async { - // Setup - await dotenv.load(fileName: "test/resources/test_res.env"); + setUpAll(() { + TestWidgetsFlutterBinding.ensureInitialized(); // Create mock object. preferenceProvider = MockPreferenceProvider(); currencyApi = MockCurrencyApi(); diff --git a/test/unit_test/viewmodel_test.dart b/test/unit_test/viewmodel_test.dart index a792d36..e341090 100644 --- a/test/unit_test/viewmodel_test.dart +++ b/test/unit_test/viewmodel_test.dart @@ -6,7 +6,6 @@ import 'package:easy_cc_flutter/data/model/Currency.dart'; import 'package:easy_cc_flutter/data/prefs/CurrencyPair.dart'; import 'package:easy_cc_flutter/data/repository/RepositoryImpl.dart'; import 'package:easy_cc_flutter/locator.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; @@ -24,9 +23,9 @@ void main() { const String fromCurrency = "AUD - Australian Dollar"; const String toCurrency = "GBP - British Pound Sterling"; - setUpAll(() async { - // Setup - await dotenv.load(fileName: "test/resources/test_res.env"); + setUpAll(() { + TestWidgetsFlutterBinding.ensureInitialized(); + // Create mock object. repository = MockRepositoryImpl();