Skip to content

#26 Feature/audio recording.... Done with the features of audio recording #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dikshantbhangala wants to merge 5 commits into
base: gsoc-2024
Choose a base branch
from
Open

#26 Feature/audio recording.... Done with the features of audio recording #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ca5b82
Merge pull request #20 from AOSSIE-Org/gsoc-2022
ManavSarkar Aug 13, 2024
5b193f4
Merge pull request #29 from AOSSIE-Org/gsoc-2024
ManavSarkar Dec 26, 2024
1348a30
done with change
dikshantbhangala Dec 30, 2024
1ed7a2a
done
dikshantbhangala Dec 30, 2024
c669a23
Added audio recording feature and refactored code
dikshantbhangala Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions android/app/src/main/kotlin/com/nankai/openpeerchat_flutter/MainActivity.kt
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions lib/classes/global.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class Global extends ChangeNotifier {
static Map<String, dynamic> cache = {};
static final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();

static var profileNameStream;


void sentToConversations(Msg msg, String converser, {bool addToTable = true}) {

Expand Down
135 changes: 102 additions & 33 deletions lib/components/message_panel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter_sound/flutter_sound.dart'; // ADDED
import 'package:flutter/services.dart';
import 'package:nanoid/nanoid.dart';
import 'package:pointycastle/asymmetric/api.dart';
Expand All @@ -13,10 +14,6 @@ import '../database/database_helper.dart';
import '../encyption/rsa.dart';
import 'view_file.dart';

/// This component is used in the ChatPage.
/// It is the message bar where the message is typed on and sent to
/// connected devices.

class MessagePanel extends StatefulWidget {
const MessagePanel({Key? key, required this.converser}) : super(key: key);
final String converser;
Expand All @@ -28,19 +25,41 @@ class MessagePanel extends StatefulWidget {
class _MessagePanelState extends State<MessagePanel> {
TextEditingController myController = TextEditingController();
File _selectedFile = File('');
FlutterSoundRecorder? _recorder; // ADDED
bool _isRecording = false; // ADDED
String? _recordedFilePath; // ADDED

@override
void initState() {
super.initState();
_recorder = FlutterSoundRecorder(); // ADDED
_initializeRecorder(); // ADDED
}

@override
void dispose() {
_recorder?.closeRecorder(); // ADDED
_recorder = null; // ADDED
super.dispose();
}

// ADDED: Initialize audio recorder
Future<void> _initializeRecorder() async {
await _recorder?.openRecorder();
await _recorder?.setSubscriptionDuration(const Duration(milliseconds: 100));
}

@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: TextFormField(
//multiline text field
maxLines: null,
controller: myController,
decoration: InputDecoration(
icon: const Icon(Icons.person),
hintText: 'Send Message?',
labelText: 'Send Message ',
labelText: 'Send Message',
suffixIcon: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.min,
Expand All @@ -49,6 +68,13 @@ class _MessagePanelState extends State<MessagePanel> {
onPressed: () => _navigateToFilePreviewPage(context),
icon: const Icon(Icons.attach_file),
),
IconButton(
onPressed: _toggleRecording, // ADDED
icon: Icon(
_isRecording ? Icons.mic_off : Icons.mic, // ADDED
color: _isRecording ? Colors.red : null, // ADDED
),
),
IconButton(
onPressed: () => _sendMessage(context),
icon: const Icon(
Expand All @@ -67,7 +93,6 @@ class _MessagePanelState extends State<MessagePanel> {
if (myController.text.isEmpty) {
return;
}
// Encode the message to base64

String data = jsonEncode({
"sender": Global.myName,
Expand Down Expand Up @@ -95,7 +120,6 @@ class _MessagePanelState extends State<MessagePanel> {
);

RSAPublicKey publicKey = Global.myPublicKey!;
// Encrypt the message
Uint8List encryptedMessage = rsaEncrypt(
publicKey, Uint8List.fromList(utf8.encode(myController.text)));

Expand All @@ -110,21 +134,76 @@ class _MessagePanelState extends State<MessagePanel> {
widget.converser,
);

// refreshMessages();
myController.clear();
}

/// This function is used to navigate to the file preview page and check the file size.
// ADDED: Start and stop audio recording
Future<void> _toggleRecording() async {
if (_isRecording) {
final path = await _recorder?.stopRecorder();
setState(() {
_isRecording = false;
_recordedFilePath = path;
});
if (path != null) {
_sendAudioMessage(context, path); // Send the recorded audio
}
} else {
await _recorder?.startRecorder(
codec: Codec.aacMP4,
toFile: 'audio_${DateTime.now().millisecondsSinceEpoch}.m4a',
);
setState(() {
_isRecording = true;
});
}
}

// ADDED: Send recorded audio as a message
void _sendAudioMessage(BuildContext context, String filePath) {
var msgId = nanoid(21);
String fileName = filePath.split('/').last;

String data = jsonEncode({
"sender": Global.myName,
"type": "audio",
"fileName": fileName,
"filePath": filePath,
});

String date = DateTime.now().toUtc().toString();
Global.cache[msgId] = Payload(
msgId,
Global.myName,
widget.converser,
data,
date,
);
insertIntoMessageTable(
Payload(
msgId,
Global.myName,
widget.converser,
data,
date,
),
);

Provider.of<Global>(context, listen: false).sentToConversations(
Msg(data, "sent", date, msgId),
widget.converser,
);
}

// Existing file picker and sender logic
void _navigateToFilePreviewPage(BuildContext context) async {
//max size of file is 30 MB
double sizeKbs = 0;
const int maxSizeKbs = 30 * 1024;
FilePickerResult? result = await FilePicker.platform.pickFiles();
if(result != null) {
if (result != null) {
sizeKbs = result.files.single.size / 1024;
}


if (sizeKbs > maxSizeKbs) {
if (!context.mounted) return;
showDialog(
Expand All @@ -136,10 +215,8 @@ class _MessagePanelState extends State<MessagePanel> {
mainAxisSize: MainAxisSize.min,
children: [
ListTile(
//file size in MB
title: Text('File Size: ${(sizeKbs / 1024).ceil()} MB'),
subtitle: const Text(
'File size should not exceed 30 MB'),
subtitle: const Text('File size should not exceed 30 MB'),
),
],
),
Expand All @@ -157,7 +234,6 @@ class _MessagePanelState extends State<MessagePanel> {
return;
}

//this function is used to open the file preview dialog
if (result != null) {
setState(() {
_selectedFile = File(result.files.single.path!);
Expand All @@ -172,12 +248,11 @@ class _MessagePanelState extends State<MessagePanel> {
mainAxisSize: MainAxisSize.min,
children: [
ListTile(

title: Text('File Name: ${_selectedFile.path
.split('/')
.last}', overflow: TextOverflow.ellipsis,),
subtitle: Text(
'File Size: ${(sizeKbs / 1024).floor()} MB'),
title: Text(
'File Name: ${_selectedFile.path.split('/').last}',
overflow: TextOverflow.ellipsis,
),
subtitle: Text('File Size: ${(sizeKbs / 1024).floor()} MB'),
),
ElevatedButton(
onPressed: () => FilePreview.openFile(_selectedFile.path),
Expand All @@ -186,7 +261,6 @@ class _MessagePanelState extends State<MessagePanel> {
],
),
actions: [

TextButton(
onPressed: () {
Navigator.of(context).pop();
Expand All @@ -195,10 +269,9 @@ class _MessagePanelState extends State<MessagePanel> {
),
IconButton(
onPressed: () {
Navigator.pop(context);
_sendFileMessage(context, _selectedFile);

},
Navigator.pop(context);
_sendFileMessage(context, _selectedFile);
},
icon: const Icon(
Icons.send,
),
Expand All @@ -210,9 +283,7 @@ class _MessagePanelState extends State<MessagePanel> {
}
}


/// This function is used to send the file message.
void _sendFileMessage(BuildContext context, File file) async{
void _sendFileMessage(BuildContext context, File file) async {
var msgId = nanoid(21);

String fileName = _selectedFile.path.split('/').last;
Expand Down Expand Up @@ -247,7 +318,5 @@ class _MessagePanelState extends State<MessagePanel> {
Msg(data, "sent", date, msgId),
widget.converser,
);

}

}
Loading