Hotfixes (#167)

* Bump app version

* Update packages

* Fix bug with the sponsor enums

* Update sponsor layouts

* Fix data loading of sponsors

* Load company organisers

* Unify fetching of organisers

* Fix formatting

* Fix color issue on the search bar text

* Fix side scroll not updating the indicated tab

* Clear the local database when logging out

* Add an empty state for feed

* Request to sign in a user

* Move static strings to an arb file

* Go to the decision page after a logout

* Enable feedback only if a user is signed in

* Allow access to pages without a token

* Remove guarded zone

* Fix bug with loading the images of organisers

* Fix formatting

lib/bootstrap.dart

@@ -43,7 +43,7 @@ class AppBlocObserver extends BlocObserver {
 }
 
 Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
-  await runZonedGuarded(() async {
+  try {
     Bloc.observer = const AppBlocObserver();
 
     await Firebase.initializeApp(
@@ -86,6 +86,7 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
             create: (_) => LogOutCubit(
               authRepository: getIt(),
               hiveRepository: getIt(),
+              dbRepository: getIt(),
             ),
           ),
           BlocProvider<FetchFeedCubit>(
@@ -129,6 +130,7 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
               apiRepository: getIt(),
               dBRepository: getIt(),
               notificationService: getIt(),
+              hiveRepository: getIt(),
             ),
           ),
           BlocProvider<ShareFeedPostCubit>(
@@ -156,7 +158,7 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
         child: await builder(),
       ),
     );
-  }, (error, stackTrace) {
+  } catch (error, stackTrace) {
     if (kDebugMode) {
       log(error.toString(), stackTrace: stackTrace);
     } else {
@@ -169,5 +171,5 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
         return true;
       };
     }
-  });
+  }
 }

lib/common/data/enums/organiser_type.dart

@@ -0,0 +1,8 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+enum OrganiserType {
+  @JsonValue('individual')
+  individual,
+  @JsonValue('company')
+  company;
+}

lib/common/data/enums/sponsor_type.dart

@@ -1,21 +1,16 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
 enum SponsorType {
+  @JsonValue('platinum')
   platinum,
+  @JsonValue('swag')
   swag,
+  @JsonValue('startup')
   startup,
-  venue;
-
-  static SponsorType fromValue(String value) {
-    switch (value) {
-      case 'platinum':
-        return SponsorType.platinum;
-      case 'swag':
-        return SponsorType.swag;
-      case 'startup':
-        return SponsorType.startup;
-      case 'venue':
-        return SponsorType.venue;
-      default:
-        throw Exception('Unknown sponsor type: $value');
-    }
-  }
+  @JsonValue('venue')
+  venue,
+  @JsonValue('bronze')
+  bronze,
+  @JsonValue('gold')
+  gold;
 }

lib/common/data/models/local/local_organiser.dart

@@ -5,14 +5,22 @@ part 'local_organiser.g.dart';
 @collection
 class LocalOrganiser {
   LocalOrganiser({
-    required this.serverId,
     required this.logo,
     required this.name,
+    required this.type,
+    required this.tagline,
+    required this.bio,
+    required this.designation,
   });
 
   Id id = Isar.autoIncrement;
-  @Index(unique: true, replace: true)
-  late int serverId;
+
   late String logo;
+  @Index(unique: true, replace: true)
   late String name;
+  late String type;
+  @Enumerated(EnumType.name)
+  late String tagline;
+  late String bio;
+  late String designation;
 }

lib/common/data/models/local/local_sponsor.dart

@@ -1,3 +1,4 @@
+import 'package:fluttercon/common/data/enums/sponsor_type.dart';
 import 'package:isar/isar.dart';
 
 part 'local_sponsor.g.dart';
@@ -18,7 +19,8 @@ class LocalSponsor {
   late String name;
   late String tagline;
   late String link;
-  late String sponsorType;
+  @Enumerated(EnumType.name)
+  late SponsorType sponsorType;
   late String logo;
   late String createdAt;
 }

lib/common/data/models/organisers.dart

