environment: remove & refactor

lib/app.dart

@@ -1,13 +1,15 @@
+import 'package:coffeecard/core/network/network_request_executor.dart';
 import 'package:coffeecard/core/strings.dart';
 import 'package:coffeecard/core/styles/theme.dart';
 import 'package:coffeecard/core/widgets/pages/splash/splash_error_page.dart';
 import 'package:coffeecard/core/widgets/pages/splash/splash_loading_page.dart';
 import 'package:coffeecard/features/authentication.dart';
-import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
 import 'package:coffeecard/features/product.dart';
 import 'package:coffeecard/features/redirection/redirection_router.dart';
 import 'package:coffeecard/features/user/presentation/cubit/user_cubit.dart';
+import 'package:coffeecard/generated/api/coffeecard_api_v2.swagger.dart';
 import 'package:coffeecard/service_locator.dart';
+import 'package:coffeecard/src/environment/environment.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -20,25 +22,40 @@ class App extends StatelessWidget {
     // Force screen orientation to portrait
     SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
 
-    return MultiBlocProvider(
+    return MultiRepositoryProvider(
       providers: [
-        BlocProvider.value(value: sl<AuthenticationCubit>()..appStarted()),
-        BlocProvider.value(value: sl<EnvironmentCubit>()..getConfig()),
-        BlocProvider(create: (_) => sl<UserCubit>()),
-        BlocProvider.value(value: sl<ProductCubit>()),
+        RepositoryProvider.value(value: sl<CoffeecardApiV2>()),
+        RepositoryProvider.value(value: sl<NetworkRequestExecutor>()),
+        RepositoryProvider(
+          create: (context) => EnvironmentRepository(
+            apiV2: context.read(),
+            executor: context.read(),
+          ),
+        ),
       ],
-      child: MainRedirectionRouter(
-        navigatorKey: _navigatorKey,
-        child: MaterialApp(
-          title: Strings.appTitle,
-          theme: analogTheme,
+      child: MultiBlocProvider(
+        providers: [
+          BlocProvider.value(value: sl<AuthenticationCubit>()..appStarted()),
+          BlocProvider(
+            create: (context) =>
+                EnvironmentCubit(repository: context.read())..loadEnvironment(),
+          ),
+          BlocProvider(create: (_) => sl<UserCubit>()),
+          BlocProvider.value(value: sl<ProductCubit>()),
+        ],
+        child: MainRedirectionRouter(
           navigatorKey: _navigatorKey,
-          home: BlocBuilder<EnvironmentCubit, EnvironmentState>(
-            builder: (_, state) {
-              return (state is EnvironmentError)
-                  ? SplashErrorPage(errorMessage: state.message)
-                  : const SplashLoadingPage();
-            },
+          child: MaterialApp(
+            title: Strings.appTitle,
+            theme: analogTheme,
+            navigatorKey: _navigatorKey,
+            home: BlocBuilder<EnvironmentCubit, EnvironmentState>(
+              builder: (_, state) => switch (state) {
+                EnvironmentLoadError(:final message) =>
+                  SplashErrorPage(message),
+                _ => const SplashLoadingPage(),
+              },
+            ),
           ),
         ),
       ),

lib/core/errors/failures.dart

@@ -53,3 +53,8 @@ class ServerFailure extends NetworkFailure {
 class ConnectionFailure extends NetworkFailure {
   const ConnectionFailure() : super('connection refused');
 }
+
+/// An unknown failure that is not expected to occur.
+class UnknownFailure extends Failure {
+  const UnknownFailure(super.reason);
+}

lib/core/network/network_request_executor.dart

@@ -8,6 +8,7 @@ part 'network_request_executor_mapping.dart';
 
 typedef _NetworkRequest<BodyType> = Future<Response<BodyType>> Function();
 typedef _ExecutorResult<R> = Future<Either<Failure, R>>;
+// FIXME: Attempt to change back to NetworkFailure for Left type?
 typedef _ExecutorTaskEither<R> = TaskEither<Failure, R>;
 
 class NetworkRequestExecutor {

lib/core/widgets/components/scaffold.dart

@@ -1,26 +1,14 @@
 import 'package:coffeecard/core/styles/app_colors.dart';
 import 'package:coffeecard/core/styles/app_text_styles.dart';
-import 'package:coffeecard/features/environment/domain/entities/environment.dart';
-import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
-import 'package:coffeecard/features/environment/presentation/widgets/environment_banner.dart';
-import 'package:coffeecard/features/environment/presentation/widgets/environment_button.dart';
+import 'package:coffeecard/features/environment.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class AppScaffold extends StatelessWidget {
-  final Widget? title;
-  final Widget body;
-  final bool applyPadding;
-  final Color backgroundColor;
-  final bool resizeToAvoidBottomInset;
-  final double? appBarHeight;
-
-  bool get hasTitle => title != null;
-
   /// A Scaffold with a normal app bar.
   ///
-  /// If connected to test envrionment, an environment
-  /// warning button is shown below the title.
+  /// If connected to test environment, a [TestingEnvironmentBanner]
+  /// is shown below the title.
   ///
   /// The body's background color is always `AppColor.background`.
   AppScaffold.withTitle({
@@ -35,8 +23,8 @@ class AppScaffold extends StatelessWidget {
 
   /// A Scaffold with an empty, 48 dp tall app bar.
   ///
-  /// If connected to test envrionment, an environment warning
-  /// button is shown where the title would normally show.
+  /// If connected to test environment, an [TestingEnvironmentButton]
+  /// is shown where the title would normally show.
   ///
   /// The body's background color is, by default, the same as the app bar.
   const AppScaffold.withoutTitle({
@@ -47,8 +35,20 @@ class AppScaffold extends StatelessWidget {
         applyPadding = false,
         appBarHeight = 48;
 
+  final Widget? title;
+  final Widget body;
+  final bool applyPadding;
+  final Color backgroundColor;
+  final bool resizeToAvoidBottomInset;
+  final double? appBarHeight;
+
+  bool get hasTitle => title != null;
+
   @override
   Widget build(BuildContext context) {
+    final isTestEnvironment =
+        context.watch<EnvironmentCubit>().state.isTestingEnvironment;
+
     return Scaffold(
       resizeToAvoidBottomInset: resizeToAvoidBottomInset,
       // The background color is set to avoid a thin line
@@ -57,31 +57,26 @@ class AppScaffold extends StatelessWidget {
       // in the child of the Expanded widget below.
       backgroundColor: AppColors.primary,
       appBar: AppBar(
-        title: hasTitle ? title : const EnvironmentButton(),
-        centerTitle: hasTitle ? null : true,
+        title: (!hasTitle && isTestEnvironment)
+            ? const TestingEnvironmentButton()
+            : title,
+        centerTitle: !hasTitle,
         toolbarHeight: appBarHeight,
         backgroundColor: AppColors.primary,
         iconTheme: const IconThemeData(color: AppColors.white),
       ),
-      body: BlocBuilder<EnvironmentCubit, EnvironmentState>(
-        builder: (_, state) {
-          final bool isTestEnvironment =
-              state is EnvironmentLoaded && state.env.isTest;
-
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              if (hasTitle && isTestEnvironment) const EnvironmentBanner(),
-              Expanded(
-                child: Container(
-                  padding: applyPadding ? const EdgeInsets.all(16) : null,
-                  color: backgroundColor,
-                  child: body,
-                ),
-              ),
-            ],
-          );
-        },
+      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          if (hasTitle && isTestEnvironment) const TestingEnvironmentBanner(),
+          Expanded(
+            child: Container(
+              padding: applyPadding ? const EdgeInsets.all(16) : null,
+              color: backgroundColor,
+              child: body,
+            ),
+          ),
+        ],
       ),
     );
   }

lib/core/widgets/pages/splash/splash_error_page.dart

@@ -2,13 +2,13 @@ import 'package:coffeecard/core/strings.dart';
 import 'package:coffeecard/core/styles/app_text_styles.dart';
 import 'package:coffeecard/core/widgets/components/loading_overlay.dart';
 import 'package:coffeecard/core/widgets/components/rounded_button.dart';
-import 'package:coffeecard/features/environment/presentation/cubit/environment_cubit.dart';
+import 'package:coffeecard/features/environment.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:gap/gap.dart';
 
 class SplashErrorPage extends StatefulWidget {
-  const SplashErrorPage({required this.errorMessage});
+  const SplashErrorPage(this.errorMessage);
   final String errorMessage;
 
   @override
@@ -23,7 +23,7 @@ class _SplashErrorPageState extends State<SplashErrorPage> {
     // may not be obvious that a load is happening with no internet
     await Future.wait<void>([
       Future.delayed(const Duration(milliseconds: 200)),
-      context.read<EnvironmentCubit>().getConfig(),
+      context.read<EnvironmentCubit>().loadEnvironment(),
     ]);
 
     if (mounted) {

lib/features/environment.dart

@@ -0,0 +1 @@
+export 'package:coffeecard/src/environment/environment.dart';