Kommunikation Version 1.6 UDP Socket

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
@@ -26,15 +26,18 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 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'
+    implementation 'com.google.android.gms:play-services-nearby:18.0.0'
     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"
 }

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,11 @@
 <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)-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-<!--         or higher, you must declare the NEARBY_WIFI_DEVICES permission. &ndash;&gt;-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-<!--    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"-->
+    <uses-permission android:name="android.permission.INTERNET" />
-<!--    &lt;!&ndash; If your app derives location information from Wi-Fi APIs,-->
+    <uses-permission android:name="android.permission.CAMERA" /> <!-- §permissionCamera§ -->
-<!--         don't include the "usesPermissionFlags" attribute. &ndash;&gt;-->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-<!--        android:usesPermissionFlags="neverForLocation" />-->
-
-    <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"/>
 
     <application
         android:allowBackup="true"
@@ -30,12 +14,14 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Ueberwachungssystem"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:label="Ueberwachungsapp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -0,0 +1,103 @@
+package com.example.ueberwachungssystem;
+
+import android.annotation.SuppressLint;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+@SuppressLint("SetTextI18n")
+public class MainActivity extends AppCompatActivity {
+    TextView tvMessages;
+    TextView tvConnectionInfos;
+    WifiCommunication communication;
+    PermissionRequest permission;
+    public static String SERVER_IP = "";
+    public static final int SERVER_PORT = 1234;
+    //private static final int PERMISSION_REQUEST_CODE = 123;
+    float i=0;
+
+    boolean communicationRunning = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        tvMessages = findViewById(R.id.tvMessages);
+        tvConnectionInfos = findViewById(R.id.tvConnectionInfos);
+        try {
+            SERVER_IP = getLocalIpAddress();
+            tvConnectionInfos.setText("Connection Infos: \n Own IP-Adress: " + SERVER_IP+ " Port: " + SERVER_PORT);
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        Button btnSend = findViewById(R.id.btnSend);
+        btnSend.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                i++;
+                communication.sendTrue(String.valueOf(i));
+            }
+        });
+    }
+    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(tvMessages);
+                popUpClass.RechtePrüfen();
+                return true;
+            case R.id.Sensoren:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(tvMessages);
+                popUpClass.Sensoren();
+                return true;
+            case R.id.Impressum:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(tvMessages);
+                popUpClass.Impressum();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    protected void onResume() {
+        super.onResume();
+        if (!communicationRunning){
+            communication = new WifiCommunication(MainActivity.this, SERVER_PORT);
+            communicationRunning = true;
+        }
+        permission = new PermissionRequest(MainActivity.this);
+        permission.rechtePruefen();
+    }
+    @Override
+    protected void onPause() {
+        super.onPause();
+        communication.stopCommunication();
+    }
+    private String getLocalIpAddress() throws UnknownHostException {
+        WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
+        assert wifiManager != null;
+        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+        int ipInt = wifiInfo.getIpAddress();
+        return InetAddress.getByAddress(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(ipInt).array()).getHostAddress();
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.example.ueberwachungssystem;
+
+import static android.Manifest.permission.INTERNET;
+import static android.Manifest.permission.CAMERA;
+import static android.Manifest.permission.RECORD_AUDIO;
+
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
+public class PermissionRequest extends AppCompatActivity{
+    private static final int PERMISSION_REQUEST_CODE = 123;
+    private final MainActivity mainActivity;
+
+    Handler handler = new Handler();
+
+    public PermissionRequest(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+    }
+
+    public StringBuilder rechtePruefen() {
+        boolean rechtKamera = ContextCompat.checkSelfPermission(mainActivity, CAMERA) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtMikrofon = ContextCompat.checkSelfPermission(mainActivity, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtInternet = ContextCompat.checkSelfPermission(mainActivity, INTERNET) == PackageManager.PERMISSION_GRANTED;
+        StringBuilder sb = new StringBuilder();
+        sb.append("Rechte prüfen:")
+                .append("\nKamera: ").append(rechtKamera)
+                .append("\nMikrofon: ").append(rechtMikrofon)
+                .append("\nInternet: ").append(rechtInternet);
+        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(sb));
+        if (!(rechtKamera && rechtMikrofon && rechtInternet)){
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_LONG).show();
+                }
+            });
+        }
+        return sb;
+    }
+
+    public void rechteAnfordern() {
+        mainActivity.requestPermissions(new String[]{CAMERA, RECORD_AUDIO, INTERNET}, PERMISSION_REQUEST_CODE);
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.example.ueberwachungssystem;
+
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+public class PopUpClass {
+    private final MainActivity mainActivity;
+
+    PermissionRequest permission;
+    TextView PopUpText;
+
+
+    public PopUpClass(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+        permission = new PermissionRequest(mainActivity);
+    }
+
+    //PopupWindow display method
+
+    public void showPopupWindow(final View view) {
+
+
+        //Create a View object yourself through inflater
+        LayoutInflater inflater = (LayoutInflater) view.getContext().getSystemService(view.getContext().LAYOUT_INFLATER_SERVICE);
+        View popupView = inflater.inflate(R.layout.popup_window, null);
+
+        //Specify the length and width through constants
+        int width = LinearLayout.LayoutParams.WRAP_CONTENT;
+        int height = LinearLayout.LayoutParams.WRAP_CONTENT;
+
+        //Make Inactive Items Outside Of PopupWindow
+        boolean focusable = true;
+
+        //Create a window with our parameters
+        final PopupWindow popupWindow = new PopupWindow(popupView,width*1, height*1, focusable);
+
+        //Set the location of the window on the screen
+        popupWindow.showAtLocation(view, Gravity.CENTER, 0, 0);
+
+        //Initialize the elements of our window, install the handler
+
+        PopUpText = popupView.findViewById(R.id.titleText);
+
+        Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
+        buttonEdit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                RechteAnfordern();
+            }
+        });
+
+        //Handler for clicking on the inactive zone of the window
+
+        popupView.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+
+                //Close the window when clicked
+                popupWindow.dismiss();
+                return true;
+            }
+        });
+    }
+    public void RechtePrüfen(){
+        StringBuilder Text = permission.rechtePruefen();
+        PopUpText.setText(Text);
+    }
+    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");
+    }
+    public void Impressum(){
+        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
+    }
+
+}

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