@@ -6,9 +6,12 @@ part 'organisers.freezed.dart';
 @freezed
 class Organiser with _$Organiser {
   factory Organiser({
-    required int id,
-    required String logo,
+    @JsonKey(name: 'photo') required String logo,
     required String name,
+    @JsonEnum() required String type,
+    required String tagline,
+    required String bio,
+    required String designation,
   }) = _Organiser;
 
   factory Organiser.fromJson(Map<String, Object?> json) =>

lib/common/data/models/sponsor.dart

@@ -1,3 +1,4 @@
+import 'package:fluttercon/common/data/enums/sponsor_type.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'sponsor.freezed.dart';
@@ -9,7 +10,7 @@ class Sponsor with _$Sponsor {
     String name,
     String tagline,
     String link,
-    @JsonKey(name: 'sponsor_type') String sponsorType,
+    @JsonEnum() @JsonKey(name: 'sponsor_type') SponsorType sponsorType,
     String logo,
     @JsonKey(name: 'created_at') String createdAt,
   ) = _Sponsor;

lib/common/repository/api_repository.dart

@@ -1,6 +1,5 @@
 import 'package:fluttercon/common/data/models/feed.dart';
 import 'package:fluttercon/common/data/models/feedback_dto.dart';
-import 'package:fluttercon/common/data/models/individual_organiser.dart';
 import 'package:fluttercon/common/data/models/models.dart';
 import 'package:fluttercon/common/data/models/sponsor.dart';
 import 'package:fluttercon/common/utils/env/flavor_config.dart';
@@ -12,6 +11,7 @@ class ApiRepository {
   final _networkUtil = NetworkUtil();
 
   final _eventSlug = FlutterConConfig.instance!.values.eventSlug;
+  final _organiserSlug = FlutterConConfig.instance!.values.organiserSlug;
 
   Future<List<Speaker>> fetchSpeakers({
     int perPage = 100,
@@ -79,7 +79,7 @@ class ApiRepository {
   }) async {
     try {
       final response = await _networkUtil.getReq(
-        '/organizers',
+        '/organizers/$_organiserSlug/team',
         queryParameters: {'per_page': perPage, 'page': page},
       );
 
@@ -105,26 +105,6 @@ class ApiRepository {
     }
   }
 
-  Future<List<IndividualOrganiser>> fetchIndividualOrganisers({
-    int perPage = 20,
-    int page = 1,
-  }) async {
-    try {
-      final response = await _networkUtil.getReq(
-        '/organizers/droidcon-ke-645/team',
-        queryParameters: {
-          'per_page': perPage,
-          'page': page,
-          'type': 'individual',
-        },
-      );
-
-      return IndividualOrganiserResponse.fromJson(response).data;
-    } catch (e) {
-      rethrow;
-    }
-  }
-
   Future<String> bookmarkSession(int sessionId) async {
     try {
       final response = await _networkUtil.postReq(

lib/common/repository/auth_repository.dart

@@ -86,7 +86,6 @@ class AuthRepository {
   Future<void> logOut() async {
     try {
       await _googleSignIn.signOut();
-      await _networkUtil.postReq('/logout');
     } catch (e) {
       rethrow;
     }

lib/common/repository/db_repository.dart

@@ -1,6 +1,6 @@
 import 'package:fluttercon/common/data/enums/bookmark_status.dart';
+import 'package:fluttercon/common/data/enums/organiser_type.dart';
 import 'package:fluttercon/common/data/models/feed.dart';
-import 'package:fluttercon/common/data/models/individual_organiser.dart';
 import 'package:fluttercon/common/data/models/local/local_feed.dart';
 import 'package:fluttercon/common/data/models/local/local_individual_organiser.dart';
 import 'package:fluttercon/common/data/models/local/local_organiser.dart';
@@ -105,47 +105,29 @@ class DBRepository {
         localOrganisers.add(
           LocalOrganiser(
             name: organiser.name,
-            serverId: organiser.id,
             logo: organiser.logo,
-          ),
-        );
-      }
-
-      await localDB.localOrganisers.putAll(localOrganisers);
-    });
-  }
-
-  Future<List<LocalOrganiser>> fetchOrganisers() async {
-    return localDB.localOrganisers.where().findAll();
-  }
-
-  Future<void> persistIndividualOrganisers({
-    required List<IndividualOrganiser> organisers,
-  }) async {
-    await localDB.writeTxn(() async {
-      final localIndividualOrganisers = <LocalIndividualOrganiser>[];
-
-      for (final organiser in organisers) {
-        localIndividualOrganisers.add(
-          LocalIndividualOrganiser(
-            name: organiser.name,
             tagline: organiser.tagline,
-            link: organiser.link,
             type: organiser.type,
             bio: organiser.bio,
             designation: organiser.designation,
-            photo: organiser.photo,
-            twitterHandle: organiser.twitterHandle,
           ),
         );
       }
 
-      await localDB.localIndividualOrganisers.putAll(localIndividualOrganisers);
+      await localDB.localOrganisers.putAll(localOrganisers);
     });
   }
 
-  Future<List<LocalIndividualOrganiser>> fetchIndividualOrganisers() async {
-    return localDB.localIndividualOrganisers.where().findAll();
+  Future<List<LocalOrganiser>> fetchOrganisers({
+    required OrganiserType type,
+  }) async {
+    return localDB.localOrganisers
+        .where()
+        .filter()
+        .typeEqualTo(type.name)
+        .not()
+        .nameContains('Nairobi Gophers')
+        .findAll();
   }
 
   Future<void> persistSponsors({

lib/common/utils/env/flavor_config.dart

@@ -4,12 +4,14 @@ class FlutterConValues {
     required this.baseDomain,
     required this.hiveBox,
     required this.eventSlug,
+    required this.organiserSlug,
   });
 
   final String urlScheme;
   final String baseDomain;
   final String hiveBox;
   final String eventSlug;
+  final String organiserSlug;
 
   String get baseUrl => '$urlScheme://$baseDomain';
 }

lib/common/utils/network.dart

@@ -50,6 +50,7 @@ class NetworkUtil {
         PrettyDioLogger(
           requestHeader: true,
           requestBody: true,
+          responseBody: false,
         ),
       );
     }

lib/common/widgets/app_bar/feedback_button.dart

@@ -1,8 +1,10 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
+import 'package:fluttercon/common/repository/hive_repository.dart';
 import 'package:fluttercon/common/utils/misc.dart';
 import 'package:fluttercon/common/utils/router.dart';
 import 'package:fluttercon/common/widgets/bottom_nav/app_nav_icon.dart';
+import 'package:fluttercon/core/di/injectable.dart';
 import 'package:fluttercon/core/theme/theme_colors.dart';
 import 'package:fluttercon/l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
@@ -18,8 +20,15 @@ class FeedbackButton extends StatelessWidget {
     return selectedIndex == 0
         ? const SizedBox()
         : InkWell(
-            onTap: () =>
-                GoRouter.of(context).push(FlutterConRouter.feedbackRoute),
+            onTap: () {
+              final profile = getIt<HiveRepository>().retrieveUser();
+              if (profile == null) {
+                GoRouter.of(context).goNamed(FlutterConRouter.signInRoute);
+                return;
+              }
+
+              GoRouter.of(context).push(FlutterConRouter.feedbackRoute);
+            },
             child: Container(
               height: 30,
               width: 127,

lib/common/widgets/app_bar/logout_dialog.dart

@@ -29,7 +29,7 @@ class _LogOutDialogState extends State<LogOutDialog> {
             loaded: () {
               GoRouter.of(context)
                 ..pop()
-                ..go(FlutterConRouter.signInRoute);
+                ..go(FlutterConRouter.decisionRoute);
             },
             orElse: () {},
           );

lib/common/widgets/app_bar/user_profile_icon.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttercon/common/repository/hive_repository.dart';
 import 'package:fluttercon/common/utils/env/flavor_config.dart';
 import 'package:fluttercon/common/utils/misc.dart';
+import 'package:fluttercon/common/utils/router.dart';
 import 'package:fluttercon/common/widgets/app_bar/logout_dialog.dart';
 import 'package:fluttercon/core/di/injectable.dart';
 import 'package:fluttercon/core/theme/theme_colors.dart';
@@ -26,6 +27,12 @@ class _UserProfileIconState extends State<UserProfileIcon> {
     final l10n = context.l10n;
     return InkWell(
       onTap: () {
+        final profile = getIt<HiveRepository>().retrieveUser();
+        if (profile == null) {
+          GoRouter.of(context).goNamed(FlutterConRouter.signInRoute);
+          return;
+        }
+
         WoltModalSheet.show<dynamic>(
           context: context,
           barrierDismissible: true,