From 9aa7e37ea5005b8e65eaacc1764cbf4eaba0702f Mon Sep 17 00:00:00 2001 From: Oliver Bagge Date: Sun, 21 Jan 2024 14:07:12 +0100 Subject: [PATCH] add scroll view to fix UI overflowing problems --- open_earable/lib/apps/tightness.dart | 142 +++++++++++++-------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/open_earable/lib/apps/tightness.dart b/open_earable/lib/apps/tightness.dart index 45b8073..e2b0ae8 100644 --- a/open_earable/lib/apps/tightness.dart +++ b/open_earable/lib/apps/tightness.dart @@ -10,8 +10,6 @@ class TightnessMeter extends StatefulWidget { _TightnessMeterState createState() => _TightnessMeterState(_openEarable); } - - class _TightnessMeterState extends State { final OpenEarable _openEarable; StreamSubscription? _imuSubscription; @@ -93,7 +91,7 @@ class _TightnessMeterState extends State { void _isNodTight(DateTime last, DateTime secondToLast) { int difference = last.difference(secondToLast).inMilliseconds.abs(); int expected = _bpmToMilliseconds(bpm); - if (_isWithinMargin(difference, expected, 25.0-difficulty)) { + if (_isWithinMargin(difference, expected, 25.0 - difficulty)) { setState(() { streak += 1; }); @@ -102,14 +100,13 @@ class _TightnessMeterState extends State { setState(() { streak = 0; tightness = 0; - }); } } void _updateScore() { setState(() { - score = score + (((10 * streak) + difficulty) / tightness.abs() ).round(); + score = score + (((10 * streak) + difficulty) / tightness.abs()).round(); }); } @@ -120,7 +117,8 @@ class _TightnessMeterState extends State { double lowerBound = expectedInterval - margin; double upperBound = expectedInterval + margin; setState(() { - tightness = math.min(_bpmToMilliseconds(bpm), (givenInterval - expectedInterval)); + tightness = + math.min(_bpmToMilliseconds(bpm), (givenInterval - expectedInterval)); }); return givenInterval >= lowerBound && givenInterval <= upperBound; } @@ -155,7 +153,6 @@ class _TightnessMeterState extends State { _openEarable.audioPlayer.wavFile(fileName); } - @override Widget build(BuildContext context) { return Scaffold( @@ -163,7 +160,8 @@ class _TightnessMeterState extends State { appBar: AppBar( title: Text('Tightness Meter'), ), - body: Center( + body: SingleChildScrollView( + child: Center( child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.only( @@ -280,59 +278,60 @@ class _TightnessMeterState extends State { bottomLeft: Radius.circular(20.0)), ), child: Slider( - thumbColor: Colors.purple, - activeColor: Colors.grey, - secondaryActiveColor: Colors.purpleAccent, - inactiveColor: Colors.grey, - value: tightness.toDouble(), - min: -_bpmToMilliseconds(bpm).toDouble(), - max: _bpmToMilliseconds(bpm).toDouble(), - divisions: 2000, - label: tightness.toString(), - onChanged: (double value) { - setState(() { - }); - }), + thumbColor: Colors.purple, + activeColor: Colors.grey, + secondaryActiveColor: Colors.purpleAccent, + inactiveColor: Colors.grey, + value: tightness.toDouble(), + min: -_bpmToMilliseconds(bpm).toDouble(), + max: _bpmToMilliseconds(bpm).toDouble(), + divisions: 2000, + label: tightness.toString(), + onChanged: (double value) { + setState(() {}); + }), ), ), Padding( - padding: const EdgeInsets.only(bottom:20.0), - child: Row(children: [ - Spacer(), - Text('Early'), - Spacer(flex: 5), - Text('Tight'), - Spacer(flex: 5), - Text('Late'), - Spacer() - ], + padding: const EdgeInsets.only(bottom: 20.0), + child: Row( + children: [ + Spacer(), + Text('Early'), + Spacer(flex: 5), + Text('Tight'), + Spacer(flex: 5), + Text('Late'), + Spacer() + ], ), ), ], ), ), - Card(margin: EdgeInsets.all(20), + Card( + margin: EdgeInsets.all(20), color: Colors.black, child: Column( - children: [ - Padding( - padding: EdgeInsets.all(20), - child: ElevatedButton( - onPressed: startStopMonitoring, - style: ElevatedButton.styleFrom( - minimumSize: Size(1000, 80), - backgroundColor: _monitoring - ? Color(0xfff27777) - : Theme.of(context).colorScheme.secondary, - foregroundColor: Colors.black, - ), - child: Text( - _monitoring ? 'Stop' : 'Start', - style: TextStyle(fontSize: 30), - ), + children: [ + Padding( + padding: EdgeInsets.all(20), + child: ElevatedButton( + onPressed: startStopMonitoring, + style: ElevatedButton.styleFrom( + minimumSize: Size(1000, 80), + backgroundColor: _monitoring + ? Color(0xfff27777) + : Theme.of(context).colorScheme.secondary, + foregroundColor: Colors.black, + ), + child: Text( + _monitoring ? 'Stop' : 'Start', + style: TextStyle(fontSize: 30), ), ), - ], + ), + ], ), ), Card( @@ -345,8 +344,7 @@ class _TightnessMeterState extends State { child: Row( children: [ Spacer(), - Text('BPM', - style: TextStyle(fontSize: 30)), + Text('BPM', style: TextStyle(fontSize: 30)), Spacer(flex: 5), DropdownButton( style: TextStyle( @@ -354,12 +352,15 @@ class _TightnessMeterState extends State { ), value: bpm, icon: const Icon(Icons.arrow_drop_down), - onChanged: _monitoring ? null :(int? newValue) { - setState(() { - bpm = newValue!; - }); - }, - items: bpmList.map>((int value) { + onChanged: _monitoring + ? null + : (int? newValue) { + setState(() { + bpm = newValue!; + }); + }, + items: + bpmList.map>((int value) { return DropdownMenuItem( value: value, child: Text(value.toString()), @@ -372,9 +373,8 @@ class _TightnessMeterState extends State { ), Padding( padding: EdgeInsets.only(top: 20), - child: Text('Sensitivity', - style: TextStyle(fontSize: 20) - ), + child: + Text('Sensitivity', style: TextStyle(fontSize: 20)), ), Padding( padding: EdgeInsets.all(16), @@ -395,22 +395,21 @@ class _TightnessMeterState extends State { nodThreshold = value; }); }), - Row(children: [ - Spacer(), - Text('Cool Nodding'), - Spacer(flex: 10), - Text('Headbanging'), - Spacer() - ], + Row( + children: [ + Spacer(), + Text('Cool Nodding'), + Spacer(flex: 10), + Text('Headbanging'), + Spacer() + ], ), ], ), ), Padding( padding: EdgeInsets.only(top: 10), - child: Text('Difficulty', - style: TextStyle(fontSize: 20) - ), + child: Text('Difficulty', style: TextStyle(fontSize: 20)), ), Padding( padding: EdgeInsets.all(16), @@ -446,10 +445,11 @@ class _TightnessMeterState extends State { ], ), ), + SizedBox(height: 40), ], ), ), - ), + )), ); } }