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 8c27157..4df4620 100644
--- a/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
@@ -11,12 +11,15 @@ 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);
}
@@ -25,6 +28,8 @@ public class MainActivity extends AppCompatActivity {
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;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d71e3de..b2660d0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
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:background="@android:color/holo_green_dark"
android:visibility="visible"
tools:context="de.oklein.android.ueberwachungssystem.MainActivity"
tools:visibility="visible">
@@ -12,8 +12,10 @@
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:layout_marginRight="15dp"
+ android:layout_toStartOf="@+id/toggleAudio"
+ android:layout_toLeftOf="@id/toggleAudio"
android:text="Kamera" />
-
+ 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" />
@@ -89,23 +90,34 @@
android:id="@+id/btnWiedergabe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/btn2"
- android:layout_toRightOf="@id/btnZwischen"
+ android:layout_below="@+id/btnKamera"
+ android:layout_toRightOf="@id/btnKamera"
+ android:layout_marginLeft="15dp"
android:onClick="onClickEntferneFragment"
android:text="Wiedergabe" />
+ android:id= "@+id/scrollView1"
+ android:layout_width= "wrap_content"
+ android:layout_height= "wrap_content"
+ android:layout_below= "@id/frame">
+
+
+
\ No newline at end of file