Refactor

Author: ashtanko

Makefile

@@ -37,16 +37,19 @@ runDevStaging:
 	flutter run --flavor dev -t lib/main_staging.dart
 
 release:
-	flutter run --release -t lib/main_release.dart
+	flutter run --release -t lib/main_prod.dart
 
 prodRelease:
-	flutter run --flavor prod --release -t lib/main_release.dart
+	flutter run --flavor prod --release -t lib/main_prod.dart
 
 apk:
-	flutter build apk --release -t lib/main_release.dart
+	flutter build apk --release -t lib/main_prod.dart
 
 lines:
 	find . -name '*.dart' | xargs wc -l
 
 force_upgrade:
 	flutter update-packages --force-upgrade
+
+integration_test:
+    flutter test integration_test/app_test.dart --flavor dev

integration_test/app_test.dart

@@ -1,32 +1,28 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc_app_template/main.dart' as app;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
 void main() {
-  final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  testWidgets('verify text', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  setUp(() {});
+
+  testWidgets('load launches test', (
+    WidgetTester tester,
+  ) async {
     app.main([]);
+    await tester.pumpAndSettle();
+
+    expect(find.text('Launches'), findsOneWidget);
+    expect(find.text('Emails'), findsOneWidget);
+    expect(find.text('Settings'), findsOneWidget);
+
+    expect(find.textContaining('Mission'), findsAtLeast(1));
 
-    // Trace the timeline of the following operation. The timeline result will
-    // be written to `build/integration_response_data.json` with the key
-    // `timeline`.
-    await binding.traceAction(() async {
-      // Trigger a frame.
-      await tester.pumpAndSettle();
+    await tester.fling(find.byType(ListView), const Offset(0, -300), 1000);
+    await tester.pumpAndSettle();
 
-      // Verify that platform version is retrieved.
-      expect(
-        find.byWidgetPredicate(
-          (Widget widget) =>
-              widget is Text &&
-              widget.data!.startsWith('Platform: ${Platform.operatingSystem}'),
-        ),
-        findsOneWidget,
-      );
-    });
+    expect(find.textContaining('Mission'), findsAtLeast(1));
   });
 }

lib/app/app.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_bloc_app_template/app/localization.dart';
 import 'package:flutter_bloc_app_template/bloc/init/init_bloc.dart';
 import 'package:flutter_bloc_app_template/di/di_container.dart';
 import 'package:flutter_bloc_app_template/features/launches/bloc/launches_bloc.dart';
@@ -9,7 +10,6 @@ import 'package:flutter_bloc_app_template/index.dart';
 import 'package:flutter_bloc_app_template/repository/launches_repository.dart';
 import 'package:flutter_bloc_app_template/repository/theme_repository.dart';
 import 'package:flutter_bloc_app_template/theme/util.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
 
 class MyApp extends StatelessWidget {
   const MyApp({
@@ -60,26 +60,14 @@ class MyApp extends StatelessWidget {
           child: Builder(
             builder: (context) {
               final navigator = NavigationService.of(context);
-              // Retrieves the default theme for the platform
-              //TextTheme textTheme = Theme.of(context).textTheme;
-
-              // Use with Google Fonts package to use downloadable fonts
-              var textTheme = createTextTheme(context, 'Rubik', 'Rubik');
+              var textTheme = createTextTheme(context: context);
               var theme = MaterialTheme(textTheme);
 
               return MaterialApp(
                 debugShowCheckedModeBanner: kDebugMode,
                 restorationScopeId: 'app',
-                localizationsDelegates: const [
-                  S.delegate,
-                  GlobalMaterialLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
-                  GlobalCupertinoLocalizations.delegate,
-                ],
-                supportedLocales: const [
-                  Locale('en', ''), // English, no country code
-                  Locale('de', ''), // Ukraine, no country code
-                ],
+                localizationsDelegates: appLocalizationsDelegates,
+                supportedLocales: appSupportedLocales,
                 onGenerateTitle: (BuildContext context) =>
                     S.of(context).appTitle,
                 theme: context.watch<ThemeCubit>().getDefaultTheme(theme),

lib/app/localization.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc_app_template/generated/l10n.dart';
+import 'package:flutter_localizations/flutter_localizations.dart'
+    show
+        GlobalCupertinoLocalizations,
+        GlobalMaterialLocalizations,
+        GlobalWidgetsLocalizations;
+
+const appSupportedLocales = <Locale>[
+  Locale('en', ''),
+  Locale('de', ''),
+  Locale('pt', ''),
+];
+
+const appLocalizationsDelegates = <LocalizationsDelegate<dynamic>>[
+  S.delegate,
+  GlobalMaterialLocalizations.delegate,
+  GlobalWidgetsLocalizations.delegate,
+  GlobalCupertinoLocalizations.delegate,
+];

lib/bloc/news/news_bloc.dart

@@ -7,7 +7,7 @@ part 'network_launch_model.g.dart';
 @freezed
 abstract class NetworkLaunchModel with _$NetworkLaunchModel {
   const factory NetworkLaunchModel({
-    @JsonKey(name: '_id') required String id,
+    @JsonKey(name: '_id') String? id,
     @JsonKey(name: 'mission_name') String? missionName,
     @TimestampSerializer()
     @JsonKey(name: 'launch_date_utc')