chore: update dependencies (fireship-io#16)

* chore: bump sdk version

* style: organize imports

* style: add missing trailing commas

* feat: add bloc overrides

* chore: bump android minSdkVersion

* refactor: remove deprecated theme member

* ci: bump flutter action version

Author: narcodico

.github/workflows/main.yaml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/[email protected].0
+      - uses: subosito/[email protected].3
 
       - name: Install Dependencies
         run: flutter packages get

android/app/build.gradle

@@ -33,7 +33,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion flutter.compileSdkVersion
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -42,8 +42,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.fireship.quizapp"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 19
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()

lib/app/app_bootstrap.dart

@@ -7,32 +7,29 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';
 
-void bootstrap(
-  FutureOr<Widget> Function() appFn, {
+Future<void> bootstrap(
+  FutureOr<Widget> Function() appDelegate, {
   void Function(Object, StackTrace)? onZoneError,
   FlutterExceptionHandler? onFlutterError,
   BlocObserver? blocObserver,
   Future<FirebaseApp> Function()? firebaseApp,
-}) {
-  return runZonedGuarded<void>(
-    () async {
-      WidgetsFlutterBinding.ensureInitialized();
-
-      FlutterError.onError = onFlutterError ??
-          (details) {
-            log(details.exceptionAsString(), stackTrace: details.stack);
-          };
+}) async {
+  WidgetsFlutterBinding.ensureInitialized();
 
-      if (blocObserver != null) {
-        Bloc.observer = blocObserver;
-      }
+  FlutterError.onError = onFlutterError ??
+      (details) {
+        log(details.exceptionAsString(), stackTrace: details.stack);
+      };
 
-      await (firebaseApp ?? Firebase.initializeApp)();
+  await (firebaseApp ?? Firebase.initializeApp)();
 
-      await Assets.covers.preload();
+  await Assets.covers.preload();
 
-      runApp(await appFn());
-    },
+  return runZonedGuarded<void>(
+    () => BlocOverrides.runZoned(
+      () async => runApp(await appDelegate()),
+      blocObserver: blocObserver,
+    ),
     onZoneError ??
         (error, stackTrace) => log(error.toString(), stackTrace: stackTrace),
   );

lib/app/cubit/app_cubit.dart

@@ -1,19 +1,19 @@
 import 'dart:async';
 
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:user_repository/user_repository.dart';
 import 'package:shared/shared.dart';
+import 'package:user_repository/user_repository.dart';
 
 part 'app_state.dart';
 
 class AppCubit extends Cubit<AppState> {
   AppCubit({
     required UserRepository userRepository,
   })  : _userRepository = userRepository,
-        super(userRepository.user.isNone
-            ? const AppState.unauthenticated()
-            : AppState.newlyAuthenticated(userRepository.user)) {
+        super(
+          userRepository.user.isNone
+              ? const AppState.unauthenticated()
+              : AppState.newlyAuthenticated(userRepository.user),
+        ) {
     _watchUser();
   }
 

lib/app/view/app.dart

@@ -6,8 +6,8 @@ import 'package:quizapp/app/cubit/app_cubit.dart';
 import 'package:quizapp/home/home.dart';
 import 'package:quizapp/l10n/l10n.dart';
 import 'package:quizapp/login/login.dart';
-import 'package:user_repository/user_repository.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';
+import 'package:user_repository/user_repository.dart';
 
 List<Page> onGenerateAppPages(
   AppStatus status,

lib/home/view/bottom_nav_bar.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:quizapp/l10n/l10n.dart';
 import 'package:shared/shared.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';

lib/home/view/home_page.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:quizapp/about/about.dart';
 import 'package:quizapp/home/view/bottom_nav_bar.dart';
 import 'package:quizapp/profile/profile.dart';
-import 'package:provider/provider.dart';
 import 'package:quizapp/topics/topics.dart';
+import 'package:shared/shared.dart';
 
 class HomePage extends StatelessWidget {
   const HomePage._({Key? key}) : super(key: key);

lib/login/view/login_page.dart

@@ -1,9 +1,7 @@
 import 'dart:io';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:quizapp/l10n/l10n.dart';
 import 'package:quizapp/login/cubit/login_cubit.dart';
 import 'package:ui_toolkit/ui_toolkit.dart';

lib/profile/cubit/profile_cubit.dart

@@ -1,8 +1,7 @@
 import 'dart:async';
 
-import 'package:bloc/bloc.dart';
-import 'package:user_repository/user_repository.dart';
 import 'package:shared/shared.dart';
+import 'package:user_repository/user_repository.dart';
 
 class ProfileCubit extends Cubit<User> {
   ProfileCubit({required UserRepository userRepository})