From 9d67e2f7551512d2379368d5a34217d197188cc4 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 27 Jun 2025 19:41:44 +0200 Subject: [PATCH] Put data classes in models folder --- lib/data/{ => models}/game_manager.dart | 2 +- lib/data/{ => models}/game_session.dart | 2 +- lib/data/{ => models}/round.dart | 2 +- lib/services/local_storage_service.dart | 4 ++-- lib/views/active_game_view.dart | 2 +- lib/views/create_game_view.dart | 4 ++-- lib/views/graph_view.dart | 2 +- lib/views/main_menu_view.dart | 2 +- lib/views/round_view.dart | 2 +- pubspec.yaml | 4 ++++ test/data/game_session_test.dart | 2 +- test/data/round_test.dart | 2 +- 12 files changed, 17 insertions(+), 13 deletions(-) rename lib/data/{ => models}/game_manager.dart (96%) rename lib/data/{ => models}/game_session.dart (99%) rename lib/data/{ => models}/round.dart (96%) diff --git a/lib/data/game_manager.dart b/lib/data/models/game_manager.dart similarity index 96% rename from lib/data/game_manager.dart rename to lib/data/models/game_manager.dart index 94b6287..074aff4 100644 --- a/lib/data/game_manager.dart +++ b/lib/data/models/game_manager.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:cabo_counter/services/local_storage_service.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/data/game_session.dart b/lib/data/models/game_session.dart similarity index 99% rename from lib/data/game_session.dart rename to lib/data/models/game_session.dart index 4896e02..444f962 100644 --- a/lib/data/game_session.dart +++ b/lib/data/models/game_session.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/round.dart'; +import 'package:cabo_counter/data/models/round.dart'; import 'package:flutter/cupertino.dart'; /// This class represents a game session for Cabo game. diff --git a/lib/data/round.dart b/lib/data/models/round.dart similarity index 96% rename from lib/data/round.dart rename to lib/data/models/round.dart index dcc5d9f..5695f8f 100644 --- a/lib/data/round.dart +++ b/lib/data/models/round.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; /// This class represents a single round in the game. /// It is stored within the [GameSession] class. diff --git a/lib/services/local_storage_service.dart b/lib/services/local_storage_service.dart index e3fddcc..2004845 100644 --- a/lib/services/local_storage_service.dart +++ b/lib/services/local_storage_service.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:io'; -import 'package:cabo_counter/data/game_manager.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_manager.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:file_picker/file_picker.dart'; import 'package:file_saver/file_saver.dart'; import 'package:flutter/services.dart'; diff --git a/lib/views/active_game_view.dart b/lib/views/active_game_view.dart index 6266348..c0d359f 100644 --- a/lib/views/active_game_view.dart +++ b/lib/views/active_game_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:cabo_counter/l10n/app_localizations.dart'; import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/views/graph_view.dart'; diff --git a/lib/views/create_game_view.dart b/lib/views/create_game_view.dart index 5ac5026..4e6720b 100644 --- a/lib/views/create_game_view.dart +++ b/lib/views/create_game_view.dart @@ -1,5 +1,5 @@ -import 'package:cabo_counter/data/game_manager.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_manager.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:cabo_counter/l10n/app_localizations.dart'; import 'package:cabo_counter/utility/custom_theme.dart'; import 'package:cabo_counter/utility/globals.dart'; diff --git a/lib/views/graph_view.dart b/lib/views/graph_view.dart index 345c670..39e91c2 100644 --- a/lib/views/graph_view.dart +++ b/lib/views/graph_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:cabo_counter/l10n/app_localizations.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/main_menu_view.dart b/lib/views/main_menu_view.dart index 90c384c..69783d8 100644 --- a/lib/views/main_menu_view.dart +++ b/lib/views/main_menu_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_manager.dart'; +import 'package:cabo_counter/data/models/game_manager.dart'; import 'package:cabo_counter/l10n/app_localizations.dart'; import 'package:cabo_counter/services/local_storage_service.dart'; import 'package:cabo_counter/utility/custom_theme.dart'; diff --git a/lib/views/round_view.dart b/lib/views/round_view.dart index 056d0a1..4ad8f0d 100644 --- a/lib/views/round_view.dart +++ b/lib/views/round_view.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:cabo_counter/l10n/app_localizations.dart'; import 'package:cabo_counter/services/local_storage_service.dart'; import 'package:cabo_counter/utility/custom_theme.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index b0bf86a..5a24035 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,12 +26,16 @@ dependencies: sdk: flutter intl: any syncfusion_flutter_charts: ^30.1.37 + drift: ^2.26.1 + drift_flutter: ^0.2.4 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^5.0.0 test: ^1.25.15 + drift_dev: ^2.26.1 + build_runner: ^2.4.15 flutter: generate: true diff --git a/test/data/game_session_test.dart b/test/data/game_session_test.dart index 0e9bfa1..a28a4e8 100644 --- a/test/data/game_session_test.dart +++ b/test/data/game_session_test.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/models/game_session.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/data/round_test.dart b/test/data/round_test.dart index 3e5ef4e..c80f0dc 100644 --- a/test/data/round_test.dart +++ b/test/data/round_test.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/round.dart'; +import 'package:cabo_counter/data/models/round.dart'; import 'package:test/test.dart'; void main() {