[WIP] UI enhancement

lib/src/data/models/api_models.dart

@@ -166,7 +166,7 @@ abstract class _Envelop {
 
 @JsonSerializable()
 class DataEnvelop<T> extends _Envelop {
-  @_GenericListConverter()
+  @_GenericConverter()
   T data;
 
   DataEnvelop({
@@ -183,7 +183,7 @@ class DataEnvelop<T> extends _Envelop {
 
 @JsonSerializable()
 class DataArrayEnvelop<T> extends _Envelop {
-  @_GenericListConverter()
+  @_GenericConverter()
   List<T> data;
 
   int total;
@@ -203,8 +203,8 @@ class DataArrayEnvelop<T> extends _Envelop {
 
 /// Example of model with GenericCollection
 /// https://github.com/dart-lang/json_serializable/blob/ee2c5c788279af01860624303abe16811850b82c/example/lib/json_converter_example.dart
-class _GenericListConverter<T> implements JsonConverter<T, Object> {
-  const _GenericListConverter();
+class _GenericConverter<T> implements JsonConverter<T, Object> {
+  const _GenericConverter();
 
   @override
   T fromJson(Object json) {

lib/src/presentation/localizations/buzzer_localization_en.dart

@@ -206,16 +206,6 @@ class BuzzerLocalizationsEN implements BuzzerLocalizations {
   @override
   String get appErrorUserNotFound => 'User not found';
 
-  /// --------------------------------------------------------------------------
-  ///                            App Errors
-  /// --------------------------------------------------------------------------
-
-  @override
-  String get errorNotYetImplemented => 'Not yet implemented';
-
-  @override
-  String get errorNotSupported => 'Not supported';
-
   @override
   String get appErrorAuthForbidden => 'Access forbidden';
 
@@ -231,6 +221,16 @@ class BuzzerLocalizationsEN implements BuzzerLocalizations {
   @override
   String get appErrorServerSideProblem => 'A server side error occured';
 
+  /// --------------------------------------------------------------------------
+  ///                            App Errors
+  /// --------------------------------------------------------------------------
+
+  @override
+  String get errorNotYetImplemented => 'Not yet implemented';
+
+  @override
+  String get errorNotSupported => 'Not supported';
+
   /// --------------------------------------------------------------------------
   ///                            Other Exceptions
   /// --------------------------------------------------------------------------

lib/src/presentation/pages/main_navigation_page.dart

@@ -43,7 +43,7 @@ class MainNavigationPage extends StatelessWidget {
       bottomNavigationBar: BottomAppBar(
         color: Theme.of(context).primaryColor,
         child: Row(
-          mainAxisAlignment: MainAxisAlignment.end,
+          mainAxisAlignment: MainAxisAlignment.start,
           children: <Widget>[
             MenuButton(),
           ],

lib/src/presentation/widgets/menu_button_widget.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_door_buzzer/bloc.dart';
-import 'package:flutter_door_buzzer/domain.dart';
 import 'package:flutter_door_buzzer/presentation.dart';
 
 class MenuButton extends StatelessWidget {
@@ -34,34 +33,37 @@ class _DefaultMenuButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return IconButton(
+      icon: Icon(
+        Icons.menu,
+        color: Colors.white,
+      ),
       onPressed: () => openMenuBottomSheet(context),
-      icon: Icon(Icons.menu),
     );
   }
 }
 
-class _MenuButtonConnected extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    final AccountBloc _accountBloc = BlocProvider.of<AccountBloc>(context);
-
-    return BlocBuilder<AccountEvent, AccountState>(
-      bloc: _accountBloc,
-      builder: (BuildContext context, AccountState state) {
-        if (state is AccountLoaded) {
-          final UserEntity userEntity = state.user;
-          return Padding(
-            padding: const EdgeInsets.only(top: 3.0, bottom: 3.0),
-            child: IconButton(
-              onPressed: () => openMenuBottomSheet(context),
-              icon: InitialCircleAvatar(
-                text: userEntity.email,
-              ),
-            ),
-          );
-        }
-        return _DefaultMenuButton();
-      },
-    );
-  }
-}
+//class _MenuButtonConnected extends StatelessWidget {
+//  @override
+//  Widget build(BuildContext context) {
+//    final AccountBloc _accountBloc = BlocProvider.of<AccountBloc>(context);
+//
+//    return BlocBuilder<AccountEvent, AccountState>(
+//      bloc: _accountBloc,
+//      builder: (BuildContext context, AccountState state) {
+//        if (state is AccountLoaded) {
+//          final UserEntity userEntity = state.user;
+//          return Padding(
+//            padding: const EdgeInsets.only(top: 3.0, bottom: 3.0),
+//            child: IconButton(
+//              onPressed: () => openMenuBottomSheet(context),
+//              icon: InitialCircleAvatar(
+//                text: userEntity.email,
+//              ),
+//            ),
+//          );
+//        }
+//        return _DefaultMenuButton();
+//      },
+//    );
+//  }
+//}