diff --git a/apps/mobile/packages/core_localization/lib/src/bloc/locale_bloc.dart b/apps/mobile/packages/core_localization/lib/src/bloc/locale_bloc.dart index e0187a14..50d07c42 100644 --- a/apps/mobile/packages/core_localization/lib/src/bloc/locale_bloc.dart +++ b/apps/mobile/packages/core_localization/lib/src/bloc/locale_bloc.dart @@ -64,16 +64,13 @@ class LocaleBloc extends Bloc { LoadLocale event, Emitter emit, ) async { - final Locale? savedLocale = await getLocaleUseCase(); - final Locale defaultLocale = getDefaultLocaleUseCase(); + final Locale savedLocale = await getLocaleUseCase(); final List supportedLocales = getSupportedLocalesUseCase(); - final Locale locale = savedLocale ?? defaultLocale; - - await LocaleSettings.setLocaleRaw(locale.languageCode); + await LocaleSettings.setLocaleRaw(savedLocale.languageCode); emit(LocaleState( - locale: locale, + locale: savedLocale, supportedLocales: supportedLocales, )); } diff --git a/apps/mobile/packages/core_localization/lib/src/domain/repositories/locale_repository_interface.dart b/apps/mobile/packages/core_localization/lib/src/domain/repositories/locale_repository_interface.dart index 34dffa1c..912d8248 100644 --- a/apps/mobile/packages/core_localization/lib/src/domain/repositories/locale_repository_interface.dart +++ b/apps/mobile/packages/core_localization/lib/src/domain/repositories/locale_repository_interface.dart @@ -13,7 +13,7 @@ abstract interface class LocaleRepositoryInterface { /// Retrieves the saved [locale] from persistent storage. /// /// Returns `null` if no locale has been previously saved. - Future getSavedLocale(); + Future getSavedLocale(); /// Retrieves the default [Locale] for the application. Locale getDefaultLocale(); diff --git a/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_locale_use_case.dart b/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_locale_use_case.dart index 8d29876e..02256a69 100644 --- a/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_locale_use_case.dart +++ b/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_locale_use_case.dart @@ -13,7 +13,7 @@ class GetLocaleUseCase extends NoInputUseCase { GetLocaleUseCase(this._repository); @override - Future call() { + Future call() { return _repository.getSavedLocale(); } }