diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 2ea0bc307..ec8261740 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -2504,7 +2504,7 @@ "type": "text", "placeholders": {} }, - "interactiveTranslatorAllowedDesc": "Students can choose whether to use translation assistance in space group chats in Settings > Learning Settings.", + "interactiveTranslatorAllowedDesc": "Students can choose whether to use translation assistance in space group chats in Main Menu > My Learning Settings.", "@interactiveTranslatorAllowedDesc": { "type": "text", "placeholders": {} @@ -2984,9 +2984,9 @@ "errorDisableLanguageAssistanceClassDesc": "Translation assistance and grammar assistance are turned off for the space that this chat is in.", "itIsDisabled": "Interactive Translation is disabled", "igcIsDisabled": "Interactive Grammar Checking is disabled", - "goToLearningSettings": "Go to Learning Settings", + "goToLearningSettings": "Go to My Learning Settings", "error405Title": "Languages not set", - "error405Desc": "Please set your languages in Settings > Learning Settings", + "error405Desc": "Please set your languages in Main Menu > My Learning Settings.", "loginOrSignup": "Sign in with", "@loginOrSignup": { "type": "text", @@ -3049,7 +3049,7 @@ "type": "text", "placeholders": {} }, - "learningSettings": "Learning Settings", + "learningSettings": "My Learning Settings", "classNameRequired": "Please enter a space name", "@classNameRequired": { "type": "text", @@ -3947,4 +3947,4 @@ "noPaymentInfo": "No payment info necessary!", "updatePhoneOS": "You may need to update your device's OS version.", "wordsPerMinute": "Words per minute" -} \ No newline at end of file +} diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index 896b6dc36..af21a177a 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -154,6 +154,18 @@ class ClientChooserButton extends StatelessWidget { ], ), ), + // #Pangea + PopupMenuItem( + value: SettingsAction.learning, + child: Row( + children: [ + const Icon(Icons.psychology_outlined), + const SizedBox(width: 18), + Expanded(child: Text(L10n.of(context)!.learningSettings)), + ], + ), + ), + // Pangea# PopupMenuItem( value: SettingsAction.settings, child: Row( @@ -382,6 +394,9 @@ class ClientChooserButton extends StatelessWidget { case SettingsAction.setStatus: controller.setStatus(); // #Pangea + case SettingsAction.learning: + context.go('/rooms/settings/learning'); + break; case SettingsAction.newClass: context.go('/rooms/newspace'); break; @@ -493,6 +508,7 @@ enum SettingsAction { settings, archive, // #Pangea + learning, joinWithClassCode, classAnalytics, myAnalytics, diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index 36766ea65..cc52f0ef0 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -181,14 +181,6 @@ class SettingsView extends StatelessWidget { trailing: const Icon(Icons.chevron_right_outlined), ), // #Pangea - ListTile( - leading: const Icon(Icons.account_circle_outlined), - title: Text(L10n.of(context)!.learningSettings), - onTap: () => context.go('/rooms/settings/learning'), - trailing: const Icon( - Icons.chevron_right_outlined, - ), - ), ListTile( leading: const Icon(Icons.account_circle_outlined), title: Text(L10n.of(context)!.subscriptionManagement),