migrating localizaition_package from flutter_localization to flutter_intl

l10n.yaml

@@ -1,4 +1,4 @@
-arb-dir: lib/l10n/arb
-template-arb-file: app_en.arb
+arb-dir: lib/l10n/
+template-arb-file: intl_en.arb
 output-localization-file: app_localizations.dart
 nullable-getter: false

lib/app/routes/routes.dart

@@ -4,8 +4,8 @@ import 'package:dairy_app/core/pages/settings_page.dart';
 import 'package:dairy_app/features/auth/presentation/pages/auth_page.dart';
 import 'package:dairy_app/features/notes/presentation/pages/note_create_page.dart';
 import 'package:dairy_app/features/notes/presentation/pages/note_read_only_page.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class RouteGenerator {
   static Route<dynamic> generateRoute(RouteSettings settings) {
@@ -35,7 +35,7 @@ class RouteGenerator {
 
     return MaterialPageRoute(
       builder: (context) => Center(
-        child: Text(AppLocalizations.of(context).pageNotFound),
+        child: Text(S.current.pageNotFound),
       ),
     );
   }

lib/app/view/app.dart

@@ -14,9 +14,9 @@ import 'package:dairy_app/features/notes/presentation/bloc/notes/notes_bloc.dart
 import 'package:dairy_app/features/notes/presentation/bloc/notes_fetch/notes_fetch_cubit.dart';
 import 'package:dairy_app/features/notes/presentation/bloc/selectable_list/selectable_list_cubit.dart';
 import 'package:dairy_app/features/sync/presentation/bloc/notes_sync/notesync_cubit.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 
 final log = printer("App");
@@ -107,20 +107,9 @@ class _AppViewState extends State<AppView> {
           navigatorKey: _navigatorKey,
           debugShowCheckedModeBanner: false,
           title: "My Dairy",
-          supportedLocales: const [
-            Locale('en'),
-            Locale('hi'),
-            Locale('pa'),
-            Locale('he'),
-            Locale('kn'),
-            Locale('pt', "BR"),
-            Locale('sw'),
-            Locale('ar'),
-            Locale('de'),
-            Locale('fi')
-          ],
+          supportedLocales: S.delegate.supportedLocales,
           localizationsDelegates: const [
-            AppLocalizations.delegate,
+            S.delegate,
             GlobalMaterialLocalizations.delegate,
             GlobalCupertinoLocalizations.delegate,
             GlobalWidgetsLocalizations.delegate

lib/core/pages/settings_page.dart

@@ -12,9 +12,9 @@ import 'package:dairy_app/features/auth/presentation/widgets/security_settings.d
 import 'package:dairy_app/features/auth/presentation/widgets/setup_account.dart';
 import 'package:dairy_app/features/notes/presentation/widgets/daily_reminders.dart';
 import 'package:dairy_app/features/sync/presentation/widgets/sync_settings.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../widgets/auto_save_enable.dart';
 
 class SettingsPage extends StatefulWidget {
@@ -73,7 +73,7 @@ class _SettingsPageState extends State<SettingsPage> {
           onPressed: () => Navigator.of(context).pop(),
           icon: const Icon(Icons.arrow_back),
         ),
-        title: Text(AppLocalizations.of(context).settings),
+        title: Text(S.current.settings),
         actions: [LogoutButton(authSessionBloc: authSessionBloc)],
       ),
       body: Container(

lib/core/widgets/auto_save_enable.dart

@@ -1,11 +1,11 @@
 import 'package:dairy_app/app/themes/theme_extensions/note_create_page_theme_extensions.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../../app/themes/theme_extensions/settings_page_theme_extensions.dart';
-import '../../features/auth/core/constants.dart';
-import '../../features/auth/presentation/bloc/user_config/user_config_cubit.dart';
-import '../utils/utils.dart';
+import 'package:dairy_app/app/themes/theme_extensions/settings_page_theme_extensions.dart';
+import 'package:dairy_app/features/auth/core/constants.dart';
+import 'package:dairy_app/features/auth/presentation/bloc/user_config/user_config_cubit.dart';
+import 'package:dairy_app/core/utils/utils.dart';
 
 class AutoSaveToggleButton extends StatelessWidget {
   const AutoSaveToggleButton({Key? key}) : super(key: key);
@@ -32,7 +32,7 @@ class AutoSaveToggleButton extends StatelessWidget {
           activeColor: activeColor,
           contentPadding: const EdgeInsets.all(0.0),
           title: Text(
-            AppLocalizations.of(context).enableAutoSave,
+            S.current.enableAutoSave,
             style: TextStyle(color: mainTextColor),
           ),
           subtitle: Text(

lib/core/widgets/home_page_app_bar.dart

@@ -10,9 +10,9 @@ import 'package:dairy_app/core/widgets/submit_button.dart';
 import 'package:dairy_app/features/notes/presentation/bloc/notes/notes_bloc.dart';
 import 'package:dairy_app/features/notes/presentation/bloc/notes_fetch/notes_fetch_cubit.dart';
 import 'package:dairy_app/features/notes/presentation/bloc/selectable_list/selectable_list_cubit.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class HomePageAppBar extends StatefulWidget implements PreferredSizeWidget {
   const HomePageAppBar({
@@ -296,7 +296,7 @@ class Title extends StatelessWidget {
                           mainAxisSize: MainAxisSize.min,
                           children: [
                             Text(
-                              AppLocalizations.of(context).dateFilter,
+                              S.current.dateFilter,
                               textAlign: TextAlign.center,
                               style: TextStyle(
                                 fontSize: 20.0,
@@ -310,7 +310,7 @@ class Title extends StatelessWidget {
                                 Flexible(
                                   flex: 2,
                                   child: Text(
-                                    AppLocalizations.of(context).from,
+                                    S.current.from,
                                     textAlign: TextAlign.center,
                                     style: TextStyle(
                                       fontSize: 16.0,
@@ -334,7 +334,7 @@ class Title extends StatelessWidget {
                                 Flexible(
                                   flex: 2,
                                   child: Text(
-                                    AppLocalizations.of(context).to,
+                                    S.current.to,
                                     textAlign: TextAlign.center,
                                     style: TextStyle(
                                       fontSize: 16.0,
@@ -355,7 +355,7 @@ class Title extends StatelessWidget {
                             SubmitButton(
                               isLoading: false,
                               onSubmitted: () => Navigator.of(context).pop(),
-                              buttonText: AppLocalizations.of(context).done,
+                              buttonText: S.current.done,
                             )
                           ],
                         ),
@@ -407,7 +407,7 @@ class _DeleteButton extends StatelessWidget {
                     noteList: selectableListCubit.state.selectedItems));
               }
             },
-            buttonText: AppLocalizations.of(context).delete);
+            buttonText: S.current.delete);
       },
     );
   }
@@ -423,7 +423,7 @@ class _CancelButton extends StatelessWidget {
     return BlocBuilder<NotesBloc, NotesState>(
       builder: (context, state) {
         return CancelButton(
-          buttonText: AppLocalizations.of(context).cancel,
+          buttonText: S.current.cancel,
           onPressed: () {
             if (state is NoteDeleteLoading) {
               return;
@@ -509,7 +509,7 @@ class DeleteIcon extends StatelessWidget {
               showToast(
                   "$deletionCount item${deletionCount > 1 ? "s" : ""} deleted");
             } else {
-              showToast(AppLocalizations.of(context).deletionFailed);
+              showToast(S.current.deletionFailed);
             }
           }
         },

lib/core/widgets/logout_button.dart

@@ -3,8 +3,8 @@ import 'package:dairy_app/core/widgets/cancel_button.dart';
 import 'package:dairy_app/core/widgets/glass_dialog.dart';
 import 'package:dairy_app/core/widgets/submit_button.dart';
 import 'package:dairy_app/features/auth/presentation/bloc/auth_session/auth_session_bloc.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class LogoutButton extends StatelessWidget {
   const LogoutButton({
@@ -34,7 +34,7 @@ class LogoutButton extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
                     Text(
-                      AppLocalizations.of(context).areYouSureAboutLoggingOut,
+                      S.current.areYouSureAboutLoggingOut,
                       style: TextStyle(fontSize: 16.0, color: mainTextColor),
                     ),
                     const SizedBox(height: 15),

lib/core/widgets/send_feedback.dart

@@ -1,6 +1,6 @@
 import 'package:dairy_app/app/themes/theme_extensions/note_create_page_theme_extensions.dart';
 import 'package:dairy_app/core/widgets/settings_tile.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -14,7 +14,7 @@ class SendFeedBack extends StatelessWidget {
   Widget build(BuildContext context) => SettingsTile(
         onTap: _launchEmailApp,
         child: Text(
-          AppLocalizations.of(context).sendFeedback,
+          S.current.sendFeedback,
           style: TextStyle(
             fontSize: 16.0,
             color: Theme.of(context)

lib/core/widgets/share_with_friends.dart

@@ -1,8 +1,8 @@
 import 'package:dairy_app/app/themes/theme_extensions/note_create_page_theme_extensions.dart';
 import 'package:dairy_app/core/widgets/settings_tile.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:share_plus/share_plus.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class ShareWithFriends extends StatelessWidget {
   const ShareWithFriends({Key? key}) : super(key: key);
@@ -31,7 +31,7 @@ class ShareWithFriends extends StatelessWidget {
         }
       }),
       child: Text(
-        AppLocalizations.of(context).shareWithFriends,
+        S.current.shareWithFriends,
         style: mainTextStyle,
       ),
     );

lib/core/widgets/theme_dropdown.dart

@@ -1,9 +1,9 @@
 import 'package:dairy_app/app/themes/theme_extensions/note_create_page_theme_extensions.dart';
 import 'package:dairy_app/app/themes/theme_extensions/settings_page_theme_extensions.dart';
 import 'package:dairy_app/features/auth/presentation/bloc/cubit/theme_cubit.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class ThemeDropdown extends StatelessWidget {
   const ThemeDropdown({Key? key}) : super(key: key);
@@ -23,7 +23,7 @@ class ThemeDropdown extends StatelessWidget {
     return Row(
       children: [
         Text(
-          AppLocalizations.of(context).chooseTheme,
+          S.current.chooseTheme,
           style: TextStyle(
             fontSize: 16.0,
             color: mainTextColor,

lib/core/widgets/version_number.dart

@@ -1,8 +1,8 @@
 import 'package:dairy_app/app/themes/theme_extensions/note_create_page_theme_extensions.dart';
 import 'package:dairy_app/core/widgets/settings_tile.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class VersionNumber extends StatelessWidget {
   const VersionNumber({Key? key}) : super(key: key);
@@ -25,7 +25,7 @@ class VersionNumber extends StatelessWidget {
           child: Row(
             children: [
               Text(
-                AppLocalizations.of(context).appVersion,
+                S.current.appVersion,
                 style: mainTextStyle,
               ),
               const Spacer(),

lib/features/auth/data/repositories/fingerprint_auth_repo.dart

@@ -8,8 +8,8 @@ import 'package:dairy_app/features/auth/data/models/user_config_model.dart';
 import 'package:dairy_app/features/auth/domain/repositories/authentication_repository.dart';
 import 'package:dairy_app/features/auth/presentation/bloc/auth_session/auth_session_bloc.dart';
 import 'package:dairy_app/features/sync/data/datasources/temeplates/key_value_data_source_template.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/widgets.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 final log = printer("FingerPrintAuthRepo");
 
@@ -88,7 +88,7 @@ class FingerPrintAuthRepository {
 
             result.fold((e) {
               log.e(e);
-              showToast(AppLocalizations.of(context).fingerprintLoginFailed);
+              showToast(S.current.fingerprintLoginFailed);
             }, (user) {
               // for fingerprint login, it's never fresh login
               //! since a feature is removed, freshlogin is true to avoid breaking changes
@@ -98,7 +98,7 @@ class FingerPrintAuthRepository {
             });
           } else {
             log.e("lastLoginUser not found");
-            showToast(AppLocalizations.of(context).fingerprintLoginFailed);
+            showToast(S.current.fingerprintLoginFailed);
           }
         } else if (value == FingerPrintAuthState.platformError) {
           fingerPrintAuthStreamSubscription?.cancel();
@@ -107,7 +107,7 @@ class FingerPrintAuthRepository {
           fingerPrintAuthStreamSubscription?.cancel();
           isFingerPrintAuthActivated = false;
 
-          showToast(AppLocalizations.of(context).tooManyWrongAttempts);
+          showToast(S.current.tooManyWrongAttempts);
         } else if (value == FingerPrintAuthState.fail) {
           // showToast("fingerprint not recognized");
         }

lib/features/auth/presentation/widgets/email_change_popup.dart

@@ -4,8 +4,8 @@ import 'package:dairy_app/core/widgets/glass_dialog.dart';
 import 'package:dairy_app/core/widgets/submit_button.dart';
 import 'package:dairy_app/features/auth/core/failures/failures.dart';
 import 'package:dairy_app/features/auth/presentation/widgets/email_input_field.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 Future<dynamic> emailChangePopup(
     BuildContext context, Function(String) submitEmailChange) {
@@ -24,7 +24,7 @@ Future<dynamic> emailChangePopup(
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Text(AppLocalizations.of(context).enterNewEmail,
+          Text(S.current.enterNewEmail,
               style: TextStyle(
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
@@ -58,13 +58,12 @@ Future<dynamic> emailChangePopup(
                   setState(() {
                     isLoading = false;
                   });
-                  showToast(
-                      AppLocalizations.of(context).emailUpdatedSuccessfully);
+                  showToast(S.current.emailUpdatedSuccessfully);
                   await Future.delayed(const Duration(milliseconds: 500));
                   Navigator.of(context).pop(true);
                 });
               },
-              buttonText: AppLocalizations.of(context).submit,
+              buttonText: S.current.submit,
             );
           })
         ],

lib/features/auth/presentation/widgets/forgot_password_popup.dart

@@ -4,8 +4,8 @@ import 'package:dairy_app/core/widgets/glass_dialog.dart';
 import 'package:dairy_app/core/widgets/submit_button.dart';
 import 'package:dairy_app/features/auth/core/failures/failures.dart';
 import 'package:dairy_app/features/auth/presentation/widgets/email_input_field.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 Future<void> forgotPasswordPopup(
     BuildContext context, Function(String) submitForgotPassword) {
@@ -24,7 +24,7 @@ Future<void> forgotPasswordPopup(
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Text(AppLocalizations.of(context).enterRegisteredEmail,
+          Text(S.current.enterRegisteredEmail,
               style: TextStyle(
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
@@ -58,11 +58,11 @@ Future<void> forgotPasswordPopup(
                   setState(() {
                     isLoading = false;
                   });
-                  showToast(AppLocalizations.of(context).passwordResetMailSent);
+                  showToast(S.current.passwordResetMailSent);
                   Navigator.of(context).pop();
                 });
               },
-              buttonText: AppLocalizations.of(context).submit,
+              buttonText: S.current.submit,
             );
           })
         ],

lib/features/auth/presentation/widgets/guest_sign_up.dart

@@ -2,9 +2,9 @@ import 'package:dairy_app/app/themes/theme_extensions/auth_page_theme_extensions
 import 'package:dairy_app/features/auth/core/constants.dart';
 import 'package:dairy_app/features/auth/presentation/bloc/auth_form/auth_form_bloc.dart';
 import 'package:dairy_app/features/auth/presentation/bloc/auth_session/auth_session_bloc.dart';
+import 'package:dairy_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class GuestSignUp extends StatelessWidget {
   const GuestSignUp({Key? key}) : super(key: key);
@@ -28,7 +28,7 @@ class GuestSignUp extends StatelessWidget {
                 authFormbloc.add(AuthFormGuestSignIn());
               },
               child: Text(
-                AppLocalizations.of(context).continueAsGues,
+                S.current.continueAsGues,
                 style: TextStyle(
                   color: linkColor,
                   fontWeight: FontWeight.bold,