Merge branch 'main' into '8-datenbank-einbinden'

# Conflicts:
#   lib/widgets/mood_form.dart
#   lib/widgets/sleep_form.dart

lib/pages/interval_page.dart

@@ -11,14 +11,15 @@ class IntervalTimerPage extends StatefulWidget {
 }
 
 class _IntervalTimerPageState extends State<IntervalTimerPage> {
-  final Duration _warmupDuration = const Duration(minutes: 5);
-  final Duration _cooldownDuration = const Duration(minutes: 5);
-  final Duration _highIntensityDuration = const Duration(minutes: 4);
-  final Duration _lowIntensityDuration = const Duration(minutes: 3);
+  final Duration _warmupDuration = const Duration(seconds: 5);
+  final Duration _cooldownDuration = const Duration(seconds: 5);
+  final Duration _highIntensityDuration = const Duration(seconds: 4);
+  final Duration _lowIntensityDuration = const Duration(seconds: 3);
   late Duration _totalDuration = const Duration(minutes: 35);
   AudioPlayer warmUpPlayer = AudioPlayer();
   AudioPlayer workoutPlayer = AudioPlayer();
   AudioPlayer coolDownPlayer = AudioPlayer();
+  final AudioCache _audioCache = AudioCache();
   final int _numHighIntensityBlocks = 4;
   final int _numLowIntensityBlocks = 3;
 
@@ -49,7 +50,8 @@ class _IntervalTimerPageState extends State<IntervalTimerPage> {
       },
     );
     _isPaused = false;
-    await AudioPlayer().play(UrlSource('assets/go.mp3'));
+    Source source = AssetSource('go.mp3');
+    await AudioPlayer().play(source);
 
     _timer = Timer.periodic(const Duration(seconds: 1), (_) => _tick());
     Future.delayed(const Duration(seconds: 1)).then((value) {
@@ -80,20 +82,23 @@ class _IntervalTimerPageState extends State<IntervalTimerPage> {
   }
 
   Future<void> _playWarmUpMusic() async {
+    Source source = AssetSource('warmUp.mp3');
     await warmUpPlayer.setReleaseMode(ReleaseMode.loop);
-    await warmUpPlayer.play(UrlSource('assets/warmUp.mp3'));
+    await warmUpPlayer.play(source);
   }
 
   Future<void> _playWorkoutMusic() async {
     await warmUpPlayer.stop();
     Future.delayed(const Duration(microseconds: 600)).then((value) async {
+      Source source = AssetSource('workout.mp3');
       await workoutPlayer.setReleaseMode(ReleaseMode.loop);
-      await workoutPlayer.play(UrlSource('assets/workout.mp3'));
+      await workoutPlayer.play(source);
     });
   }
 
   Future<void> _intervalChange() async {
-    await AudioPlayer().play(UrlSource('assets/beep.mp3'));
+    Source source = AssetSource('beep.mp3');
+    await AudioPlayer().play(source);
   }
 
   void _tick() {
@@ -123,14 +128,16 @@ class _IntervalTimerPageState extends State<IntervalTimerPage> {
           _currentDuration = _cooldownDuration;
           () async {
             await workoutPlayer.stop();
+            Source source = AssetSource('cool_down.mp3');
             await coolDownPlayer.setReleaseMode(ReleaseMode.loop);
-            await coolDownPlayer.play(UrlSource('assets/cool_down.mp3'));
+            await coolDownPlayer.play(source);
           }();
         } else {
           () async {
             Future.delayed(const Duration(microseconds: 900))
                 .then((value) async {
-              await AudioPlayer().play(UrlSource('assets/finish.mp3'));
+              Source source = AssetSource('finish.mp3');
+              await AudioPlayer().play(source);
             });
           }();
           _resetTimer();

lib/widgets/mood_form.dart

@@ -16,7 +16,7 @@ class MoodForm extends StatefulWidget {
 
 class _MoodFormState extends State<MoodForm> {
   final GlobalKey<FormState> _moodFormKey = GlobalKey<FormState>();
-  MySlider slider = const MySlider();
+  MySlider slider = MySlider();
   String _textInput = "";
 
   void submitForm() {

lib/widgets/popup_for_start_and_stop.dart

@@ -13,7 +13,7 @@ class TimerStartStopPopup extends StatefulWidget {
 }
 
 class TimerStartStopPopupState extends State<TimerStartStopPopup> {
-  final MySlider slider = const MySlider();
+  final MySlider slider = MySlider();
 
   void submitForm(BuildContext context) {
     Navigator.of(context).pop();
@@ -29,9 +29,9 @@ class TimerStartStopPopupState extends State<TimerStartStopPopup> {
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          const Padding(
-            padding: EdgeInsets.only(top: 8),
-            child: MySlider(labelText: 'Motivation'),
+          Padding(
+            padding: const EdgeInsets.only(top: 8),
+            child: MySlider(),
           ),
           const SizedBox(height: 16),
           MyTextFormField('Beschreibe deinen Motivation', onFormFieldSave),

lib/widgets/sleep_form.dart

@@ -16,7 +16,7 @@ class SleepForm extends StatefulWidget {
 
 class _SleepFormState extends State<SleepForm> {
   final GlobalKey<FormState> _sleepFormKey = GlobalKey<FormState>();
-  MySlider slider = const MySlider();
+  MySlider slider = MySlider();
   String _textInput = "";
   TimePicker sleepTimePicker = TimePicker(
     const TimeOfDay(hour: 22, minute: 00),

lib/widgets/slider.dart

@@ -1,91 +1,59 @@
 import 'package:flutter/material.dart';
 
-double _currentSliderValue = 50;
-
+// ignore: must_be_immutable
 class MySlider extends StatefulWidget {
-  final String _labelText;
-  const MySlider({Key? key, String labelText = 'Stimmung'})
-      : _labelText = labelText,
-        super(key: key);
+  double _currentSliderValue = 50;
+  MySlider({Key? key}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() => SliderState();
 
-  double getSliderValue() {
-    return _currentSliderValue;
-  }
+  double get sliderValue => _currentSliderValue;
 }
 
 class SliderState extends State<MySlider> {
-  TextEditingController _textFieldController = TextEditingController();
-  String? _errorText;
-
-  @override
-  void initState() {
-    super.initState();
-    _textFieldController.text = _currentSliderValue.toStringAsFixed(0);
-  }
-
   @override
   Widget build(BuildContext context) {
     return Center(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          SizedBox(height: 16),
+          const SizedBox(height: 16),
+          Text('${widget._currentSliderValue.toInt()}',
+              style: const TextStyle(fontSize: 22)),
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
+              IconButton(
+                icon: const Icon(Icons.remove_outlined),
+                onPressed: () {
+                  setState(() {
+                    widget._currentSliderValue -= 1;
+                  });
+                },
+              ),
               Expanded(
                 child: Slider(
-                  value: _currentSliderValue,
-                  min: 1,
+                  value: widget._currentSliderValue,
+                  min: 0,
                   max: 100,
-                  divisions: 99,
-                  label: _currentSliderValue.round().toString(),
+                  divisions: 100,
+                  label: widget._currentSliderValue.round().toString(),
                   onChanged: (double value) {
                     setState(() {
-                      _currentSliderValue = value;
-                      _textFieldController.text = _currentSliderValue.toStringAsFixed(0);
-                      _errorText = null;
+                      widget._currentSliderValue = value;
                     });
                   },
                 ),
               ),
-              SizedBox(width: 16),
-              SizedBox(
-                width: 100,
-                child: TextFormField(
-                  controller: _textFieldController,
-                  keyboardType: TextInputType.number,
-                  decoration: InputDecoration(
-                    labelText: widget._labelText,
-                    errorText: _errorText,
-                  ),
-                  onChanged: (text) {
-                    if (text.isEmpty) {
+              IconButton(
+                icon: const Icon(Icons.add_outlined),
+                onPressed: () {
                   setState(() {
-                        _currentSliderValue = 1;
-                        _textFieldController.clear();
-                        _errorText = null;
-                      });
-                      return;
-                    }
-                    final value = double.tryParse(text);
-                    if (value == null || value < 1 || value > 100) {
-                      setState(() {
-                        _textFieldController.clear();
-                        _errorText = 'Please enter a value between 1 and 100.';
-                      });
-                      return;
-                    }
-                    setState(() {
-                      _currentSliderValue = value;
-                      _errorText = null;
+                    widget._currentSliderValue += 1;
                   });
                 },
               ),
-              ),
             ],
           ),
         ],