@@ -0,0 +1,124 @@
+package com.example.ueberwachungssystem;
+import android.annotation.SuppressLint;
+import android.widget.Toast;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+
+public class WifiCommunication {
+    private final MainActivity mainActivity;
+    private final InetAddress address;
+    private final int port;
+
+    private String messageToSend;
+    volatile private boolean send;
+    private final DatagramSocket socket;
+    volatile private boolean running;
+    @SuppressLint("SetTextI18n")
+    public WifiCommunication(MainActivity mainActivity, int port) {
+        this.mainActivity = mainActivity;
+        this.port = port;
+        try {
+            socket = new DatagramSocket(this.port);
+            socket.setBroadcast(true);
+            address = InetAddress.getByName("255.255.255.255"); //100.82.255.255
+            running = true;
+            send = false;
+            new ReceiveThread().start();
+            new SendThread().start();
+        } catch (SocketException | UnknownHostException e) {
+            throw new RuntimeException(e);
+        }
+        Toast.makeText(mainActivity.getApplicationContext(),"Communication running", Toast.LENGTH_SHORT).show();
+
+        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText("Communication running"));
+    }
+    private class ReceiveThread extends Thread {
+        private StringBuffer rxStringBuffer = new StringBuffer();
+        private String rxString="";
+        private String previousRxString = "";
+
+        @Override
+        public void run() {
+            try {
+                do {
+                    byte[] receiveData = new byte[512];
+                    DatagramPacket rxPacket = new DatagramPacket(receiveData, receiveData.length);
+                    socket.receive(rxPacket);
+                    rxString = new String(rxPacket.getData());
+                    String[] splitrxString = rxString.split(",");
+                    if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
+                        rxStringBuffer.append(rxString).append("\n");
+                        mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
+                        previousRxString = rxString;
+                    }
+                } while (running);
+            }
+            catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    private class SendThread extends Thread {
+        private int tmpCnt = 0;
+        @Override
+        public void run() {
+            try {
+                do {
+                    if(send)
+                    {
+                        send = false;
+                        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+                        Date curDate = new Date(System.currentTimeMillis());
+                        String str = formatter.format(curDate);
+                        byte[] send_Data = new byte[512];
+                        String txString = ("1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video," +messageToSend);
+                        send_Data = txString.getBytes();
+
+                        DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
+
+                        for(int i = 0; i < 500; i++) {
+                            socket.send(txPacket);
+                        }
+                    }
+                } while (running);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    public static String getLocalIpAddress() {
+        try {
+            for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
+                NetworkInterface networkInterface = (NetworkInterface) ((Enumeration<?>) en).nextElement();
+                for (Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); addresses.hasMoreElements();) {
+                    InetAddress inetAddress = addresses.nextElement();
+                    if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
+                        return inetAddress.getHostAddress();
+                    }
+                }
+            }
+        } catch (SocketException ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    public void sendTrue(String message){
+        send = true;
+        messageToSend = message;
+    }
+    public void stopCommunication() {
+        running = false;
+        socket.close();
+    }
+}

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,37 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version = "1.0" encoding = "utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android = "http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools = "http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width = "match_parent"
-    android:layout_height="match_parent"
+    android:layout_height = "match_parent"
-    android:background="@android:color/holo_green_dark"
+    android:layout_margin = "16dp"
-    android:visibility="visible"
+    tools:context = ".MainActivity">
-    tools:context="de.oklein.android.ueberwachungssystem.MainActivity"
+    <TextView
-    tools:visibility="visible">
+        android:id = "@+id/tvConnectionInfos"
+        android:layout_width = "match_parent"
+        android:layout_height = "wrap_content"
+        android:inputType = "textMultiLine"
+        android:hint="ConnectionInfos"
+        android:textAppearance = "@style/Base.TextAppearance.AppCompat.Medium" />
 
-    <ToggleButton
+    <Button
-        android:id="@+id/toggleKamera"
+        android:id="@+id/btnSend"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
+        android:layout_below="@id/scrollView"
-        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" />
+        android:text="SEND" />
-
-    <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:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:layout_below="@+id/btnZwischen"
-        android:layout_alignParentStart="true">
-    </FrameLayout>
 
     <ScrollView
-        android:id= "@+id/scrollView1"
+        android:id="@+id/scrollView"
-        android:layout_width= "wrap_content"
+        android:layout_width="match_parent"
-        android:layout_height= "wrap_content"
+        android:layout_below="@id/tvConnectionInfos"
-        android:layout_below= "@id/frame">
+        android:layout_height="300dp">
-        <LinearLayout
+        <TextView
-            android:layout_width= "match_parent"
+            android:id = "@+id/tvMessages"
-            android:layout_height= "match_parent"
+            android:layout_width = "match_parent"
-            android:orientation= "vertical" >
+            android:layout_height = "wrap_content"
-            <TextView
+            android:hint="Messages"
-                android:id= "@+id/Alarm"
+            android:inputType = "textMultiLine"
-                android:layout_width= "wrap_content"
+            android:textAppearance = "@style/Base.TextAppearance.AppCompat.Medium" />
-                android:layout_height= "wrap_content" />
-        </LinearLayout>
     </ScrollView>
-
 </RelativeLayout>

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/main/res/layout/popup_window.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:gravity="center"
+    android:background="#A5ACB2">
+
+    <TextView
+        android:id="@+id/titleText"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:textStyle="italic"
+        android:padding="10dp"/>
+
+    <Button
+        android:id="@+id/RechteAnfordern"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="Rechte Anfordern" />
+
+
+
+</LinearLayout>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/Rechteverwaltung"
+        android:title="Rechteverwaltung" />
+    <item android:id="@+id/Sensoren"
+        android:title="Sensoren" />
+    <item android:id="@+id/Impressum"
+        android:title="Impressum" />
+</menu>

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

settings.gradle

@@ -14,3 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Ueberwachungssystem"
 include ':app'
+include ':app'