Kamera um neue Detektion ergänzt

Timer zum besseren Alarm Handling ergänzt

app/src/main/AndroidManifest.xml

@@ -29,9 +29,6 @@
         <activity
             android:name=".AccelerometerActivity"
             android:exported="false" />
-        <activity
-            android:name=".VideoPreviewActivity"
-            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true">

app/src/main/java/com/example/greenwatch/AccelerometerActivity.java

@@ -70,6 +70,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             @Override
             public void onChanged(List<Device> devices) {
                 deviceListAdapter.setDevices(devices);
+                Toast.makeText(AccelerometerActivity.this, "onChanged", Toast.LENGTH_LONG).show();
             }
         });
 
@@ -80,19 +81,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             }
         });
 
-        mAccelerometerViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-                else {
-                    Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
-        mAccelerometerViewModel.getAccelerometerAlarmDetected().observe(this, new Observer<Boolean>() {
+        mAccelerometerViewModel.getMovementDetectedValue().observe(this, new Observer<Boolean>() {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {

app/src/main/java/com/example/greenwatch/MainActivity.java

@@ -27,7 +27,6 @@ public class MainActivity extends AppCompatActivity {
     private Button audiodetectionAndAccelerometerButton;
     private Button videodetectionAndAccelerometerButton;
     private Button connectionButton;
-    private Button prewview_kamera;
     private MainActivityViewModel mMainActivityViewModel;
 
     @Override
@@ -41,7 +40,6 @@ public class MainActivity extends AppCompatActivity {
         audiodetectionAndAccelerometerButton = (Button) findViewById(R.id.audiodetectionAndAccelerometerButton);
         videodetectionAndAccelerometerButton = (Button) findViewById(R.id.videodetectionAndAccelerometerButton);
         connectionButton = (Button) findViewById(R.id.connectionButton);
-        prewview_kamera = (Button) findViewById(R.id.preview_kamera);
 
         RecyclerView deviceListRecyclerView = findViewById(R.id.deviceListRecyclerView);
         deviceListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
@@ -64,6 +62,7 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onChanged(List<Device> devices) {
                 deviceListAdapter.setDevices(devices);
+                Toast.makeText(MainActivity.this, "onChanged", Toast.LENGTH_LONG).show();
             }
         });
 
@@ -74,29 +73,6 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        mMainActivityViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-                else {
-                    Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
-        prewview_kamera.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mMainActivityViewModel.isCameraAccessAllowed(MainActivity.this)) {
-                    openVideoPrewvoewActivity();
-                }
-                else {
-                    mMainActivityViewModel.accessRequestCamera(MainActivity.this);
-                }
-            }
-        });
         audiodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -113,6 +89,7 @@ public class MainActivity extends AppCompatActivity {
                 else {
                     mMainActivityViewModel.accessRequestCamera(MainActivity.this);
                 }
+
             }
         });
         accelerometerButton.setOnClickListener(new View.OnClickListener() {
@@ -144,10 +121,6 @@ public class MainActivity extends AppCompatActivity {
             }
         });
     }
-    public void openVideoPrewvoewActivity() {
-        Intent intent = new Intent(this, VideoPreviewActivity.class);
-        startActivity(intent);
-    }
     public void openAudiodetectionActivity(){
         Intent intent = new Intent(this, AudiodetectionActivity.class);
         startActivity(intent);
@@ -165,8 +138,9 @@ public class MainActivity extends AppCompatActivity {
         startActivity(intent);
     }
     public void openVideodetectionAndAccelerometerActivity(){
-        Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
-        startActivity(intent);
+        //Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
+        //startActivity(intent);
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "24:00",  false, "Video", 0);
     }
     public void openConnectionActivity(){
         //Intent intent = new Intent(this, ConnectionActivity.class);

app/src/main/java/com/example/greenwatch/VideoPreviewActivity.java

@@ -1,61 +0,0 @@
-package com.example.greenwatch;
-
-import android.os.Bundle;
-import android.util.Size;
-import android.widget.Button;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.ImageAnalysis;
-import androidx.camera.core.ImageProxy;
-import androidx.camera.core.Preview;
-import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.camera.view.PreviewView;
-import androidx.core.content.ContextCompat;
-import androidx.lifecycle.LifecycleOwner;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.concurrent.ExecutionException;
-
-public class VideoPreviewActivity extends AppCompatActivity {
-
-    private Button backToMainActivity;
-    private PreviewView previewView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_preview_kamera);
-
-        backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
-        previewView = findViewById(R.id.previewView);
-
-        backToMainActivity.setOnClickListener(v -> finish());
-
-
-        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
-        cameraProviderFuture.addListener(() -> {
-            try {
-                bindImageAnalysis(cameraProviderFuture.get());
-            } catch (ExecutionException | InterruptedException e) {
-                e.printStackTrace();
-            }
-        }, ContextCompat.getMainExecutor(this));
-    }
-
-    private void bindImageAnalysis(ProcessCameraProvider cameraProvider) {
-        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
-        builder.setTargetResolution(new Size(640, 480));
-        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
-        ImageAnalysis imageAnalysis = builder.build();
-        imageAnalysis.setAnalyzer(
-                ContextCompat.getMainExecutor(this),
-                ImageProxy::close);
-
-        Preview preview = new Preview.Builder().build();
-        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
-        preview.setSurfaceProvider(previewView.getSurfaceProvider());
-        cameraProvider.bindToLifecycle((LifecycleOwner) this, cameraSelector, imageAnalysis, preview);
-    }
-}

