WIP: audio recorder

startDetection(), stopDetection(), isRunning()

app/build.gradle

@@ -3,11 +3,11 @@ plugins {
 }
 
 android {
-    namespace 'de.oklein.android.ueberwachungssystem'
+    namespace 'com.example.ueberwachungssystem'
     compileSdk 33
 
     defaultConfig {
-        applicationId "de.oklein.android.ueberwachungssystem"
+        applicationId "com.example.ueberwachungssystem"
         minSdk 28
         targetSdk 33
         versionCode 1
@@ -31,10 +31,18 @@ android {
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation "androidx.startup:startup-runtime:1.1.1"
+
+    // Required for CameraX
+    def camerax_version = "1.2.3"
+    implementation "androidx.camera:camera-core:${camerax_version}"
+    implementation "androidx.camera:camera-camera2:${camerax_version}"
+    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+    implementation "androidx.camera:camera-video:${camerax_version}"
+    implementation "androidx.camera:camera-view:${camerax_version}"
+    implementation "androidx.camera:camera-extensions:${camerax_version}"
 }

app/src/androidTest/java/com/example/ueberwachungssystem/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package de.oklein.android.ueberwachungssystem;
+package com.example.ueberwachungssystem;
 
 import android.content.Context;
 
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("de.oklein.android.ueberwachungssystem", appContext.getPackageName());
+        assertEquals("com.example.ueberwachungssystem", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -2,27 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-<!--    &lt;!&ndash; If your app targets Android 13 (API level 33)-->
-<!--         or higher, you must declare the NEARBY_WIFI_DEVICES permission. &ndash;&gt;-->
-<!--    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"-->
-<!--    &lt;!&ndash; If your app derives location information from Wi-Fi APIs,-->
-<!--         don't include the "usesPermissionFlags" attribute. &ndash;&gt;-->
-<!--        android:usesPermissionFlags="neverForLocation" />-->
+    <uses-feature android:name="android.hardware.camera"/>
 
-    <uses-permission
-        android:required="true"
-        android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <!-- If any feature in your app relies on precise location information,
-         don't include the "maxSdkVersion" attribute. -->
-    <uses-permission
-        android:required="true"
-        android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission
-        android:required="true"
-        android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission
-        android:required="true"
-        android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:allowBackup="true"

app/src/main/java/com/example/ueberwachungssystem/AudioRecorder.java

@@ -0,0 +1,76 @@
+package com.example.ueberwachungssystem;
+
+import android.content.Context;
+import android.hardware.Camera;
+import android.media.CamcorderProfile;
+import android.media.MediaPlayer;
+import android.media.MediaRecorder;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.widget.VideoView;
+
+import java.io.File;
+import java.io.IOException;
+
+public class AudioRecorder {
+    private final Context context;
+    private Camera camera;
+    private MediaRecorder mediaRecorder = null;
+    private SurfaceView surfaceView;
+
+    public AudioRecorder (Context context) {
+        this.context = context;
+        this.surfaceView = new SurfaceView(context);
+    }
+
+
+    public void startRecording() {
+
+        mediaRecorder = new MediaRecorder();
+
+        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+        mediaRecorder.setOutputFile(context.getFilesDir() + "/audio.mp3");
+
+
+        try {
+            mediaRecorder.prepare();
+            mediaRecorder.start();
+        } catch (IOException e) {
+            Log.e("audioRecorder", "prepare() failed");
+        }
+    }
+
+    public void stopRecording() {
+        if (mediaRecorder != null) {
+            try {
+                mediaRecorder.stop();
+                mediaRecorder.release();
+                mediaRecorder = null;
+            } catch (RuntimeException e) {
+                // RuntimeException may be thrown if the MediaRecorder is in an invalid state
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void playAudio() {
+        MediaPlayer mp = new MediaPlayer();
+        try {
+            mp.setDataSource(context.getFilesDir() + "/audio.mp3");
+            mp.prepare();
+            mp.start();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public void deleteRecording(){
+        File file = new File(context.getFilesDir() + "/audio.mp3");
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java

@@ -0,0 +1,36 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.util.Log;
+
+import java.util.Calendar;
+
+/** Detection Report Class */
+public class DetectionReport {
+    public String timeStamp;
+    public String detectionType;
+    public float detectedValue;
+    public String detectorID;
+
+    public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) {
+        this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
+        this.detectionType = detectionType;
+        this.detectedValue = detectedAmplitude;
+        this.detectorID = detectorID;
+    }
+
+
+    /** Get Detection Report in String format */
+    public String toString() {
+        String time = "Time: " + "[" + this.timeStamp + "]";
+        String type = "Type: " + "[" + this.detectionType + "]";
+        String value = "Value: " + "[" + this.detectedValue + "]";
+        String id = "ID: " + "[" + this.detectorID + "]";
+
+        return String.join("\t", time, type, value, id);
+    }
+
+    /** Debug Report */
+    public void log(String tag) {
+        Log.d(tag, this.toString());
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/Detector.java

@@ -0,0 +1,38 @@
+package com.example.ueberwachungssystem.Detection;
+
+import androidx.annotation.NonNull;
+
+
+abstract public class Detector {
+    private OnDetectionListener listener;
+
+    /** Constructor - takes context of current activity */
+    public Detector() {}
+
+
+    /** On Detection Listener - runs when violation is reported */
+    public interface OnDetectionListener {
+        void onDetection(@NonNull DetectionReport detectionReport);
+    }
+    public void setOnDetectionListener(@NonNull OnDetectionListener listener) {
+        this.listener = listener;
+    }
+
+
+    /** Triggers onDetectionListener - call this to trigger violation/alarm */
+    public void reportViolation(String detectorID, String detectionType, float amplitude) {
+        if (listener != null) {
+            DetectionReport detectionReport = new DetectionReport(detectorID, detectionType, amplitude);
+            listener.onDetection(detectionReport);
+        } else {
+            throw new IllegalStateException("No listener set for violation reporting");
+        }
+    }
+
+
+    /** Starts Detection (abstract method: needs to be overridden in child class) */
+    public abstract void startDetection();
+
+    /** Stops Detection (abstract method: needs to be overridden in child class) */
+    public abstract void stopDetection();
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java

@@ -0,0 +1,257 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.ImageFormat;
+import android.media.Image;
+import android.util.Size;
+import android.view.Surface;
+import android.widget.Toast;
+import android.widget.VideoView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.Preview;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.concurrent.ExecutionException;
+
+
+/**
+ * Video Detector inherits some methods from abstract Detector class (more info there)
+ *
+ *
+ * USE FROM MAIN ACTIVITY:
+ *
+ * VideoDetector vd = new VideoDetector(this);
+ * vd.setPreview(previewView);  //THIS IS OPTIONAL!
+ * vd.setOnDetectionListener(new Detector.OnDetectionListener{...});
+ * vd.startDetection();
+ * vd.stopDetection
+ *
+ * */
+
+
+@ExperimentalGetImage
+public class VideoDetector extends Detector {
+
+    // Calling Activity
+    private final Context context;
+    // Camera Provider
+    private ProcessCameraProvider cameraProvider;
+    private Boolean isDetectionRunning = false;
+    // Preview Camera Image
+    private PreviewView previewView = null;
+    private VideoCapture videoCapture = null;
+    // Detect Violation
+    private static final float PIXEL_THRESHOLD = 30f;  // Luminosity (brightness channel of YUV_420_888)
+    private static final float ALARM_THRESHOLD = 0.2f;   // Percent of pixels changed
+    private ByteBuffer previousBuffer = null;
+
+
+    /**
+     * Constructor
+     * @param context: the context of calling activity (usually "this")
+     * */
+    public VideoDetector(Context context) {
+        super();
+        this.context = context;
+    }
+
+
+    /**
+     *  Starts the Video Detection
+     * */
+    @Override
+    public void startDetection() {
+        if (isDetectionRunning)
+            return;
+        // Request Camera Provider
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+        //Check for Camera availability
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                bindAnalysis(cameraProvider);
+                isDetectionRunning = true;
+                previousBuffer = null;
+            } catch (ExecutionException | InterruptedException e) {
+                // No errors need to be handled for this Future. This should never be reached.
+            }
+        }, ContextCompat.getMainExecutor(context));
+    }
+
+
+    /**
+     * Stops the Video Detection
+     * */
+    @Override
+    public void stopDetection() {
+        if (!isDetectionRunning)
+            return;
+        cameraProvider.unbindAll();
+        isDetectionRunning = false;
+    }
+
+
+    /**
+     * Set PreviewView to show video feed while detecting
+     * this is optional and does not need to be called
+     * */
+    public void setPreviewView(PreviewView previewView) {
+        this.previewView = previewView;
+    }
+
+
+    /**
+     * Binds the Luminosity Analyzer (configure and run Analysis)
+     * @param cameraProvider: CameraProvider of Context passed by Constructor
+     * */
+    @SuppressLint("RestrictedApi")
+    private void bindAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
+        // Configure and create Image Analysis
+        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
+        builder.setTargetResolution(new Size(640, 480));
+        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
+        builder.setOutputImageFormat(ImageAnalysis.OUTPUT_IMAGE_FORMAT_YUV_420_888);
+        ImageAnalysis imageAnalysis = builder.build();
+
+        // Set Analyzer
+        imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(context), imageProxy -> {
+            if (imageProxy.getFormat() == ImageFormat.YUV_420_888) {
+                Image image = imageProxy.getImage();
+                assert image != null;
+
+                // Changed Pixel Detection
+                int pixelChanged = getChangedPixelCount(image);
+                int width = image.getWidth();
+                int height = image.getHeight();
+
+                float percentPixelChanged = (float) 100f * pixelChanged / (width * height);
+
+                if (percentPixelChanged > ALARM_THRESHOLD)
+                    reportViolation("0", "Video", percentPixelChanged);
+            }
+            imageProxy.close();
+        });
+        // Create Preview
+        Preview preview = new Preview.Builder().build();
+        // Specify which Camera to use
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+        // Update PreviewView if set
+        if (previewView != null)
+            preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        videoCapture = new VideoCapture.Builder()
+                .setVideoFrameRate(30)
+                .setTargetRotation(Surface.ROTATION_0)
+                .build();
+
+
+        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, videoCapture);
+    }
+
+
+    @SuppressLint("RestrictedApi")
+    public void startRecording() {
+
+        File dir = context.getFilesDir();
+        String filename = "recording";
+        String vidFilePath = dir.getAbsolutePath() + "/" + filename + ".mp4";
+        File vidFile = new File(vidFilePath);
+
+        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return;
+        }
+        videoCapture.startRecording(
+                new VideoCapture.OutputFileOptions.Builder(vidFile).build(),
+                context.getMainExecutor(),
+                new VideoCapture.OnVideoSavedCallback() {
+                    @Override
+                    public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
+                        Toast.makeText(context, "recording saved", Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
+                        Toast.makeText(context, "recording failed", Toast.LENGTH_SHORT).show();
+                    }
+                }
+        );
+    }
+
+    @SuppressLint("RestrictedApi")
+    public void stopRecording(){
+        videoCapture.stopRecording();
+    }
+
+    /**
+     * Calculate Amount of Pixels changed using a threshold
+     * @param image
+     * */
+    private int getChangedPixelCount(Image image) {
+        Image.Plane[] planes = image.getPlanes();
+        ByteBuffer buffer = planes[0].getBuffer();
+
+        if (previousBuffer == null) {
+            previousBuffer = ByteBuffer.allocate(buffer.capacity());
+            buffer.rewind();
+            previousBuffer.put(buffer);
+            previousBuffer.rewind();
+            return 0;
+        }
+
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        int yRowStride = image.getPlanes()[0].getRowStride();
+        int yPixelStride = image.getPlanes()[0].getPixelStride();
+
+        int changedPixelCount = 0;
+
+        // Count changed pixels
+        for (int y = 0; y < height; ++y) {
+            for (int x = 0; x < width; x++) {
+                int index = (y * yRowStride) + (x * yPixelStride);
+                int luminosity = (buffer.get(index) & 0xff);
+                int previousLuminosity = (previousBuffer.get(index) & 0xff);
+                int diff = Math.abs(luminosity - previousLuminosity);
+                if (diff > PIXEL_THRESHOLD)
+                    changedPixelCount++;
+            }
+        }
+
+        // Reset and copy Byte Buffer
+        buffer.rewind();
+        previousBuffer.rewind();
+        previousBuffer.put(buffer);
+
+        return changedPixelCount;
+    }
+
+    public void playVideo(VideoView videoView) {
+        videoView.setVideoPath(context.getFilesDir() + "/recording.mp4");
+        videoView.start();
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/DetectionRecorder.java

@@ -0,0 +1,147 @@
+package com.example.ueberwachungssystem;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.media.MediaPlayer;
+import android.view.Surface;
+import android.widget.Toast;
+import android.widget.VideoView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.Preview;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.io.File;
+import java.util.concurrent.ExecutionException;
+
+public class DetectionRecorder {
+
+    private final Context context;
+    private ProcessCameraProvider cameraProvider;
+    private VideoCapture videoCapture = null;
+    private PreviewView previewView = null;
+    private boolean isRunning = false;
+    private boolean isVideoPlaying = false;
+
+
+    // Constructor
+    public DetectionRecorder(Context context) {
+        this.context = context;
+    }
+
+
+    public void start() {
+        if (isRunning)
+            return;
+        isRunning = true;
+
+        // Request Camera Provider
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+        //Check for Camera availability
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                startCameraX(cameraProvider);
+            } catch (ExecutionException | InterruptedException e) {
+                // No errors need to be handled for this Future. This should never be reached.
+            }
+        }, ContextCompat.getMainExecutor(context));
+    }
+
+
+    @SuppressLint("RestrictedApi")
+    public void stop() {
+        if (!isRunning)
+            return;
+
+        videoCapture.stopRecording();
+        cameraProvider.unbind(videoCapture);
+        isRunning = false;
+    }
+
+    @SuppressLint("RestrictedApi")
+    private void startCameraX(ProcessCameraProvider cameraProvider) {
+        //cameraProvider.unbindAll();
+
+        CameraSelector cameraSelector = new CameraSelector.Builder()
+                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+                .build();
+
+        // Preview Use Case
+        Preview preview = new Preview.Builder().build();
+        if (previewView != null)
+            preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        // Video Capture Use Case
+        videoCapture = new VideoCapture.Builder()
+                .setVideoFrameRate(30)
+                .setTargetRotation(Surface.ROTATION_0)
+                .build();
+
+        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, preview, videoCapture);
+
+
+        File dir = context.getFilesDir();
+        String filename = "recording";
+        String vidFilePath = dir.getAbsolutePath() + "/" + filename + ".mp4";
+        File vidFile = new File(vidFilePath);
+
+        if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return;
+        }
+        videoCapture.startRecording(
+                new VideoCapture.OutputFileOptions.Builder(vidFile).build(),
+                context.getMainExecutor(),
+                new VideoCapture.OnVideoSavedCallback() {
+                    @Override
+                    public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
+                        Toast.makeText(context, "recording saved", Toast.LENGTH_SHORT).show();
+                    }
+                    @Override
+                    public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
+                        Toast.makeText(context, "recording failed", Toast.LENGTH_SHORT).show();
+                    }
+                }
+        );
+    }
+
+    /** Set PreviewView to show Image */
+    public void setPreviewView(PreviewView previewView) {
+        this.previewView = previewView;
+    }
+
+    private void playAudio() {
+        MediaPlayer mp = new MediaPlayer();
+        try {
+            mp.setDataSource(context.getFilesDir() + "/audio.gpp");
+            mp.prepare();
+            mp.start();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void playVideo(VideoView videoView) {
+        if (isVideoPlaying)
+            return;
+        videoView.setVideoPath(context.getFilesDir() + "/recording.mp4");
+        videoView.start();
+    }
+}

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

@@ -0,0 +1,120 @@
+package com.example.ueberwachungssystem;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.camera.core.ExperimentalGetImage;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+import android.widget.VideoView;
+
+import com.example.ueberwachungssystem.Detection.DetectionReport;
+import com.example.ueberwachungssystem.Detection.Detector;
+import com.example.ueberwachungssystem.Detection.VideoDetector;
+
+import java.io.File;
+import java.util.Arrays;
+
+@ExperimentalGetImage
+public class MainActivity extends AppCompatActivity {
+
+    private static final int PERMISSION_REQUEST_CODE = 111;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        TextView textView = findViewById(R.id.textView);
+        VideoView videoView = findViewById(R.id.videoView);
+        PreviewView previewView = findViewById(R.id.previewView);
+
+        File directory = getFilesDir();
+
+
+        AudioRecorder ar = new AudioRecorder(this);
+
+
+        //DetectionRecorder detectionRecorder = new DetectionRecorder(this);
+        //detectionRecorder.setPreviewView(previewView);
+
+        ToggleButton toggleButton = findViewById(R.id.previewButton);
+        ToggleButton toggleButton2 = findViewById(R.id.toggleButton2);
+
+        toggleButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getRecordVideoAccess();
+                File[] files = directory.listFiles();
+                textView.setText(Arrays.toString(files));
+
+                if (isRecordVideoAllowed() && toggleButton.isChecked())
+                {
+                    ar.startRecording();
+                    //vd.startRecording();
+                    //vd.playVideo(videoView);
+                    //detectionRecorder.playVideo(videoView);
+                    //detectionRecorder.start();
+                }
+                else {
+                    ar.stopRecording();
+                    //vd.stopRecording();
+
+                    //detectionRecorder.stop();
+                }
+            }
+        });
+
+        toggleButton2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (toggleButton.isChecked())
+                {
+                    ar.playAudio();
+                }
+                else {
+                    ar.deleteRecording();
+                }
+            }
+        });
+    }
+
+    private boolean isRecordVideoAllowed() {
+        return ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED &&
+                ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void getRecordVideoAccess() {
+        if (!isRecordVideoAllowed()) {
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO}, PERMISSION_REQUEST_CODE);
+        }
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PERMISSION_REQUEST_CODE && grantResults.length > 0) {
+
+            boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+            boolean recordAudioRights = grantResults[1] == PackageManager.PERMISSION_GRANTED;
+
+            if (cameraRights && recordAudioRights) {
+                Toast.makeText(this, "permissions granted", Toast.LENGTH_LONG).show();
+            } else {
+                Toast.makeText(this, "permissions denied", Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+}

app/src/main/java/de/oklein/android/ueberwachungssystem/Logger/Logger.java

@@ -1,44 +0,0 @@
-package de.oklein.android.ueberwachungssystem.Logger;
-
-import android.util.Log;
-import android.widget.TextView;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class Logger {
-    private TextView textView;
-    private StringBuffer sb = new StringBuffer();
-    private String tag;
-
-    public Logger(String tag, TextView textView, String logInitText)  {
-        this.tag = tag;
-        this.textView = textView;
-        sb.append(logInitText);
-    }
-
-    public void log(String s)  {
-        Log.d(tag, s);
-        sb.append(s).append("\n");
-        if (textView != null) {
-            textView.setText(sb.toString());
-        }
-    }
-
-    public void log(Exception e)  {
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw));
-        log(sw.toString());
-    }
-
-    public void clearLog()  {
-        sb.setLength(0);
-        if (textView != null) {
-            textView.setText("");
-        }
-    }
-
-    public String getLoggedText()  {
-        return sb.toString();
-    }
-}

