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 2c9d0d6..8219c1b 100644
--- a/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/de/oklein/android/ueberwachungssystem/MainActivity.java
@@ -11,9 +11,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
-import android.widget.ListView;
import android.widget.TextView;
+import org.w3c.dom.Text;
public class MainActivity extends AppCompatActivity {
private Fragment aktuellesFragment;
@@ -23,7 +23,7 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setTitle( this.getClass().getSimpleName());
+ setTitle(this.getClass().getSimpleName());
setContentView(R.layout.activity_main);
}
public void onClickZeigeFragment1(View view) {
@@ -37,6 +37,12 @@ public class MainActivity extends AppCompatActivity {
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();
}
@@ -66,8 +72,10 @@ public class MainActivity extends AppCompatActivity {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
log("onCreateView");
View view = inflater.inflate(R.layout.fragment1, container, false);
- TextView textView = (TextView) view.findViewById(R.id.textView);
- textView.setText(text);
+ 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) {
@@ -99,8 +107,10 @@ public class MainActivity extends AppCompatActivity {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
log( "onCreateView" );
View view = inflater.inflate(R.layout.fragment2, container, false );
- EditText editText = (EditText) view.findViewById(R.id.editText1);
- editText.setText(text);
+ 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) {
@@ -122,4 +132,40 @@ public class MainActivity extends AppCompatActivity {
}
}
}
+
+ 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);
+ TextView Alarm = (TextView) view.findViewById(R.id.Alarm);
+ Alarm.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");
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6fa09dd..aba4361 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,38 +7,64 @@
android:background="@android:color/holo_orange_light">
+ android:id="@+id/btn1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/btn2"
+ android:layout_toLeftOf="@id/btn2"
+ android:text="Audio"
+ android:onClick="onClickZeigeFragment1"/>
+ android:id="@+id/btn2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentTop="true"
+ android:text="Kamera"
+ android:onClick="onClickZeigeFragment2"/>
+ android:id="@+id/btn3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/btn2"
+ android:layout_toRightOf="@id/btn2"
+ android:text="Bewegung"
+ android:onClick="onClickZeigeFragment3"/>
+
+
+
+
+
+
-
+ android:id="@+id/frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/btnAufnahme">
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment1.xml b/app/src/main/res/layout/fragment1.xml
index 5336bc3..7c0f74f 100644
--- a/app/src/main/res/layout/fragment1.xml
+++ b/app/src/main/res/layout/fragment1.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment2.xml b/app/src/main/res/layout/fragment2.xml
index 410b14e..a44702c 100644
--- a/app/src/main/res/layout/fragment2.xml
+++ b/app/src/main/res/layout/fragment2.xml
@@ -6,14 +6,17 @@
android:orientation="vertical"
android:background="@android:color/holo_blue_light" >
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment3.xml b/app/src/main/res/layout/fragment3.xml
new file mode 100644
index 0000000..a44702c
--- /dev/null
+++ b/app/src/main/res/layout/fragment3.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
\ No newline at end of file