Skip to content
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.

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

fix:removed overflow from home screen #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mboalab.community.opensource.outreachy.mboathoscope">

<uses-permission android:name="android.permission.RECORD_AUDIO" />

<uses-permission android:name=
"android.permission.READ_EXTERNAL_STORAGE" />

<uses-permission android:name=
"android.permission.WRITE_EXTERNAL_STORAGE" />

<application />

<application
android:label="mboathoscope"
android:name="${applicationName}"
Expand Down
89 changes: 80 additions & 9 deletions lib/buttons/WaveformButton.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@

import 'dart:async';
import 'dart:io';
import 'dart:math';

import 'package:audio_waveforms/audio_waveforms.dart';
import 'package:flutter/material.dart';
import 'package:flutter_sound/flutter_sound.dart';
import 'package:assets_audio_player/assets_audio_player.dart';
import 'package:intl/date_symbol_data_file.dart';
import 'package:intl/intl.dart';
import 'package:permission_handler/permission_handler.dart';


class WaveformButton extends StatefulWidget {
Expand All @@ -14,12 +23,35 @@ class WaveformButton extends StatefulWidget {
class _WaveformButtonState extends State<WaveformButton> {
late final RecorderController recorderController;

void _initialiseController() {
late FlutterSoundRecorder _recordingSession;
final recordingPlayer = AssetsAudioPlayer();

late String pathToAudio;
String _timerText = '00:00:00';

bool _playAudio = false;
get path => null;

Future<void> _initialiseController() async {
pathToAudio = '/Download/temp.wav';
recorderController = RecorderController()
..androidEncoder = AndroidEncoder.aac
..androidOutputFormat = AndroidOutputFormat.mpeg4
..iosEncoder = IosEncoder.kAudioFormatMPEG4AAC
..sampleRate = 16000;
await _recordingSession.openAudioSession(
focus: AudioFocus.requestFocusAndStopOthers,
category: SessionCategory.playAndRecord,
mode: SessionMode.modeDefault,
device: AudioDevice.speaker);
await _recordingSession.setSubscriptionDuration(const Duration(
milliseconds: 10));
await initializeDateFormatting();
await Permission.microphone.request();
await Permission.storage.request();
await Permission.manageExternalStorage.request();


}

@override
Expand All @@ -31,6 +63,7 @@ class _WaveformButtonState extends State<WaveformButton> {
@override
Widget build(BuildContext context) {
late final PlayerController playerController;

return Container(
margin: const EdgeInsets.all(5.0),
padding: const EdgeInsets.all(3.0),
Expand All @@ -56,6 +89,11 @@ class _WaveformButtonState extends State<WaveformButton> {
color: Color(0xff3D79FD),
),
onPressed: () {
setState(() {
_playAudio = !_playAudio;
});
if (_playAudio) playFunc();
if (!_playAudio) stopPlayFunc();
// do something
},
),
Expand All @@ -81,13 +119,46 @@ class _WaveformButtonState extends State<WaveformButton> {
),
);
}
}
/*

void _startRecording() async {
await recorderController.record(path);
// update state here to, for eample, change the button's state
Future<void> startRecording() async {
Directory directory = Directory(path.dirname(pathToAudio));
if (!directory.existsSync()) {
directory.createSync();
}
_recordingSession.openAudioSession();
await _recordingSession.startRecorder(
toFile: pathToAudio,
codec: Codec.pcm16WAV,
);
StreamSubscription recorderSubscription =
_recordingSession.onProgress.listen((e) {
var date = DateTime.fromMillisecondsSinceEpoch(
e.duration.inMilliseconds,
isUtc: true);
var timeText = DateFormat('mm:ss:SS', 'en_GB').format(date);
setState(() {
_timerText = timeText.substring(0, 8);
});
});
recorderSubscription.cancel();
}

Future<String> stopRecording() async {
_recordingSession.closeAudioSession();
return await _recordingSession.stopRecorder();
}

Future<void> playFunc() async {
recordingPlayer.open(
Audio.file(pathToAudio),
autoStart: true,
showNotification: true,
);
}

Future<void> stopPlayFunc() async {
recordingPlayer.stop();
}

}
void _stopRecording() async {
final path = await recorderController.stop();
}*/

28 changes: 23 additions & 5 deletions lib/buttons/headerHalf.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import 'dart:developer';

import 'package:flutter/material.dart';
import 'package:mboathoscope/buttons/SaveButton.dart';

class headerHalf extends StatelessWidget {
const headerHalf({Key? key}) : super(key: key);


@override
Widget build(BuildContext context) {

return Column(
children: [
Padding(
Expand Down Expand Up @@ -104,11 +108,25 @@ class headerHalf extends StatelessWidget {
),
Expanded(
flex: 6,
child: Image.asset(
'assets/images/img_record.png',
height: 150,
width: 150,
),
child: GestureDetector(
onLongPress: () {
// start recording
log('long press');
},
onLongPressEnd: (_) {

log('release press');
// stop recording
},
child: Image.asset(
'assets/images/img_record.png',
height: 150,
width: 150,
),


),

),
Expanded(
flex: 3,
Expand Down
13 changes: 8 additions & 5 deletions lib/screens/HomePage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ class _HomePageState extends State<HomePage> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xffF3F7FF),
body: Column(
children: const [
headerHalf(),
RecordingList()
],
body: SingleChildScrollView(
child: Column(
children: const [
headerHalf(),
RecordingList()
],
),

),
bottomNavigationBar: BottomNavigationBar(
//backgroundColor: const Color(0xffF3F7FF),
Expand Down
Loading