app/src/main/java/com/example/greenwatch/VideodetectionActivity.java

@@ -62,6 +62,7 @@ public class VideodetectionActivity extends AppCompatActivity {
             @Override
             public void onChanged(List<Device> devices) {
                 deviceListAdapter.setDevices(devices);
+                Toast.makeText(VideodetectionActivity.this, "onChanged", Toast.LENGTH_LONG).show();
             }
         });
 
@@ -72,18 +73,6 @@ public class VideodetectionActivity extends AppCompatActivity {
             }
         });
 
-        mVideoDetectionViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-                else {
-                    Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
         mVideoDetectionViewModel.getVideoAlarmDetectedValue().observe(this, new Observer<Boolean>() {
             @Override
             public void onChanged(Boolean aBoolean) {

app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java

@@ -1,171 +1,27 @@
 package com.example.greenwatch;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.core.content.ContextCompat;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
 import android.os.Bundle;
 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.VideodetectionAndAccelerometerViewModel;
-import com.example.greenwatch.viewmodels.VideodetectionViewModel;
-import com.google.common.util.concurrent.ListenableFuture;
+public class VideodetectionAndAccelerometerActivity extends AppCompatActivity {
 
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-public class VideodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
-    private SensorManager accelerometerManager;
-    private Sensor accelerometerSensor;
-    private TextView videodetectionAndAccelerometerStatusMessage;
-    private TextView videodetectionAndAccelerometerDataTV;
-    private TextView videodetectionAndAccelerometerWarningTV;
     private Button backToMainActivity;
-    private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_videodetection_and_accelerometer);
 
-        videodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerStatusmessage);
-        videodetectionAndAccelerometerDataTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerData);
-        videodetectionAndAccelerometerWarningTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerWarning);
         backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
 
-        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.setHasFixedSize(true);
-
-        final DeviceListAdapter deviceListAdapter = new DeviceListAdapter();
-        recyclerView.setAdapter(deviceListAdapter);
-
-        RecyclerView alarmHistoryListRecyclerView = findViewById(R.id.alarmHistoryListRecyclerView);
-        alarmHistoryListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        alarmHistoryListRecyclerView.setHasFixedSize(true);
-
-        final AlarmHistoryListAdapter alarmHistoryListAdapter  = new AlarmHistoryListAdapter();
-        alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
-
         backToMainActivity.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
-
-        mVideodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(VideodetectionAndAccelerometerViewModel.class);
-        mVideodetectionAndAccelerometerViewModel.init();
-        mVideodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
-            @Override
-            public void onChanged(List<Device> devices) {
-                deviceListAdapter.setDevices(devices);
-            }
-        });
-
-        mVideodetectionAndAccelerometerViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
-            @Override
-            public void onChanged(List<Device> devices) {
-                alarmHistoryListAdapter.setAlarmHistoryList(devices);
-            }
-        });
-
-        mVideodetectionAndAccelerometerViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-                else {
-                    Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
-        mVideodetectionAndAccelerometerViewModel.getVideodetectionAndAccelerometerAlarmDetected().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
-                }
-                else {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
-                }
-
-            }
-        });
-
-        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
-        cameraProviderFuture.addListener(() -> {
-            try {
-                mVideodetectionAndAccelerometerViewModel.bindImageAnalysis(cameraProviderFuture.get(), this, this);
-            } catch (ExecutionException | InterruptedException e) {
-                e.printStackTrace();
-            }
-        }, ContextCompat.getMainExecutor(this));
-
-        accelerometerManager = (SensorManager) getSystemService(SENSOR_SERVICE);
-        if (accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
-            accelerometerSensor = null;
-            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "No accelerometer sensor available", Toast.LENGTH_LONG).show();
-        }
-        else {
-            accelerometerSensor = accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).get(0);
-        }
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("x=")
-                .append(event.values[0])
-                .append("\ny=")
-                .append(event.values[1])
-                .append("\nz=")
-                .append(event.values[2]);
-        videodetectionAndAccelerometerDataTV.setText(sb.toString());
-        mVideodetectionAndAccelerometerViewModel.addValueToGesamtBE(event.values[0] + event.values[1] + event.values[2]);
-        mVideodetectionAndAccelerometerViewModel.meanValueCalculation();
-        mVideodetectionAndAccelerometerViewModel.calibrateAccelerometerSensor();
-        mVideodetectionAndAccelerometerViewModel.checkAlarmCondition();
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-
-    }
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (accelerometerSensor != null) {
-            if (accelerometerManager.registerListener(this, accelerometerSensor, SensorManager.SENSOR_DELAY_GAME)) {
-                Toast.makeText(VideodetectionAndAccelerometerActivity.this, "We registered to the sensor", Toast.LENGTH_LONG).show();
-            } else {
-                Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Registration did not work", Toast.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (accelerometerSensor != null) {
-            accelerometerManager.unregisterListener(this, accelerometerSensor);
-        }
     }
 }

app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java

@@ -17,12 +17,10 @@ public class DeviceRepository {
 
     private final int maxAlarmHistoryListSize = 20;
     private final String delimiter = ", ";
-    private final String sensorStatusKey = "An";
+    private final String SensorStatusKey = "An";
     private String localDeviceUUID;
     private static DeviceRepository deviceRepositoryInstance;
     private WiFiCommunication mWiFiCommunication;
-    private boolean startAlarmRecordingValue;
-    private MutableLiveData<Boolean> startAlarmRecording = new MutableLiveData<>();
     private MutableLiveData<List<Device>> deviceList = new MutableLiveData<>();
     private MutableLiveData<List<Device>> alarmHistoryList = new MutableLiveData<>();
     private HashMap<String, Device> connectedDevicesList = new HashMap<>();
@@ -31,7 +29,6 @@ public class DeviceRepository {
 
     private DeviceRepository() {
         setLocalDeviceUUID();
-        startAlarmRecordingValue = false;
     }
 
     public static synchronized DeviceRepository getInstance() {
@@ -55,21 +52,11 @@ public class DeviceRepository {
         return alarmHistoryList;
     }
 
-    public MutableLiveData<Boolean> getStartAlarmRecording() {
-        setMutableLiveDataStartAlarmRecording();
-        return startAlarmRecording;
-    }
-
     public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
         Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
         if (sensorStatus) {
             setAlarmHistoryDeviceList(newDevice);
         }
-        boolean newStartAlarmRecordingValue = checkDeviceStatus();
-        if (startAlarmRecordingValue != newStartAlarmRecordingValue) {
-            startAlarmRecordingValue = newStartAlarmRecordingValue;
-            setMutableLiveDataStartAlarmRecording();
-        }
         addToConnectedDeviceList(newDevice.getDeviceID(), newDevice);
         setMutableLiveDataDeviceList();
     }
@@ -137,11 +124,6 @@ public class DeviceRepository {
                 setAlarmHistoryDeviceList(device);
             }
             device.setSensorStatus(sensorStatus);
-            boolean newStartAlarmRecordingValue = checkDeviceStatus();
-            if (startAlarmRecordingValue != newStartAlarmRecordingValue) {
-                startAlarmRecordingValue = newStartAlarmRecordingValue;
-                setMutableLiveDataStartAlarmRecording();
-            }
             addToConnectedDeviceList(checkedDeviceID, device);
             setMutableLiveDataDeviceList();
         }
@@ -195,11 +177,6 @@ public class DeviceRepository {
                 setAlarmHistoryDeviceList(device);
             }
             device.setSensorStatus(sensorStatus);
-            boolean newStartAlarmRecordingValue = checkDeviceStatus();
-            if (startAlarmRecordingValue != newStartAlarmRecordingValue) {
-                startAlarmRecordingValue = newStartAlarmRecordingValue;
-                setMutableLiveDataStartAlarmRecording();
-            }
             addToConnectedDeviceList(checkedDeviceID, device);
             setMutableLiveDataDeviceList();
 
@@ -268,10 +245,6 @@ public class DeviceRepository {
         alarmHistoryList.setValue(alarmHistoryDeviceList);
     }
 
-    private void setMutableLiveDataStartAlarmRecording() {
-        startAlarmRecording.setValue(startAlarmRecordingValue);
-    }
-
     private void addToConnectedDeviceList(String key, Device device) {
         connectedDevicesList.put(key, device);
         if (key.equals(checkDeviceID(localDeviceUUID))) {
@@ -299,7 +272,7 @@ public class DeviceRepository {
     }
 
     private boolean convertSensorStatus(String status) {
-        return status.equals(sensorStatusKey);
+        return status.equals(SensorStatusKey);
     }
 
     private void setAlarmHistoryDeviceList(Device device) {
@@ -310,13 +283,4 @@ public class DeviceRepository {
         alarmHistoryDeviceList.add(0, alarmHistoryDevice);
         setMutableLiveDataAlarmHistoryList();
     }
-
-    private boolean checkDeviceStatus() {
-        for (Device device : connectedDevicesList.values()) {
-            if (device.getSensorStatus()) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java

@@ -1,85 +0,0 @@
-package com.example.greenwatch.sensors;
-
-import androidx.lifecycle.MutableLiveData;
-
-import java.util.ArrayList;
-
-public class AccelerometerSensor {
-    private MutableLiveData<Boolean> mAccelerometerAlarmDetected = new MutableLiveData<>();
-    private static AccelerometerSensor accelerometerSensorInstance;
-    private boolean accelerometerAlarmDetected;
-    private ArrayList<Float> Gesamt_be;
-    int arraySize = 500;
-    int functionCallCount;
-    float meanValue;
-    float offsetValue;
-    float thresholdValue;
-    boolean startMeasuring;
-
-    private AccelerometerSensor() {
-        initGesamtBE();
-        accelerometerAlarmDetected = false;
-        setMutableLiveDataAccelerometerAlarmDetected();
-        functionCallCount = 0;
-        meanValue = 0.0f;
-        offsetValue = 0.1f;
-        thresholdValue = 0.15f;
-        startMeasuring = false;
-    }
-
-    public static synchronized AccelerometerSensor getInstance() {
-        if (accelerometerSensorInstance == null){
-            accelerometerSensorInstance = new AccelerometerSensor();
-        }
-        return accelerometerSensorInstance;
-    }
-
-    public MutableLiveData<Boolean> getAccelerometerAlarmDetected() {
-        setMutableLiveDataAccelerometerAlarmDetected();
-        return mAccelerometerAlarmDetected;
-    }
-
-    private void setMutableLiveDataAccelerometerAlarmDetected() {
-        mAccelerometerAlarmDetected.setValue(accelerometerAlarmDetected);
-    }
-
-    private void initGesamtBE() {
-        Gesamt_be = new ArrayList<>(arraySize);
-        for (int i = 0; i < arraySize; i++) {
-            Gesamt_be.add(0.0f);
-        }
-    }
-
-    public void addValueToGesamtBE(float newValue) {
-        if (Gesamt_be.size() == arraySize) {
-            Gesamt_be.remove(Gesamt_be.size() -1);
-        }
-        Gesamt_be.add(0, newValue);
-        functionCallCount++;
-    }
-
-    public void meanValueCalculation() {
-        for (float element : Gesamt_be) {
-            meanValue += Math.abs(element);
-        }
-        meanValue = meanValue/arraySize;
-    }
-
-    public void calibrateAccelerometerSensor() {
-        if (functionCallCount <= arraySize) {
-            offsetValue = meanValue;
-        }
-        else {
-            startMeasuring = true;
-        }
-    }
-
-    public void checkAlarmCondition() {
-        if (meanValue > (thresholdValue + offsetValue) && startMeasuring && !mAccelerometerAlarmDetected.getValue()) {
-            mAccelerometerAlarmDetected.setValue(true);
-        }
-        else if (meanValue < (thresholdValue + offsetValue) && mAccelerometerAlarmDetected.getValue()){
-            mAccelerometerAlarmDetected.setValue(false);
-        }
-    }
-}

app/src/main/java/com/example/greenwatch/sensors/CameraSensor.java

@@ -3,6 +3,7 @@ package com.example.greenwatch.sensors;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.media.Image;
+import android.os.Handler;
 import android.util.Size;
 
 import androidx.camera.core.CameraSelector;
@@ -18,9 +19,19 @@ public class CameraSensor {
     private final MutableLiveData<Boolean> mVideoAlarmDetected = new MutableLiveData<>();
     private static CameraSensor cameraSensorInstance;
     private boolean videoAlarmDetected;
+    private boolean isMotionDetected;
     private ByteBuffer previousBuffer;
     private int previousWidth;
     private int previousHeight;
+    private final int threshold = 50;
+    private int startX;
+    private int startY;
+    private int endX;
+    private int endY;
+
+    private static final long ALARM_RESET_DELAY = 5000;
+    private Runnable alarmResetRunnable;
+    private final Handler alarmResetHandler = new Handler();
 
     private CameraSensor() {
         videoAlarmDetected = false;
@@ -34,11 +45,11 @@ public class CameraSensor {
     }
 
     public MutableLiveData<Boolean> getVideoAlarmDetectedValue() {
-        setMutableLiveDataVideoAlarmDetected();
+        setMutableLiveDataVideoMovementDetected();
         return mVideoAlarmDetected;
     }
 
-    private void setMutableLiveDataVideoAlarmDetected() {
+    private void setMutableLiveDataVideoMovementDetected() {
         mVideoAlarmDetected.setValue(videoAlarmDetected);
     }
 
@@ -59,7 +70,7 @@ public class CameraSensor {
 
                         if (previousHeight != 0) {
                             assert currentImage != null;
-                            videoAlarmDetected = compareFrames(currentImage);
+                            isMotionDetected = compareFrames(currentImage);
                         }
 
                         assert currentImage != null;
@@ -72,6 +83,18 @@ public class CameraSensor {
 
                         currentImage.close();
 
+                        if (isMotionDetected) {
+
+                            videoAlarmDetected = true;
+
+                            if(alarmResetRunnable != null) {
+                                alarmResetHandler.removeCallbacks(alarmResetRunnable);
+                            }
+
+                            alarmResetRunnable = this::resetAlarmStatus;
+                            alarmResetHandler.postDelayed(alarmResetRunnable, ALARM_RESET_DELAY);
+                        }
+
                         checkAlarmCondition();
 
                     }
@@ -85,42 +108,82 @@ public class CameraSensor {
     }
 
     private boolean compareFrames(Image currentImage) {
-
-        ByteBuffer currentBuffer = currentImage.getPlanes()[0].getBuffer();
-
+        Image.Plane[] planes = currentImage.getPlanes();
+        ByteBuffer currentBuffer = planes[0].getBuffer();
         int currentWidth = currentImage.getWidth();
         int currentHeight = currentImage.getHeight();
+        int yRowStride = planes[0].getRowStride();
+        int yPixelStride = planes[0].getPixelStride();
 
         if (previousWidth != currentWidth || previousHeight != currentHeight) {
             return false;
         }
 
-        for (int row = 0; row < previousHeight; row++) {
-            for (int col = 0; col < previousWidth; col++) {
+        int blockSize = kleinstesQuadrat(previousHeight, previousWidth) / 8;
 
-                int previousIndex = row * previousWidth + col;
-                int currentIndex = row * currentWidth + col;
+        int numBlocksX = currentWidth / blockSize;
+        int numBlocksY = currentHeight / blockSize;
 
-                int previousPixel = previousBuffer.get(previousIndex) & 0xFF;
-                int currentPixel = currentBuffer.get(currentIndex) & 0xFF;
+        for (int blockY = 0; blockY < numBlocksY; blockY++) {
+            for (int blockX = 0; blockX < numBlocksX; blockX++) {
+                startX = blockX * blockSize;
+                startY = blockY * blockSize;
+                endX = startX + blockSize;
+                endY = startY + blockSize;
 
-                int pixelDifference = Math.abs(previousPixel - currentPixel);
-                int threshold = 120;
+                float currentLuminance = berechneMittlereLuminanz(currentBuffer, yRowStride, yPixelStride);
+                float previousLuminance = berechneMittlereLuminanz(previousBuffer, yRowStride, yPixelStride);
+
+                int pixelDifference = Math.abs((int) previousLuminance - (int) currentLuminance);
 
                 if (pixelDifference > threshold) {
+                    System.out.println(pixelDifference);
                     return true;
                 }
             }
         }
+
         return false;
     }
 
+    private float berechneMittlereLuminanz(ByteBuffer buffer, int rowStride, int pixelStride) {
+        int sumLuminance = 0;
+        int countPixels = 0;
+
+        for (int row = startY; row < endY; row++) {
+            for (int col = startX; col < endX; col++) {
+                int bufferIndex = row * rowStride + col * pixelStride;
+                int currentPixel = buffer.get(bufferIndex) & 0xFF;
+
+                sumLuminance += currentPixel;
+                countPixels++;
+            }
+        }
+
+        return (float) sumLuminance / countPixels;
+    }
+
+    private int kleinstesQuadrat(int height, int width) {
+        if (height == width) {
+            return height;
+        } else if (height > width) {
+            return kleinstesQuadrat(height - width, width);
+        } else {
+            return kleinstesQuadrat(height, width - height);
+        }
+    }
+
+    private void resetAlarmStatus() {
+        videoAlarmDetected = false;
+        alarmResetRunnable = null;
+    }
+
     public void checkAlarmCondition() {
         if (videoAlarmDetected && !mVideoAlarmDetected.getValue()) {
-            setMutableLiveDataVideoAlarmDetected();
+            setMutableLiveDataVideoMovementDetected();
         }
         else if (!videoAlarmDetected && mVideoAlarmDetected.getValue()){
-            setMutableLiveDataVideoAlarmDetected();
+            setMutableLiveDataVideoMovementDetected();
         }
     }
 }

app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java

@@ -6,59 +6,84 @@ import androidx.lifecycle.ViewModel;
 
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
-import com.example.greenwatch.sensors.AccelerometerSensor;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class AccelerometerViewModel extends ViewModel implements ViewModelInterface {
 
     private MutableLiveData<List<Device>> mDeviceList;
-    private MutableLiveData<Boolean> mAccelerometerAlarmDetected;
+    private MutableLiveData<Boolean> mMovementDetected = new MutableLiveData<>();
     private MutableLiveData<List<Device>> mAlarmHistoryList;
-    private MutableLiveData<Boolean> mStartAlarmRecording;
-    private AccelerometerSensor mAccelerometerSensor;
     private DeviceRepository mDeviceRepository;
+    private ArrayList<Float> Gesamt_be;
+    int arraySize = 500;
+    int functionCallCount;
+    float meanValue;
+    float offsetValue;
+    float thresholdValue;
+    boolean startMeasuring;
 
     @Override
     public void init() {
-        if (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mAccelerometerSensor == null) {
-            mAccelerometerSensor = AccelerometerSensor.getInstance();
-        }
         if (mDeviceList == null) {
+            mDeviceRepository = DeviceRepository.getInstance();
             mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
             mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
         }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
-        if (mAccelerometerAlarmDetected == null) {
-            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
+        initGesamtBE();
+        mMovementDetected.setValue(false);
+        functionCallCount = 0;
+        meanValue = 0f;
+        offsetValue = 0.1f;
+        thresholdValue = 0.15f;
+        startMeasuring = false;
+    }
+
+    public void initGesamtBE() {
+        Gesamt_be = new ArrayList<>(arraySize);
+        for (int i = 0; i < arraySize; i++) {
+            Gesamt_be.add(0f);
         }
     }
 
     public void addValueToGesamtBE(float newValue) {
-        mAccelerometerSensor.addValueToGesamtBE(newValue);
+        if (Gesamt_be.size() == arraySize) {
+            Gesamt_be.remove(Gesamt_be.size() -1);
+        }
+        Gesamt_be.add(0, newValue);
+        functionCallCount++;
     }
 
     public void meanValueCalculation() {
-        mAccelerometerSensor.meanValueCalculation();
+        for (float element : Gesamt_be) {
+            meanValue += Math.abs(element);
+        }
+        meanValue = meanValue/arraySize;
     }
 
     public void calibrateAccelerometerSensor() {
-        mAccelerometerSensor.calibrateAccelerometerSensor();
+        if (functionCallCount <= arraySize) {
+            offsetValue = meanValue;
+        }
+        else {
+            startMeasuring = true;
+        }
     }
 
     public void checkAlarmCondition() {
-        mAccelerometerSensor.checkAlarmCondition();
+        if (meanValue > (thresholdValue + offsetValue) && startMeasuring && !mMovementDetected.getValue()) {
+            mMovementDetected.setValue(true);
+        }
+        else if (meanValue < (thresholdValue + offsetValue) && mMovementDetected.getValue()){
+            mMovementDetected.setValue(false);
+        }
     }
 
-    public LiveData<Boolean> getAccelerometerAlarmDetected() {
-        return mAccelerometerAlarmDetected;
+    public LiveData<Boolean> getMovementDetectedValue() {
+        return mMovementDetected;
     }
 
     @Override
@@ -71,11 +96,6 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
         return mAlarmHistoryList;
     }
 
-    @Override
-    public LiveData<Boolean> getStartAlarmRecording() {
-        return mStartAlarmRecording;
-    }
-
     @Override
     public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);

app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java

@@ -20,9 +20,8 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
 
     private MutableLiveData<List<Device>> mDeviceList;
     private MutableLiveData<List<Device>> mAlarmHistoryList;
-    private MutableLiveData<Boolean> mStartAlarmRecording;
     private DeviceRepository mDeviceRepository;
-    private static final int RIGHTS_REQUEST_CAMERA = 10;
+    private static final int RECHTEANFORDERUNG_KAMERA = 10;
 
     @Override
     public void init() {
@@ -38,7 +37,6 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
         mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
         mDeviceList = mDeviceRepository.getConnectedDeviceList();
         mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
     }
 
     public boolean isCameraAccessAllowed(Context context) {
@@ -46,7 +44,7 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
     }
 
     public void accessRequestCamera(Activity activity) {
-        ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.CAMERA}, RIGHTS_REQUEST_CAMERA);
+        ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.CAMERA}, RECHTEANFORDERUNG_KAMERA);
     }
 
     @Override
@@ -59,11 +57,6 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
         return mAlarmHistoryList;
     }
 
-    @Override
-    public LiveData<Boolean> getStartAlarmRecording() {
-        return mStartAlarmRecording;
-    }
-
     @Override
     public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);

app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java

@@ -1,196 +0,0 @@
-package com.example.greenwatch.viewmodels;
-
-import android.content.Context;
-
-import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModel;
-
-import com.example.greenwatch.models.Device;
-import com.example.greenwatch.repositories.DeviceRepository;
-import com.example.greenwatch.sensors.AccelerometerSensor;
-import com.example.greenwatch.sensors.CameraSensor;
-
-import java.util.List;
-
-public class VideodetectionAndAccelerometerViewModel extends ViewModel implements ViewModelInterface{
-    private MutableLiveData<List<Device>> mDeviceList;
-    private MutableLiveData<Boolean> mAccelerometerAlarmDetected;
-    private MutableLiveData<Boolean> mVideoAlarmDetected;
-    private MutableLiveData<Boolean> mVideodetectionAndAccelerometerAlarmDetected = new MutableLiveData<>();
-    private MutableLiveData<List<Device>> mAlarmHistoryList;
-    private MutableLiveData<Boolean> mStartAlarmRecording;
-    private AccelerometerSensor mAccelerometerSensor;
-    private CameraSensor mCameraSensor;
-    private DeviceRepository mDeviceRepository;
-    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;
-        registerAlarmObserver();
-    }
-
-    public void addValueToGesamtBE(float newValue) {
-        mAccelerometerSensor.addValueToGesamtBE(newValue);
-    }
-
-    public void meanValueCalculation() {
-        mAccelerometerSensor.meanValueCalculation();
-    }
-
-    public void calibrateAccelerometerSensor() {
-        mAccelerometerSensor.calibrateAccelerometerSensor();
-    }
-
-    public void checkAlarmCondition() {
-        mAccelerometerSensor.checkAlarmCondition();
-    }
-
-    public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
-        mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
-    }
-
-    public LiveData<Boolean> getVideodetectionAndAccelerometerAlarmDetected() {
-        setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
-        return mVideodetectionAndAccelerometerAlarmDetected;
-    }
-
-    private void setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected() {
-        mVideodetectionAndAccelerometerAlarmDetected.setValue(VideodetectionAndAccelerometerAlarmDetected);
-    }
-
-    Observer<Boolean> observer = new Observer<Boolean>() {
-        @Override
-        public void onChanged(Boolean aBoolean) {
-            if (mVideoAlarmDetected.getValue() || mAccelerometerAlarmDetected.getValue() && !VideodetectionAndAccelerometerAlarmDetected) {
-                VideodetectionAndAccelerometerAlarmDetected = true;
-                setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
-
-            }
-            else if (!mVideoAlarmDetected.getValue() && !mAccelerometerAlarmDetected.getValue() && VideodetectionAndAccelerometerAlarmDetected) {
-                VideodetectionAndAccelerometerAlarmDetected = false;
-                setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
-            }
-        }
-    };
-
-    private void registerAlarmObserver() {
-        mVideoAlarmDetected.observeForever(observer);
-        mAccelerometerAlarmDetected.observeForever(observer);
-    }
-
-    @Override
-    protected void onCleared() {
-        super.onCleared();
-        mVideoAlarmDetected.removeObserver(observer);
-        mAccelerometerAlarmDetected.removeObserver(observer);
-    }
-
-    @Override
-    public LiveData<List<Device>> getConnectedDeviceList() {
-        return mDeviceList;
-    }
-
-    @Override
-    public LiveData<List<Device>> getAlarmHistoryList() {
-        return mAlarmHistoryList;
-    }
-
-    @Override
-    public LiveData<Boolean> getStartAlarmRecording() {
-        return mStartAlarmRecording;
-    }
-
-    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
-        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
-    }
-
-    @Override
-    public void setTimeStamp(String deviceID, String timeStamp) {
-        mDeviceRepository.setTimeStamp(deviceID, timeStamp);
-    }
-
-    @Override
-    public String getTimeStamp(String deviceID) {
-        return mDeviceRepository.getTimeStamp(deviceID);
-    }
-
-    @Override
-    public void setDeviceID(String deviceID, String newDeviceID) {
-        mDeviceRepository.setDeviceID(deviceID, newDeviceID);
-    }
-
-    @Override
-    public String getDeviceID(String deviceID) {
-        return mDeviceRepository.getDeviceID(deviceID);
-    }
-
-    @Override
-    public void setSensorStatus(String deviceID, boolean sensorStatus) {
-        mDeviceRepository.setSensorStatus(deviceID, sensorStatus);
-    }
-
-    @Override
-    public boolean getSensorStatus(String deviceID) {
-        return mDeviceRepository.getSensorStatus(deviceID);
-    }
-
-    @Override
-    public void setSensorType(String deviceID, String sensorType) {
-        mDeviceRepository.setSensorType(deviceID, sensorType);
-    }
-
-    @Override
-    public String getSensorType(String deviceID) {
-        return mDeviceRepository.getSensorType(deviceID);
-    }
-
-    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
-        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
-    }
-
-    @Override
-    public int getSensorMassage(String deviceID) {
-        return mDeviceRepository.getSensorMassage(deviceID);
-    }
-
-    @Override
-    public String getLocalDeviceUUID() {
-        return mDeviceRepository.getLocalDeviceUUID();
-    }
-
-    @Override
-    public String getSystemTimeStamp() {
-        return mDeviceRepository.getSystemTimeStamp();
-    }
-}

app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java

@@ -19,7 +19,6 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
     private MutableLiveData<List<Device>> mDeviceList;
     private MutableLiveData<Boolean> mVideoAlarmDetected;
     private MutableLiveData<List<Device>> mAlarmHistoryList;
-    private MutableLiveData<Boolean> mStartAlarmRecording;
     private DeviceRepository mDeviceRepository;
     private CameraSensor mCameraSensor;
 
@@ -42,9 +41,6 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
         if (mAlarmHistoryList == null) {
             mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
         }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
         if (mVideoAlarmDetected == null) {
             mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
         }
@@ -68,11 +64,6 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
         return mAlarmHistoryList;
     }
 
-    @Override
-    public LiveData<Boolean> getStartAlarmRecording() {
-        return mStartAlarmRecording;
-    }
-
     @Override
     public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);

app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java

@@ -10,7 +10,6 @@ public interface ViewModelInterface {
     void init();
     LiveData<List<Device>> getConnectedDeviceList();
     LiveData<List<Device>> getAlarmHistoryList();
-    LiveData<Boolean> getStartAlarmRecording();
     void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
     void setTimeStamp(String deviceID, String timeStamp);
     String getTimeStamp(String deviceID);

app/src/main/res/layout/activity_main.xml

@@ -8,12 +8,6 @@
     android:padding="10dp"
     tools:context=".MainActivity">
 
-    <Button
-        android:id="@+id/preview_kamera"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="PrewView Kamera" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/alarmHistoryListRecyclerView"
         android:layout_width="match_parent"
@@ -28,7 +22,6 @@
         android:layout_height="match_parent"
         android:layout_weight="3"
         tools:listitem="@layout/device_item">
-
     </androidx.recyclerview.widget.RecyclerView>
     
     <LinearLayout

app/src/main/res/layout/activity_preview_kamera.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="">
-
-    <Button
-        android:id="@+id/videodetectorBackToMainActivity"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Back to MainActivity">
-    </Button>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/erklaerung">
-
-        <androidx.camera.view.PreviewView
-            android:id="@+id/previewView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-    </FrameLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_videodetection_and_accelerometer.xml

@@ -9,24 +9,10 @@
     tools:context=".VideodetectionAndAccelerometerActivity">
 
     <TextView
-        android:id="@+id/tvvideodetectionAndAccelerometerStatusmessage"
+        android:id="@+id/tvVideodetectionAndAccelerometerStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="">
-    </TextView>
-
-    <TextView
-        android:id="@+id/tvvideodetectionAndAccelerometerData"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="">
-    </TextView>
-
-    <TextView
-        android:id="@+id/tvvideodetectionAndAccelerometerWarning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="">
+        android:text="Videodetection + Accelerometer Activity">
     </TextView>
 
     <Button
@@ -36,27 +22,4 @@
         android:text="Back to MainActivity">
     </Button>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/deviceListRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/device_item"
-            android:layout_weight="1">
-        </androidx.recyclerview.widget.RecyclerView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/alarmHistoryListRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/alarm_history_item"
-            android:layout_weight="1">
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </LinearLayout>
-
 </LinearLayout>