diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3004346 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +.PHONY: build release + +build: release + +release: + flutter build apk --release --dart-define-from-file=.env diff --git a/README.md b/README.md index c7acd0e..89ca007 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,13 @@ flutter pub get 1. Run: ```bash -flutter run +flutter run --dart-define-from-file=.env +``` + +1. Build release APK: + +```bash +make build release ``` ## Usage diff --git a/lib/main.dart b/lib/main.dart index 1a3ebee..197463d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,12 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:provider/provider.dart'; import 'package:rental_income_tracker/screens/home_screen.dart'; import 'package:rental_income_tracker/state/rent_controller.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(fileName: '.env'); runApp(const RentalIncomeTrackerApp()); } diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 80b266d..d77d610 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -198,7 +198,7 @@ class _SettingsScreenState extends State { ), const SizedBox(height: 16), const Text( - 'ForexRateAPI key is loaded from .env (FOREX_RATE_API_KEY).', + 'ForexRateAPI key is loaded from FOREX_RATE_API_KEY via --dart-define-from-file=.env.', ), ], ), diff --git a/lib/services/open_exchange_service.dart b/lib/services/open_exchange_service.dart index c28a8f2..ae85b6d 100644 --- a/lib/services/open_exchange_service.dart +++ b/lib/services/open_exchange_service.dart @@ -41,7 +41,7 @@ class ForexRateApiService { final parsed = jsonDecode(response.body) as Map; final error = parsed['error'] as Map?; final code = error?['code']?.toString().toLowerCase(); - return code == 'rate_limit_reached'; + return code == '104' || code == 'rate_limit_reached'; } catch (_) { return false; } @@ -136,6 +136,62 @@ class ForexRateApiService { if (apiKey == 'REPLACE_WITH_YOUR_FOREXRATE_API_KEY') { throw StateError('ForexRateAPI key is not configured.'); } - return null; + + final start = DateTime(year, 1, 1); + final end = DateTime(year, 12, 31); + final uri = + Uri.https('api.forexrateapi.com', '/v1/timeframe', { + 'api_key': apiKey, + 'base': 'USD', + 'currencies': 'SEK', + 'start_date': DateFormat('yyyy-MM-dd').format(start), + 'end_date': DateFormat('yyyy-MM-dd').format(end), + }); + + _log('Timeframe request: ${_redactedUri(uri)}'); + + final response = await _getWithRateLimitRetry(uri, operation: 'Timeframe'); + if (response.statusCode != 200) { + _log( + 'Timeframe endpoint unavailable for this account or request; falling back to per-day requests. status=${response.statusCode}', + ); + return null; + } + + final json = jsonDecode(response.body) as Map; + final success = json['success'] as bool? ?? false; + if (!success) { + _log( + 'Timeframe success=false; falling back to per-day requests. error=${json['error']}', + ); + return null; + } + + final rates = json['rates'] as Map?; + if (rates == null) { + _log( + 'Timeframe response missing rates; falling back to per-day requests.', + ); + return null; + } + + final results = {}; + for (final entry in rates.entries) { + final dayRates = entry.value as Map?; + final sek = dayRates?['SEK']; + if (sek is num) { + results[entry.key] = sek.toDouble(); + } + } + + if (results.isEmpty) { + _log( + 'Timeframe parsed no SEK entries; falling back to per-day requests.', + ); + return null; + } + + _log('Timeframe parsed ${results.length} daily SEK quotes.'); + return results; } } diff --git a/lib/state/rent_controller.dart b/lib/state/rent_controller.dart index 38d21d0..bc26927 100644 --- a/lib/state/rent_controller.dart +++ b/lib/state/rent_controller.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/foundation.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:http/http.dart' as http; import 'package:intl/intl.dart'; import 'package:rental_income_tracker/models/app_settings.dart'; @@ -56,16 +55,17 @@ class RentController extends ChangeNotifier { } static String _exchangeRateApiKeyFromEnv() { - final key = dotenv.env['FOREX_RATE_API_KEY']?.trim() ?? ''; - if (key.isEmpty) { + const key = String.fromEnvironment('FOREX_RATE_API_KEY'); + final trimmed = key.trim(); + if (trimmed.isEmpty) { if (kDebugMode) { debugPrint( - '[RentController] FOREX_RATE_API_KEY missing in .env, API calls will fail until set.', + '[RentController] FOREX_RATE_API_KEY missing from dart defines. Pass --dart-define-from-file=.env (or --dart-define) when building/running.', ); } return 'REPLACE_WITH_YOUR_FOREXRATE_API_KEY'; } - return key; + return trimmed; } final StorageService _storageService; diff --git a/pubspec.yaml b/pubspec.yaml index 23c7e3c..c824bdc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,6 @@ dependencies: flutter: sdk: flutter file_picker: ^10.3.2 - flutter_dotenv: ^5.2.1 flutter_local_notifications: ^19.5.0 flutter_timezone: ^4.1.1 http: ^1.5.0 @@ -27,5 +26,3 @@ dev_dependencies: flutter: uses-material-design: true - assets: - - ./.env