Skip to content

Commit 8a4ca7e

Browse files
authored
fix: update base/target language on dropdown value change in activity planner (#1869)
1 parent 820e795 commit 8a4ca7e

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

lib/pages/chat_list/chat_list.dart

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import '../../widgets/matrix.dart';
4343
import 'package:fluffychat/utils/tor_stub.dart'
4444
if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
4545

46-
4746
enum PopupMenuAction {
4847
settings,
4948
invite,

lib/pangea/activity_planner/activity_planner_page.dart

+19-8
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
1919
import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart';
2020
import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart';
2121
import 'package:fluffychat/pangea/learning_settings/enums/language_level_type_enum.dart';
22+
import 'package:fluffychat/pangea/learning_settings/utils/language_list_util.dart';
2223
import 'package:fluffychat/pangea/learning_settings/widgets/p_language_dropdown.dart';
2324
import 'package:fluffychat/widgets/matrix.dart';
2425

@@ -276,10 +277,15 @@ class ActivityPlannerPageState extends State<ActivityPlannerPage> {
276277
PLanguageDropdown(
277278
languages: MatrixState
278279
.pangeaController.pLanguageStore.baseOptions,
279-
onChange: (val) =>
280-
_selectedLanguageOfInstructions = val.langCode,
281-
initialLanguage: MatrixState
282-
.pangeaController.languageController.userL1,
280+
onChange: (val) => setState(
281+
() => _selectedLanguageOfInstructions = val.langCode,
282+
),
283+
initialLanguage: _selectedLanguageOfInstructions != null
284+
? PangeaLanguage.byLangCode(
285+
_selectedLanguageOfInstructions!,
286+
)
287+
: MatrixState
288+
.pangeaController.languageController.userL1,
283289
isL2List: false,
284290
decorationText:
285291
L10n.of(context).languageOfInstructionsLabel,
@@ -288,10 +294,15 @@ class ActivityPlannerPageState extends State<ActivityPlannerPage> {
288294
PLanguageDropdown(
289295
languages: MatrixState
290296
.pangeaController.pLanguageStore.targetOptions,
291-
onChange: (val) =>
292-
_selectedTargetLanguage = val.langCode,
293-
initialLanguage: MatrixState
294-
.pangeaController.languageController.userL2,
297+
onChange: (val) => setState(
298+
() => _selectedTargetLanguage = val.langCode,
299+
),
300+
initialLanguage: _selectedTargetLanguage != null
301+
? PangeaLanguage.byLangCode(
302+
_selectedTargetLanguage!,
303+
)
304+
: MatrixState
305+
.pangeaController.languageController.userL2,
295306
decorationText: L10n.of(context).targetLanguageLabel,
296307
isL2List: true,
297308
),

0 commit comments

Comments
 (0)