Merge branch 'Benutzeroberflaeche' of bauseweinfr74630/mMDT5_GreenWatch into master

Adaptation of the receive logic
Aufzeichnung ohne Audio
2023-06-23 16:20:58 +00:00 · 2023-06-23 17:46:50 +02:00 · 2023-06-22 16:06:52 +02:00 · 2023-06-22 11:50:11 +02:00 · 2023-06-22 11:49:37 +02:00 · 2023-06-22 08:40:24 +02:00
28 changed files with 1061 additions and 268 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -3,10 +3,14 @@
    package="com.example.greenwatch">

    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />

    <uses-feature android:name="android.hardware.camera"/>

--- a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
@ -11,6 +11,7 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Bundle;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@ -27,9 +28,11 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv

    private SensorManager accelerometerManager;
    private Sensor accelerometerSensor;
+    private SurfaceView surfaceView;
    private TextView accelerometerStatusMessage;
    private TextView accelerometerDataTV;
-    private TextView accelerometerWarningTV;
+    private TextView tvAccelerometerdeviceListRecyclerView;
+    private TextView tvAccelerometeralarmHistoryListRecyclerView;
    private Button backToMainActivityButton;
    private AccelerometerViewModel mAccelerometerViewModel;
    private Permission permission = new Permission();
@ -39,9 +42,11 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_accelerometer);

+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewAccelerometer);
        accelerometerStatusMessage = (TextView) findViewById(R.id.tvAccelerometerStatusmessage);
        accelerometerDataTV = (TextView) findViewById(R.id.tvAccelerometerData);
-        accelerometerWarningTV = (TextView) findViewById(R.id.tvAccelerometerWarning);
+        tvAccelerometerdeviceListRecyclerView = (TextView) findViewById(R.id.tvAccelerometerdeviceListRecyclerView);
+        tvAccelerometeralarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAccelerometeralarmHistoryListRecyclerView);
        backToMainActivityButton = (Button) findViewById(R.id.accelerometerBackToMainActivity);

        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
@ -66,7 +71,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
        });

        mAccelerometerViewModel = new ViewModelProvider(this).get(AccelerometerViewModel.class);
-        mAccelerometerViewModel.init();
+        mAccelerometerViewModel.init(surfaceView.getHolder());
        mAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
            @Override
            public void onChanged(List<Device> devices) {
@ -87,18 +92,24 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
                if (aBoolean) {
                    if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
                        Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        mAccelerometerViewModel.startAlarmRecording();
                        //todo AlarmHandling einfügen
-                    } else {
+                    }
+                    else {
                        permission.alarmRechteAnfordern(AccelerometerActivity.this);
                        if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
                            Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            mAccelerometerViewModel.startAlarmRecording();
                            //todo Alarmhandling einfügen
-                        } else {
+                        }
+                        else {
                            Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                            mAccelerometerViewModel.stopAlarmRecording(AccelerometerActivity.this);
                        }
                    }
                }
                else {
+                    mAccelerometerViewModel.stopAlarmRecording(AccelerometerActivity.this);
                    Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
                }
            }
@ -108,10 +119,10 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
            @Override
            public void onChanged(Boolean aBoolean) {
                if (aBoolean) {
-                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAccelerometerViewModel.getAccelerometerSensorMeanValue());
                }
                else {
-                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
+                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0.0f);
                }

            }
--- a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java
@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-import android.hardware.SensorManager;
 import android.os.Bundle;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@ -16,14 +16,16 @@ import android.widget.Toast;
 import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
 import com.example.greenwatch.adapters.DeviceListAdapter;
 import com.example.greenwatch.models.Device;
-import com.example.greenwatch.viewmodels.AccelerometerViewModel;
 import com.example.greenwatch.viewmodels.MicrofonViewModel;

 import java.util.List;

 public class AudiodetectionActivity extends AppCompatActivity {
    private TextView microfonStatusMessage;
+    private TextView tvAAudiodetectionAlarmHistoryListRecyclerView;
+    private TextView tvAudiodetectionDeviceListRecyclerView;
    private Button backToMainActivityButton;
+    private SurfaceView surfaceView;
    private Permission permission = new Permission();
    private MicrofonViewModel mMicrofonViewModel;

@ -32,7 +34,10 @@ public class AudiodetectionActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_audiodetection);

+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewAudio);
        microfonStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionStatusmessage);
+        tvAAudiodetectionAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAlarmHistoryListRecyclerView);
+        tvAudiodetectionDeviceListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionDeviceListRecyclerView);
        backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);

        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
@ -57,7 +62,7 @@ public class AudiodetectionActivity extends AppCompatActivity {
        });

        mMicrofonViewModel = new ViewModelProvider(this).get(MicrofonViewModel.class);
-        mMicrofonViewModel.init();
+        mMicrofonViewModel.init(surfaceView.getHolder());
        mMicrofonViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
            @Override
            public void onChanged(List<Device> devices) {
@ -78,19 +83,23 @@ public class AudiodetectionActivity extends AppCompatActivity {
                if (aBoolean) {
                    if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
                        Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        mMicrofonViewModel.startAlarmRecording();
                        //todo AlarmHandling einfügen
                    } else {
                        permission.alarmRechteAnfordern(AudiodetectionActivity.this);
                        if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
                            Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            mMicrofonViewModel.startAlarmRecording();
                            //todo Alarmhandling einfügen
                        } else {
                            Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                            mMicrofonViewModel.stopAlarmRecording(AudiodetectionActivity.this);
                        }
                    }
                }
                else {
                    Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                    mMicrofonViewModel.stopAlarmRecording(AudiodetectionActivity.this);
                }
            }
        });
@ -99,10 +108,10 @@ public class AudiodetectionActivity extends AppCompatActivity {
            @Override
            public void onChanged(Boolean aBoolean) {
                if (aBoolean) {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Audio", mMicrofonViewModel.getAmplitudeInDB());
                }
                else {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Audio", 0.0f);
                }

            }
--- a/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java
@ -11,6 +11,7 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Bundle;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@ -20,14 +21,16 @@ import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
 import com.example.greenwatch.adapters.DeviceListAdapter;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.viewmodels.AudiodetectionAndAccelerometerViewModel;
-import com.example.greenwatch.viewmodels.VideodetectionAndAccelerometerViewModel;

 import java.util.List;

 public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
    private SensorManager accelerometerManager;
    private Sensor accelerometerSensor;
+    private SurfaceView surfaceView;
    private TextView audiodetectionAndAccelerometerStatusMessage;
+    private TextView tvAudiodetectionAndAccelerometerDeviceListRecyclerView;
+    private TextView tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView;
    private AudiodetectionAndAccelerometerViewModel mAudiodetectionAndAccelerometerViewModel;
    private Button backToMainActivity;

@ -38,7 +41,10 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_audiodetection_and_accelerometer);

+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewAudiodetectionAndAccelerometer);
        audiodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerStatusmessage);
+        tvAudiodetectionAndAccelerometerDeviceListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerDeviceListRecyclerView);
+        tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView);
        backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);

        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
@ -63,7 +69,7 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
        });

        mAudiodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(AudiodetectionAndAccelerometerViewModel.class);
-        mAudiodetectionAndAccelerometerViewModel.init();
+        mAudiodetectionAndAccelerometerViewModel.init(surfaceView.getHolder());
        mAudiodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
            @Override
            public void onChanged(List<Device> devices) {
@ -84,19 +90,23 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
                if (aBoolean) {
                    if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
                        Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        mAudiodetectionAndAccelerometerViewModel.startAlarmRecording();
                        //todo AlarmHandling einfügen
                    } else {
                        permission.alarmRechteAnfordern(AudiodetectionAndAccelerometerActivity.this);
                        if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
                            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            mAudiodetectionAndAccelerometerViewModel.startAlarmRecording();
                            //todo Alarmhandling einfügen
                        } else {
                            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                            mAudiodetectionAndAccelerometerViewModel.stopAlarmRecording(AudiodetectionAndAccelerometerActivity.this);
                        }
                    }
                }
                else {
                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                    mAudiodetectionAndAccelerometerViewModel.stopAlarmRecording(AudiodetectionAndAccelerometerActivity.this);
                }
            }
        });
