Notiz.txt

@@ -0,0 +1,3 @@
+Sensor als Service einrichten, der aus Activity heraus gestartet werden kann.
+Stichwort: Intent
+Siehe Skript Teil 1

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

@@ -12,7 +12,7 @@ abstract public class Detector {
     private boolean extendViolation = false;
 
     // Countdown parameters
-    private final int COUNTDOWN_TIME = 5000;          // milliseconds
+    private final int COUNTDOWN_TIME = 10000;          // milliseconds
     private final int COUNTDOWN_POLLING_TIME = 100;   // milliseconds
 
     /** Constructor - takes context of current activity */

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

@@ -3,7 +3,6 @@ package com.example.ueberwachungssystem.Detection;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
-import android.util.Log;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
@@ -11,8 +10,6 @@ import androidx.annotation.Nullable;
 import androidx.camera.core.ExperimentalGetImage;
 import androidx.lifecycle.LifecycleService;
 
-import com.example.ueberwachungssystem.WifiCommunication;
-
 import java.io.File;
 
 @ExperimentalGetImage
@@ -27,38 +24,12 @@ public class DetectorService extends LifecycleService {
     public Accelerometer motionDetector = null;
     public MicrophoneDetector audioDetector = null;
 
-    public WifiCommunication wifiCommunication;
-
-
-    String wifiData;
-    StringBuffer stringBufferWifi = new StringBuffer();
-
-    String typOfAlarm;
-
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (isServiceRunning)
             return START_NOT_STICKY;
 
-        /** Wifi Instanz **/
-        wifiCommunication = new WifiCommunication(1234);
-        wifiCommunication.sendTrue("TEst");
-
-        wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
-            @Override
-            public void onConnection(String data) {
-                Log.d("Listener", data);
-                wifiData = data;
-                stringToStringbuffer(data);
-                Log.d("buffer",stringBufferWifi.toString());
-                passToServiceListener(stringBufferWifi);
-                checkState(data);
-                checkTyp(data);
-            }
-        });
-
-
 
 
 
@@ -67,17 +38,7 @@ public class DetectorService extends LifecycleService {
         videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                //passToServiceListener(detectionReport);
+                passToServiceListener(detectionReport);
-
-                if(detectionReport.detectionState){
-                    videoDetector.startRecording();
-                } else {
-                    videoDetector.stopRecording();
-                }
-
-                wifiCommunication.sendTrue(detectionReport.toMessage());
-
-
             }
         });
         /** Motion Detection**/
