snggle · kronikarz · Aug 5, 2025 · Jul 16, 2025
diff --git a/lib/cubit/receive_tab_cubit/receive_tab_cubit.dart b/lib/cubit/receive_tab_cubit/receive_tab_cubit.dart
@@ -17,7 +17,13 @@ class ReceiveTabCubit extends Cubit<AReceiveTabState> {
   late AudioDecoder _audioDecoder;
   bool _canceledByUserBool = false;
 
-  ReceiveTabCubit() : super(const ReceiveTabEmptyState());
+  ReceiveTabCubit() : super(const ReceiveTabEmptyState()) {
+    _audioDecoder = AudioDecoder(
+      onMetadataFrameReceived: _handleMetadataFrameReceived,
+      onDecodingCompleted: _handleDecodingCompleted,
+      onDecodingFailed: _handleDecodingFailed,
+    );
+  }
 
   void resetScreen() {
     emit(const ReceiveTabEmptyState());
@@ -37,14 +43,8 @@ class ReceiveTabCubit extends Cubit<AReceiveTabState> {
 
   void startRecording() {
     try {
-      _audioDecoder = AudioDecoder(
-        audioSettingsModel: _audioSettingsModel,
-        onMetadataFrameReceived: _handleMetadataFrameReceived,
-        onDecodingCompleted: _handleDecodingCompleted,
-        onDecodingFailed: _handleDecodingFailed,
-      );
       emit(const ReceiveTabRecordingState());
-      _audioDecoder.startRecording();
+      _audioDecoder.startRecording(_audioSettingsModel);
     } catch (e) {
       AppLogger().log(message: 'Cannot start recording: $e');
       emit(const ReceiveTabEmptyState());

diff --git a/lib/cubit/send_tab_cubit/send_tab_cubit.dart b/lib/cubit/send_tab_cubit/send_tab_cubit.dart
@@ -12,18 +12,23 @@ import 'package:share_plus/share_plus.dart';
 import 'package:whisp/cubit/send_tab_cubit/a_send_tab_state.dart';
 import 'package:whisp/cubit/send_tab_cubit/states/send_tab_emitting_state.dart';
 import 'package:whisp/cubit/send_tab_cubit/states/send_tab_empty_state.dart';
+import 'package:whisp/cubit/send_tab_cubit/states/send_tab_preparing_state.dart';
 import 'package:whisp/shared/audio_settings_mode.dart';
 import 'package:whisp/shared/utils/file_utils.dart';
 
 class SendTabCubit extends Cubit<ASendTabState> {
+  late final AudioGenerator _audioGenerator;
   late AudioSettingsModel audioSettingsModel = AudioSettingsModel(
     frequencyGenerator: MusicalFrequencyGenerator(
       frequencies: MusicalFrequencies.fdm9FullScaleAMaj,
     ),
   );
-  AudioGenerator? _audioGenerator;
 
-  SendTabCubit() : super(SendTabEmptyState());
+  SendTabCubit() : super(SendTabEmptyState()) {
+    _audioGenerator = AudioGenerator(onGenerationCompleted: () {
+      emit(SendTabEmptyState());
+    });
+  }
 
   void switchAudioType(AudioSettingsMode audioSettingsMode) {
     if (audioSettingsMode == AudioSettingsMode.rocket) {
@@ -38,23 +43,18 @@ class SendTabCubit extends Cubit<ASendTabState> {
   }
 
   Future<void> playSound(String text) async {
+    emit(SendTabPreparingState());
     Uint8List textBytes = utf8.encode(text);
-    AudioStreamSink audioStreamSink = AudioStreamSink();
-    emit(SendTabEmittingState());
-    _audioGenerator = AudioGenerator(
-      audioSink: audioStreamSink,
+    await _audioGenerator.startGenerating(AudioGeneratorParams(
       audioSettingsModel: audioSettingsModel,
-    );
-    await _audioGenerator!.generate(textBytes);
-
-    await audioStreamSink.future;
-
-    emit(SendTabEmptyState());
+      bytes: textBytes,
+      audioSinkArgs: StreamAudioSinkArgs(),
+    ));
+    emit(SendTabEmittingState());
   }
 
   void stopSound() {
-    _audioGenerator?.stop();
-    emit(SendTabEmptyState());
+    _audioGenerator.cancelGenerating();
   }
 
   Future<void> saveFile(String text) async {
@@ -67,7 +67,7 @@ class SendTabCubit extends Cubit<ASendTabState> {
       // For desktop platforms (Linux, macOS & Windows), this function does not actually
       // save a file. It only opens the dialog to let the user choose a location and
       // file name. This function only returns the **path** to this (non-existing) file.
-      // Since AudioFileSink handles saving the files in both cases,
+      // Since FileAudioSink handles saving the files in both cases,
       // creating a temporary empty file is needed for Android.
       bytes: Platform.isWindows ? null : Uint8List(0),
     );
@@ -93,15 +93,13 @@ class SendTabCubit extends Cubit<ASendTabState> {
     Uint8List textBytes = utf8.encode(text);
     String filePath = '${tempDir.path}/generated_audio_message.wav';
     File wavFile = File(filePath);
-    AudioFileSink audioFileSink = AudioFileSink(wavFile);
-    _audioGenerator = AudioGenerator(
-      audioSink: audioFileSink,
+    await _audioGenerator.startGenerating(AudioGeneratorParams(
       audioSettingsModel: audioSettingsModel,
-    );
-    unawaited(_audioGenerator?.generate(textBytes));
-
-    await audioFileSink.future;
+      bytes: textBytes,
+      audioSinkArgs: FileAudioSinkArgs(file: wavFile),
+    ));
 
+    await _audioGenerator.future;
     XFile xWavFile = XFile(filePath);
     await Share.shareXFiles(<XFile>[xWavFile], text: 'Share');
 
@@ -125,14 +123,11 @@ class SendTabCubit extends Cubit<ASendTabState> {
   Future<void> _writeFile(String text, String outputPath) async {
     Uint8List bytes = Uint8List.fromList(utf8.encode(text));
     File sinkFile = File(outputPath);
-    AudioFileSink audioSink = AudioFileSink(sinkFile);
 
-    _audioGenerator = AudioGenerator(
-      audioSink: audioSink,
+    await _audioGenerator.startGenerating(AudioGeneratorParams(
       audioSettingsModel: audioSettingsModel,
-    );
-    unawaited(_audioGenerator?.generate(bytes));
-
-    await audioSink.future;
+      bytes: bytes,
+      audioSinkArgs: FileAudioSinkArgs(file: sinkFile),
+    ));
   }
 }
diff --git a/lib/cubit/send_tab_cubit/states/send_tab_preparing_state.dart b/lib/cubit/send_tab_cubit/states/send_tab_preparing_state.dart
@@ -0,0 +1,3 @@
+import 'package:whisp/cubit/send_tab_cubit/states/send_tab_emitting_state.dart';
+
+class SendTabPreparingState extends SendTabEmittingState {}
diff --git a/lib/page/send_tab.dart b/lib/page/send_tab.dart
@@ -6,6 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:whisp/cubit/send_tab_cubit/a_send_tab_state.dart';
 import 'package:whisp/cubit/send_tab_cubit/send_tab_cubit.dart';
 import 'package:whisp/cubit/send_tab_cubit/states/send_tab_emitting_state.dart';
+import 'package:whisp/cubit/send_tab_cubit/states/send_tab_preparing_state.dart';
 import 'package:whisp/cubit/theme_cubit/theme_assets.dart';
 import 'package:whisp/widgets/buttons_panel.dart';
 import 'package:whisp/widgets/custom_app_bar.dart';
@@ -70,8 +71,9 @@ class _SendTabState extends State<SendTab> {
             onClearButtonPressed: _clearMessage,
           ),
           bottomWidget: ButtonsPanel(
+            buttonsDisabledBool: buttonsDisabledBool,
+            mainButtonDisabledBool: state is SendTabPreparingState || _msgEmptyBool,
             emissionInProgressBool: emissionInProgressBool,
-            msgEmptyBool: _msgEmptyBool,
             themeAssets: widget.themeAssets,
             onSaveButtonPressed: _saveFile,
             onPlayButtonPressed: () => widget.sendTabCubit.playSound(widget.messageTextController.text),

diff --git a/lib/widgets/buttons_panel.dart b/lib/widgets/buttons_panel.dart
@@ -3,17 +3,19 @@ import 'package:whisp/cubit/theme_cubit/theme_assets.dart';
 import 'package:whisp/widgets/square_button.dart';
 
 class ButtonsPanel extends StatelessWidget {
+  final bool buttonsDisabledBool;
+  final bool mainButtonDisabledBool;
   final bool emissionInProgressBool;
-  final bool msgEmptyBool;
   final ThemeAssets themeAssets;
   final VoidCallback onSaveButtonPressed;
   final VoidCallback onPlayButtonPressed;
   final VoidCallback onStopButtonPressed;
   final VoidCallback onShareButtonPressed;
 
   const ButtonsPanel({
+    required this.buttonsDisabledBool,
+    required this.mainButtonDisabledBool,
     required this.emissionInProgressBool,
-    required this.msgEmptyBool,
     required this.themeAssets,
     required this.onSaveButtonPressed,
     required this.onPlayButtonPressed,
@@ -24,7 +26,6 @@ class ButtonsPanel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    bool buttonsDisabledBool = emissionInProgressBool || msgEmptyBool;
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 16),
       child: Row(
@@ -47,15 +48,15 @@ class ButtonsPanel extends StatelessWidget {
             flex: 10,
             child: SquareButton.big(
               backgroundColor: themeAssets.primaryColor,
-              onTap: msgEmptyBool
+              onTap: mainButtonDisabledBool
                   ? null
                   : emissionInProgressBool
                       ? onStopButtonPressed
                       : onPlayButtonPressed,
               child: Icon(
                 emissionInProgressBool ? Icons.stop_rounded : Icons.play_arrow_rounded,
                 size: 80,
-                color: emissionInProgressBool ? const Color(0xff244064) : const Color(0xff396521),
+                color: buttonsDisabledBool ? const Color(0xff244064) : const Color(0xff396521),
               ),
             ),
           ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: whisp
 description: "Demo application for mrumru."
 publish_to: 'none'
-version: 0.0.3
+version: 0.0.4
 
 environment:
   sdk: "3.2.6"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import 'package:whisp/cubit/send_tab_cubit/states/send_tab_emitting_state.dart';

		class SendTabPreparingState extends SendTabEmittingState {}