@ -107,18 +117,18 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
                if (aBoolean) {
                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedTrue", Toast.LENGTH_LONG).show();
                    if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAudiodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                    }
                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
                    }
                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2AudioAndAccelerometer", 10);
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "AudioAndAccelerometer", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
                    }
                }
                else {
                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedFalse", Toast.LENGTH_LONG).show();
-                    mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0);
+                    mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0.0f);
                }

            }
--- a/app/src/main/java/com/example/greenwatch/MainActivity.java
+++ b/app/src/main/java/com/example/greenwatch/MainActivity.java
@ -10,8 +10,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;

 import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
@ -19,7 +21,6 @@ import com.example.greenwatch.adapters.DeviceListAdapter;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.viewmodels.MainActivityViewModel;

-
 import java.util.List;

 public class MainActivity extends AppCompatActivity {
@ -29,7 +30,9 @@ public class MainActivity extends AppCompatActivity {
    private Button accelerometerButton;
    private Button audiodetectionAndAccelerometerButton;
    private Button videodetectionAndAccelerometerButton;
-    private Button connectionButton;
+    private TextView tvMainActivityDeviceListRecyclerView;
+    private TextView tvMainActivityAlarmHistoryListRecyclerView;
+    private SurfaceView surfaceView;
    private MainActivityViewModel mMainActivityViewModel;
    private Permission permission = new Permission();

@ -44,12 +47,14 @@ public class MainActivity extends AppCompatActivity {
        activity = MainActivity.this;
        context = MainActivity.this;

+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewMainActivity);
+        tvMainActivityDeviceListRecyclerView = (TextView) findViewById(R.id.tvMainActivityDeviceListRecyclerView);
+        tvMainActivityAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvMainActivityAlarmHistoryListRecyclerView);
        audiodetectionButton = (Button) findViewById(R.id.audiodetectionButton);
        videodetectionButton = (Button) findViewById(R.id.videodetectionButton);
        accelerometerButton = (Button) findViewById(R.id.accelerometerButton);
        audiodetectionAndAccelerometerButton = (Button) findViewById(R.id.audiodetectionAndAccelerometerButton);
        videodetectionAndAccelerometerButton = (Button) findViewById(R.id.videodetectionAndAccelerometerButton);
-        connectionButton = (Button) findViewById(R.id.connectionButton);

        RecyclerView deviceListRecyclerView = findViewById(R.id.deviceListRecyclerView);
        deviceListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
@ -68,7 +73,8 @@ public class MainActivity extends AppCompatActivity {
        permission.startRechtePruefen(this, this);

        mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
-        mMainActivityViewModel.init();
+        mMainActivityViewModel.init(surfaceView.getHolder());
+
        mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
            @Override
            public void onChanged(List<Device> devices) {
@ -89,14 +95,17 @@ public class MainActivity extends AppCompatActivity {
                if (aBoolean) {
                    if(permission.alarmRechtePruefen(context, activity)){
                        Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        mMainActivityViewModel.startAlarmRecording();
                        //todo AlarmHandling einfügen
                    } else {
                        permission.alarmRechteAnfordern(activity);
                        if(permission.alarmRechtePruefen(context, activity)){
                            Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            mMainActivityViewModel.startAlarmRecording();
                            //todo Alarmhandling einfügen
                        } else {
                            Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                            mMainActivityViewModel.stopAlarmRecording(MainActivity.this);
                        }
                    }
                }
@ -158,37 +167,42 @@ public class MainActivity extends AppCompatActivity {
                }
            }
        });
-        connectionButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                openConnectionActivity();
-            }
-        });
    }
-    public void openAudiodetectionActivity(){
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "No Sensor selected", 0.0f);
+    }
+
+    public void openAudiodetectionActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "Audio", 0.0f);
        Intent intent = new Intent(this, AudiodetectionActivity.class);
        startActivity(intent);
    }
-    public void openVideodetectionActivity(){
+    public void openVideodetectionActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "Video", 0.0f);
        Intent intent =  new Intent(this, VideodetectionActivity.class);
        startActivity(intent);
    }
-    public void openAccelerometerActivity(){
+    public void openAccelerometerActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "Accelerometer", 0.0f);
        Intent intent = new Intent(this, AccelerometerActivity.class);
        startActivity(intent);
    }
-    public void openAudiodetectionAndAccelerometerActivity(){
+    public void openAudiodetectionAndAccelerometerActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "AudioAndAccelerometer", 0.0f);
        Intent intent = new Intent(this, AudiodetectionAndAccelerometerActivity.class);
        startActivity(intent);
    }
-    public void openVideodetectionAndAccelerometerActivity(){
+    public void openVideodetectionAndAccelerometerActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "VideoAndAccelerometer", 0.0f);
        Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
        startActivity(intent);
    }
-    public void openConnectionActivity(){
-        //Intent intent = new Intent(this, ConnectionActivity.class);
-        //startActivity(intent);
-        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51",  true, "Audio", 10);
-    }

+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/VideodetectionActivity.java
+++ b/app/src/main/java/com/example/greenwatch/VideodetectionActivity.java
@ -9,14 +9,15 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

 import android.os.Bundle;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;

 import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
 import com.example.greenwatch.adapters.DeviceListAdapter;
 import com.example.greenwatch.models.Device;
-import com.example.greenwatch.viewmodels.AccelerometerViewModel;
 import com.example.greenwatch.viewmodels.VideodetectionViewModel;
 import com.google.common.util.concurrent.ListenableFuture;

@ -26,6 +27,9 @@ import java.util.concurrent.ExecutionException;
 public class VideodetectionActivity extends AppCompatActivity {

    private Button backToMainActivity;
+    private SurfaceView surfaceView;
+    private TextView tvVideodetectionDeviceListRecyclerView;
+    private TextView tvVideodetectionAlarmHistoryListRecyclerView;
    private VideodetectionViewModel mVideoDetectionViewModel;
    private Permission permission = new Permission();

@ -34,6 +38,9 @@ public class VideodetectionActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_videodetection);

+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewVideodetection);
+        tvVideodetectionDeviceListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionDeviceListRecyclerView);
+        tvVideodetectionAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAlarmHistoryListRecyclerView);
        backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);

        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
@ -58,7 +65,7 @@ public class VideodetectionActivity extends AppCompatActivity {
        });

        mVideoDetectionViewModel = new ViewModelProvider(this).get(VideodetectionViewModel.class);
-        mVideoDetectionViewModel.init();
+        mVideoDetectionViewModel.init(surfaceView.getHolder());
        mVideoDetectionViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
            @Override
            public void onChanged(List<Device> devices) {
@ -79,14 +86,17 @@ public class VideodetectionActivity extends AppCompatActivity {
                if (aBoolean) {
                    if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
                        Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        mVideoDetectionViewModel.startAlarmRecording();
                        //todo AlarmHandling einfügen
                    } else {
                        permission.alarmRechteAnfordern(VideodetectionActivity.this);
                        if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
                            Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            mVideoDetectionViewModel.startAlarmRecording();
                            //todo Alarmhandling einfügen
                        } else {
                            Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                            mVideoDetectionViewModel.stopAlarmRecording(VideodetectionActivity.this);
                        }
                    }
                }
@ -100,10 +110,10 @@ public class VideodetectionActivity extends AppCompatActivity {
            @Override
            public void onChanged(Boolean aBoolean) {
                if (aBoolean) {
-                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 10);
+                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
                }
                else {
-                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0);
+                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0.0f);
                }

            }
--- a/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java
@ -13,6 +13,7 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Bundle;
+import android.view.SurfaceView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@ -32,9 +33,11 @@ import java.util.concurrent.ExecutionException;
 public class VideodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
    private SensorManager accelerometerManager;
    private Sensor accelerometerSensor;
+    private SurfaceView surfaceView;
    private TextView videodetectionAndAccelerometerStatusMessage;
    private TextView videodetectionAndAccelerometerDataTV;
-    private TextView videodetectionAndAccelerometerWarningTV;
+    private TextView tvVideodetectionAndAccelerometerDeviceListRecyclerView;
+    private TextView tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView;
    private Button backToMainActivity;
    private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
    private Permission permission = new Permission();
@ -44,9 +47,11 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_videodetection_and_accelerometer);

