From 74eb3e0d988faf227711ebe0bcd5977f47912370 Mon Sep 17 00:00:00 2001
From: Oliver K <kleineckeol72024@th-nuernberg.de>
Date: Mon, 12 Jun 2023 20:23:42 +0200
Subject: [PATCH] Added Toggle Buttons for Detection Mode Added Scrollview for
 alarm

---
 .../ueberwachungssystem/MainActivity.java     |  6 --
 app/src/main/res/layout/activity_main.xml     | 83 ++++++++++++++-----
 2 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java b/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
index 8219c1b..8c27157 100644
--- a/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
@@ -74,8 +74,6 @@ public class MainActivity extends AppCompatActivity {
             View view = inflater.inflate(R.layout.fragment1, container, false);
             TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
             Sensor.setText(text);
-            TextView Alarm = (TextView) view.findViewById(R.id.Alarm);
-            Alarm.setText(text);
             return view;
         }
         public static Fragment1 erstellen(String text) {
@@ -109,8 +107,6 @@ public class MainActivity extends AppCompatActivity {
             View view = inflater.inflate(R.layout.fragment2, container, false );
             TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
             Sensor.setText(text);
-            TextView Alarm = (TextView) view.findViewById(R.id.Alarm);
-            Alarm.setText(text);
             return view;
         }
         public static Fragment2 erstellen(String text) {
@@ -145,8 +141,6 @@ public class MainActivity extends AppCompatActivity {
             View view = inflater.inflate(R.layout.fragment2, container, false );
             TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
             Sensor.setText(text);
-            TextView Alarm = (TextView) view.findViewById(R.id.Alarm);
-            Alarm.setText(text);
             return view;
         }
         public static Fragment3 erstellen(String text) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aba4361..d71e3de 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,8 +3,34 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/holo_orange_light"
+    android:visibility="visible"
     tools:context="de.oklein.android.ueberwachungssystem.MainActivity"
-    android:background="@android:color/holo_orange_light">
+    tools:visibility="visible">
+
+    <ToggleButton
+        android:id="@+id/toggleKamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@id/toggleAudio"
+        android:layout_alignBottom="@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_toRightOf="@id/toggleAudio"
+        android:layout_alignBottom="@id/toggleAudio"
+        android:text="Bewegung" />
 
     <Button
         android:id="@+id/btn1"
@@ -12,17 +38,17 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/btn2"
         android:layout_toLeftOf="@id/btn2"
-        android:text="Audio"
-        android:onClick="onClickZeigeFragment1"/>
+        android:onClick="onClickZeigeFragment1"
+        android:text="Audio" />
 
     <Button
         android:id="@+id/btn2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@id/toggleAudio"
         android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true"
-        android:text="Kamera"
-        android:onClick="onClickZeigeFragment2"/>
+        android:onClick="onClickZeigeFragment2"
+        android:text="Kamera" />
 
     <Button
         android:id="@+id/btn3"
@@ -30,9 +56,9 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/btn2"
         android:layout_toRightOf="@id/btn2"
-        android:text="Bewegung"
-        android:onClick="onClickZeigeFragment3"/>
-
+        android:onClick="onClickZeigeFragment3"
+        android:text="Bewegung" />
+    <!--
     <Button
         android:id="@+id/btnSensorWeg"
         android:layout_width="wrap_content"
@@ -41,30 +67,45 @@
         android:layout_below="@+id/btn1"
         android:text="Entferne Sensordarstellung"
         android:onClick="onClickEntferneFragment"/>
+    -->
+    <Button
+        android:id="@+id/btnZwischen"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/btn2"
+        android:layout_centerHorizontal="true"
+        tools:visibility="invisible" />
 
     <Button
         android:id="@+id/btnAufnahme"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/btnSensorWeg"
-        android:text="Aufnahme"
-        android:onClick="onClickEntferneFragment"/>
+        android:layout_below="@+id/btn2"
+        android:layout_toLeftOf="@id/btnZwischen"
+        android:onClick="onClickEntferneFragment"
+        android:text="Aufnahme" />
 
     <Button
         android:id="@+id/btnWiedergabe"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/btnAufnahme"
-        android:layout_below="@+id/btnSensorWeg"
-        android:text="Wiedergabe"
-        android:onClick="onClickEntferneFragment"/>
+        android:layout_below="@+id/btn2"
+        android:layout_toRightOf="@id/btnZwischen"
+        android:onClick="onClickEntferneFragment"
+        android:text="Wiedergabe" />
 
     <FrameLayout
         android:id="@+id/frame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_below="@+id/btnAufnahme">
-        </FrameLayout>
+        android:layout_height="300dp"
+        android:layout_below="@+id/btnZwischen"
+        android:layout_alignParentStart="true">
+    </FrameLayout>
 
-    </RelativeLayout>
\ No newline at end of file
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/frame">
+    </ScrollView>
+
+</RelativeLayout>
\ No newline at end of file