Merge pull request #134 from DevKor-github/133-persistent-login

133 persistent login

lib/data/repositories/authentication_repository_impl.dart

@@ -84,7 +84,7 @@ class AuthenticationRepositoryImpl implements AuthenticationRepository {
   }
 
   @override
-  Future<UserEntity> getUSer() async {
+  Future<UserEntity> getUser() async {
     try {
       final user = await _authenticationRemoteDataSource.getUser();
       _userStreamController.add(user);

lib/data/repositories/schedule_repository_impl.dart

@@ -81,8 +81,9 @@ class ScheduleRepositoryImpl implements ScheduleRepository {
   Future<void> updateSchedule(ScheduleEntity schedule) async {
     try {
       await scheduleRemoteDataSource.updateSchedule(schedule);
-      _scheduleStreamController
-          .add(Set.from(_scheduleStreamController.value)..add(schedule));
+      _scheduleStreamController.add(Set.from(_scheduleStreamController.value)
+        ..remove(schedule)
+        ..add(schedule));
       //await scheduleLocalDataSource.updateSchedule(schedule);
     } catch (e) {
       rethrow;

lib/domain/repositories/authentication_repository.dart

@@ -12,5 +12,5 @@ abstract interface class AuthenticationRepository {
 
   Future<void> signInWithGoogle();
 
-  Future<void> getUSer();
+  Future<void> getUser();
 }

lib/domain/use-cases/load_user_use_case.dart

@@ -0,0 +1,13 @@
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/domain/repositories/authentication_repository.dart';
+
+@Injectable()
+class LoadUserUseCase {
+  final AuthenticationRepository _authenticationRepository;
+
+  LoadUserUseCase(this._authenticationRepository);
+
+  Future<void> call() async {
+    await _authenticationRepository.getUser();
+  }
+}

lib/domain/use-cases/onboard_use_case.dart

@@ -16,6 +16,6 @@ class OnboardUseCase {
       required String note}) async {
     await _preparationRepository.createDefaultPreparation(
         preparationEntity: preparationEntity, spareTime: spareTime, note: note);
-    await _authenticationRepository.getUSer();
+    await _authenticationRepository.getUser();
   }
 }

lib/domain/use-cases/sign_out_use_case.dart

@@ -0,0 +1,13 @@
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/domain/repositories/authentication_repository.dart';
+
+@Injectable()
+class SignOutUseCase {
+  final AuthenticationRepository _authenticationRepository;
+
+  SignOutUseCase(this._authenticationRepository);
+
+  Future<void> call() async {
+    return _authenticationRepository.signOut();
+  }
+}

lib/domain/use-cases/stream_user_use_case.dart

@@ -0,0 +1,14 @@
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/domain/entities/user_entity.dart';
+import 'package:on_time_front/domain/repositories/authentication_repository.dart';
+
+@Injectable()
+class StreamUserUseCase {
+  final AuthenticationRepository _authenticationRepository;
+
+  StreamUserUseCase(this._authenticationRepository);
+
+  Stream<UserEntity> call() {
+    return _authenticationRepository.userStream;
+  }
+}

lib/presentation/app/bloc/app_bloc.dart

@@ -3,26 +3,32 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:injectable/injectable.dart';
 import 'package:on_time_front/domain/entities/user_entity.dart';
 import 'package:on_time_front/domain/repositories/authentication_repository.dart';
+import 'package:on_time_front/domain/use-cases/load_user_use_case.dart';
+import 'package:on_time_front/domain/use-cases/sign_out_use_case.dart';
+import 'package:on_time_front/domain/use-cases/stream_user_use_case.dart';
 
 part 'app_event.dart';
 part 'app_state.dart';
 
 @Injectable()
 class AppBloc extends Bloc<AppEvent, AppState> {
-  AppBloc(this._authenticationRepository)
+  AppBloc(this._streamUserUseCase, this._signOutUseCase, this._loadUserUseCase)
       : super(AppState(user: const UserEntity.empty())) {
     on<AppUserSubscriptionRequested>(_appUserSubscriptionRequested);
-    on<AppLogoutPressed>(_appLogoutPressed);
+    on<AppSignOutPressed>(_appLogoutPressed);
   }
 
-  final AuthenticationRepository _authenticationRepository;
+  final StreamUserUseCase _streamUserUseCase;
+  final LoadUserUseCase _loadUserUseCase;
+  final SignOutUseCase _signOutUseCase;
 
   Future<void> _appUserSubscriptionRequested(
     AppUserSubscriptionRequested event,
     Emitter<AppState> emit,
   ) {
+    _loadUserUseCase();
     return emit.onEach(
-      _authenticationRepository.userStream,
+      _streamUserUseCase.call(),
       onData: (user) => emit(
         state.copyWith(
           user: user,
@@ -38,9 +44,9 @@ class AppBloc extends Bloc<AppEvent, AppState> {
   }
 
   void _appLogoutPressed(
-    AppLogoutPressed event,
+    AppSignOutPressed event,
     Emitter<AppState> emit,
   ) {
-    _authenticationRepository.signOut();
+    _signOutUseCase();
   }
 }

lib/presentation/app/bloc/app_event.dart

@@ -8,6 +8,6 @@ final class AppUserSubscriptionRequested extends AppEvent {
   const AppUserSubscriptionRequested();
 }
 
-final class AppLogoutPressed extends AppEvent {
-  const AppLogoutPressed();
+final class AppSignOutPressed extends AppEvent {
+  const AppSignOutPressed();
 }

lib/presentation/home/components/home_app_bar.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:on_time_front/presentation/app/bloc/app_bloc.dart';
 import 'package:on_time_front/presentation/shared/constants/constants.dart';
 
 class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -30,7 +32,9 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
           [
             IconButton(
               icon: friendsSvg,
-              onPressed: () {},
+              onPressed: () {
+                context.read<AppBloc>().add(AppSignOutPressed());
+              },
             ),
             IconButton(
               icon: bellSvg,

lib/presentation/home/screens/home_screen.dart

@@ -10,7 +10,6 @@ import 'package:on_time_front/presentation/home/components/todays_schedule_tile.
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:on_time_front/presentation/home/components/week_calendar.dart';
 import 'package:on_time_front/presentation/shared/components/arc_indicator.dart';
-import 'package:on_time_front/presentation/shared/components/bottom_navigation_bar.dart';
 
 class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
@@ -57,8 +56,8 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     final dateOfToday = DateTime(
         DateTime.now().year, DateTime.now().month, DateTime.now().day, 0, 0, 0);
     final theme = Theme.of(context);
-    final double score = context.select(
-        (AppBloc bloc) => bloc.state.user.mapOrNull((user) => user.score)!);
+    final double score = context.select((AppBloc bloc) =>
+        bloc.state.user.mapOrNull((user) => user.score) ?? -1);
     _animationController = AnimationController(
       duration: const Duration(seconds: 1),
       vsync: this,

lib/presentation/onboarding/screens/onboarding_screen.dart

@@ -169,9 +169,8 @@ class _OnboardingFormState extends State<OnboardingForm>
     if (_tabController.index < _numberOfPages - 1) {
       _updateCurrentPageIndex(_tabController.index + 1);
     } else {
-      return await context
-          .read<OnboardingCubit>()
-          .onboardingFormSubmitted(preparationFormData.toOnboardingState());
+      return await context.read<OnboardingCubit>().onboardingFormSubmitted(
+          preparationFormData.toOnboardingState(spareTime));
     }
   }
 
@@ -278,7 +277,7 @@ class PreparationFormData {
     return tmp.map((e) => e.preparationStep).toList();
   }
 
-  OnboardingState toOnboardingState() {
+  OnboardingState toOnboardingState(Duration spareTime) {
     final sortedList = sortByOrder().preparationStepList;
     final steps = sortedList
         .mapIndexed((index, step) => OnboardingPreparationStepState(
@@ -290,7 +289,7 @@ class PreparationFormData {
                   : null, // if not last step, set next step id
             ))
         .toList();
-    return OnboardingState(preparationStepList: steps);
+    return OnboardingState(preparationStepList: steps, spareTime: spareTime);
   }
 }
 

lib/presentation/schedule_create/compoenent/schedule_spare_and_preparing_time_form.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:on_time_front/domain/entities/preparation_entity.dart';
+import 'package:on_time_front/presentation/app/bloc/app_bloc.dart';
 import 'package:on_time_front/presentation/schedule_create/bloc/schedule_form/schedule_form_bloc.dart';
 
 class ScheduleSpareAndPreparingTimeForm extends StatefulWidget {
@@ -62,8 +63,9 @@ class _ScheduleSpareAndPreparingTimeFormState
           Expanded(
             flex: 1,
             child: FormField<Duration>(
-              initialValue:
-                  widget.initalValue.scheduleSpareTime ?? Duration.zero,
+              initialValue: widget.initalValue.scheduleSpareTime ??
+                  context.select((AppBloc appBloc) =>
+                      appBloc.state.user.mapOrNull((user) => user.spareTime))!,
               builder: (field) => TextField(
                 readOnly: true,
                 decoration: InputDecoration(labelText: ''),