app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java

@@ -1,170 +0,0 @@
-package de.oklein.android.ueberwachungssystem;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import org.w3c.dom.Text;
-
-public class MainActivity extends AppCompatActivity {
-    private Fragment aktuellesFragment;
-    private TextView alarm;
-    private String text = "Das ist ein Alarm des Sensors";
-    private void log(String nachricht) {
-        Log.d(this.getClass().getSimpleName(), nachricht);
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setTitle(this.getClass().getSimpleName());
-        setContentView(R.layout.activity_main);
-        alarm = findViewById(R.id.Alarm);
-        alarm.setText(text);
-    }
-    public void onClickZeigeFragment1(View view) {
-        Button button = (Button) view;
-        log(button.getText() + " ausgewählt");
-        zeigeFragment(Fragment1.erstellen("Fragment 1 wurde angeklickt"));
-    }
-    public void onClickZeigeFragment2(View view) {
-        Button button = (Button) view;
-        log(button.getText() + " ausgewählt");
-        zeigeFragment(Fragment2.erstellen("Fragment 2 wurde angeklickt"));
-    }
-
-    public void onClickZeigeFragment3(View view) {
-        Button button = (Button) view;
-        log(button.getText() + " ausgewählt");
-        zeigeFragment(Fragment3.erstellen("Fragment 3 wurde angeklickt"));
-    }
-
-    public void onClickEntferneFragment(View view) {
-        entferneFragment();
-    }
-    private void zeigeFragment(Fragment fragment) {
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.replace(R.id.frame, fragment);
-        ft.commit();
-        aktuellesFragment = fragment;
-    }
-    private void entferneFragment() {
-        if (aktuellesFragment != null) {
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.remove(aktuellesFragment);
-            ft.commit();
-            aktuellesFragment = null ;
-        }
-    }
-    public static class Fragment1 extends Fragment {
-        private String text;
-        private final static String KEY_TEXT = "KEY_TEXT";
-
-        private void log(String nachricht) {
-            Log.d(this.getClass().getSimpleName(), nachricht);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-            log("onCreateView");
-            View view = inflater.inflate(R.layout.fragment1, container, false);
-            TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
-            Sensor.setText(text);
-            return view;
-        }
-        public static Fragment1 erstellen(String text) {
-            Fragment1 fragment = new Fragment1();
-            Bundle b = new Bundle();
-            b.putString(KEY_TEXT, text);
-            fragment.setArguments(b);
-            return fragment;
-        }
-        @Override
-        public void onCreate(Bundle bundle) {
-            super .onCreate(bundle);
-            Bundle args = getArguments();
-            if (args != null ) {
-                text = args.getString(KEY_TEXT);
-                log("onCreate: text=" + text);
-            } else {
-                log("onCreate");
-            }
-        }
-    }
-    public static class Fragment2 extends Fragment {
-        private String text;
-        private final static String KEY_TEXT = "KEY_TEXT" ;
-        private void log(String nachricht) {
-            Log.d(this.getClass().getSimpleName(), nachricht);
-        }
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-            log( "onCreateView" );
-            View view = inflater.inflate(R.layout.fragment2, container, false );
-            TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
-            Sensor.setText(text);
-            return view;
-        }
-        public static Fragment2 erstellen(String text) {
-            Fragment2 fragment = new Fragment2();
-            Bundle b = new Bundle();
-            b.putString(KEY_TEXT, text);
-            fragment.setArguments(b);
-            return fragment;
-        }
-        @Override
-        public void onCreate(Bundle bundle) {
-            super.onCreate(bundle);
-            Bundle args = getArguments();
-            if (args != null) {
-                text = args.getString(KEY_TEXT);
-                log("onCreate: text=" + text);
-            } else {
-                log("onCreate");
-            }
-        }
-    }
-
-    public static class Fragment3 extends Fragment {
-        private String text;
-        private final static String KEY_TEXT = "KEY_TEXT" ;
-        private void log(String nachricht) {
-            Log.d(this.getClass().getSimpleName(), nachricht);
-        }
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-            log( "onCreateView" );
-            View view = inflater.inflate(R.layout.fragment2, container, false );
-            TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
-            Sensor.setText(text);
-            return view;
-        }
-        public static Fragment3 erstellen(String text) {
-            Fragment3 fragment = new Fragment3();
-            Bundle b = new Bundle();
-            b.putString(KEY_TEXT, text);
-            fragment.setArguments(b);
-            return fragment;
-        }
-        @Override
-        public void onCreate(Bundle bundle) {
-            super.onCreate(bundle);
-            Bundle args = getArguments();
-            if (args != null) {
-                text = args.getString(KEY_TEXT);
-                log("onCreate: text=" + text);
-            } else {
-                log("onCreate");
-            }
-        }
-    }
-}

