Added fundamentals of the Model View Controler Structure of the device handling

app/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.greenwatch">
 
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -11,7 +10,22 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.GreenWatch">
         <activity
-            android:name=".Mikrofon"
+            android:name=".ConnectionActivity"
+            android:exported="false" />
+        <activity
+            android:name=".VideodetectionAndAccelerometerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".AudiodetectionAndAccelerometerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".VideodetectionActivity"
+            android:exported="false" />
+        <activity
+            android:name=".AudiodetectionActivity"
+            android:exported="false" />
+        <activity
+            android:name=".AccelerometerActivity"
             android:exported="false" />
         <activity
             android:name=".MainActivity"

app/src/main/java/com/example/greenwatch/AccelerometerActivity.java

@@ -0,0 +1,28 @@
+package com.example.greenwatch;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class AccelerometerActivity extends AppCompatActivity {
+
+    private Button backToMainActivityButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_accelerometer);
+
+        backToMainActivityButton = (Button) findViewById(R.id.accelerometerBackToMainActivity);
+
+        backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+
+}

app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java

@@ -0,0 +1,27 @@
+package com.example.greenwatch;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class AudiodetectionActivity extends AppCompatActivity {
+
+    private Button backToMainActivityButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_audiodetection);
+
+        backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);
+
+        backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+}

app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java

@@ -0,0 +1,27 @@
+package com.example.greenwatch;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity {
+
+    private Button backToMainActivity;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_audiodetection_and_accelerometer);
+
+        backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);
+
+        backToMainActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+}

app/src/main/java/com/example/greenwatch/ConnectionActivity.java

@@ -0,0 +1,27 @@
+package com.example.greenwatch;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class ConnectionActivity extends AppCompatActivity {
+
+    private Button backToMainActivity;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_connection);
+
+        backToMainActivity = (Button) findViewById(R.id.connectionBackToMainActivity);
+
+        backToMainActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+}

app/src/main/java/com/example/greenwatch/GleitenderMittelwert.java

@@ -1,23 +0,0 @@
-package com.example.greenwatch;
-
-public class GleitenderMittelwert {
-    private final float wichtungNeuerWert;
-    private final float wichtungAlterWert;
-    private float mittelwert = 0;
-
-    private boolean istMittelwertGesetzt = false;
-
-    GleitenderMittelwert(float wichtungNeuerWert) {
-        this.wichtungNeuerWert = wichtungNeuerWert;
-        this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
-    }
-
-    float mittel(float wert) {
-        if (istMittelwertGesetzt) {
-            mittelwert = wert * wichtungNeuerWert + mittelwert * wichtungAlterWert;
-        } else {
-            mittelwert = wert;
-            istMittelwertGesetzt = true;
-        }
-        return mittelwert;
-}}

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

@@ -9,17 +9,84 @@ import android.widget.Button;
 
 public class MainActivity extends AppCompatActivity {
 
+    private Button audiodetectionButton;
+    private Button videodetectionButton;
+    private Button accelerometerButton;
+    private Button audiodetectionAndAccelerometerButton;
+    private Button videodetectionAndAccelerometerButton;
+    private Button connectionButton;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        ((Button)findViewById(R.id.buttonstartmicdetection)).setOnClickListener(new View.OnClickListener(){
+        audiodetectionButton = (Button) findViewById(R.id.audiodetectionButton);
+        videodetectionButton = (Button) findViewById(R.id.videodetectionButton);
+        accelerometerButton = (Button) findViewById(R.id.accelerometerButton);
+        audiodetectionAndAccelerometerButton = (Button) findViewById(R.id.audiodetectionAndAccelerometerButton);
+        videodetectionAndAccelerometerButton = (Button) findViewById(R.id.videodetectionAndAccelerometerButton);
+        connectionButton = (Button) findViewById(R.id.connectionButton);
+        audiodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                Intent i = new Intent(MainActivity.this, Mikrofon.class);
-                startActivity(i);
+            public void onClick(View v) {
+                openAudiodetectionActivity();
+            }
+        });
+        videodetectionButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openVideodetectionActivity();
+            }
+        });
+        accelerometerButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openAccelerometerActivity();
+            }
+        });
+        audiodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openAudiodetectionAndAccelerometerActivity();
+            }
+        });
+        videodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openVideodetectionAndAccelerometerActivity();
+            }
+        });
+        connectionButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openConnectionActivity();
             }
         });
     }
