ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5611 from pangeachat/merge-prod-into-main

Browse source 
Merge prod into main
This commit is contained in:
ggurdin 2026-02-09 16:14:11 -05:00 • committed by GitHub
commit 48c681c074
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/l10n/intl_en.arb
View file

@ -5090,5 +5090,6 @@
"perfectPractice": "Perfect practice!",
"greatPractice": "Great practice!",
"usedNoHints": "Nice job not using any hints!",
"youveCompletedPractice": "You've completed practice, keep it up to get better!"
"youveCompletedPractice": "You've completed practice, keep it up to get better!",
"emptyAudioError": "Recording failed. Please check your audio permissions and try again."
}

4
lib/pangea/analytics_practice/analytics_practice_page.dart
View file

@ -1,7 +1,10 @@
import 'dart:async';
import 'dart:collection';
import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/analytics_data/analytics_data_service.dart';
import 'package:fluffychat/pangea/analytics_data/analytics_updater_mixin.dart';
@ -28,7 +31,6 @@ import 'package:fluffychat/pangea/toolbar/message_practice/message_audio_card.da
import 'package:fluffychat/pangea/toolbar/message_practice/practice_record_controller.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
class SelectedMorphChoice {
final MorphFeaturesEnum feature;

3
lib/pangea/analytics_practice/analytics_practice_view.dart
View file

@ -1,3 +1,5 @@
import 'package:flutter/material.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
@ -23,7 +25,6 @@ import 'package:fluffychat/pangea/practice_activities/practice_activity_model.da
import 'package:fluffychat/utils/localized_exception_extension.dart';
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
class AnalyticsPracticeView extends StatelessWidget {
final AnalyticsPracticeState controller;

4
lib/pangea/analytics_practice/choice_cards/game_choice_card.dart
View file

@ -155,8 +155,8 @@ class _CardContainer extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
height: shrinkWrap ? null : height,
padding: shrinkWrap
? const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0)
padding: shrinkWrap
? const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0)
: null,
alignment: shrinkWrap ? null : Alignment.center,
decoration: BoxDecoration(