app/src/main/res/layout-land/activity_main_land.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>

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

@@ -1,123 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
-    android:background="@android:color/holo_green_dark"
-    android:visibility="visible"
-    tools:context="de.oklein.android.ueberwachungssystem.MainActivity"
-    tools:visibility="visible">
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textSize="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 
     <ToggleButton
-        android:id="@+id/toggleKamera"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
-        android:layout_marginRight="15dp"
-        android:layout_toStartOf="@+id/toggleAudio"
-        android:layout_toLeftOf="@id/toggleAudio"
-        android:text="Kamera" />
-
-    <ToggleButton
-        android:id="@+id/toggleAudio"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:text="Audio" />
-
-    <ToggleButton
-        android:id="@+id/toggleBewegung"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
-        android:layout_marginLeft="15dp"
-        android:layout_toEndOf="@+id/toggleAudio"
-        android:layout_toRightOf="@id/toggleAudio"
-        android:text="Bewegung" />
-
-    <Button
-        android:id="@+id/btnAudio"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/btnKamera"
-        android:layout_marginRight="15dp"
-        android:layout_toStartOf="@+id/btnKamera"
-        android:onClick="onClickZeigeFragment1"
-        android:text="Audio" />
-
-    <Button
-        android:id="@+id/btnKamera"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/toggleAudio"
-        android:layout_centerHorizontal="true"
-        android:onClick="onClickZeigeFragment2"
-        android:text="Kamera" />
-
-    <!--
-    <Button
-        android:id="@+id/btnSensorWeg"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@+id/btn1"
-        android:text="Entferne Sensordarstellung"
-        android:onClick="onClickEntferneFragment"/>
-    -->
-    <Button
-        android:id="@+id/btnBewegung"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/btnKamera"
-        android:layout_marginLeft="15dp"
-        android:layout_toEndOf="@+id/btnKamera"
-        android:layout_toRightOf="@id/btnKamera"
-        android:onClick="onClickZeigeFragment3"
-        android:text="Bewegung" />
-
-    <Button
-        android:id="@+id/btnAufnahme"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnKamera"
-        android:layout_toLeftOf="@id/btnKamera"
-        android:layout_marginRight="15dp"
-        android:onClick="onClickEntferneFragment"
-        android:text="Aufnahme" />
-
-    <Button
-        android:id="@+id/btnWiedergabe"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnKamera"
-        android:layout_toRightOf="@id/btnKamera"
-        android:layout_marginLeft="15dp"
-        android:onClick="onClickEntferneFragment"
-        android:text="Wiedergabe" />
-
-    <FrameLayout
-        android:id="@+id/frame"
+        android:id="@+id/previewButton"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:layout_below="@+id/btnZwischen"
-        android:layout_alignParentStart="true">
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        android:text="ToggleButton" />
 
-    <ScrollView
-        android:id= "@+id/scrollView1"
-        android:layout_width= "wrap_content"
-        android:layout_height= "wrap_content"
-        android:layout_below= "@id/frame">
-        <LinearLayout
-            android:layout_width= "match_parent"
-            android:layout_height= "match_parent"
-            android:orientation= "vertical" >
-            <TextView
-                android:id= "@+id/Alarm"
-                android:layout_width= "wrap_content"
-                android:layout_height= "wrap_content" />
-        </LinearLayout>
-    </ScrollView>
 
-</RelativeLayout>
+    <ToggleButton
+        android:id="@+id/toggleButton2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="ToggleButton" />
+
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
+        android:layout_width="match_parent"
+        android:layout_height="200dp" />
+
+    <VideoView
+        android:id="@+id/videoView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</LinearLayout>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_green_light">
-
-    <TextView
-        android:id="@+id/Sensor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    <TextView
-        android:id="@+id/Alarm"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/Sensor"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-</RelativeLayout>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_blue_light" >
-
-    <TextView
-        android:id="@+id/Sensor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    <TextView
-        android:id="@+id/Alarm"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/Sensor"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-</LinearLayout>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_blue_light" >
-
-    <TextView
-        android:id="@+id/Sensor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-    <TextView
-        android:id="@+id/Alarm"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/Sensor"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-</LinearLayout>

app/src/test/java/com/example/ueberwachungssystem/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package de.oklein.android.ueberwachungssystem;
+package com.example.ueberwachungssystem;
 
 import org.junit.Test;
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu May 11 15:19:24 CEST 2023
+#Thu May 11 15:04:30 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists