Fix import paths and test issues
- Fixed test file import paths to point to correct Bloc file locations - Fixed Bloc file import paths for models (../../../models/models.dart) - Added explicit type annotations to resolve null safety warnings - Fixed null safety issues in wishlist_bloc_test.dart - All 70 tests now passing
This commit is contained in:
22
bookshelf_flutter/lib/features/home/bloc/home_bloc.dart
Normal file
22
bookshelf_flutter/lib/features/home/bloc/home_bloc.dart
Normal file
@@ -0,0 +1,22 @@
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import '../../../models/models.dart';
|
||||
import 'home_event.dart';
|
||||
import 'home_state.dart';
|
||||
|
||||
class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
||||
HomeBloc() : super(HomeState.initial()) {
|
||||
on<LoadHomeData>(_onLoadHomeData);
|
||||
on<NavigateToScreen>(_onNavigateToScreen);
|
||||
}
|
||||
|
||||
void _onLoadHomeData(LoadHomeData event, Emitter<HomeState> emit) {
|
||||
emit(state.copyWith(
|
||||
currentScreen: AppScreen.library,
|
||||
isLoading: false,
|
||||
));
|
||||
}
|
||||
|
||||
void _onNavigateToScreen(NavigateToScreen event, Emitter<HomeState> emit) {
|
||||
emit(state.copyWith(currentScreen: event.screen));
|
||||
}
|
||||
}
|
||||
14
bookshelf_flutter/lib/features/home/bloc/home_event.dart
Normal file
14
bookshelf_flutter/lib/features/home/bloc/home_event.dart
Normal file
@@ -0,0 +1,14 @@
|
||||
import '../../../models/models.dart';
|
||||
|
||||
abstract class HomeEvent {
|
||||
const HomeEvent();
|
||||
}
|
||||
|
||||
class LoadHomeData extends HomeEvent {
|
||||
const LoadHomeData();
|
||||
}
|
||||
|
||||
class NavigateToScreen extends HomeEvent {
|
||||
final AppScreen screen;
|
||||
const NavigateToScreen(this.screen);
|
||||
}
|
||||
39
bookshelf_flutter/lib/features/home/bloc/home_state.dart
Normal file
39
bookshelf_flutter/lib/features/home/bloc/home_state.dart
Normal file
@@ -0,0 +1,39 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
import '../../../models/models.dart';
|
||||
|
||||
class HomeState extends Equatable {
|
||||
final AppScreen currentScreen;
|
||||
final bool isLoading;
|
||||
final String? errorMessage;
|
||||
|
||||
const HomeState({
|
||||
this.currentScreen = AppScreen.library,
|
||||
this.isLoading = false,
|
||||
this.errorMessage,
|
||||
});
|
||||
|
||||
factory HomeState.initial() {
|
||||
return const HomeState(
|
||||
isLoading: true,
|
||||
);
|
||||
}
|
||||
|
||||
HomeState copyWith({
|
||||
AppScreen? currentScreen,
|
||||
bool? isLoading,
|
||||
String? errorMessage,
|
||||
}) {
|
||||
return HomeState(
|
||||
currentScreen: currentScreen ?? this.currentScreen,
|
||||
isLoading: isLoading ?? this.isLoading,
|
||||
errorMessage: errorMessage ?? this.errorMessage,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
currentScreen,
|
||||
isLoading,
|
||||
errorMessage,
|
||||
];
|
||||
}
|
||||
68
bookshelf_flutter/lib/features/home/home_screen.dart
Normal file
68
bookshelf_flutter/lib/features/home/home_screen.dart
Normal file
@@ -0,0 +1,68 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import '../../bloc/app_bloc.dart';
|
||||
import '../../bloc/app_state.dart';
|
||||
import '../../../models/models.dart';
|
||||
import '../library/library_screen.dart';
|
||||
import '../categories/categories_screen.dart';
|
||||
import '../book_details/book_details_screen.dart';
|
||||
import '../add_book/add_book_screen.dart';
|
||||
import '../scanner/scanner_screen.dart';
|
||||
import '../wishlist/wishlist_screen.dart';
|
||||
import '../settings/settings_screen.dart';
|
||||
import '../../widgets/bottom_nav.dart';
|
||||
|
||||
class HomeScreen extends StatelessWidget {
|
||||
const HomeScreen({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: BlocBuilder<AppBloc, AppState>(
|
||||
builder: (context, state) {
|
||||
final currentScreen = state.currentScreen;
|
||||
final hideNav = [
|
||||
AppScreen.scanner,
|
||||
AppScreen.details,
|
||||
AppScreen.addBook,
|
||||
].contains(currentScreen);
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
_buildScreen(context, state),
|
||||
if (!hideNav)
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
child: BottomNav(currentScreen: currentScreen),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildScreen(BuildContext context, AppState state) {
|
||||
switch (state.currentScreen) {
|
||||
case AppScreen.library:
|
||||
return const LibraryScreen();
|
||||
case AppScreen.categories:
|
||||
return const CategoriesScreen();
|
||||
case AppScreen.wishlist:
|
||||
return const WishlistScreen();
|
||||
case AppScreen.settings:
|
||||
return const SettingsScreen();
|
||||
case AppScreen.details:
|
||||
if (state.selectedBook == null) return const SizedBox();
|
||||
return BookDetailsScreen(book: state.selectedBook!);
|
||||
case AppScreen.addBook:
|
||||
return AddBookScreen(
|
||||
initialData: state.selectedBook ?? state.prefilledData,
|
||||
);
|
||||
case AppScreen.scanner:
|
||||
return const ScannerScreen();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user