@@ -86,8 +47,7 @@ public class DetectorService extends LifecycleService {
         motionDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                //passToServiceListener(detectionReport);
+                passToServiceListener(detectionReport);
-                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Audio Detection **/
@@ -95,8 +55,7 @@ public class DetectorService extends LifecycleService {
         audioDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                //passToServiceListener(detectionReport);
+                passToServiceListener(detectionReport);
-                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Audio Recorder**/
@@ -133,44 +92,18 @@ public class DetectorService extends LifecycleService {
 
 
     /** Pass Detection Report to Service Detection Listener and trigger it */
-    public void passToServiceListener(StringBuffer stringBuffer) {
+    public void passToServiceListener(DetectionReport detectionReport) {
         if (listener != null) {
-            listener.onDetection(stringBuffer);
+            listener.onDetection(detectionReport);
         }
     }
 
 
     /** On Detection Listener - runs when violation is reported */
     public interface OnDetectionListener {
-        void onDetection(@NonNull StringBuffer stringBuffer);
+        void onDetection(@NonNull DetectionReport detectionReport);
     }
     public void setOnDetectionListener(@NonNull DetectorService.OnDetectionListener listener) {
         this.listener = listener;
     }
-
-    public void stringToStringbuffer(String string){
-        if(string != null) {
-            stringBufferWifi.insert(0,string + "\n");
-        }
-    }
-
-    public String[] splitString(String string){
-        String[] splitrxString = string.split(",");
-        return splitrxString; //splitrxString[0] = "1",splitrxString[1] = "HH:MM:SS", splitrxString[0].equals("1")
-
-    }
-
-
-    public boolean checkState(String string){
-        Log.d("state", String.valueOf(splitString(string)[4].equals("An")));
-        return splitString(string)[4].equals("An");
-    }
-
-    public String checkTyp(String string){
-        if (splitString(string)[5] != null) {
-            typOfAlarm = splitString(string)[5];
-            Log.d("Type",  typOfAlarm);
-        }
-        return typOfAlarm;
-    }
 }

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

@@ -2,16 +2,24 @@ package com.example.ueberwachungssystem.Detection;
 
 import static java.lang.Math.*;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex;
 import com.example.ueberwachungssystem.Detection.Signalverarbeitung.FFT;
+import com.example.ueberwachungssystem.Detection.DetectionReport;
+import com.example.ueberwachungssystem.Detection.Detector;
 
 public class MicrophoneDetector extends Detector {
     /**
@@ -20,9 +28,11 @@ public class MicrophoneDetector extends Detector {
      * @param context
      */
 
+    private static final int RECHTEANFORDERUNG_MIKROFON = 1;
+
     private AufnahmeTask aufnahmeTask;
     public boolean armed = false;
-    public int schwellwertAlarm = 100;
+    public int Schwellwert_Alarm = 100;
     private Context context;
 
     public MicrophoneDetector(Context context) {
@@ -48,17 +58,12 @@ public class MicrophoneDetector extends Detector {
         private final int sampleRateInHz = 44100;
         private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
         private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
-
-        private final int startDelay = 2000;
-        private final int threadSleeptime = 10;
         private int minPufferGroesseInBytes;
         private int pufferGroesseInBytes;
         private RingPuffer ringPuffer = new RingPuffer(10);
         private float kalibierWert;
         private com.example.ueberwachungssystem.Detection.DetectionReport detectionReport;
 
-
-
         @SuppressLint("MissingPermission")
         AufnahmeTask() {
             minPufferGroesseInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
@@ -107,6 +112,8 @@ public class MicrophoneDetector extends Detector {
 
             Log.d("0","Konfiguration: "+ s);
 
+            int pufferGroesseInAnzahlAbtastwerten = pufferGroesseInBytes / anzahlBytesProAbtastwert;
+
         }
 
         @Override
@@ -122,7 +129,7 @@ public class MicrophoneDetector extends Detector {
 
             //Kalibrierung
             try {
-                Thread.sleep(startDelay); // Time to lay down the phone
+                Thread.sleep(3000); // Time to lay down the phone
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -132,7 +139,7 @@ public class MicrophoneDetector extends Detector {
                 Verarbeitungsergebnis kalibrierErgebnis = verarbeiten(puffer, n);
                 kalibierWert += kalibrierErgebnis.maxAmp;
                 try {
-                    Thread.sleep(threadSleeptime);
+                    Thread.sleep(50);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
@@ -186,7 +193,7 @@ public class MicrophoneDetector extends Detector {
                     publishProgress(ergebnis);
 
                     try {
-                        Thread.sleep(threadSleeptime);
+                        Thread.sleep(10);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
@@ -214,7 +221,7 @@ public class MicrophoneDetector extends Detector {
 
                 ringPuffer.hinzufuegen(max);
                 maxAmp = ringPuffer.maximum();
-                if (maxAmp <= schwellwertAlarm + kalibierWert) {
+                if (maxAmp <= Schwellwert_Alarm+kalibierWert) {
                     armed = true;
                 }
             }
@@ -227,10 +234,10 @@ public class MicrophoneDetector extends Detector {
             super.onProgressUpdate(progress);
             float maxAmpPrint = round(20*log10(abs(progress[0].maxAmp/1.0)));
             float kalibierWertPrint = round(20*log10(abs(kalibierWert)));
-            Log.d("alarmAudio","VR: " + progress[0].verarbeitungsrate + ", Amp: " + maxAmpPrint
+            Log.d("0","VR, Max, Kal:" + progress[0].verarbeitungsrate + ", " + maxAmpPrint
-            + " dB, Kal: " + kalibierWertPrint + " dB");
+            + " dB, " + kalibierWertPrint + " dB");
 
-            if (progress[0].maxAmp >= schwellwertAlarm + kalibierWert && armed == true) {
+            if (progress[0].maxAmp >= Schwellwert_Alarm+kalibierWert && armed == true) {
                 armed = false;
                 detectionReport = new DetectionReport(true, "Audio", maxAmpPrint);
                 reportViolation("Audio", maxAmpPrint);
@@ -352,6 +359,16 @@ public class MicrophoneDetector extends Detector {
             this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
         }
 
+        float MittelwertPuffer(short[] puffer) {
+
+            for (int i = 0; i < puffer.length; i++) {
+                mittelwert = Math.abs(puffer[i]);
+            }
+            mittelwert = mittelwert/puffer.length;
+
+            return mittelwert;
+        }
+
         float mittel(float wert) {
             if (istMittelwertGesetzt) {
                 mittelwert = wert * wichtungNeuerWert + mittelwert * wichtungAlterWert;

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

@@ -76,7 +76,7 @@ public class VideoDetector extends Detector {
     private static final float ALARM_THRESHOLD = 0f;   // Percent of pixels changed
     private static final float AREA_THRESHOLD = 10f;
     private static final int DILATE_ITERATIONS = 2;
-    private static final float START_DELAY = 2000;   // milliseconds
+    private static final float START_DELAY = 20000;   // milliseconds
     private static final android.util.Size IMAGE_RES = new android.util.Size(640, 480);
 
 
@@ -134,7 +134,7 @@ public class VideoDetector extends Detector {
         if (isRecording){
             return;
         }
-        Toast.makeText(context, "Aufnahme gestartet", Toast.LENGTH_SHORT).show();
+
         videoCapture = setupVideoCapture();
 
         final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
@@ -155,12 +155,12 @@ public class VideoDetector extends Detector {
                             @Override
                             public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
                                 isRecording = false;
-                                Toast.makeText(context, "Aufnahme gespeichert", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(context, "video recording saved", Toast.LENGTH_SHORT).show();
                             }
                             @Override
                             public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
                                 isRecording = false;
-                                Toast.makeText(context, "Aufnahme fehlgeschlagen", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(context, "video recording failed", Toast.LENGTH_SHORT).show();
                             }
                         }
                 );

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment1.java

@@ -1,26 +1,20 @@
 package com.example.ueberwachungssystem.Fragments;
 
-import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.VideoView;
 
 import androidx.fragment.app.Fragment;
 
 import com.example.ueberwachungssystem.R;
 
-import java.io.File;
-
 public 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);
     }
@@ -29,7 +23,7 @@ public class Fragment1 extends Fragment {
     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.Alarm);
+        TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
         Sensor.setText(text);
         return view;
     }
@@ -40,16 +34,9 @@ public class Fragment1 extends Fragment {
         fragment.setArguments(b);
         return fragment;
     }
-    public static Fragment1 aktualisieren(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);
+        super .onCreate(bundle);
         Bundle args = getArguments();
         if (args != null ) {
             text = args.getString(KEY_TEXT);

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java

@@ -0,0 +1,46 @@
+package com.example.ueberwachungssystem.Fragments;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.ueberwachungssystem.R;
+
+public 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");
+        }
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java

@@ -1,58 +1,42 @@
 package com.example.ueberwachungssystem.Fragments;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
 
 import com.example.ueberwachungssystem.R;
 
 public class Fragment3 extends Fragment {
-
-    private OnImageViewReadyListener onImageViewReadyListener;
     private String text;
-    public static ImageView ivp;
+    private final static String KEY_TEXT = "KEY_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");
+        log( "onCreateView" );
-        View view = inflater.inflate(R.layout.fragment3, container, false);
+        View view = inflater.inflate(R.layout.fragment2, container, false );
-        if (onImageViewReadyListener != null) {
+        TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
-            ImageView ivp = (ImageView) view.findViewById(R.id.Video);
+        Sensor.setText(text);
-            ImageView ivp2 = (ImageView) view.findViewById(R.id.Video2);
-            onImageViewReadyListener.onImageViewReady(ivp, ivp2);
-        }
         return view;
     }
-    public static Fragment3 erstellen(View 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;
     }
-    public interface OnImageViewReadyListener {
-        void onImageViewReady(ImageView imageView, ImageView imageView2);
-    }
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            onImageViewReadyListener = (OnImageViewReadyListener) context;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(context.toString() + " must implement OnImageViewReadyListener");
-        }
-    }
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         Bundle args = getArguments();
-        if (args != null ) {
+        if (args != null) {
             text = args.getString(KEY_TEXT);
             log("onCreate: text=" + text);
         } else {

app/src/main/java/com/example/ueberwachungssystem/Fragments/VideoListFragment.java

@@ -1,104 +0,0 @@
-package com.example.ueberwachungssystem.Fragments;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.Toast;
-import android.widget.VideoView;
-
-import androidx.fragment.app.Fragment;
-
-import com.example.ueberwachungssystem.R;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-public class VideoListFragment extends Fragment {
-
-    private ListView listView;
-    private Button button;
-    private ArrayAdapter<String> adapter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.videolist_fragment, container, false);
-
-
-        button = rootView.findViewById(R.id.button);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                File dir = getContext().getFilesDir();
-                File[] files = dir.listFiles();
-                for (File file: files) {
-                    file.delete();
-                }
-            }
-        });
-
-
-
-        listView = rootView.findViewById(R.id.listView);
-        adapter = new ArrayAdapter<>(requireContext(), android.R.layout.simple_list_item_1, getFileNames());
-        listView.setAdapter(adapter);
-
-        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                // Handle item click event here
-                String selectedItem = getContext().getFilesDir().toString() + "/" + adapter.getItem(position);
-                //Toast.makeText(requireContext(), selectedItem, Toast.LENGTH_SHORT).show();
-
-                openVideoPopup(selectedItem);
-            }
-        });
-        return rootView;
-    }
-
-    private List<String> getFileNames() {
-        // Add your data source here, e.g., an array or a list
-        File dir = getContext().getFilesDir();
-        File[] files = dir.listFiles();
-        Log.d("files", getContext().getFilesDir().toString());
-
-
-        List<String> fileNamesList = new ArrayList<>();
-        assert files != null;
-        for (File file : files) {
-            fileNamesList.add(file.getName());
-        }
-        return fileNamesList;
-    }
-
-
-    private void openVideoPopup(String videoPath) {
-        LayoutInflater inflater = LayoutInflater.from(requireContext());
-        View popupView = inflater.inflate(R.layout.videolist_popup, null);
-
-        VideoView videoView = popupView.findViewById(R.id.videoView);
-        videoView.setVideoPath(videoPath);
-        videoView.start();
-
-        PopupWindow popupWindow = new PopupWindow(popupView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true);
-
-        popupView.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                //Close the window when clicked
-                popupWindow.dismiss();
-                return true;
-            }
-        });
-        popupWindow.showAtLocation(listView, Gravity.CENTER, 0, 0);
-    }
-}

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

@@ -0,0 +1,44 @@
+package com.example.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/com/example/ueberwachungssystem/MainActivity.java

@@ -1,12 +1,10 @@
 package com.example.ueberwachungssystem;
 
-import androidx.camera.core.ExperimentalGetImage;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.view.PreviewView;
 
-import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -14,156 +12,86 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.ToggleButton;
 
-import com.example.ueberwachungssystem.Fragments.Fragment1;
+import com.example.ueberwachungssystem.Detection.Accelerometer;
+import com.example.ueberwachungssystem.Detection.AudioRecorder;
+import com.example.ueberwachungssystem.Detection.DetectionReport;
+import com.example.ueberwachungssystem.Detection.Detector;
 import com.example.ueberwachungssystem.Detection.DetectorService;
-import com.example.ueberwachungssystem.Fragments.Fragment3;
+import com.example.ueberwachungssystem.Detection.MicrophoneDetector;
-import com.example.ueberwachungssystem.Fragments.VideoListFragment;
+import com.example.ueberwachungssystem.Detection.VideoDetector;
-
-import java.util.OptionalInt;
 
 @ExperimentalGetImage
-public class MainActivity extends AppCompatActivity implements Fragment3.OnImageViewReadyListener{
+public class MainActivity extends AppCompatActivity {
-    //StringBuffer
-    private StringBuffer messageBuffer = new StringBuffer();
 
-    //Fragmente
-    private Fragment aktuellesFragment;
-    private Fragment fragment1_;
-    private Fragment fragment2_;
-    private Fragment fragment3_;
-
-    private Fragment1 fragment1;
-    private Fragment3 fragment3;
-
-    private ImageView fragmentImage;
-    private ImageView fragmentImage2;
-    private VideoListFragment videoListFragment = new VideoListFragment();
     private DetectorService detectorService = new DetectorService();
-    int num = 0;
+    ImageView inputImageView;
-    //Textviews
+    ImageView outputImageView;
-    private TextView Auswahl;
+    ToggleButton toggleButton;
-    private TextView AoderA;
-    private String auswahltext = "Wahl des Detektionsmodus";
-    private String auswahlAoderA = "Wahl von Alarmmeldungen oder Auswahl von Alarmaufzeichnungen";
-    //Buttons
-    private ToggleButton toggleKamera;
-    private ToggleButton toggleAudio;
-    private ToggleButton toggleBewegung;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTitle("Supervision");
         setContentView(R.layout.activity_main);
-        Auswahl = findViewById(R.id.textAuswahl);
-        Auswahl.setText(auswahltext);
-        AoderA = findViewById(R.id.textAoderA);
-        AoderA.setText(auswahlAoderA);
-        toggleKamera = findViewById(R.id.toggleKamera);
-        toggleAudio = findViewById(R.id.toggleAudio);
-        toggleBewegung = findViewById(R.id.toggleBewegung);
-    }
 
-    @Override
+
-    protected void onResume() {
+        inputImageView = findViewById(R.id.inputImageView);
-        super.onResume();
+        outputImageView = findViewById(R.id.outputImageView);
+        toggleButton = findViewById(R.id.toggleButton);
+
 
         PermissionHandler permissionHandler = new PermissionHandler(this);
-        //permissionHandler.getPermissions();
+        permissionHandler.getPermissions();
         if (permissionHandler.hasPermissions()) {
 
+
             Intent serviceIntent = new Intent(this, DetectorService.class);
             bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
             startService(serviceIntent);
 
-            toggleKamera.setOnClickListener(new View.OnClickListener() {
+
+            toggleButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (toggleKamera.isChecked()) {
+                    if (toggleButton.isChecked())
-                        if(detectorService != null) {
+                    {
+                        if (detectorService != null){
+
+                            detectorService.videoDetector.debugProcessing(inputImageView, outputImageView);
                             detectorService.videoDetector.startDetection();
-                        }
+
-                    } else {
-                        if(detectorService != null) {
-                            detectorService.videoDetector.stopDetection();
-                        }
-                    }
-                }
-            });
-            toggleAudio.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (toggleAudio.isChecked()) {
-                        if(detectorService != null) {
                             detectorService.audioDetector.startDetection();
-                        }
+
-                    } else {
-                        if(detectorService != null) {
-                            detectorService.audioDetector.stopDetection();
-                        }
-                    }
-                }
-            });
-            toggleBewegung.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (toggleBewegung.isChecked()) {
-                        if(detectorService != null) {
                             detectorService.motionDetector.startDetection();
+
+                            detectorService.audioRecorder.stopRecording();
+
+                            detectorService.videoDetector.startRecording();
                         }
-                    } else {
+                    }
-                        if(detectorService != null) {
+                    else {
+                        detectorService.videoDetector.stopDetection();
+
+                        detectorService.audioDetector.stopDetection();
+
                         detectorService.motionDetector.stopDetection();
-                        }
+
+                        detectorService.audioRecorder.stopRecording();
+
+                        detectorService.videoDetector.stopRecording();
                     }
                 }
             });
-        }else{
-            Toast.makeText(this,"Bitte Rechte geben", Toast.LENGTH_SHORT).show();
-        }
 
-    }
 
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.options_menu, menu);
-        return true;
-    }
 
-    public boolean onOptionsItemSelected(MenuItem item) {
+
-        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
+
-        PopUpClass popUpClass;
+
-        switch (item.getItemId()) {
+
-            case R.id.Rechteverwaltung:
-                popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
-                popUpClass.RechtePrüfen();
-                return true;
-            case R.id.Sensoren:
-                popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
-                popUpClass.Sensoren();
-                return true;
-            case R.id.Impressum:
-                popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
-                popUpClass.Impressum();
-                return true;
-            case R.id.Detection:
-                popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
-                popUpClass.DetectionTotal(num);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
         }
     }
 
@@ -175,59 +103,12 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
 
             detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
                 @Override
-                public void onDetection(@NonNull StringBuffer stringBuffer) {
+                public void onDetection(@NonNull DetectionReport detectionReport) {
-                    Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
+                    Log.d("onDetection", detectionReport.toMessage());
-                    num = stringBuffer.toString().split("\n").length;
-                    messageBuffer = stringBuffer;
-                    if ((aktuellesFragment == fragment1_) && (aktuellesFragment != null)) {
-                        Log.d("Fragment", aktuellesFragment.toString() + " " + fragment1_.toString());
-                        fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
-                    }
                 }
             });
         }
         @Override
-        public void onServiceDisconnected(ComponentName name) {
+        public void onServiceDisconnected(ComponentName name) {}
-        }
     };
-
-    public void onClickZeigeFragment1(View view) {
-        Button button = (Button) view;
-        fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
-    }
-
-    public void onClickZeigeFragment2(View view) {
-        Button button = (Button) view;
-        //zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
-        fragment2_ = zeigeFragment(videoListFragment);
-    }
-    public void onClickZeigeFragment3(View view) {
-        Button button = (Button) view;
-        fragment3_ = zeigeFragment(fragment3.erstellen(view));
-    }
-    public void onImageViewReady(ImageView imageView, ImageView imageView2) {
-        fragmentImage = imageView;
-        fragmentImage2 = imageView2;
-        detectorService.videoDetector.debugProcessing(fragmentImage, fragmentImage2); //inputImageView
-    }
-
-    public void onClickEntferneFragment(View view) {
-        entferneFragment();
-    }
-
-    private Fragment zeigeFragment(Fragment fragment) {
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.replace(R.id.frame, fragment);
-        ft.commit();
-        aktuellesFragment = fragment;
-        return aktuellesFragment;
-    }
-    private void entferneFragment() {
-        if (aktuellesFragment != null) {
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.remove(aktuellesFragment);
-            ft.commit();
-            aktuellesFragment = null ;
-        }
-    }
 }

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

@@ -35,7 +35,7 @@ public class PermissionRequest extends AppCompatActivity{
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_LONG).show();
                 }
             });
         }

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

@@ -15,8 +15,6 @@ public class PopUpClass {
     PermissionRequest permission;
     TextView PopUpText;
 
-    Button buttonEdit;
-
 
     public PopUpClass(MainActivity mainActivity) {
         this.mainActivity = mainActivity;
@@ -49,7 +47,7 @@ public class PopUpClass {
 
         PopUpText = popupView.findViewById(R.id.titleText);
 
-        buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
+        Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
         buttonEdit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -72,25 +70,17 @@ public class PopUpClass {
     public void RechtePrüfen(){
         StringBuilder Text = permission.rechtePruefen();
         PopUpText.setText(Text);
-        buttonEdit.setVisibility(View.VISIBLE);
-
     }
     public void RechteAnfordern(){
         permission.rechteAnfordern();
         StringBuilder Text = permission.rechtePruefen();
         PopUpText.setText(Text);
-
     }
     public void Sensoren(){
-        PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera\n Diese können sowohl einzeln als auch alle zusammen verwendet werden");
+        PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera");
-        buttonEdit.setVisibility(View.GONE);
     }
     public void Impressum(){
-        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert \n Von: \n -Kohler Bastian\n -Kleinecke Oliver\n -Market Leon\n -Siebenhaar Miguel\n -Wolz Tobias ");
+        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
-        buttonEdit.setVisibility(View.GONE);
-    }
-    public void DetectionTotal(int num) {
-        PopUpText.setText("Total Detektions:" +num);
-        buttonEdit.setVisibility(View.GONE);
     }
+
 }

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

@@ -1,6 +1,5 @@
 package com.example.ueberwachungssystem;
 import android.annotation.SuppressLint;
-import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -31,11 +30,6 @@ public class WifiCommunication {
     private final DatagramSocket socket;
     volatile private boolean running;
 
-    private boolean Gruppe =true;
-    private boolean showMessage = true;
-
-    StringBuffer rxStringBuffer = new StringBuffer();
-
     private OnConnectionListener listener;
     @SuppressLint("SetTextI18n")
     public WifiCommunication(int port) {
@@ -57,20 +51,20 @@ public class WifiCommunication {
     }
 
     public interface OnConnectionListener {
-        void onConnection(String data);
+        void onConnection(StringBuffer data);
     }
     public void setOnConnectionListener(@NonNull OnConnectionListener listener) {
         this.listener = listener;
     }
 
-    public void sendWifiData(String wifiMessage) {
+    public void sendWifiData(StringBuffer wifiMessage) {
         if (listener != null) {
             listener.onConnection(wifiMessage);
-
         }
     }
 
     private class ReceiveThread extends Thread {
+        private StringBuffer rxStringBuffer = new StringBuffer();
         private String rxString="";
         private String previousRxString = "";
 
@@ -83,31 +77,12 @@ public class WifiCommunication {
                     socket.receive(rxPacket);
                     rxString = new String(receiveData, 0, rxPacket.getLength());
                     String[] splitrxString = rxString.split(",");
-                    String[] splitrxStringBuffer = splitBufferIntoStrings(rxStringBuffer);
+                    if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
-                    for(String elem: splitrxStringBuffer){
-                        if(elem.equals(rxString)){
-                            showMessage = false;
-                        }else{
-                            showMessage = true;
-                        }
-                    }
-                    if(Gruppe){
-                        if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7 && showMessage) {
                         rxStringBuffer.append(rxString).append("\n");
-                            Log.d("empfangen", rxString);
+                        sendWifiData(rxStringBuffer);
-                            sendWifiData(rxString);
                         //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
                         previousRxString = rxString;
                     }
-                    }else{
-                        if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7 && showMessage) {
-                            rxStringBuffer.append(rxString).append("\n");
-                            Log.d("empfangen", rxString);
-                            sendWifiData(rxString);
-                            //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
-                            previousRxString = rxString;
-                        }
-                    }
                 } while (running);
             }
             catch (IOException e) {
@@ -124,17 +99,16 @@ public class WifiCommunication {
                     if(send)
                     {
                         send = false;
-                        /*SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+                        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
                         Date curDate = new Date(System.currentTimeMillis());
-                        String str = formatter.format(curDate);*/
+                        String str = formatter.format(curDate);
                         byte[] send_Data = new byte[512];
-                        String txString = (messageToSend); //"1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video,"
+                        String txString = ("1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video," +messageToSend);
-                        Log.d("send", txString);
                         send_Data = txString.getBytes();
 
                         DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
 
-                        for(int i = 0; i < 500; i++) {
+                        for(int i = 0; i < 300; i++) {
                             socket.send(txPacket);
                         }
                     }
@@ -169,8 +143,4 @@ public class WifiCommunication {
         running = false;
         socket.close();
     }
-    public String[] splitBufferIntoStrings(StringBuffer string){
-        String[] splitrxString2 = string.toString().split("\n");
-        return splitrxString2;
-    }
 }

app/src/main/res/drawable/toggle_btn.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:drawable="@color/redbright"  />
-    <item android:state_checked="true" android:drawable="@color/greenbright"  />
-</selector>

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

@@ -0,0 +1,6 @@
+<?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,133 +1,41 @@
 <?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="#010C49"
+    android:layout_gravity="center"
-    android:visibility="visible"
+    android:gravity="top"
-    tools:context="com.example.ueberwachungssystem.MainActivity"
+    android:orientation="vertical"
-    tools:visibility="visible">
+    tools:context=".MainActivity">
 
-    <TextView
+
-        android:id="@+id/textAuswahl"
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:backgroundTint="@android:color/black"/>
-        android:layout_alignParentLeft="true"
-        android:textSize="20sp"
-        android:textColor="@color/white"/>
-
-    <TextView
-        android:id="@+id/textAoderA"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/toggleAudio"
-        android:layout_alignParentLeft="true"
-        android:layout_marginTop="15dp"
-        android:textSize="20sp"
-        android:textColor="@color/white"/>
 
     <ToggleButton
-        android:id="@+id/toggleKamera"
+        android:id="@+id/toggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
-        android:layout_marginRight="30dp"
-        android:layout_toLeftOf="@id/toggleAudio"
-        android:textColor="@color/yellow"
-        android:textOn="Kamera an"
-        android:textOff="Kamera aus"
-        android:background="@drawable/toggle_btn"/>
-
-    <ToggleButton
-        android:id="@+id/toggleAudio"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/textAuswahl"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        android:textColor="@color/yellow"
-        android:textOn="Audio an"
-        android:textOff="Audio aus"
-        android:background="@drawable/toggle_btn"/>
-
-    <ToggleButton
-        android:id="@+id/toggleBewegung"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
-        android:layout_marginLeft="30dp"
-        android:layout_toEndOf="@+id/toggleAudio"
-        android:layout_toRightOf="@id/toggleAudio"
-        android:textColor="@color/yellow"
-        android:textOn="Bewegung an"
-        android:textOff="Bewegung aus"
-        android:background="@drawable/toggle_btn"/>
-
-    <Button
-        android:id="@+id/btnAlarme"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/btnAufnahmen"
-        android:layout_toLeftOf="@id/btnAufnahmen"
-        android:layout_marginRight="15dp"
-        android:theme="@style/Button.Green"
-        android:onClick="onClickZeigeFragment1"
-        android:text="Alarme" />
-
-    <Button
-        android:id="@+id/btnAufnahmen"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/textAoderA"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="15dp"
-        android:theme="@style/Button.Green"
-        android:onClick="onClickZeigeFragment2"
-        android:text="Aufnahmen" />
-
-    <Button
-        android:id="@+id/btnAnzeigeVerb"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/btnAufnahmen"
-        android:layout_toRightOf="@id/btnAufnahmen"
-        android:layout_marginLeft="15dp"
-        android:text="Live Video"
-        android:onClick="onClickZeigeFragment3"/>
-
-    <FrameLayout
-        android:id="@+id/frame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnAufnahmen"
+        android:text="ToggleButton" />
-        android:layout_marginTop="25dp"
-        android:layout_alignParentStart="true"
-        android:background="@color/white">
-    </FrameLayout>
 
-    <!--
+    <ImageView
-    <ScrollView
+        android:id="@+id/inputImageView"
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/btnAufnahmen"
-        android:layout_marginTop="25dp">
-        <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"
-                android:background="@color/red"/>
+        tools:srcCompat="@tools:sample/avatars" />
-        </LinearLayout>
-    </ScrollView>
-    -->
-    <ListView
-        android:id = "@+id/listView"
-        android:layout_width = "wrap_content"
-        android:layout_height = "wrap_content"/>
 
-</RelativeLayout>
+    <ImageView
+        android:id="@+id/outputImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <androidx.camera.view.PreviewView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

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

@@ -4,23 +4,19 @@
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:background="@color/bluedark">
+    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"/>
 
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="25dp">
-        <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"
-                android:textColor="@color/yellow"/>
+        android:layout_below="@id/Sensor"
-        </LinearLayout>
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
-    </ScrollView>
 
 </RelativeLayout>

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

@@ -6,28 +6,17 @@
     android:orientation="vertical"
     android:background="@android:color/holo_blue_light" >
 
-    <ScrollView
-        android:id="@+id/scrollView2"
-        android:layout_width="match_parent"
-        android:layout_height="250dp"
-        android:layout_marginTop="25dp">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
     <TextView
-                android:id="@+id/Aufzeichnungen"
+        android:id="@+id/Sensor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-                android:textColor="@color/yellow"/>
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
-        </LinearLayout>
-    </ScrollView>
 
-    <VideoView
+    <TextView
-        android:id="@+id/AusAuf"
+        android:id="@+id/Alarm"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/scrollView2"
+        android:layout_below="@id/Sensor"
         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
 </LinearLayout>

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

@@ -4,21 +4,19 @@
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:background="@color/bluedark">
+    android:background="@android:color/holo_blue_light" >
 
-    <ImageView
+    <TextView
-        android:id="@+id/Video"
+        android:id="@+id/Sensor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
-        android:rotation="90">
+
-    </ImageView>
+    <TextView
-    <ImageView
+        android:id="@+id/Alarm"
-        android:id="@+id/Video2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
+        android:layout_below="@id/Sensor"
-        android:rotation="90">
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
-    </ImageView>
 
 </LinearLayout>

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

@@ -6,7 +6,7 @@
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
     android:gravity="center"
-    android:background="#010C49">
+    android:background="#A5ACB2">
 
     <TextView
         android:id="@+id/titleText"
@@ -15,7 +15,6 @@
         android:layout_height="wrap_content"
         android:textSize="20sp"
         android:textStyle="italic"
-        android:textColor="@color/white"
         android:padding="10dp"/>
 
     <Button
@@ -23,7 +22,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:backgroundTint="@color/purple_500"
         android:text="Rechte Anfordern" />
 
 

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat 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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_blue_light">
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Aufnahmen Löschen"
-        android:backgroundTint="#010C49"
-        tools:ignore="MissingConstraints" />
-
-    <ListView
-        android:id="@+id/listView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
-
-
-</androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/videoView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"/>
-
-</FrameLayout>

app/src/main/res/menu/options_menu.xml

@@ -4,8 +4,6 @@
         android:title="Rechteverwaltung" />
     <item android:id="@+id/Sensoren"
         android:title="Sensoren" />
-    <item android:id="@+id/Detection"
-        android:title="Detektionen" />
     <item android:id="@+id/Impressum"
         android:title="Impressum" />
 </menu>

app/src/main/res/values/colors.xml

@@ -7,9 +7,4 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="red">#5C0000</color>
-    <color name="redbright">#EF3434</color>
-    <color name="greenbright">#469733</color>
-    <color name="bluedark">#053C8E</color>
-    <color name="yellow">#FFEB3B</color>
 </resources>

app/src/main/res/values/themes.xml

@@ -13,9 +13,4 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-
-    <style name="Button.Green" parent="ThemeOverlay.AppCompat">
-        <item name="colorAccent">#0F3E01</item>
-    </style>
-
 </resources>