+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewVideodetectionAndAccelerometer);
        videodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerStatusmessage);
        videodetectionAndAccelerometerDataTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerData);
-        videodetectionAndAccelerometerWarningTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerWarning);
+        tvVideodetectionAndAccelerometerDeviceListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAndAccelerometerDeviceListRecyclerView);
+        tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView);
        backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);

        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
@ -71,7 +76,7 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
        });

        mVideodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(VideodetectionAndAccelerometerViewModel.class);
-        mVideodetectionAndAccelerometerViewModel.init();
+        mVideodetectionAndAccelerometerViewModel.init(surfaceView.getHolder());
        mVideodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
            @Override
            public void onChanged(List<Device> devices) {
@ -92,19 +97,23 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
                if (aBoolean) {
                    if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
                        Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                        mVideodetectionAndAccelerometerViewModel.startAlarmRecording();
                        //todo AlarmHandling einfügen
                    } else {
                        permission.alarmRechteAnfordern(VideodetectionAndAccelerometerActivity.this);
                        if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
                            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
+                            mVideodetectionAndAccelerometerViewModel.startAlarmRecording();
                            //todo Alarmhandling einfügen
                        } else {
                            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                            mVideodetectionAndAccelerometerViewModel.stopAlarmRecording(VideodetectionAndAccelerometerActivity.this);
                        }
                    }
                }
                else {
                    Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
+                    mVideodetectionAndAccelerometerViewModel.stopAlarmRecording(VideodetectionAndAccelerometerActivity.this);
                }
            }
        });
@ -114,17 +123,17 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
            public void onChanged(Boolean aBoolean) {
                if (aBoolean) {
                    if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                    }
                    else if (mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
                    }
                    else if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2VideoAndAccelerometer", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "VideoAndAccelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                    }
                }
                else {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0);
+                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0.0f);
                }
            }
        });
