MCSI-1 refactor: rename game version -> vanila

This commit is contained in:
SquidSpirit 2025-06-29 15:04:35 +09:00
parent d040751262
commit ebd764ab58
13 changed files with 61 additions and 57 deletions

View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/main/framework/ui/strings.dart'; import 'package:minecraft_server_installer/main/framework/ui/strings.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_bloc.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/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanila/framework/ui/game_version_dropdown.dart'; import 'package:minecraft_server_installer/vanila/framework/ui/game_version_dropdown.dart';
@ -22,7 +22,7 @@ class _BasicConfigurationTabState extends State<BasicConfigurationTab> {
const GameVersionDropdown(), const GameVersionDropdown(),
const Spacer(), const Spacer(),
ElevatedButton.icon( ElevatedButton.icon(
onPressed: context.watch<GameVersionBloc>().state.isGameVersionSelected ? _downloadServerFile : null, onPressed: context.watch<VanilaBloc>().state.isGameVersionSelected ? _downloadServerFile : null,
icon: const Icon(Icons.download), icon: const Icon(Icons.download),
label: const Text(Strings.buttonStartToInstall), label: const Text(Strings.buttonStartToInstall),
), ),
@ -31,6 +31,6 @@ class _BasicConfigurationTabState extends State<BasicConfigurationTab> {
} }
void _downloadServerFile() { void _downloadServerFile() {
context.read<GameVersionBloc>().add(VanilaServerFileDownloadedEvent()); context.read<VanilaBloc>().add(VanilaServerFileDownloadedEvent());
} }
} }

View File

@ -1,21 +1,21 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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/main/framework/ui/basic_configuration_tab.dart';
import 'package:minecraft_server_installer/vanila/adapter/gateway/game_version_repository_impl.dart'; import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_repository_impl.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_bloc.dart'; import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_bloc.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/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/application/use_case/get_game_version_list_use_case.dart';
import 'package:minecraft_server_installer/vanila/framework/api/game_version_api_service_impl.dart'; import 'package:minecraft_server_installer/vanila/framework/api/vanila_api_service_impl.dart';
import 'package:minecraft_server_installer/vanila/framework/storage/game_version_file_storage_impl.dart'; import 'package:minecraft_server_installer/vanila/framework/storage/vanila_file_storage_impl.dart';
class MinecraftServerInstaller extends StatelessWidget { class MinecraftServerInstaller extends StatelessWidget {
const MinecraftServerInstaller({super.key}); const MinecraftServerInstaller({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final gameVersionApiService = GameVersionApiServiceImpl(); final gameVersionApiService = VanilaApiServiceImpl();
final gameVersionFileStorage = GameVersionFileStorageImpl(); final gameVersionFileStorage = VanilaFileStorageImpl();
final gameVersionRepository = GameVersionRepositoryImpl(gameVersionApiService, gameVersionFileStorage); final gameVersionRepository = VanilaRepositoryImpl(gameVersionApiService, gameVersionFileStorage);
final getGameVersionListUseCase = GetGameVersionListUseCase(gameVersionRepository); final getGameVersionListUseCase = GetGameVersionListUseCase(gameVersionRepository);
final downloadServerFileUseCase = DownloadServerFileUseCase(gameVersionRepository); final downloadServerFileUseCase = DownloadServerFileUseCase(gameVersionRepository);
@ -24,8 +24,8 @@ class MinecraftServerInstaller extends StatelessWidget {
theme: ThemeData(primarySwatch: Colors.blue), theme: ThemeData(primarySwatch: Colors.blue),
home: MultiBlocProvider( home: MultiBlocProvider(
providers: [ providers: [
BlocProvider<GameVersionBloc>( BlocProvider<VanilaBloc>(
create: (context) => GameVersionBloc(getGameVersionListUseCase, downloadServerFileUseCase), create: (context) => VanilaBloc(getGameVersionListUseCase, downloadServerFileUseCase),
), ),
], ],
child: const Scaffold( child: const Scaffold(

View File

@ -2,7 +2,7 @@ import 'dart:typed_data';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
abstract interface class GameVersionApiService { abstract interface class VanilaApiService {
Future<List<GameVersion>> fetchGameVersionList(); Future<List<GameVersion>> fetchGameVersionList();
Future<Uint8List> fetchServerFile(Uri url); Future<Uint8List> fetchServerFile(Uri url);

View File

@ -1,5 +1,5 @@
import 'dart:typed_data'; import 'dart:typed_data';
abstract interface class GameVersionFileStorage { abstract interface class VanilaFileStorage {
Future<void> saveFile(Uint8List fileBytes, String savePath); Future<void> saveFile(Uint8List fileBytes, String savePath);
} }

View File

@ -1,13 +1,13 @@
import 'package:minecraft_server_installer/vanila/adapter/gateway/game_version_api_service.dart'; import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_api_service.dart';
import 'package:minecraft_server_installer/vanila/adapter/gateway/game_version_file_storage.dart'; import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_file_storage.dart';
import 'package:minecraft_server_installer/vanila/application/repository/game_version_repository.dart'; 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/vanila/domain/entity/game_version.dart';
class GameVersionRepositoryImpl implements GameVersionRepository { class VanilaRepositoryImpl implements VanilaRepository {
final GameVersionApiService _gameVersionApiService; final VanilaApiService _gameVersionApiService;
final GameVersionFileStorage _gameVersionFileStorage; final VanilaFileStorage _gameVersionFileStorage;
GameVersionRepositoryImpl(this._gameVersionApiService, this._gameVersionFileStorage); VanilaRepositoryImpl(this._gameVersionApiService, this._gameVersionFileStorage);
@override @override
Future<List<GameVersion>> getGameVersionList() => _gameVersionApiService.fetchGameVersionList(); Future<List<GameVersion>> getGameVersionList() => _gameVersionApiService.fetchGameVersionList();

View File

@ -1,14 +1,14 @@
import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.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/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/application/use_case/get_game_version_list_use_case.dart';
class GameVersionBloc extends Bloc<VanilaEvent, VanilaState> { class VanilaBloc extends Bloc<VanilaEvent, VanilaState> {
final GetGameVersionListUseCase _getGameVersionListUseCase; final GetGameVersionListUseCase _getGameVersionListUseCase;
final DownloadServerFileUseCase _downloadServerFileUseCase; final DownloadServerFileUseCase _downloadServerFileUseCase;
GameVersionBloc(this._getGameVersionListUseCase, this._downloadServerFileUseCase) : super(const VanilaState.empty()) { VanilaBloc(this._getGameVersionListUseCase, this._downloadServerFileUseCase) : super(const VanilaState.empty()) {
on<VanilaGameVersionListLoadedEvent>((_, emit) async { on<VanilaGameVersionListLoadedEvent>((_, emit) async {
try { try {
final gameVersions = await _getGameVersionListUseCase(); final gameVersions = await _getGameVersionListUseCase();
@ -49,23 +49,3 @@ class VanilaGameVersionSelectedEvent extends VanilaEvent {
} }
class VanilaServerFileDownloadedEvent extends VanilaEvent {} class VanilaServerFileDownloadedEvent extends VanilaEvent {}
class VanilaState with EquatableMixin {
final List<GameVersionViewModel> gameVersions;
final GameVersionViewModel? selectedGameVersion;
const VanilaState({required this.gameVersions, required this.selectedGameVersion});
const VanilaState.empty() : this(gameVersions: const [], selectedGameVersion: null);
@override
List<Object?> get props => [gameVersions, selectedGameVersion];
bool get isGameVersionSelected => selectedGameVersion != null;
VanilaState copyWith({List<GameVersionViewModel>? gameVersions, GameVersionViewModel? selectedGameVersion}) =>
VanilaState(
gameVersions: gameVersions ?? this.gameVersions,
selectedGameVersion: selectedGameVersion ?? this.selectedGameVersion,
);
}

View File

@ -0,0 +1,23 @@
import 'package:equatable/equatable.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_view_model.dart';
class VanilaState with EquatableMixin {
final List<GameVersionViewModel> gameVersions;
final GameVersionViewModel? selectedGameVersion;
const VanilaState({required this.gameVersions, required this.selectedGameVersion});
const VanilaState.empty() : this(gameVersions: const [], selectedGameVersion: null);
@override
List<Object?> get props => [gameVersions, selectedGameVersion];
bool get isGameVersionSelected => selectedGameVersion != null;
VanilaState copyWith({List<GameVersionViewModel>? gameVersions, GameVersionViewModel? selectedGameVersion}) =>
VanilaState(
gameVersions: gameVersions ?? this.gameVersions,
selectedGameVersion: selectedGameVersion ?? this.selectedGameVersion,
);
}

View File

@ -1,6 +1,6 @@
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
abstract interface class GameVersionRepository { abstract interface class VanilaRepository {
Future<List<GameVersion>> getGameVersionList(); Future<List<GameVersion>> getGameVersionList();
Future<void> downloadServerFile(GameVersion version, String savePath); Future<void> downloadServerFile(GameVersion version, String savePath);

View File

@ -1,8 +1,8 @@
import 'package:minecraft_server_installer/vanila/application/repository/game_version_repository.dart'; 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/vanila/domain/entity/game_version.dart';
class DownloadServerFileUseCase { class DownloadServerFileUseCase {
final GameVersionRepository _gameVersionRepository; final VanilaRepository _gameVersionRepository;
DownloadServerFileUseCase(this._gameVersionRepository); DownloadServerFileUseCase(this._gameVersionRepository);

View File

@ -1,8 +1,8 @@
import 'package:minecraft_server_installer/vanila/application/repository/game_version_repository.dart'; 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/vanila/domain/entity/game_version.dart';
class GetGameVersionListUseCase { class GetGameVersionListUseCase {
final GameVersionRepository _gameVersionRepository; final VanilaRepository _gameVersionRepository;
GetGameVersionListUseCase(this._gameVersionRepository); GetGameVersionListUseCase(this._gameVersionRepository);

View File

@ -1,10 +1,10 @@
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:minecraft_server_installer/vanila/adapter/gateway/game_version_api_service.dart'; import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_api_service.dart';
import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart'; import 'package:minecraft_server_installer/vanila/domain/entity/game_version.dart';
class GameVersionApiServiceImpl implements GameVersionApiService { class VanilaApiServiceImpl implements VanilaApiService {
@override @override
Future<List<GameVersion>> fetchGameVersionList() async { Future<List<GameVersion>> fetchGameVersionList() async {
final sourceUrl = Uri.parse('https://www.dropbox.com/s/mtz3moc9dpjtz7s/GameVersions.txt?dl=1'); final sourceUrl = Uri.parse('https://www.dropbox.com/s/mtz3moc9dpjtz7s/GameVersions.txt?dl=1');

View File

@ -1,9 +1,9 @@
import 'dart:io'; import 'dart:io';
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:minecraft_server_installer/vanila/adapter/gateway/game_version_file_storage.dart'; import 'package:minecraft_server_installer/vanila/adapter/gateway/vanila_file_storage.dart';
class GameVersionFileStorageImpl implements GameVersionFileStorage { class VanilaFileStorageImpl implements VanilaFileStorage {
@override @override
Future<void> saveFile(Uint8List fileBytes, String savePath) async { Future<void> saveFile(Uint8List fileBytes, String savePath) async {
final file = File(savePath); final file = File(savePath);

View File

@ -1,8 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:minecraft_server_installer/main/framework/ui/strings.dart'; import 'package:minecraft_server_installer/main/framework/ui/strings.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/game_version_bloc.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/game_version_view_model.dart';
import 'package:minecraft_server_installer/vanila/adapter/presentation/vanila_state.dart';
class GameVersionDropdown extends StatefulWidget { class GameVersionDropdown extends StatefulWidget {
const GameVersionDropdown({super.key}); const GameVersionDropdown({super.key});
@ -15,11 +16,11 @@ class _GameVersionDropdownState extends State<GameVersionDropdown> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
context.read<GameVersionBloc>().add(VanilaGameVersionListLoadedEvent()); context.read<VanilaBloc>().add(VanilaGameVersionListLoadedEvent());
} }
@override @override
Widget build(BuildContext context) => BlocConsumer<GameVersionBloc, VanilaState>( Widget build(BuildContext context) => BlocConsumer<VanilaBloc, VanilaState>(
listener: (_, __) {}, listener: (_, __) {},
builder: builder:
(_, state) => DropdownMenu( (_, state) => DropdownMenu(
@ -29,7 +30,7 @@ class _GameVersionDropdownState extends State<GameVersionDropdown> {
label: const Text(Strings.fieldGameVersion), label: const Text(Strings.fieldGameVersion),
onSelected: (value) { onSelected: (value) {
if (value != null) { if (value != null) {
context.read<GameVersionBloc>().add(VanilaGameVersionSelectedEvent(value)); context.read<VanilaBloc>().add(VanilaGameVersionSelectedEvent(value));
} }
}, },
dropdownMenuEntries: dropdownMenuEntries: