Prepare built value

.github/workflows/build.yml

@@ -12,8 +12,8 @@ jobs:
       with:
         java-version: '12.x'
         distribution: 'adopt'
-    - uses: subosito/flutter-action@v2.8.0
+    - uses: subosito/flutter-action@v2.10.0
       with:
-        flutter-version: '3.3.0'
+        channel: 'stable'
     - run: flutter pub get
     - run: flutter build apk --debug

lib/main.dart

@@ -2,17 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_settings_screens/flutter_settings_screens.dart';
 import 'package:flutter_translate/flutter_translate.dart';
-import 'package:nextcloud_cookbook_flutter/src/blocs/authentication/authentication.dart';
-import 'package:nextcloud_cookbook_flutter/src/blocs/categories/categories.dart';
-import 'package:nextcloud_cookbook_flutter/src/blocs/recipes_short/recipes_short.dart';
+import 'package:nextcloud_cookbook_flutter/src/blocs/authentication/authentication_bloc.dart';
+import 'package:nextcloud_cookbook_flutter/src/blocs/categories/categories_bloc.dart';
+import 'package:nextcloud_cookbook_flutter/src/blocs/recipes_short/recipes_short_bloc.dart';
 import 'package:nextcloud_cookbook_flutter/src/blocs/simple_bloc_delegatae.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/category/category_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/loading_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/login_screen.dart';
 import 'package:nextcloud_cookbook_flutter/src/screens/splash_screen.dart';
-import 'package:nextcloud_cookbook_flutter/src/services/intent_repository.dart';
-import 'package:nextcloud_cookbook_flutter/src/services/notification_provider.dart';
-import 'package:nextcloud_cookbook_flutter/src/services/user_repository.dart';
+import 'package:nextcloud_cookbook_flutter/src/services/services.dart';
 import 'package:nextcloud_cookbook_flutter/src/util/lifecycle_event_handler.dart';
 import 'package:nextcloud_cookbook_flutter/src/util/setting_keys.dart';
 import 'package:nextcloud_cookbook_flutter/src/util/supported_locales.dart';
@@ -39,7 +37,7 @@ void main() async {
         providers: [
           BlocProvider<AuthenticationBloc>(
             create: (context) {
-              return AuthenticationBloc()..add(AppStarted());
+              return AuthenticationBloc()..add(const AppStarted());
             },
           ),
           BlocProvider<RecipesShortBloc>(
@@ -98,35 +96,32 @@ class _AppState extends State<App> {
         theme: ThemeData(
           brightness: Brightness.light,
           hintColor: Colors.grey,
-          backgroundColor: Colors.grey[400],
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
           hintColor: Colors.grey,
         ),
         home: BlocBuilder<AuthenticationBloc, AuthenticationState>(
           builder: (context, state) {
-            if (state is AuthenticationUninitialized) {
-              return const SplashPage();
-            } else if (state is AuthenticationAuthenticated) {
-              IntentRepository().handleIntent();
-              if (BlocProvider.of<CategoriesBloc>(context).state
-                  is CategoriesInitial) {
-                BlocProvider.of<CategoriesBloc>(context)
-                    .add(CategoriesLoaded());
-              }
-              return const CategoryScreen();
-            } else if (state is AuthenticationUnauthenticated) {
-              return const LoginScreen();
-            } else if (state is AuthenticationInvalid) {
-              return const LoginScreen(
-                invalidCredentials: true,
-              );
-            } else if (state is AuthenticationLoading ||
-                state is AuthenticationError) {
-              return const LoadingScreen();
-            } else {
-              return const LoadingScreen();
+            switch (state.status) {
+              case AuthenticationStatus.loading:
+                return const SplashPage();
+              case AuthenticationStatus.authenticated:
+                IntentRepository().handleIntent();
+                final categoryBloc = BlocProvider.of<CategoriesBloc>(context);
+                if (categoryBloc.state.status ==
+                    CategoriesStatus.loadInProgress) {
+                  categoryBloc.add(const CategoriesLoaded());
+                }
+                return const CategoryScreen();
+              case AuthenticationStatus.unauthenticated:
+                return const LoginScreen();
+              case AuthenticationStatus.invalid:
+                return const LoginScreen(
+                  invalidCredentials: true,
+                );
+              case AuthenticationStatus.error:
+                return const LoadingErrorScreen();
             }
           },
         ),

lib/src/blocs/authentication/authentication_bloc.dart

@@ -1,56 +1,69 @@
-import 'dart:async';
-
+import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:nextcloud_cookbook_flutter/src/models/app_authentication.dart';
+import 'package:nextcloud_cookbook_flutter/src/services/services.dart';
 
-import 'package:nextcloud_cookbook_flutter/src/blocs/authentication/authentication.dart';
-import 'package:nextcloud_cookbook_flutter/src/services/user_repository.dart';
+part 'authentication_event.dart';
+part 'authentication_state.dart';
 
 class AuthenticationBloc
     extends Bloc<AuthenticationEvent, AuthenticationState> {
   final UserRepository userRepository = UserRepository();
 
-  AuthenticationBloc() : super(AuthenticationUninitialized());
+  AuthenticationBloc() : super(AuthenticationState()) {
+    on<AppStarted>(_mapAppStartedEventToState);
+    on<LoggedIn>(_mapLoggedInEventToState);
+    on<LoggedOut>(_mapLoggedOutEventToState);
+  }
 
-  @override
-  Stream<AuthenticationState> mapEventToState(
-    AuthenticationEvent event,
-  ) async* {
-    if (event is AppStarted) {
-      final bool hasToken = await userRepository.hasAppAuthentication();
+  Future<void> _mapAppStartedEventToState(
+    AppStarted event,
+    Emitter<AuthenticationState> emit,
+  ) async {
+    final bool hasToken = await userRepository.hasAppAuthentication();
 
-      if (hasToken) {
-        yield AuthenticationLoading();
-        await userRepository.loadAppAuthentication();
-        bool validCredentials = false;
-        try {
-          validCredentials = await userRepository.checkAppAuthentication();
-        } catch (e) {
-          yield AuthenticationError(e.toString());
-          return;
-        }
-        if (validCredentials) {
-          await userRepository.fetchApiVersion();
-          yield AuthenticationAuthenticated();
-        } else {
-          await userRepository.deleteAppAuthentication();
-          yield AuthenticationInvalid();
-        }
+    if (hasToken) {
+      await userRepository.loadAppAuthentication();
+      bool validCredentials = false;
+      try {
+        validCredentials = await userRepository.checkAppAuthentication();
+      } catch (e) {
+        emit(
+          AuthenticationState(
+            status: AuthenticationStatus.error,
+            error: e.toString(),
+          ),
+        );
+        return;
+      }
+      if (validCredentials) {
+        await userRepository.fetchApiVersion();
+        emit(AuthenticationState(status: AuthenticationStatus.authenticated));
       } else {
-        yield AuthenticationUnauthenticated();
+        await userRepository.deleteAppAuthentication();
+        emit(AuthenticationState(status: AuthenticationStatus.invalid));
       }
+    } else {
+      emit(AuthenticationState(status: AuthenticationStatus.unauthenticated));
     }
+  }
 
-    if (event is LoggedIn) {
-      yield AuthenticationLoading();
-      await userRepository.persistAppAuthentication(event.appAuthentication);
-      await userRepository.fetchApiVersion();
-      yield AuthenticationAuthenticated();
-    }
+  Future<void> _mapLoggedInEventToState(
+    LoggedIn event,
+    Emitter<AuthenticationState> emit,
+  ) async {
+    emit(AuthenticationState());
+    await userRepository.persistAppAuthentication(event.appAuthentication);
+    await userRepository.fetchApiVersion();
+    emit(AuthenticationState(status: AuthenticationStatus.authenticated));
+  }
 
-    if (event is LoggedOut) {
-      yield AuthenticationLoading();
-      await userRepository.deleteAppAuthentication();
-      yield AuthenticationUnauthenticated();
-    }
+  Future<void> _mapLoggedOutEventToState(
+    LoggedOut event,
+    Emitter<AuthenticationState> emit,
+  ) async {
+    emit(AuthenticationState());
+    await userRepository.deleteAppAuthentication();
+    emit(AuthenticationState(status: AuthenticationStatus.unauthenticated));
   }
 }

lib/src/blocs/authentication/authentication_event.dart

@@ -1,5 +1,4 @@
-import 'package:equatable/equatable.dart';
-import 'package:nextcloud_cookbook_flutter/src/models/app_authentication.dart';
+part of 'authentication_bloc.dart';
 
 abstract class AuthenticationEvent extends Equatable {
   const AuthenticationEvent();
@@ -8,7 +7,9 @@ abstract class AuthenticationEvent extends Equatable {
   List<Object> get props => [];
 }
 
-class AppStarted extends AuthenticationEvent {}
+class AppStarted extends AuthenticationEvent {
+  const AppStarted();
+}
 
 class LoggedIn extends AuthenticationEvent {
   final AppAuthentication appAuthentication;
@@ -22,4 +23,6 @@ class LoggedIn extends AuthenticationEvent {
   String toString() => appAuthentication.toString();
 }
 
-class LoggedOut extends AuthenticationEvent {}
+class LoggedOut extends AuthenticationEvent {
+  const LoggedOut();
+}

lib/src/blocs/authentication/authentication_state.dart

@@ -1,27 +1,25 @@
-import 'package:equatable/equatable.dart';
-
-abstract class AuthenticationState extends Equatable {
-  const AuthenticationState();
-
-  @override
-  List<Object> get props => [];
+part of 'authentication_bloc.dart';
+
+enum AuthenticationStatus {
+  unauthenticated,
+  authenticated,
+  invalid,
+  loading,
+  error;
 }
 
-class AuthenticationUninitialized extends AuthenticationState {}
-
-class AuthenticationAuthenticated extends AuthenticationState {}
+class AuthenticationState extends Equatable {
+  final AuthenticationStatus status;
+  final String? error;
 
-class AuthenticationUnauthenticated extends AuthenticationState {}
-
-class AuthenticationInvalid extends AuthenticationState {}
-
-class AuthenticationError extends AuthenticationState {
-  final String errorMsg;
-
-  const AuthenticationError(this.errorMsg);
+  const AuthenticationState({
+    this.status = AuthenticationStatus.loading,
+    this.error,
+  }) : assert(
+          (status != AuthenticationStatus.error && error == null) ||
+              (status == AuthenticationStatus.error && error != null),
+        );
 
   @override
-  List<Object> get props => [errorMsg];
+  List<Object?> get props => [status, error];
 }
-
-class AuthenticationLoading extends AuthenticationState {}

lib/src/blocs/categories/categories_bloc.dart

@@ -1,32 +1,46 @@
+import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-
-import 'package:nextcloud_cookbook_flutter/src/blocs/categories/categories.dart';
 import 'package:nextcloud_cookbook_flutter/src/models/category.dart';
-import 'package:nextcloud_cookbook_flutter/src/services/data_repository.dart';
+import 'package:nextcloud_cookbook_flutter/src/services/services.dart';
+
+part 'categories_event.dart';
+part 'categories_state.dart';
 
 class CategoriesBloc extends Bloc<CategoriesEvent, CategoriesState> {
   final DataRepository dataRepository = DataRepository();
 
-  CategoriesBloc() : super(CategoriesInitial());
-
-  @override
-  Stream<CategoriesState> mapEventToState(CategoriesEvent event) async* {
-    if (event is CategoriesLoaded) {
-      yield* _mapCategoriesLoadedToState();
-    }
+  CategoriesBloc() : super(CategoriesState()) {
+    on<CategoriesLoaded>(_mapCategoriesLoadedEventToState);
   }
 
-  Stream<CategoriesState> _mapCategoriesLoadedToState() async* {
+  Future<void> _mapCategoriesLoadedEventToState(
+    CategoriesLoaded event,
+    Emitter<CategoriesState> emit,
+  ) async {
     try {
-      yield CategoriesLoadInProgress();
       final List<Category> categories = await dataRepository.fetchCategories();
       dataRepository.updateCategoryNames(categories);
-      yield CategoriesLoadSuccess(categories: categories);
+      emit(
+        CategoriesState(
+          status: CategoriesStatus.loadSuccess,
+          categories: categories,
+        ),
+      );
       final List<Category> categoriesWithImage =
           await dataRepository.fetchCategoryMainRecipes(categories);
-      yield CategoriesImageLoadSuccess(categories: categoriesWithImage);
+      emit(
+        CategoriesState(
+          status: CategoriesStatus.imageLoadSuccess,
+          categories: categoriesWithImage,
+        ),
+      );
     } on Exception catch (e) {
-      yield CategoriesLoadFailure(e.toString());
+      emit(
+        CategoriesState(
+          status: CategoriesStatus.loadFailure,
+          error: e.toString(),
+        ),
+      );
     }
   }
 }

lib/src/blocs/categories/categories_event.dart

@@ -1,4 +1,4 @@
-import 'package:equatable/equatable.dart';
+part of 'categories_bloc.dart';
 
 abstract class CategoriesEvent extends Equatable {
   const CategoriesEvent();
@@ -7,4 +7,6 @@ abstract class CategoriesEvent extends Equatable {
   List<Object> get props => [];
 }
 
-class CategoriesLoaded extends CategoriesEvent {}
+class CategoriesLoaded extends CategoriesEvent {
+  const CategoriesLoaded();
+}