--- a/app/src/main/java/com/example/greenwatch/alarmrecorder/AlarmRecorder.java
+++ b/app/src/main/java/com/example/greenwatch/alarmrecorder/AlarmRecorder.java
@ -0,0 +1,256 @@
+package com.example.greenwatch.alarmrecorder;
+
+import android.app.Activity;
+import android.content.Context;
+import android.media.MediaCodec;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.media.MediaMuxer;
+import android.media.MediaRecorder;
+import android.os.Environment;
+import android.view.SurfaceHolder;
+import android.widget.Toast;
+
+import com.example.greenwatch.MainActivity;
+import com.example.greenwatch.alarmrecorder.runnables.AudioRecorder;
+import com.example.greenwatch.alarmrecorder.runnables.VideoRecorder;
+import com.example.greenwatch.sensors.AccelerometerSensor;
+import com.example.greenwatch.sensors.CameraSensor;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public class AlarmRecorder {
+    private static AlarmRecorder alarmRecorderInstance;
+    private boolean isRecording;
+    private String videoPath;
+    private String audioPath;
+    private MediaFormat videoFormat;
+    private MediaFormat audioFormat;
+    private MediaExtractor videoExtractor;
+    private MediaExtractor audioExtractor;
+    private AudioRecorder audioRecorderRunnable;
+    private VideoRecorder videoRecorderRunnable;
+    private SurfaceHolder previewHolder;
+    private MediaRecorder videoRecorder;
+    //private MediaRecorder audioRecorder;
+    private Thread videoThread; // Video-Thread als Instanzvariable
+    private Thread audioThread; // Audio-Thread als Instanzvariable
+
+    private AlarmRecorder() {
+        //audioRecorder = new MediaRecorder();
+        //videoRecorder = new MediaRecorder();
+        videoExtractor = new MediaExtractor();
+        audioExtractor = new MediaExtractor();
+        audioRecorderRunnable = new AudioRecorder();
+        videoRecorderRunnable = new VideoRecorder();
+    }
+
+    public static synchronized AlarmRecorder getInstance() {
+        if (alarmRecorderInstance == null){
+            alarmRecorderInstance = new AlarmRecorder();
+        }
+        return alarmRecorderInstance;
+    }
+
+    public void setPreviewHolder(SurfaceHolder previewHolder) {
+        this.previewHolder = previewHolder;
+    }
+
+    public void startRecording() {
+        createStoragePaths(); //Speicherort und -namen für Audio- und Video-Datei
+
+        setAudioPath(audioPath);
+        setVideoPath(videoPath);
+        setVideoRecorderPreviewHolder(previewHolder);
+
+        //audioThread = new Thread(audioRecorderRunnable);
+        videoThread = new Thread(videoRecorderRunnable);
+
+        //Threads starten
+        videoThread.start();
+        //audioThread.start();
+    }
+
+    public void stopRecording(Context context) {
+        try {
+            //stopAudioRecording();
+            stopVideoRecording();
+
+            Toast.makeText(context, "Video- und Audioaufzeichnung beendet", Toast.LENGTH_SHORT).show();
+
+            waitTillThreadsStopped();
+            File videoFile = new File(videoPath); //Speichere das aufgenommene Video
+            File audioFile = new File(audioPath); //Speichere die aufgenommene Audio
+
+            if (videoFile.exists() && audioFile.exists()) {
+                //Wenn Video- und Audioaufzeichnung gestoppt und abgespeichert sind, beginne mit dem Mergeprozess der beiden
+               // mergeVideoWithAudio();
+                Toast.makeText(context, "Video und Audio erfolgreich zusammengeführt", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(context, "Dateien wurden nicht gefunden!", Toast.LENGTH_SHORT).show();
+            }
+        } catch (RuntimeException stopException) {
+            stopException.printStackTrace();
+        }
+    }
+
+    private void createStoragePaths(){
+        //Pfade zum Zwischenspeichern der aufgenommenen Audio und Video-Datei
+        String externalStorageDirectory = Environment.getExternalStorageDirectory().getAbsolutePath();
+        String dcimDirectory = externalStorageDirectory + "/DCIM";
+        videoPath = dcimDirectory + "/video.mp4";
+        audioPath = dcimDirectory + "/audio.mp3";
+    }
+
+    private void setVideoPath(String videoPath) {
+        videoRecorderRunnable.setVideoPath(videoPath);
+    }
+
+    private void setVideoRecorderPreviewHolder(SurfaceHolder previewHolder) {
+        videoRecorderRunnable.setPreviewHolder(previewHolder);
+    }
+    private void stopVideoRecording(){
+        videoRecorderRunnable.stopVideoRecording();
+    }
+
+    private void setAudioPath(String audioPath) {
+        audioRecorderRunnable.setAudioPath(audioPath);
+    }
+
+    private void stopAudioRecording(){
+        audioRecorderRunnable.stopAudioRecording();
+    }
+
+    private void waitTillThreadsStopped(){
+        try {
+            videoThread.join();
+            audioThread.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void mergeVideoWithAudio() {
+        try {
+            setVideoExtractorDataSource(); //extrahieren der Video Datei, die zuvor zwischengespeichert wurde
+            setAudioExtractorDataSource(); //extrahieren der Audio Datei, die zuvor zwischengespeichert wurde
+
+            //Speicherort der später zusammengeführten Datei
+            String outputFilePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath() + "/merged_video.mp4";
+            //MediaMuxer zum Zusammenführen einer Audio- und einer Videodatei
+            MediaMuxer muxer = new MediaMuxer(outputFilePath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+            int videoTrack = muxer.addTrack(videoFormat);
+            int audioTrack = muxer.addTrack(audioFormat);
+            muxer.start();
+
+            ByteBuffer buffer = ByteBuffer.allocate(1024 * 1024);
+            MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
+
+            videoExtraction(buffer, videoTrack, bufferInfo, muxer);
+            audioExtraction(buffer, audioTrack, bufferInfo, muxer);
+
+            muxer.stop();
+            muxer.release();
+
+            // Löschen der separaten Video- und Audio-Dateien
+            deleteVideoFile();
+            deleteAudioFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void setVideoExtractorDataSource() {
+        try {
+            videoExtractor.setDataSource(videoPath);
+            int videoTrackIndex = getTrackIndex(videoExtractor, "video/");
+            if (videoTrackIndex < 0) {
+                // Video-Track nicht gefunden
+                return;
+            }
+            videoExtractor.selectTrack(videoTrackIndex);
+            videoFormat = videoExtractor.getTrackFormat(videoTrackIndex);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void setAudioExtractorDataSource() {
+        try {
+            audioExtractor.setDataSource(audioPath);
+            int audioTrackIndex = getTrackIndex(audioExtractor, "audio/");
+            if (audioTrackIndex < 0) {
+                // Audio-Track nicht gefunden
+                return;
+            }
+            audioExtractor.selectTrack(audioTrackIndex);
+            audioFormat = audioExtractor.getTrackFormat(audioTrackIndex);
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private int getTrackIndex(MediaExtractor extractor, String mimeType) {
+        int trackCount = extractor.getTrackCount();
+        for (int i = 0; i < trackCount; i++) {
+            MediaFormat format = extractor.getTrackFormat(i);
+            String trackMimeType = format.getString(MediaFormat.KEY_MIME);
+            if (trackMimeType.startsWith(mimeType)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private void videoExtraction(ByteBuffer buffer, int videoTrack, MediaCodec.BufferInfo bufferInfo, MediaMuxer muxer) {
+        videoExtractor.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
+        while (true) {
+            int sampleSize = videoExtractor.readSampleData(buffer, 0);
+            if (sampleSize < 0) {
+                break;
+            }
+            long presentationTimeUs = videoExtractor.getSampleTime();
+            bufferInfo.offset = 0;
+            bufferInfo.size = sampleSize;
+            bufferInfo.flags = MediaCodec.BUFFER_FLAG_KEY_FRAME;
+            bufferInfo.presentationTimeUs = presentationTimeUs;
+            muxer.writeSampleData(videoTrack, buffer, bufferInfo);
+            videoExtractor.advance();
+        }
+    }
+
+    private void audioExtraction(ByteBuffer buffer, int audioTrack, MediaCodec.BufferInfo bufferInfo, MediaMuxer muxer) {
+        audioExtractor.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
+        while (true) {
+            int sampleSize = audioExtractor.readSampleData(buffer, 0);
+            if (sampleSize < 0) {
+                break;
+            }
+            long presentationTimeUs = audioExtractor.getSampleTime();
+            bufferInfo.offset = 0;
+            bufferInfo.size = sampleSize;
+            bufferInfo.flags = 0; // or MediaCodec.BUFFER_FLAG_KEY_FRAME
+            bufferInfo.presentationTimeUs = presentationTimeUs;
+            muxer.writeSampleData(audioTrack, buffer, bufferInfo);
+            audioExtractor.advance();
+        }
+    }
+
+
+    private void deleteVideoFile(){
+        File videoFile = new File(videoPath);
+        if (videoFile.exists()) {
+            videoFile.delete();
+        }
+    }
+
+    private void deleteAudioFile(){
+        File audioFile = new File(audioPath);
+        if (audioFile.exists()) {
+            audioFile.delete();
+        }
+    }
+}
--- a/app/src/main/java/com/example/greenwatch/alarmrecorder/runnables/AudioRecorder.java
+++ b/app/src/main/java/com/example/greenwatch/alarmrecorder/runnables/AudioRecorder.java
@ -0,0 +1,47 @@
+package com.example.greenwatch.alarmrecorder.runnables;
+
+import android.media.MediaRecorder;
+import android.view.SurfaceHolder;
+import android.widget.Toast;
+
+import com.example.greenwatch.MainActivity;
+
+import java.io.IOException;
+
+public class AudioRecorder implements Runnable {
+
+    private MediaRecorder audioRecorder;
+    private String audioPath;
+    public AudioRecorder() {
+        audioRecorder = new MediaRecorder();
+    }
+
+    public void setAudioPath(String audioPath) {
+        this.audioPath = audioPath;
+    }
+
+    public void stopAudioRecording(){
+        if (audioRecorder != null) {
+            audioRecorder.stop();
+            audioRecorder.reset();
+            audioRecorder.release();
+            audioRecorder = null;
+        }
+    }
+
+    @Override
+    public void run() {
+        audioRecorder = new MediaRecorder();
+        audioRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
+        audioRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        audioRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+        audioRecorder.setOutputFile(audioPath);
+
+        try {
+            audioRecorder.prepare();
+            audioRecorder.start();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
--- a/app/src/main/java/com/example/greenwatch/alarmrecorder/runnables/VideoRecorder.java
+++ b/app/src/main/java/com/example/greenwatch/alarmrecorder/runnables/VideoRecorder.java
@ -0,0 +1,54 @@
+package com.example.greenwatch.alarmrecorder.runnables;
+
+import android.media.MediaRecorder;
+import android.view.SurfaceHolder;
+
+import com.example.greenwatch.viewmodels.ViewModelInterface;
+
+import java.io.IOException;
+
+public class VideoRecorder implements Runnable{
+    private MediaRecorder videoRecorder;
+    private String videoPath;
+    private SurfaceHolder previewHolder;
+
+    public VideoRecorder() {
+        videoRecorder = new MediaRecorder();
+    }
+
+    public void setPreviewHolder(SurfaceHolder previewHolder) {
+        this.previewHolder = previewHolder;
+    }
+
+    public void setVideoPath(String audioPath) {
+        this.videoPath = audioPath;
+    }
+
+    public void stopVideoRecording(){
+        if (videoRecorder != null) {
+            videoRecorder.stop();
+            videoRecorder.reset();
+            videoRecorder.release();
+            videoRecorder = null;
+        }
+    }
+
+    @Override
+    public void run() {
+        videoRecorder = new MediaRecorder();
+        videoRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+        videoRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        videoRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
+        videoRecorder.setOutputFile(videoPath);
+        videoRecorder.setOrientationHint(90);
+        videoRecorder.setPreviewDisplay(previewHolder.getSurface());
+
+        try {
+            videoRecorder.prepare();
+            videoRecorder.start();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
--- a/app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java
+++ b/app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java
@ -17,7 +17,7 @@ public class WiFiCommunication {
    private final InetAddress address;
    private final DatagramSocket socket;
    private final int port;
-    private String rxString;
+    private volatile String rxString;
    private String sendMessage;
    //private String sendMsg = "default";
    private boolean isNewMessage;
@ -48,7 +48,9 @@ public class WiFiCommunication {
    }

    public void setDeviceRepository(DeviceRepository deviceRepository) {
-        this.mDeviceRepository = deviceRepository;
+        if (mDeviceRepository == null) {
+            this.mDeviceRepository = deviceRepository;
+        }
    }

    public void setNewMessage(String newMessage, boolean isNewMessage){
@ -88,8 +90,7 @@ public class WiFiCommunication {
                    if(isNewMessage)
                    {
                        isNewMessage = false;
-                        //todo: adapt send String
-                        String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
+                        String txString = sendMessage;
                        byte[] txBuffer = txString.getBytes();

                        DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);
--- a/app/src/main/java/com/example/greenwatch/models/Device.java
+++ b/app/src/main/java/com/example/greenwatch/models/Device.java
@ -7,9 +7,9 @@ public class Device {
    private String deviceID;
    private boolean sensorStatus;
    private String sensorType;
-    private int sensorMassage;
+    private float sensorMassage;

-    public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage) {
        this.timeStamp = timeStamp;
        this.deviceID = deviceID;
        this.sensorStatus = sensorStatus;
@ -47,11 +47,11 @@ public class Device {
        return sensorStatus;
    }

-    public void setSensorMassage(int sensorMassage) {
+    public void setSensorMassage(float sensorMassage) {
        this.sensorMassage = sensorMassage;
    }

-    public int getSensorMassage() {
+    public float getSensorMassage() {
        return sensorMassage;
    }
 }
--- a/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
+++ b/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
@ -1,6 +1,8 @@
 package com.example.greenwatch.repositories;


+import android.os.Looper;
+
 import androidx.lifecycle.MutableLiveData;

 import com.example.greenwatch.models.Device;
@ -42,7 +44,10 @@ public class DeviceRepository {
    }

    public void setWiFiCommunication(WiFiCommunication wiFiCommunication) {
-        this.mWiFiCommunication = wiFiCommunication;
+        if (mWiFiCommunication == null) {
+            this.mWiFiCommunication = wiFiCommunication;
+        }
+
    }

    public MutableLiveData<List<Device>> getConnectedDeviceList() {
@ -60,7 +65,7 @@ public class DeviceRepository {
        return startAlarmRecording;
    }

-    public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
+    public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage){
        Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
        if (sensorStatus) {
            setAlarmHistoryDeviceList(newDevice);
@ -76,21 +81,22 @@ public class DeviceRepository {

    public void getNewReceivedMessage(String newMessage) {
        String[] messageString = messageStringSplitter(newMessage);
-        String timeStamp = messageString[0];
-        String deviceID = messageString[1];
-        boolean sensorStatus = convertSensorStatus(messageString[2]);
-        String sensorType = messageString[3];
-        int sensorMassage = Integer.valueOf(messageString[4]);
+        if(messageString[0].equals("1") && messageString.length == 7) {
+            String timeStamp = messageString[1];
+            String deviceID = messageString[3];
+            boolean sensorStatus = convertRecievedSensorStatus(messageString[4]);
+            String sensorType = messageString[5];
+            float sensorMassage = Float.valueOf(messageString[6]);

-        if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
-            return;
-        }
+            if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
+                return;
+            }

-        if(!connectedDevicesList.containsKey(deviceID)) {
-            createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
-        }
-        else {
-            updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
+            if (!connectedDevicesList.containsKey(deviceID)) {
+                createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
+            } else {
+                updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
+            }
        }
    }

@ -98,18 +104,26 @@ public class DeviceRepository {
        StringBuilder message = new StringBuilder();
        Device device = connectedDevicesList.get(deviceID);
        if(device != null) {
-            message.append(device.getTimeStamp())
+            message.append("1")
+                    .append(delimiter)
+                    .append(device.getTimeStamp())
+                    .append(delimiter)
+                    .append("Gruppe3")
                    .append(delimiter)
                    .append(device.getDeviceID())
                    .append(delimiter)
-                    .append(device.getSensorStatus())
+                    .append(convertSendSensorStatus(device.getSensorStatus()))
                    .append(delimiter)
                    .append(device.getSensorType())
                    .append(delimiter)
                    .append(device.getSensorMassage());
        }
        else {
-            message.append("")
+            message.append("1")
+                    .append(delimiter)
+                    .append("")
+                    .append(delimiter)
+                    .append("Gruppe3")
                    .append(delimiter)
                    .append("")
                    .append(delimiter)
@ -126,7 +140,7 @@ public class DeviceRepository {
        return localDeviceUUID;
    }

-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        String checkedDeviceID = checkDeviceID(deviceID);
        Device device = connectedDevicesList.get(checkedDeviceID);
        if(device != null) {
@ -234,7 +248,7 @@ public class DeviceRepository {
        return "";
    }

-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        String checkedDeviceID = checkDeviceID(deviceID);
        Device device = connectedDevicesList.get(checkedDeviceID);
        if(device != null) {
@ -244,7 +258,7 @@ public class DeviceRepository {
        }
    }

-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        String checkedDeviceID = checkDeviceID(deviceID);
        Device device = connectedDevicesList.get(checkedDeviceID);
        if(device != null) {
@ -261,7 +275,12 @@ public class DeviceRepository {

    private void setMutableLiveDataDeviceList() {
        List<Device> list = new ArrayList<>(connectedDevicesList.values());
-        deviceList.setValue(list);
+        if (Looper.myLooper() == Looper.getMainLooper()){
+            deviceList.setValue(list);
+        }
+        else {
+            deviceList.postValue(list);
+        }
    }

    private void setMutableLiveDataAlarmHistoryList() {
@ -298,10 +317,19 @@ public class DeviceRepository {
        return message.split(delimiter);
    }

-    private boolean convertSensorStatus(String status) {
+    private boolean convertRecievedSensorStatus(String status) {
        return status.equals(sensorStatusKey);
    }

+    private String convertSendSensorStatus(boolean status) {
+        if (status){
+            return "An";
+        }
+        else {
+            return "Aus";
+        }
+    }
+
    private void setAlarmHistoryDeviceList(Device device) {
        if (alarmHistoryDeviceList.size() == maxAlarmHistoryListSize) {
            alarmHistoryDeviceList.remove(alarmHistoryDeviceList.size() -1);
--- a/app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java
+++ b/app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java
@ -82,4 +82,8 @@ public class AccelerometerSensor {
            mAccelerometerAlarmDetected.setValue(false);
        }
    }
+
+    public float getAccelerometerSensorMeanValue() {
+        return meanValue;
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java
@ -1,9 +1,18 @@
 package com.example.greenwatch.viewmodels;

+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.view.SurfaceHolder;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;

+import com.example.greenwatch.alarmrecorder.AlarmRecorder;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
 import com.example.greenwatch.sensors.AccelerometerSensor;
@ -16,16 +25,20 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
    private MutableLiveData<List<Device>> mAlarmHistoryList;
    private MutableLiveData<Boolean> mStartAlarmRecording;
    private AccelerometerSensor mAccelerometerSensor;
+    private AlarmRecorder mAlarmRecorder;
    private DeviceRepository mDeviceRepository;

    @Override
-    public void init() {
+    public void init(SurfaceHolder previewHolder) {
        if (mDeviceRepository == null) {
            mDeviceRepository = DeviceRepository.getInstance();
        }
        if (mAccelerometerSensor == null) {
            mAccelerometerSensor = AccelerometerSensor.getInstance();
        }
+        if (mAlarmRecorder == null) {
+            mAlarmRecorder = AlarmRecorder.getInstance();
+        }
        if (mDeviceList == null) {
            mDeviceList = mDeviceRepository.getConnectedDeviceList();
        }
@ -38,6 +51,7 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
        if (mAccelerometerAlarmDetected == null) {
            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
        }
+        setAlarmRecordingPreviewHolder(previewHolder);
    }

    public void addValueToGesamtBE(float newValue) {
@ -56,6 +70,10 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
        mAccelerometerSensor.checkAlarmCondition();
    }

+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
    public LiveData<Boolean> getAccelerometerAlarmDetected() {
        return mAccelerometerAlarmDetected;
    }
@ -76,7 +94,7 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
    }

    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
    }

@ -121,12 +139,12 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
    }

    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
    }

    @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        return mDeviceRepository.getSensorMassage(deviceID);
    }

@ -139,4 +157,19 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
    public String getSystemTimeStamp() {
        return mDeviceRepository.getSystemTimeStamp();
    }
+
+    @Override
+    public void startAlarmRecording() {
+        mAlarmRecorder.startRecording();
+    }
+
+    @Override
+    public void stopAlarmRecording(Context context) {
+        mAlarmRecorder.stopRecording(context);
+    }
+
+    @Override
+    public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
+        mAlarmRecorder.setPreviewHolder(previewHolder);
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java
@ -1,10 +1,14 @@
 package com.example.greenwatch.viewmodels;

+import android.content.Context;
+import android.view.SurfaceHolder;
+
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModel;

+import com.example.greenwatch.alarmrecorder.AlarmRecorder;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
 import com.example.greenwatch.sensors.AccelerometerSensor;
@ -21,41 +25,14 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
    private MutableLiveData<Boolean> mStartAlarmRecording;
    private AccelerometerSensor mAccelerometerSensor;
    private MicrofonSensor mMicrofonSensor;
+    private AlarmRecorder mAlarmRecorder;
    private DeviceRepository mDeviceRepository;
    private boolean microfonAlarmDetected;
    private boolean accelerometerAlarmDetected;
    private boolean microfondetectionAndAccelerometerAlarmDetected;

-    @Override
    public void init() {
-        if (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mAccelerometerSensor == null) {
-            mAccelerometerSensor = AccelerometerSensor.getInstance();
-        }
-        if (mMicrofonSensor == null) {
-            mMicrofonSensor = MicrofonSensor.getInstance();
-        }
-        if (mDeviceList == null) {
-            mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
-            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
-        if (mAccelerometerAlarmDetected == null) {
-            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
-        }
-        if (mMicrofonAlarmDetected == null) {
-            mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
-        }
-        microfondetectionAndAccelerometerAlarmDetected = false;
-        accelerometerAlarmDetected = false;
-        microfonAlarmDetected = false;
-        registerAlarmObserver();
+
    }

    public void addValueToGesamtBE(float newValue) {
@ -74,6 +51,10 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
        mAccelerometerSensor.checkAlarmCondition();
    }

+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
    public LiveData<Boolean> getAudiodetectionAndAccelerometerAlarmDetected() {
        setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
        return mAudiodetectionAndAccelerometerAlarmDetected;
@ -144,6 +125,42 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
        mAccelerometerAlarmDetected.removeObserver(observer);
    }

+    @Override
+    public void init(SurfaceHolder previewHolder) {
+        if (mDeviceRepository == null) {
+            mDeviceRepository = DeviceRepository.getInstance();
+        }
+        if (mAccelerometerSensor == null) {
+            mAccelerometerSensor = AccelerometerSensor.getInstance();
+        }
+        if (mMicrofonSensor == null) {
+            mMicrofonSensor = MicrofonSensor.getInstance();
+        }
+        if (mAlarmRecorder == null) {
+            mAlarmRecorder = AlarmRecorder.getInstance();
+        }
+        if (mDeviceList == null) {
+            mDeviceList = mDeviceRepository.getConnectedDeviceList();
+        }
+        if (mAlarmHistoryList == null) {
+            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
+        }
+        if (mStartAlarmRecording == null) {
+            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
+        }
+        if (mAccelerometerAlarmDetected == null) {
+            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
+        }
+        if (mMicrofonAlarmDetected == null) {
+            mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
+        }
+        microfondetectionAndAccelerometerAlarmDetected = false;
+        accelerometerAlarmDetected = false;
+        microfonAlarmDetected = false;
+        registerAlarmObserver();
+        setAlarmRecordingPreviewHolder(previewHolder);
+    }
+
    @Override
    public LiveData<List<Device>> getConnectedDeviceList() {
        return mDeviceList;
@ -160,7 +177,7 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
    }

    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
    }

@ -205,12 +222,12 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
    }

    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
    }

    @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        return mDeviceRepository.getSensorMassage(deviceID);
    }

@ -223,4 +240,19 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
    public String getSystemTimeStamp() {
        return mDeviceRepository.getSystemTimeStamp();
    }
+
+    @Override
+    public void startAlarmRecording() {
+        mAlarmRecorder.startRecording();
+    }
+
+    @Override
+    public void stopAlarmRecording(Context context) {
+        mAlarmRecorder.stopRecording(context);
+    }
+
+    @Override
+    public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
+        mAlarmRecorder.setPreviewHolder(previewHolder);
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java
@ -4,6 +4,7 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.view.SurfaceHolder;

 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@ -11,9 +12,11 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;

+import com.example.greenwatch.alarmrecorder.AlarmRecorder;
 import com.example.greenwatch.communication.WiFiCommunication;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
+import com.example.greenwatch.sensors.AccelerometerSensor;

 import java.util.List;

@ -23,22 +26,36 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
    private MutableLiveData<List<Device>> mAlarmHistoryList;
    private MutableLiveData<Boolean> mStartAlarmRecording;
    private DeviceRepository mDeviceRepository;
+    private WiFiCommunication mWiFiCommunication;
+    private AlarmRecorder mAlarmRecorder;

    @Override
-    public void init() {
-        WiFiCommunication mWiFiCommunication;
-        if(mDeviceList != null) {
-            return;
+    public void init(SurfaceHolder previewHolder) {
+
+        if (mDeviceRepository == null) {
+            mDeviceRepository = DeviceRepository.getInstance();
+        }
+        if (mWiFiCommunication == null) {
+            mWiFiCommunication = WiFiCommunication.getInstance();
+        }
+        if (mAlarmRecorder == null) {
+            mAlarmRecorder = AlarmRecorder.getInstance();
+        }
+        if (mDeviceList == null) {
+            mDeviceList = mDeviceRepository.getConnectedDeviceList();
+        }
+        if (mAlarmHistoryList == null) {
+            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
+        }
+        if (mStartAlarmRecording == null) {
+            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
        }
-        //todo: check if WiFi instanz can be hold only by the repository
-        mDeviceRepository = DeviceRepository.getInstance();
-        mWiFiCommunication = WiFiCommunication.getInstance();
-        mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
        mWiFiCommunication.setDeviceRepository(mDeviceRepository);
-        mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
-        mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
+        mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
+        mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0.0f);
+        mDeviceRepository.setDeviceID(mDeviceRepository.getLocalDeviceUUID(), WiFiCommunication.getLocalIpAddress());
+        setAlarmRecordingPreviewHolder(previewHolder);
+        mWiFiCommunication = null;
    }

    @Override
@ -57,7 +74,7 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
    }

    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
    }

@ -102,12 +119,12 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
    }

    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
    }

    @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        return mDeviceRepository.getSensorMassage(deviceID);
    }

@ -118,6 +135,21 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa

    @Override
    public String getSystemTimeStamp() {
-        return null;
+        return mDeviceRepository.getSystemTimeStamp();
+    }
+
+    @Override
+    public void startAlarmRecording() {
+        mAlarmRecorder.startRecording();
+    }
+
+    @Override
+    public void stopAlarmRecording(Context context) {
+        mAlarmRecorder.stopRecording(context);
+    }
+
+    @Override
+    public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
+        mAlarmRecorder.setPreviewHolder(previewHolder);
    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/MicrofonViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/MicrofonViewModel.java
@ -1,11 +1,16 @@
 package com.example.greenwatch.viewmodels;

+import android.content.Context;
+import android.view.SurfaceHolder;
+
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;

+import com.example.greenwatch.alarmrecorder.AlarmRecorder;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
+import com.example.greenwatch.sensors.AccelerometerSensor;
 import com.example.greenwatch.sensors.MicrofonSensor;

 import java.util.List;
@ -17,28 +22,7 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
    private MutableLiveData<Boolean> mStartAlarmRecording;
    private MicrofonSensor mMicrofonSensor;
    private DeviceRepository mDeviceRepository;
-
-    @Override
-    public void init() {
-        if (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mMicrofonSensor == null) {
-            mMicrofonSensor = MicrofonSensor.getInstance();
-        }
-        if (mDeviceList == null) {
-            mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
-            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
-        if (mMicrofonAlarmDetected == null) {
-            mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
-        }
-    }
+    private AlarmRecorder mAlarmRecorder;

    public void startMicrofonSensor() {
        mMicrofonSensor.start();
@ -60,6 +44,32 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
        return mMicrofonAlarmDetected;
    }

+    @Override
+    public void init(SurfaceHolder previewHolder) {
+        if (mDeviceRepository == null) {
+            mDeviceRepository = DeviceRepository.getInstance();
+        }
+        if (mMicrofonSensor == null) {
+            mMicrofonSensor = MicrofonSensor.getInstance();
+        }
+        if (mAlarmRecorder == null) {
+            mAlarmRecorder = AlarmRecorder.getInstance();
+        }
+        if (mDeviceList == null) {
+            mDeviceList = mDeviceRepository.getConnectedDeviceList();
+        }
+        if (mAlarmHistoryList == null) {
+            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
+        }
+        if (mStartAlarmRecording == null) {
+            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
+        }
+        if (mMicrofonAlarmDetected == null) {
+            mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
+        }
+        setAlarmRecordingPreviewHolder(previewHolder);
+    }
+
    @Override
    public LiveData<List<Device>> getConnectedDeviceList() {
        return mDeviceList;
@ -76,7 +86,7 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
    }

    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
    }

@ -121,12 +131,12 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
    }

    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
    }

    @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        return mDeviceRepository.getSensorMassage(deviceID);
    }

@ -139,4 +149,19 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
    public String getSystemTimeStamp() {
        return mDeviceRepository.getSystemTimeStamp();
    }
+
+    @Override
+    public void startAlarmRecording() {
+        mAlarmRecorder.startRecording();
+    }
+
+    @Override
+    public void stopAlarmRecording(Context context) {
+        mAlarmRecorder.stopRecording(context);
+    }
+
+    @Override
+    public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
+        mAlarmRecorder.setPreviewHolder(previewHolder);
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java
@ -1,6 +1,7 @@
 package com.example.greenwatch.viewmodels;

 import android.content.Context;
+import android.view.SurfaceHolder;

 import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.lifecycle.LifecycleOwner;
@ -9,6 +10,7 @@ import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModel;

+import com.example.greenwatch.alarmrecorder.AlarmRecorder;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
 import com.example.greenwatch.sensors.AccelerometerSensor;
@ -26,42 +28,11 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
    private AccelerometerSensor mAccelerometerSensor;
    private CameraSensor mCameraSensor;
    private DeviceRepository mDeviceRepository;
+    private AlarmRecorder mAlarmRecorder;
    private boolean videoAlarmDetected;
    private boolean accelerometerAlarmDetected;
    private boolean videodetectionAndAccelerometerAlarmDetected;

-    @Override
-    public void init() {
-        if (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mAccelerometerSensor == null) {
-            mAccelerometerSensor = AccelerometerSensor.getInstance();
-        }
-        if (mCameraSensor == null) {
-            mCameraSensor = CameraSensor.getInstance();
-        }
-        if (mDeviceList == null) {
-            mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
-            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
-        if (mAccelerometerAlarmDetected == null) {
-            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
-        }
-        if (mVideoAlarmDetected == null) {
-            mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
-        }
-        videodetectionAndAccelerometerAlarmDetected = false;
-        videoAlarmDetected = false;
-        accelerometerAlarmDetected = false;
-        registerAlarmObserver();
-    }
-
    public void addValueToGesamtBE(float newValue) {
        mAccelerometerSensor.addValueToGesamtBE(newValue);
    }
@ -78,6 +49,10 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
        mAccelerometerSensor.checkAlarmCondition();
    }

+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
    public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
        mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
    }
@ -136,6 +111,42 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
        mAccelerometerAlarmDetected.removeObserver(observer);
    }

+    @Override
+    public void init(SurfaceHolder previewHolder) {
+        if (mDeviceRepository == null) {
+            mDeviceRepository = DeviceRepository.getInstance();
+        }
+        if (mAccelerometerSensor == null) {
+            mAccelerometerSensor = AccelerometerSensor.getInstance();
+        }
+        if (mCameraSensor == null) {
+            mCameraSensor = CameraSensor.getInstance();
+        }
+        if (mAlarmRecorder == null) {
+            mAlarmRecorder = AlarmRecorder.getInstance();
+        }
+        if (mDeviceList == null) {
+            mDeviceList = mDeviceRepository.getConnectedDeviceList();
+        }
+        if (mAlarmHistoryList == null) {
+            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
+        }
+        if (mStartAlarmRecording == null) {
+            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
+        }
+        if (mAccelerometerAlarmDetected == null) {
+            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
+        }
+        if (mVideoAlarmDetected == null) {
+            mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
+        }
+        videodetectionAndAccelerometerAlarmDetected = false;
+        videoAlarmDetected = false;
+        accelerometerAlarmDetected = false;
+        registerAlarmObserver();
+        setAlarmRecordingPreviewHolder(previewHolder);
+    }
+
    @Override
    public LiveData<List<Device>> getConnectedDeviceList() {
        return mDeviceList;
@ -152,7 +163,7 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
    }

    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
    }

@ -197,12 +208,12 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
    }

    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
    }

    @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        return mDeviceRepository.getSensorMassage(deviceID);
    }

@ -215,4 +226,19 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
    public String getSystemTimeStamp() {
        return mDeviceRepository.getSystemTimeStamp();
    }
+
+    @Override
+    public void startAlarmRecording() {
+        mAlarmRecorder.startRecording();
+    }
+
+    @Override
+    public void stopAlarmRecording(Context context) {
+        mAlarmRecorder.stopRecording(context);
+    }
+
+    @Override
+    public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
+        mAlarmRecorder.setPreviewHolder(previewHolder);
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java
@ -1,6 +1,7 @@
 package com.example.greenwatch.viewmodels;

 import android.content.Context;
+import android.view.SurfaceHolder;

 import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.lifecycle.LifecycleOwner;
@ -8,6 +9,7 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;

+import com.example.greenwatch.alarmrecorder.AlarmRecorder;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
 import com.example.greenwatch.sensors.CameraSensor;
@ -21,6 +23,7 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
    private MutableLiveData<List<Device>> mAlarmHistoryList;
    private MutableLiveData<Boolean> mStartAlarmRecording;
    private DeviceRepository mDeviceRepository;
+    private AlarmRecorder mAlarmRecorder;
    private CameraSensor mCameraSensor;


@ -29,13 +32,16 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
    }

    @Override
-    public void init() {
+    public void init(SurfaceHolder previewHolder) {
        if (mDeviceRepository == null) {
            mDeviceRepository = DeviceRepository.getInstance();
        }
        if (mCameraSensor == null) {
            mCameraSensor = CameraSensor.getInstance();
        }
+        if (mAlarmRecorder == null) {
+            mAlarmRecorder = AlarmRecorder.getInstance();
+        }
        if (mDeviceList == null) {
            mDeviceList = mDeviceRepository.getConnectedDeviceList();
        }
@ -48,6 +54,7 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
        if (mVideoAlarmDetected == null) {
            mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
        }
+        setAlarmRecordingPreviewHolder(previewHolder);
    }

    public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
@ -74,7 +81,7 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
    }

    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
    }

@ -119,12 +126,12 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
    }

    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
    }

    @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
        return mDeviceRepository.getSensorMassage(deviceID);
    }

@ -137,4 +144,19 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
    public String getSystemTimeStamp() {
        return mDeviceRepository.getSystemTimeStamp();
    }
+
+    @Override
+    public void startAlarmRecording() {
+        mAlarmRecorder.startRecording();
+    }
+
+    @Override
+    public void stopAlarmRecording(Context context) {
+        mAlarmRecorder.stopRecording(context);
+    }
+
+    @Override
+    public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
+        mAlarmRecorder.setPreviewHolder(previewHolder);
+    }
 }
--- a/app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java
@ -1,5 +1,8 @@
 package com.example.greenwatch.viewmodels;

+import android.content.Context;
+import android.view.SurfaceHolder;
+
 import androidx.lifecycle.LiveData;

 import com.example.greenwatch.models.Device;
@ -7,11 +10,11 @@ import com.example.greenwatch.models.Device;
 import java.util.List;

 public interface ViewModelInterface {
-    void init();
+    void init(SurfaceHolder previewHolder);
    LiveData<List<Device>> getConnectedDeviceList();
    LiveData<List<Device>> getAlarmHistoryList();
    LiveData<Boolean> getStartAlarmRecording();
-    void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
+    void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage);
    void setTimeStamp(String deviceID, String timeStamp);
    String getTimeStamp(String deviceID);
    void setDeviceID(String deviceID, String newDeviceID);
@ -20,8 +23,11 @@ public interface ViewModelInterface {
    boolean getSensorStatus(String deviceID);
    void setSensorType(String deviceID, String sensorType);
    String getSensorType(String deviceID);
-    void setSensorMassage(String deviceID, int sensorMessage);
-    int getSensorMassage(String deviceID);
+    void setSensorMassage(String deviceID, float sensorMessage);
+    float getSensorMassage(String deviceID);
    String getLocalDeviceUUID();
    String getSystemTimeStamp();
+    void startAlarmRecording();
+    void stopAlarmRecording(Context context);
+    void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder);
 }
--- a/app/src/main/res/layout/activity_accelerometer.xml
+++ b/app/src/main/res/layout/activity_accelerometer.xml
@ -8,11 +8,19 @@
    android:padding="10dp"
    tools:context=".AccelerometerActivity">

+    <SurfaceView
+        android:id="@+id/surfaceViewAccelerometer"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
    <TextView
        android:id="@+id/tvAccelerometerStatusmessage"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:text="">
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Accelerometer Activity">
    </TextView>

    <TextView
@ -22,13 +30,6 @@
        android:text="">
    </TextView>

-    <TextView
-        android:id="@+id/tvAccelerometerWarning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="">
-    </TextView>
-
    <Button
        android:id="@+id/accelerometerBackToMainActivity"
        android:layout_width="match_parent"
@ -41,6 +42,14 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <TextView
+            android:id="@+id/tvAccelerometerdeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/deviceListRecyclerView"
            android:layout_width="match_parent"
@ -49,6 +58,14 @@
            android:layout_weight="1">
        </androidx.recyclerview.widget.RecyclerView>

+        <TextView
+            android:id="@+id/tvAccelerometeralarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/alarmHistoryListRecyclerView"
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_audiodetection.xml
+++ b/app/src/main/res/layout/activity_audiodetection.xml
@ -8,10 +8,25 @@
    android:padding="10dp"
    tools:context=".AudiodetectionActivity">

+    <SurfaceView
+        android:id="@+id/surfaceViewAudio"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
    <TextView
        android:id="@+id/tvAudiodetectionStatusmessage"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Audiodetection Activity">
+    </TextView>
+
+    <TextView
+        android:id="@+id/tvAudiodetectionData"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
        android:text="">
    </TextView>

@ -27,6 +42,14 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <TextView
+            android:id="@+id/tvAudiodetectionDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/deviceListRecyclerView"
            android:layout_width="match_parent"
@ -35,6 +58,14 @@
            android:layout_weight="1">
        </androidx.recyclerview.widget.RecyclerView>

+        <TextView
+            android:id="@+id/tvAudiodetectionAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/alarmHistoryListRecyclerView"
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_audiodetection_and_accelerometer.xml
+++ b/app/src/main/res/layout/activity_audiodetection_and_accelerometer.xml
@ -8,11 +8,19 @@
    android:padding="10dp"
    tools:context=".AudiodetectionAndAccelerometerActivity">

+    <SurfaceView
+        android:id="@+id/surfaceViewAudiodetectionAndAccelerometer"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
    <TextView
        android:id="@+id/tvAudiodetectionAndAccelerometerStatusmessage"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:text="Audiodetection + Accelerometer Activity">
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Audiodetection+Accelerometer Activity">
    </TextView>

    <Button
@ -27,6 +35,14 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <TextView
+            android:id="@+id/tvAudiodetectionAndAccelerometerDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/deviceListRecyclerView"
            android:layout_width="match_parent"
@ -35,6 +51,14 @@
            android:layout_weight="1">
        </androidx.recyclerview.widget.RecyclerView>

+        <TextView
+            android:id="@+id/tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/alarmHistoryListRecyclerView"
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -5,9 +5,33 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
-    android:padding="10dp"
+    android:padding="5dp"
    tools:context=".MainActivity">

+    <TextView
+        android:id="@+id/tvMainActivityDeviceListRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Registered Devices">
+    </TextView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/deviceListRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="3"
+        tools:listitem="@layout/device_item">
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <TextView
+        android:id="@+id/tvMainActivityAlarmHistoryListRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Alarm History List">
+    </TextView>
+
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/alarmHistoryListRecyclerView"
        android:layout_width="match_parent"
@ -16,67 +40,90 @@
        tools:listitem="@layout/alarm_history_item">
    </androidx.recyclerview.widget.RecyclerView>

-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/deviceListRecyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="3"
-        tools:listitem="@layout/device_item">
-    </androidx.recyclerview.widget.RecyclerView>
-    
+    <SurfaceView
+        android:id="@+id/surfaceViewMainActivity"
+        android:layout_width="1dp"
+        android:layout_height="1dp">
+    </SurfaceView>
+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical"
        android:layout_weight="3">

-        <Button
-            android:id="@+id/audiodetectionButton"
+        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Audiodetection">
-        </Button>
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:layout_weight="1">

-        <Button
-            android:id="@+id/videodetectionButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Videodetection">
-        </Button>
+            <Button
+                android:id="@+id/audiodetectionButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="2dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="Audiodetection">
+            </Button>

-        <Button
-            android:id="@+id/accelerometerButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Accelerometer">
-        </Button>
+            <Button
+                android:id="@+id/videodetectionButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="Videodetection">
+            </Button>

-        <Button
-            android:id="@+id/audiodetectionAndAccelerometerButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Audiodetection + Accelerometer">
-        </Button>
+        </LinearLayout>

-        <Button
-            android:id="@+id/videodetectionAndAccelerometerButton"
+        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Videodetection + Accelerometer">
-        </Button>
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:layout_weight="1">

-        <Button
-            android:id="@+id/connectionButton"
+            <Button
+                android:id="@+id/accelerometerButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="Accelerometer">
+            </Button>
+
+        </LinearLayout>
+
+        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Connect to Devices">
-        </Button>
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:layout_weight="1">
+
+            <Button
+                android:id="@+id/audiodetectionAndAccelerometerButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="2dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="Audiodetection + Accelerometer">
+            </Button>
+
+            <Button
+                android:id="@+id/videodetectionAndAccelerometerButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="Videodetection + Accelerometer">
+            </Button>
+
+        </LinearLayout>

    </LinearLayout>

--- a/app/src/main/res/layout/activity_videodetection.xml
+++ b/app/src/main/res/layout/activity_videodetection.xml
@ -8,10 +8,18 @@
    android:padding="10dp"
    tools:context=".VideodetectionActivity">

+    <SurfaceView
+        android:id="@+id/surfaceViewVideodetection"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
    <TextView
        android:id="@+id/tvVideodetectionStatusmessage"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
        android:text="Videodetection Activity">
    </TextView>

@ -27,6 +35,14 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <TextView
+            android:id="@+id/tvVideodetectionDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/deviceListRecyclerView"
            android:layout_width="match_parent"
@ -35,6 +51,14 @@
            android:layout_weight="1">
        </androidx.recyclerview.widget.RecyclerView>

+        <TextView
+            android:id="@+id/tvVideodetectionAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/alarmHistoryListRecyclerView"
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_videodetection_and_accelerometer.xml
+++ b/app/src/main/res/layout/activity_videodetection_and_accelerometer.xml
@ -8,11 +8,19 @@
    android:padding="10dp"
    tools:context=".VideodetectionAndAccelerometerActivity">

+    <SurfaceView
+        android:id="@+id/surfaceViewVideodetectionAndAccelerometer"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
    <TextView
        android:id="@+id/tvvideodetectionAndAccelerometerStatusmessage"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:text="">
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Videodetection+Accelerometer Activity">
    </TextView>

    <TextView
@ -22,13 +30,6 @@
        android:text="">
    </TextView>

-    <TextView
-        android:id="@+id/tvvideodetectionAndAccelerometerWarning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="">
-    </TextView>
-
    <Button
        android:id="@+id/videodetectionAndAccelerometerBackToMainActivity"
        android:layout_width="match_parent"
@ -41,6 +42,14 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

+        <TextView
+            android:id="@+id/tvVideodetectionAndAccelerometerDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/deviceListRecyclerView"
            android:layout_width="match_parent"
@ -49,6 +58,14 @@
            android:layout_weight="1">
        </androidx.recyclerview.widget.RecyclerView>

+        <TextView
+            android:id="@+id/tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/alarmHistoryListRecyclerView"
            android:layout_width="match_parent"
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -4,5 +4,5 @@
    <string name="sensor_status_placeholder">Sensorstatus: %s</string>
    <string name="deviceID_placeholder">Sensor-ID: %s</string>
    <string name="sensor_time_stamp_placeholder">Timestamp: %s</string>
-    <string name="sensor_message_placeholder">Sensormessage: %d</string>
+    <string name="sensor_message_placeholder">Sensormessage: %f</string>
 </resources>
Author	SHA1	Message	Date
Christian Tinz	3e2b8e7830	Merge branch 'Benutzeroberflaeche' of bauseweinfr74630/mMDT5_GreenWatch into master	2023-06-23 16:20:58 +00:00
Christian	fb873406f9	Adaptation of the receive logic	2023-06-23 17:46:50 +02:00
nutzma75019	f1f90952d2	Aufzeichnung ohne Audio	2023-06-22 16:06:52 +02:00
Christian	f56973547b	added AlarmRecording	2023-06-22 11:50:11 +02:00
Christian	efb6dc9787	adapted Layout Activitys	2023-06-22 11:49:37 +02:00
Christian	60bf036b40	adapted Layout MainActivity	2023-06-22 08:40:24 +02:00
Christian	6eb28765c9	Merge branch 'Benutzeroberflaeche_Permission' into Benutzeroberflaeche	2023-06-22 01:07:07 +02:00
Christian	cca1311b74	adapted datahandling and communication strings	2023-06-22 00:48:18 +02:00
Christian	c6d33925be	adapted SensorMessage Type to float	2023-06-22 00:00:09 +02:00