diff --git a/lib/main/framework/ui/basic_configuration_tab.dart b/lib/main/framework/ui/basic_configuration_tab.dart index c29173b..8ce10fd 100644 --- a/lib/main/framework/ui/basic_configuration_tab.dart +++ b/lib/main/framework/ui/basic_configuration_tab.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:gap/gap.dart'; import 'package:minecraft_server_installer/main/framework/ui/strings.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart'; -import 'package:minecraft_server_installer/vanila/framework/ui/game_version_dropdown.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_bloc.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart'; +import 'package:minecraft_server_installer/vanilla/framework/ui/game_version_dropdown.dart'; class BasicConfigurationTab extends StatefulWidget { const BasicConfigurationTab({super.key}); @@ -23,7 +23,7 @@ class _BasicConfigurationTabState extends State { children: [ const GameVersionDropdown(), const Spacer(), - BlocConsumer( + BlocConsumer( listener: (_, __) {}, builder: (context, state) => Row( @@ -50,6 +50,6 @@ class _BasicConfigurationTabState extends State { } void _downloadServerFile() { - context.read().add(VanilaServerFileDownloadedEvent()); + context.read().add(VanillaServerFileDownloadedEvent()); } } diff --git a/lib/main/framework/ui/minecraft_server_installer.dart b/lib/main/framework/ui/minecraft_server_installer.dart index 3151b1b..190ba96 100644 --- a/lib/main/framework/ui/minecraft_server_installer.dart +++ b/lib/main/framework/ui/minecraft_server_installer.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:minecraft_server_installer/main/framework/ui/basic_configuration_tab.dart'; -import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_repository_impl.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart'; -import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart'; -import 'package:minecraft_server_installer/vanila/application/use_case/get_game_version_list_use_case.dart'; -import 'package:minecraft_server_installer/vanila/framework/api/vanila_api_service_impl.dart'; -import 'package:minecraft_server_installer/vanila/framework/storage/vanila_file_storage_impl.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_repository_impl.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_bloc.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart'; +import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/application/use_case/get_game_version_list_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/framework/api/vanilla_api_service_impl.dart'; +import 'package:minecraft_server_installer/vanilla/framework/storage/vanilla_file_storage_impl.dart'; class MinecraftServerInstaller extends StatelessWidget { const MinecraftServerInstaller({super.key}); @@ -17,9 +17,9 @@ class MinecraftServerInstaller extends StatelessWidget { @override Widget build(BuildContext context) { - final gameVersionApiService = VanilaApiServiceImpl(); - final gameVersionFileStorage = VanilaFileStorageImpl(); - final gameVersionRepository = VanilaRepositoryImpl(gameVersionApiService, gameVersionFileStorage); + final gameVersionApiService = VanillaApiServiceImpl(); + final gameVersionFileStorage = VanillaFileStorageImpl(); + final gameVersionRepository = VanillaRepositoryImpl(gameVersionApiService, gameVersionFileStorage); final getGameVersionListUseCase = GetGameVersionListUseCase(gameVersionRepository); final downloadServerFileUseCase = DownloadServerFileUseCase(gameVersionRepository); @@ -28,15 +28,15 @@ class MinecraftServerInstaller extends StatelessWidget { theme: ThemeData.light().copyWith(colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue.shade900)), home: MultiBlocProvider( providers: [ - BlocProvider( + BlocProvider( create: (context) => - VanilaBloc(getGameVersionListUseCase, downloadServerFileUseCase) - ..add(VanilaGameVersionListLoadedEvent()), + VanillaBloc(getGameVersionListUseCase, downloadServerFileUseCase) + ..add(VanillaGameVersionListLoadedEvent()), ), ], child: Scaffold( - body: BlocConsumer( + body: BlocConsumer( listener: (_, __) {}, builder: (_, state) { if (state.isLocked) { diff --git a/lib/vanila/adapter/gateway/vanila_api_service.dart b/lib/vanila/adapter/gateway/vanila_api_service.dart deleted file mode 100644 index 0e7d0a4..0000000 --- a/lib/vanila/adapter/gateway/vanila_api_service.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'dart:typed_data'; - -import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; - -abstract interface class VanilaApiService { - Future> fetchGameVersionList(); - - Future fetchServerFile(Uri url, {DownloadProgressCallback? onProgressChanged}); -} diff --git a/lib/vanila/adapter/gateway/vanila_repository_impl.dart b/lib/vanila/adapter/gateway/vanila_repository_impl.dart deleted file mode 100644 index 4edcdd0..0000000 --- a/lib/vanila/adapter/gateway/vanila_repository_impl.dart +++ /dev/null @@ -1,25 +0,0 @@ -import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_api_service.dart'; -import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_file_storage.dart'; -import 'package:minecraft_server_installer/vanila/application/repository/vanila_repository.dart'; -import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; - -class VanilaRepositoryImpl implements VanilaRepository { - final VanilaApiService _gameVersionApiService; - final VanilaFileStorage _gameVersionFileStorage; - - VanilaRepositoryImpl(this._gameVersionApiService, this._gameVersionFileStorage); - - @override - Future> getGameVersionList() => _gameVersionApiService.fetchGameVersionList(); - - @override - Future downloadServerFile( - GameVersion version, - String savePath, { - DownloadProgressCallback? onProgressChanged, - }) async { - final fileBytes = await _gameVersionApiService.fetchServerFile(version.url, onProgressChanged: onProgressChanged); - await _gameVersionFileStorage.saveFile(fileBytes, savePath); - } -} diff --git a/lib/vanila/adapter/presentation/vanila_bloc.dart b/lib/vanila/adapter/presentation/vanila_bloc.dart deleted file mode 100644 index f436bda..0000000 --- a/lib/vanila/adapter/presentation/vanila_bloc.dart +++ /dev/null @@ -1,74 +0,0 @@ -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:minecraft_server_installer/main/constants.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart'; -import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart'; -import 'package:minecraft_server_installer/vanila/application/use_case/get_game_version_list_use_case.dart'; -import 'package:path/path.dart' as path; - -class VanilaBloc extends Bloc { - final GetGameVersionListUseCase _getGameVersionListUseCase; - final DownloadServerFileUseCase _downloadServerFileUseCase; - - VanilaBloc(this._getGameVersionListUseCase, this._downloadServerFileUseCase) : super(const VanilaState.empty()) { - on((_, emit) async { - try { - final gameVersions = await _getGameVersionListUseCase(); - emit( - const VanilaState.empty().copyWith( - gameVersions: gameVersions.map((entity) => GameVersionViewModel.from(entity)).toList(), - ), - ); - } on Exception { - emit(const VanilaState.empty()); - } - }); - - on((event, emit) { - emit(state.copyWith(selectedGameVersion: event.gameVersion)); - }); - - on((_, emit) async { - final gameVersion = state.selectedGameVersion; - if (gameVersion == null) { - return; - } - - emit(state.copyWith(isLocked: true)); - await _downloadServerFileUseCase( - gameVersion.toEntity(), - path.join('.', Constants.serverFileName), - onProgressChanged: (progress) => add(_VanilaDownloadProgressChangedEvent(progress)), - ); - emit(state.copyWith(isLocked: false)); - }); - - on<_VanilaDownloadProgressChangedEvent>((event, emit) { - if (event.progress < 0) { - emit(state.copyWith(downloadProgress: 0)); - } else if (event.progress > 1) { - emit(state.copyWith(downloadProgress: 1)); - } else { - emit(state.copyWith(downloadProgress: event.progress)); - } - }); - } -} - -sealed class VanilaEvent {} - -class VanilaGameVersionListLoadedEvent extends VanilaEvent {} - -class VanilaGameVersionSelectedEvent extends VanilaEvent { - final GameVersionViewModel gameVersion; - - VanilaGameVersionSelectedEvent(this.gameVersion); -} - -class VanilaServerFileDownloadedEvent extends VanilaEvent {} - -class _VanilaDownloadProgressChangedEvent extends VanilaEvent { - final double progress; - - _VanilaDownloadProgressChangedEvent(this.progress); -} diff --git a/lib/vanila/application/repository/vanila_repository.dart b/lib/vanila/application/repository/vanila_repository.dart deleted file mode 100644 index 436f145..0000000 --- a/lib/vanila/application/repository/vanila_repository.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; - -abstract interface class VanilaRepository { - Future> getGameVersionList(); - - Future downloadServerFile(GameVersion version, String savePath, {DownloadProgressCallback? onProgressChanged}); -} diff --git a/lib/vanila/application/use_case/get_game_version_list_use_case.dart b/lib/vanila/application/use_case/get_game_version_list_use_case.dart deleted file mode 100644 index b99349f..0000000 --- a/lib/vanila/application/use_case/get_game_version_list_use_case.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:minecraft_server_installer/vanila/application/repository/vanila_repository.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; - -class GetGameVersionListUseCase { - final VanilaRepository _gameVersionRepository; - - GetGameVersionListUseCase(this._gameVersionRepository); - - Future> call() => _gameVersionRepository.getGameVersionList(); -} diff --git a/lib/vanilla/adapter/gateway/vanilla_api_service.dart b/lib/vanilla/adapter/gateway/vanilla_api_service.dart new file mode 100644 index 0000000..2c50673 --- /dev/null +++ b/lib/vanilla/adapter/gateway/vanilla_api_service.dart @@ -0,0 +1,10 @@ +import 'dart:typed_data'; + +import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; + +abstract interface class VanillaApiService { + Future> fetchGameVersionList(); + + Future fetchServerFile(Uri url, {DownloadProgressCallback? onProgressChanged}); +} diff --git a/lib/vanila/adapter/gateway/vanila_file_storage.dart b/lib/vanilla/adapter/gateway/vanilla_file_storage.dart similarity index 66% rename from lib/vanila/adapter/gateway/vanila_file_storage.dart rename to lib/vanilla/adapter/gateway/vanilla_file_storage.dart index 7ba203d..3217984 100644 --- a/lib/vanila/adapter/gateway/vanila_file_storage.dart +++ b/lib/vanilla/adapter/gateway/vanilla_file_storage.dart @@ -1,5 +1,5 @@ import 'dart:typed_data'; -abstract interface class VanilaFileStorage { +abstract interface class VanillaFileStorage { Future saveFile(Uint8List fileBytes, String savePath); } diff --git a/lib/vanilla/adapter/gateway/vanilla_repository_impl.dart b/lib/vanilla/adapter/gateway/vanilla_repository_impl.dart new file mode 100644 index 0000000..3bd2dca --- /dev/null +++ b/lib/vanilla/adapter/gateway/vanilla_repository_impl.dart @@ -0,0 +1,25 @@ +import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_api_service.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_file_storage.dart'; +import 'package:minecraft_server_installer/vanilla/application/repository/vanilla_repository.dart'; +import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; + +class VanillaRepositoryImpl implements VanillaRepository { + final VanillaApiService _gameVersionApiService; + final VanillaFileStorage _gameVersionFileStorage; + + VanillaRepositoryImpl(this._gameVersionApiService, this._gameVersionFileStorage); + + @override + Future> getGameVersionList() => _gameVersionApiService.fetchGameVersionList(); + + @override + Future downloadServerFile( + GameVersion version, + String savePath, { + DownloadProgressCallback? onProgressChanged, + }) async { + final fileBytes = await _gameVersionApiService.fetchServerFile(version.url, onProgressChanged: onProgressChanged); + await _gameVersionFileStorage.saveFile(fileBytes, savePath); + } +} diff --git a/lib/vanila/adapter/presentation/game_version_view_model.dart b/lib/vanilla/adapter/presentation/game_version_view_model.dart similarity index 83% rename from lib/vanila/adapter/presentation/game_version_view_model.dart rename to lib/vanilla/adapter/presentation/game_version_view_model.dart index de8a870..cb50d77 100644 --- a/lib/vanila/adapter/presentation/game_version_view_model.dart +++ b/lib/vanilla/adapter/presentation/game_version_view_model.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; class GameVersionViewModel with EquatableMixin { final String name; diff --git a/lib/vanilla/adapter/presentation/vanilla_bloc.dart b/lib/vanilla/adapter/presentation/vanilla_bloc.dart new file mode 100644 index 0000000..23cb010 --- /dev/null +++ b/lib/vanilla/adapter/presentation/vanilla_bloc.dart @@ -0,0 +1,74 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:minecraft_server_installer/main/constants.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart'; +import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/application/use_case/get_game_version_list_use_case.dart'; +import 'package:path/path.dart' as path; + +class VanillaBloc extends Bloc { + final GetGameVersionListUseCase _getGameVersionListUseCase; + final DownloadServerFileUseCase _downloadServerFileUseCase; + + VanillaBloc(this._getGameVersionListUseCase, this._downloadServerFileUseCase) : super(const VanillaState.empty()) { + on((_, emit) async { + try { + final gameVersions = await _getGameVersionListUseCase(); + emit( + const VanillaState.empty().copyWith( + gameVersions: gameVersions.map((entity) => GameVersionViewModel.from(entity)).toList(), + ), + ); + } on Exception { + emit(const VanillaState.empty()); + } + }); + + on((event, emit) { + emit(state.copyWith(selectedGameVersion: event.gameVersion)); + }); + + on((_, emit) async { + final gameVersion = state.selectedGameVersion; + if (gameVersion == null) { + return; + } + + emit(state.copyWith(isLocked: true)); + await _downloadServerFileUseCase( + gameVersion.toEntity(), + path.join('.', Constants.serverFileName), + onProgressChanged: (progress) => add(_VanillaDownloadProgressChangedEvent(progress)), + ); + emit(state.copyWith(isLocked: false)); + }); + + on<_VanillaDownloadProgressChangedEvent>((event, emit) { + if (event.progress < 0) { + emit(state.copyWith(downloadProgress: 0)); + } else if (event.progress > 1) { + emit(state.copyWith(downloadProgress: 1)); + } else { + emit(state.copyWith(downloadProgress: event.progress)); + } + }); + } +} + +sealed class VanillaEvent {} + +class VanillaGameVersionListLoadedEvent extends VanillaEvent {} + +class VanillaGameVersionSelectedEvent extends VanillaEvent { + final GameVersionViewModel gameVersion; + + VanillaGameVersionSelectedEvent(this.gameVersion); +} + +class VanillaServerFileDownloadedEvent extends VanillaEvent {} + +class _VanillaDownloadProgressChangedEvent extends VanillaEvent { + final double progress; + + _VanillaDownloadProgressChangedEvent(this.progress); +} diff --git a/lib/vanila/adapter/presentation/vanila_state.dart b/lib/vanilla/adapter/presentation/vanilla_state.dart similarity index 81% rename from lib/vanila/adapter/presentation/vanila_state.dart rename to lib/vanilla/adapter/presentation/vanilla_state.dart index 0c46e45..6ae3e2d 100644 --- a/lib/vanila/adapter/presentation/vanila_state.dart +++ b/lib/vanilla/adapter/presentation/vanilla_state.dart @@ -1,20 +1,20 @@ import 'package:equatable/equatable.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart'; -class VanilaState with EquatableMixin { +class VanillaState with EquatableMixin { final bool isLocked; final double downloadProgress; final List gameVersions; final GameVersionViewModel? selectedGameVersion; - const VanilaState({ + const VanillaState({ required this.isLocked, required this.downloadProgress, required this.gameVersions, required this.selectedGameVersion, }); - const VanilaState.empty() + const VanillaState.empty() : this(isLocked: false, downloadProgress: 0, gameVersions: const [], selectedGameVersion: null); @override @@ -24,12 +24,12 @@ class VanilaState with EquatableMixin { bool get isDownloading => downloadProgress > 0 && downloadProgress < 1; - VanilaState copyWith({ + VanillaState copyWith({ bool? isLocked, double? downloadProgress, List? gameVersions, GameVersionViewModel? selectedGameVersion, - }) => VanilaState( + }) => VanillaState( isLocked: isLocked ?? this.isLocked, downloadProgress: downloadProgress ?? this.downloadProgress, gameVersions: gameVersions ?? this.gameVersions, diff --git a/lib/vanilla/application/repository/vanilla_repository.dart b/lib/vanilla/application/repository/vanilla_repository.dart new file mode 100644 index 0000000..f9c0bcb --- /dev/null +++ b/lib/vanilla/application/repository/vanilla_repository.dart @@ -0,0 +1,8 @@ +import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; + +abstract interface class VanillaRepository { + Future> getGameVersionList(); + + Future downloadServerFile(GameVersion version, String savePath, {DownloadProgressCallback? onProgressChanged}); +} diff --git a/lib/vanila/application/use_case/download_server_file_use_case.dart b/lib/vanilla/application/use_case/download_server_file_use_case.dart similarity index 61% rename from lib/vanila/application/use_case/download_server_file_use_case.dart rename to lib/vanilla/application/use_case/download_server_file_use_case.dart index 89ebf4a..431ef72 100644 --- a/lib/vanila/application/use_case/download_server_file_use_case.dart +++ b/lib/vanilla/application/use_case/download_server_file_use_case.dart @@ -1,10 +1,10 @@ -import 'package:minecraft_server_installer/vanila/application/repository/vanila_repository.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; +import 'package:minecraft_server_installer/vanilla/application/repository/vanilla_repository.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; typedef DownloadProgressCallback = void Function(double progress); class DownloadServerFileUseCase { - final VanilaRepository _gameVersionRepository; + final VanillaRepository _gameVersionRepository; DownloadServerFileUseCase(this._gameVersionRepository); diff --git a/lib/vanilla/application/use_case/get_game_version_list_use_case.dart b/lib/vanilla/application/use_case/get_game_version_list_use_case.dart new file mode 100644 index 0000000..3f4fcb5 --- /dev/null +++ b/lib/vanilla/application/use_case/get_game_version_list_use_case.dart @@ -0,0 +1,10 @@ +import 'package:minecraft_server_installer/vanilla/application/repository/vanilla_repository.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; + +class GetGameVersionListUseCase { + final VanillaRepository _gameVersionRepository; + + GetGameVersionListUseCase(this._gameVersionRepository); + + Future> call() => _gameVersionRepository.getGameVersionList(); +} diff --git a/lib/vanila/domain/entity/game_version.dart b/lib/vanilla/domain/entity/game_version.dart similarity index 100% rename from lib/vanila/domain/entity/game_version.dart rename to lib/vanilla/domain/entity/game_version.dart diff --git a/lib/vanila/framework/api/vanila_api_service_impl.dart b/lib/vanilla/framework/api/vanilla_api_service_impl.dart similarity index 82% rename from lib/vanila/framework/api/vanila_api_service_impl.dart rename to lib/vanilla/framework/api/vanilla_api_service_impl.dart index d288ab0..d633312 100644 --- a/lib/vanila/framework/api/vanila_api_service_impl.dart +++ b/lib/vanilla/framework/api/vanilla_api_service_impl.dart @@ -3,11 +3,11 @@ import 'dart:typed_data'; import 'package:http/http.dart' as http; import 'package:minecraft_server_installer/main/constants.dart'; -import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_api_service.dart'; -import 'package:minecraft_server_installer/vanila/application/use_case/download_server_file_use_case.dart'; -import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_api_service.dart'; +import 'package:minecraft_server_installer/vanilla/application/use_case/download_server_file_use_case.dart'; +import 'package:minecraft_server_installer/vanilla/domain/entity/game_version.dart'; -class VanilaApiServiceImpl implements VanilaApiService { +class VanillaApiServiceImpl implements VanillaApiService { @override Future> fetchGameVersionList() async { final sourceUrl = Uri.parse(Constants.gameVersionListUrl); diff --git a/lib/vanila/framework/storage/vanila_file_storage_impl.dart b/lib/vanilla/framework/storage/vanilla_file_storage_impl.dart similarity index 68% rename from lib/vanila/framework/storage/vanila_file_storage_impl.dart rename to lib/vanilla/framework/storage/vanilla_file_storage_impl.dart index 656379e..921aa92 100644 --- a/lib/vanila/framework/storage/vanila_file_storage_impl.dart +++ b/lib/vanilla/framework/storage/vanilla_file_storage_impl.dart @@ -1,9 +1,9 @@ import 'dart:io'; import 'dart:typed_data'; -import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_file_storage.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/gateway/vanilla_file_storage.dart'; -class VanilaFileStorageImpl implements VanilaFileStorage { +class VanillaFileStorageImpl implements VanillaFileStorage { @override Future saveFile(Uint8List fileBytes, String savePath) async { final file = File(savePath); diff --git a/lib/vanila/framework/ui/game_version_dropdown.dart b/lib/vanilla/framework/ui/game_version_dropdown.dart similarity index 68% rename from lib/vanila/framework/ui/game_version_dropdown.dart rename to lib/vanilla/framework/ui/game_version_dropdown.dart index 8738939..2d9b9b7 100644 --- a/lib/vanila/framework/ui/game_version_dropdown.dart +++ b/lib/vanilla/framework/ui/game_version_dropdown.dart @@ -1,15 +1,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:minecraft_server_installer/main/framework/ui/strings.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart'; -import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_bloc.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/game_version_view_model.dart'; +import 'package:minecraft_server_installer/vanilla/adapter/presentation/vanilla_state.dart'; class GameVersionDropdown extends StatelessWidget { const GameVersionDropdown({super.key}); @override - Widget build(BuildContext context) => BlocConsumer( + Widget build(BuildContext context) => BlocConsumer( listener: (_, __) {}, builder: (_, state) => DropdownMenu( @@ -20,7 +20,7 @@ class GameVersionDropdown extends StatelessWidget { label: const Text('${Strings.fieldGameVersion} *'), onSelected: (value) { if (value != null) { - context.read().add(VanilaGameVersionSelectedEvent(value)); + context.read().add(VanillaGameVersionSelectedEvent(value)); } }, dropdownMenuEntries: