@@ -19,6 +19,7 @@ import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
19
19
import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart' ;
20
20
import 'package:fluffychat/pangea/learning_settings/constants/language_constants.dart' ;
21
21
import 'package:fluffychat/pangea/learning_settings/enums/language_level_type_enum.dart' ;
22
+ import 'package:fluffychat/pangea/learning_settings/utils/language_list_util.dart' ;
22
23
import 'package:fluffychat/pangea/learning_settings/widgets/p_language_dropdown.dart' ;
23
24
import 'package:fluffychat/widgets/matrix.dart' ;
24
25
@@ -276,10 +277,15 @@ class ActivityPlannerPageState extends State<ActivityPlannerPage> {
276
277
PLanguageDropdown (
277
278
languages: MatrixState
278
279
.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,
283
289
isL2List: false ,
284
290
decorationText:
285
291
L10n .of (context).languageOfInstructionsLabel,
@@ -288,10 +294,15 @@ class ActivityPlannerPageState extends State<ActivityPlannerPage> {
288
294
PLanguageDropdown (
289
295
languages: MatrixState
290
296
.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,
295
306
decorationText: L10n .of (context).targetLanguageLabel,
296
307
isL2List: true ,
297
308
),
0 commit comments