+    public void openAudiodetectionActivity(){
+        Intent intent = new Intent(this, AudiodetectionActivity.class);
+        startActivity(intent);
+    }
+    public void openVideodetectionActivity(){
+        Intent intent =  new Intent(this, VideodetectionActivity.class);
+        startActivity(intent);
+    }
+    public void openAccelerometerActivity(){
+        Intent intent = new Intent(this, AccelerometerActivity.class);
+        startActivity(intent);
+    }
+    public void openAudiodetectionAndAccelerometerActivity(){
+        Intent intent = new Intent(this, AudiodetectionAndAccelerometerActivity.class);
+        startActivity(intent);
+    }
+    public void openVideodetectionAndAccelerometerActivity(){
+        Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
+        startActivity(intent);
+    }
+    public void openConnectionActivity(){
+        Intent intent = new Intent(this, ConnectionActivity.class);
+        startActivity(intent);
+    }
+
 }

app/src/main/java/com/example/greenwatch/Mikrofon.java

@@ -1,254 +1,4 @@
 package com.example.greenwatch;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.widget.TextView;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class Mikrofon extends AppCompatActivity {
-
-    private AufnahmeTask aufnahmeTask;
-    private TextView textViewMaxAmp;
-    private TextView textViewMaxAmpdb;
-    private TextView textViewZeitstempel;
-    private static final int RECHTEANFORDERUNG_MIKROFON = 1;
-
-    private boolean detection_mic = false;
-    private String zeit = "0";
-    private boolean kalibrierung_do = true;
-    private float threshold = 40;
-    private float sensitivity = 5;
-    private final static String KEY_WERT = "KEY_WERT_" + Mikrofon.class.getSimpleName();
-    private final static String KEY_KALIBRIERUNG = "KEY_KALIBRIERUNG_" + Mikrofon.class.getSimpleName();
-
-
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_mikrofon);
-        textViewMaxAmp = (TextView) findViewById(R.id.textViewMaxAmp);
-        textViewMaxAmpdb = (TextView) findViewById(R.id.textViewMaxAmpdb);
-        textViewZeitstempel = (TextView) findViewById(R.id.textViewZeitstempel);
-        //kalibrierung_do = true;
-
-
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
-        threshold = p.getFloat(KEY_WERT, 40);
-        kalibrierung_do = p.getBoolean(KEY_KALIBRIERUNG, true);
-
-        if (!istZugriffAufMikrofonErlaubt()) {
-            zugriffAufMikrofonAnfordern();
-        }
-        if (istZugriffAufMikrofonErlaubt()) {
-            aufnahmeTask = new AufnahmeTask();
-            aufnahmeTask.execute();
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = p.edit();
-        editor.putFloat(KEY_WERT, threshold);
-        if(isFinishing()==true){
-            editor.putBoolean(KEY_KALIBRIERUNG, true);
-        }else {
-            editor.putBoolean(KEY_KALIBRIERUNG, false);
-        }
-        editor.commit();
-        if(aufnahmeTask!=null) {
-            aufnahmeTask.cancel(true);
-            aufnahmeTask = null;
-        }
-    }
-
-    private boolean istZugriffAufMikrofonErlaubt() {
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private void zugriffAufMikrofonAnfordern() {
-        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO}, RECHTEANFORDERUNG_MIKROFON);
-    }
-
-    public static String Zeitpunkt(){
-        Long tslong = System.currentTimeMillis();
-        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-        Date date = new Date(tslong);
-        String resultdate = sdf.format(date);
-
-        return resultdate;
-    }
-
-
-    class AufnahmeTask extends AsyncTask<Long, Verarbeitungsergebnis, Void> {
-        private AudioRecord recorder;
-        private final int sampleRateInHz = 44100;
-        private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
-        private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
-        private int minPufferGroesseInBytes;
-        private int pufferGroesseInBytes;
-        private RingPuffer ringPuffer = new RingPuffer(10);
-        private boolean erlaubt_rise = true;
-        private boolean erlaubt_fall = true;
-
-        AufnahmeTask() {
-            minPufferGroesseInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
-            pufferGroesseInBytes = minPufferGroesseInBytes * 2;
-            recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRateInHz, channelConfig, audioFormat, pufferGroesseInBytes);
-        }
-        //hi
-        public float kalibrieren(short[] puffer){
-            try {
-                Thread.sleep(3000);
-
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            int anzahlIterationen = 100;
-            float sum = 0;
-            for(int i = 0; i < anzahlIterationen; i++){
-                int z = recorder.read(puffer, 0, puffer.length);
-                Verarbeitungsergebnis kalibrierung = verarbeiten(puffer, z);
-                sum += (float) kalibrierung.db;
-                System.out.println("Aktueller_Wert Kalibrierung" +kalibrierung.db);
-            }
-            System.out.println("Summe:"+sum);
-            return sum/anzahlIterationen;
-        }
-
-        public void Detektion(Verarbeitungsergebnis ergebnis){
-            if(ergebnis.db >= (threshold+sensitivity)){
-                detection_mic = true;
-                erlaubt_fall = true;
-                while(erlaubt_rise){
-                    erlaubt_rise = false;
-                    zeit = Zeitpunkt() + " - " + ergebnis.db + " - " + (threshold+sensitivity); //Überschreiben des Zeitpunkts beim Erkennen der Detektion
-                    //nur zum Testen in zeit noch ergebnis.db und threshold ausgegeben -> muss am Ende nur Zeitpunkt() rein, Rest weg
-                }
-            } else if (ergebnis.db <= (threshold)) {
-                detection_mic = false;
-                erlaubt_rise = true;
-                while(erlaubt_fall){
-                    erlaubt_fall = false;
-                    zeit = Zeitpunkt(); //erneutes Überschreiben des Zeitpunkts beim Verschwinden der Detektion
-                }
-            }
-        }
-        @Override
-        protected Void doInBackground(Long... params) {
-
-            recorder.startRecording();
-            short[] puffer = new short[pufferGroesseInBytes / 2];
-            GleitenderMittelwert gleitenderMittelwertdB = new GleitenderMittelwert(0.2f);
-            float db = 0;
-
-
-            //kalibrierung
-            if(kalibrierung_do){
-                threshold = kalibrieren(puffer);
-                kalibrierung_do = false;
-            }
-
-
-            for (; ; ) {
-                if (isCancelled()) {
-                    break;
-                } else {
-                    //ergebnis ermitteln
-                    int n = recorder.read(puffer, 0, puffer.length);
-                    Verarbeitungsergebnis ergebnis = verarbeiten(puffer, n);
-
-                    //Mittelwertberechnnung
-                    db = (float) ergebnis.db;
-                    db = gleitenderMittelwertdB.mittel(db);
-                    ergebnis.db = (int) db;
-
-                    //Db Wert mit Schwellwert vergleichen und Warnung setzen
-                    Detektion(ergebnis);
-                    publishProgress(ergebnis);
-
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            recorder.release();
-            return null;
-        }
-
-        private Verarbeitungsergebnis verarbeiten(short[] daten, int n) {
-            String status;
-            short maxAmp = -1;
-            int db = 0, db_wert = 0;
-
-            if (n == AudioRecord.ERROR_INVALID_OPERATION) {
-                status = "ERROR_INVALID_OPERATION";
-            } else if (n == AudioRecord.ERROR_BAD_VALUE) {
-                status = "ERROR_BAD_VALUE";
-            } else {
-                status = "OK";
-                short max = 0;
-                for (int i = 0; i < n; i++) {
-                    if (daten[i] > max) {
-                        max = daten[i];
-                    }
-                }
-                ringPuffer.hinzufuegen(max);
-                maxAmp = ringPuffer.maximum();
-            }
-            //Umwandlung Amplitudenwert in dB
-            db_wert = (int) (20*Math.log10(maxAmp));
-            if (db_wert > 0){
-                db = db_wert;
-            }
-
-
-            return new Verarbeitungsergebnis(status, maxAmp, db);
-        }
-
-        /////////////////////////////////////////////
-        @Override
-        protected void onProgressUpdate(Verarbeitungsergebnis... progress) {
-            super.onProgressUpdate(progress);
-
-
-            System.out.println(detection_mic);
-            System.out.println(zeit);
-            textViewZeitstempel.setText(zeit);
-
-            textViewMaxAmpdb.setText("" + progress[0].db);
-            textViewMaxAmp.setText("" + progress[0].maxAmp);
-
-        }
-    }
-    /////////////////////////////////////////////
-
+public class Mikrofon {
 }

app/src/main/java/com/example/greenwatch/RingPuffer.java

@@ -1,63 +0,0 @@
-package com.example.greenwatch;
-
-public class RingPuffer {
-
-    private short[] puffer;
-    private final int laenge;
-    private int anzahlEnthaltenerDaten;
-    private int position;
-
-
-    public RingPuffer(int n) {
-        laenge = n;
-        anzahlEnthaltenerDaten = 0;
-        position = 0;
-        puffer = new short[laenge];
-    }
-
-    public void hinzufuegen(short wert) {
-        puffer[position] = wert;
-        position++;
-        if (position >= laenge) {
-            position = 0;
-        }
-        if (anzahlEnthaltenerDaten < laenge) {
-            anzahlEnthaltenerDaten++;
-        }
-    }
-
-        /*public void hinzufuegen(short[] daten) {
-            for (short d : daten) {
-                puffer[position] = d;
-                position++;
-                if (position >= laenge) {
-                    position = 0;
-                }
-            }
-            if (anzahlEnthaltenerDaten < laenge) {
-                anzahlEnthaltenerDaten += daten.length;
-                if (anzahlEnthaltenerDaten >= laenge) {
-                    anzahlEnthaltenerDaten = laenge;
-                }
-            }
-        }*/
-
-    public short maximum() {
-        short max = 0;
-        for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-            if (puffer[i] > max) {
-                max = puffer[i];
-            }
-        }
-        return max;
-    }
-
-       /* public float mittelwert() {
-            float summe = 0;
-            for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-                summe += puffer[i];
-            }
-            return summe / anzahlEnthaltenerDaten;
-        }*/
-}
-

app/src/main/java/com/example/greenwatch/Verarbeitungsergebnis.java

@@ -1,13 +0,0 @@
-package com.example.greenwatch;
-
-public class Verarbeitungsergebnis {
-    String status;
-    short maxAmp;
-    int db;
-//
-    Verarbeitungsergebnis(String status, short maxAmp, int db) {
-        this.status = status;
-        this.maxAmp = maxAmp;
-        this.db = db;
-    }
-}

app/src/main/java/com/example/greenwatch/VideodetectionActivity.java

@@ -0,0 +1,27 @@
+package com.example.greenwatch;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class VideodetectionActivity extends AppCompatActivity {
+
+    private Button backToMainActivity;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_videodetection);
+
+        backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
+
+        backToMainActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+}

app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java

@@ -0,0 +1,27 @@
+package com.example.greenwatch;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class VideodetectionAndAccelerometerActivity extends AppCompatActivity {
+
+    private Button backToMainActivity;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_videodetection_and_accelerometer);
+
+        backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
+
+        backToMainActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+}

app/src/main/java/com/example/greenwatch/mvc/Device.java

@@ -0,0 +1,29 @@
+package com.example.greenwatch.mvc;
+
+
+public class Device {
+
+    private String sensor;
+    private Boolean isActive;
+
+    public Device(String Sensor, Boolean Status) {
+        this.sensor = Sensor;
+        this.isActive = Status;
+    }
+
+    public void setSensor(String Sensor) {
+        this.sensor = Sensor;
+    }
+
+    public String getSensor() {
+        return sensor;
+    }
+
+    public void setIsActive(Boolean Status) {
+        this.isActive = Status;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+}

app/src/main/java/com/example/greenwatch/mvc/DeviceController.java

@@ -0,0 +1,33 @@
+package com.example.greenwatch.mvc;
+
+public class DeviceController {
+
+    private DeviceModel deviceModel;
+    private DeviceView deviceView;
+
+    public DeviceController(DeviceView view) {
+        this.deviceModel = DeviceModel.getInstance();
+        this.deviceView = view;
+    }
+
+    public void createDevice(String Sensor, Boolean Status) {
+        Device device = new Device(Sensor, Status);
+        deviceModel.addDevice(device);
+        // todo: Inform view and sender about changes
+    }
+    public void setDeviceSensor(String UUID, String Sensor) {
+       deviceModel.setDeviceSensor(UUID, Sensor);
+    }
+
+    public String  getDeviceSensor(String UUID) {
+        return deviceModel.getDeviceSensor(UUID);
+    }
+
+    public void setDeviceStatus(String UUID, Boolean Status) {
+        deviceModel.setDeviceStatus(UUID, Status);
+    }
+
+    public Boolean getDeviceStatus(String UUID) {
+        return deviceModel.getDeviceStatus(UUID);
+    }
+}

app/src/main/java/com/example/greenwatch/mvc/DeviceModel.java

@@ -0,0 +1,47 @@
+package com.example.greenwatch.mvc;
+
+import java.util.Vector;
+
+public class DeviceModel {
+    private static DeviceModel itemModelInstance;
+    // todo: should be a hashmap with UUID Keys
+    private Vector<Device> connectetDevicesList;
+
+    private DeviceModel() {
+        connectetDevicesList = new Vector<Device>();
+    }
+
+    public static synchronized DeviceModel getInstance() {
+        if (itemModelInstance == null){
+            itemModelInstance = new DeviceModel();
+        }
+        return itemModelInstance;
+    }
+
+    public void addDevice(Device device) {
+        // todo: Check if divece already exist
+        connectetDevicesList.add(device);
+    }
+
+    public Vector<Device> getConnectetDevicesList() {
+        return connectetDevicesList;
+    }
+
+    public void setDeviceSensor(String UUID, String Sensor) {
+        // todo: iterate through HashMap and find Divece for UUID
+    }
+
+    public String  getDeviceSensor(String UUID) {
+        // todo: iterate through HashMap and find Divece for UUID
+        return "hasToBeDone";
+    }
+
+    public void setDeviceStatus(String UUID, Boolean Status) {
+        // todo: iterate through HashMap and find Divece for UUID
+    }
+
+    public Boolean getDeviceStatus(String UUID) {
+        // todo: iterate through HashMap and find Divece for UUID
+        return false;
+    }
+}

app/src/main/java/com/example/greenwatch/mvc/DeviceView.java

@@ -0,0 +1,10 @@
+package com.example.greenwatch.mvc;
+
+import java.util.Vector;
+
+public class DeviceView {
+
+    public void updateView(Vector<Device> deviceVector) {
+        // todo: what should be displayed
+    }
+}

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

@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    tools:context=".AccelerometerActivity">
+
+    <TextView
+        android:id="@+id/tvAccelerometerStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Accelerometer Activity">
+    </TextView>
+
+    <Button
+        android:id="@+id/accelerometerBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    tools:context=".AudiodetectionActivity">
+
+    <TextView
+        android:id="@+id/tvAudiodetectionStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Audiodetection Activity">
+    </TextView>
+
+    <Button
+        android:id="@+id/audiodetectorBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    tools:context=".AudiodetectionAndAccelerometerActivity">
+
+    <TextView
+        android:id="@+id/tvAudiodetectionAndAccelerometerStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Audiodetection + Accelerometer Activity">
+    </TextView>
+
+    <Button
+        android:id="@+id/audiodetectionAndAccelerometerBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    tools:context=".ConnectionActivity">
+
+    <TextView
+        android:id="@+id/tvConnectionStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Connection Activity">
+    </TextView>
+
+    <Button
+        android:id="@+id/connectionBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+</LinearLayout>

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

@@ -1,18 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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:orientation="vertical"
+    android:padding="10dp"
     tools:context=".MainActivity">
 
-    <Button
-        android:id="@+id/buttonstartmicdetection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Starte Mikrofon Detection"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:id="@+id/tvStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="Hello World!"
+        android:layout_weight="1">
+    </TextView>
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_weight="1">
+
+        <Button
+            android:id="@+id/audiodetectionButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Audiodetection">
+        </Button>
+
+        <Button
+            android:id="@+id/videodetectionButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Videodetection">
+        </Button>
+
+        <Button
+            android:id="@+id/accelerometerButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Accelerometer">
+        </Button>
+
+        <Button
+            android:id="@+id/audiodetectionAndAccelerometerButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Audiodetection + Accelerometer">
+        </Button>
+
+        <Button
+            android:id="@+id/videodetectionAndAccelerometerButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Videodetection + Accelerometer">
+        </Button>
+
+        <Button
+            android:id="@+id/connectionButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Connect to Devices">
+        </Button>
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingTop="16dp"
-    tools:activity="com.example.greenwatch">
-
-
-
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="max. Amp: "
-        android:id="@+id/labelMaxAmp"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewMaxAmp"
-        android:text=" "
-        android:layout_alignBaseline="@+id/labelMaxAmp"
-        android:layout_toEndOf="@+id/labelMaxAmpdb"/>
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="max. Amp in dB: "
-        android:id="@+id/labelMaxAmpdb"
-        android:layout_below="@+id/labelMaxAmp"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewMaxAmpdb"
-        android:text=" "
-        android:layout_alignBaseline="@+id/labelMaxAmpdb"
-        android:layout_toEndOf="@+id/labelMaxAmpdb"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Meldung: "
-        android:id="@+id/labelZeitstempel"
-        android:layout_below="@+id/labelMaxAmpdb"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewZeitstempel"
-        android:text=" "
-        android:layout_alignBaseline="@+id/labelZeitstempel"
-        android:layout_toEndOf="@+id/labelMaxAmpdb"/>
-
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/scrollView3"
-        android:layout_below="@+id/labelMaxAmpdb"
-        android:layout_alignParentStart="true">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/textViewLogger"/>
-    </ScrollView>
-
-</RelativeLayout>

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

@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    tools:context=".VideodetectionActivity">
+
+    <TextView
+        android:id="@+id/tvVideodetectionStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Videodetection Activity">
+    </TextView>
+
+    <Button
+        android:id="@+id/videodetectorBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+</LinearLayout>

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

@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp"
+    tools:context=".VideodetectionAndAccelerometerActivity">
+
+    <TextView
+        android:id="@+id/tvVideodetectionAndAccelerometerStatusmessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Videodetection + Accelerometer Activity">
+    </TextView>
+
+    <Button
+        android:id="@+id/videodetectionAndAccelerometerBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+</LinearLayout>