Pre-AlphaV9 - 5 GPS Test Buttons und Displayaktualisierung

app/src/main/java/de/edotzlaff/detection/EarthquakeLocation.java

@@ -32,7 +32,9 @@ import com.google.firebase.database.FirebaseDatabase;
 import de.edotzlaff.detection.detektion.Detektionssignal;
 import de.edotzlaff.detection.detektion.Epizentrum;
 import de.edotzlaff.detection.detektion.Erdbeben;
+import de.edotzlaff.detection.detektion.berechnung.mathObjekte.Deg2UTM;
 import de.edotzlaff.detection.detektion.berechnung.mathObjekte.Koordinaten;
+import de.edotzlaff.detection.detektion.berechnung.mathObjekte.UTM2Deg;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -140,6 +142,9 @@ public class EarthquakeLocation extends FragmentActivity implements OnMapReadyCa
         }
         else
         {
+            UTM2Deg utm2Deg = new UTM2Deg();
+            utm2Deg.convertToDeg(32,'U',epizentrum.getKoordinaten().getX(),epizentrum.getKoordinaten().getY());
+            epizentrum.getKoordinaten().setLocation(utm2Deg.getLatitude(), utm2Deg.getLongitude());
             Log.i(TAGEPIZENTRUM, "Epizentrum konnte ermittelt werden, Koordinaten: " + epizentrum.getKoordinaten().getX() + " " + epizentrum.getKoordinaten().getY());
             Log.i(TAGEPIZENTRUM, "Enstehungszeitpunkt: " + epizentrum.getEntstehungsZeitpunkt());
         }
@@ -171,7 +176,10 @@ public class EarthquakeLocation extends FragmentActivity implements OnMapReadyCa
             String laengengradString = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
             double breitengrad = Double.parseDouble(breitengradString);
             double laengengrad = Double.parseDouble(laengengradString);
-            Koordinaten koordinaten = new Koordinaten(breitengrad, laengengrad);
+
+            Deg2UTM deg2UTM = new Deg2UTM(breitengrad, laengengrad);
+
+            Koordinaten koordinaten = new Koordinaten(deg2UTM.getEasting(), deg2UTM.getNorthing());
             detektionssignal.setKoordinaten(koordinaten);
 
             //Welle in m/s

app/src/main/java/de/edotzlaff/detection/MainActivity.java

@@ -19,6 +19,7 @@ import android.location.Location;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
+import android.provider.ContactsContract;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
@@ -69,7 +70,8 @@ public class MainActivity extends AppCompatActivity {
     //##########################################################################################################################################################################
     //##################################################################  vvv SensorParameter vvv  ##############################################################################
     private SensorManager mSensorManager;
-    private static final float mUpperThreshold = 1.0f; // für Emulator auf 1.5 setzen
+    private static final float mUpperThreshold = 1.0f; // für Emulator auf 1.5 setzen     //Für passende Empfindlichkeit auf 0.025f setzen ohne Smartphonehülle
+    //private static final float mUpperThreshold = 1.0f; // für Emulator auf 1.5 setzen     //Für passende Empfindlichkeit auf 0.025f setzen ohne Smartphonehülle
     private static final float mLowerThreshold = 0.5f; // für Emulator auf 0.5 setzen
     private static final long mShakeDetectionLockTimeMicroSeconds = 3500;
     private float mAccel;
@@ -378,34 +380,83 @@ public class MainActivity extends AppCompatActivity {
 
     public void analyzeDBchanges(DataSnapshot data)
     {
+        for (int i=1; i<=data.getChildrenCount(); i++)
+        {
+            if(analyzeForFullIDG(data,i) || analyzeForEmptyIDG(data,i))
+            {
+                TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
+                TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
+                TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
+                TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
+                String dbSlotStringContent = getSlotString(data,i);
+                String displayContent;
+                switch (i){
+                    case 1:
+                        displayContent = txtDevice1.getText().toString();
+                        if(!displayContent.equals(dbSlotStringContent))
+                        {
+                            if(analyzeForEmptyIDG(data,i))
+                            {
+                                txtDevice1.setText("");
+                            }else
+                            {
+                                txtDevice1.setText(dbSlotStringContent);
+                            }
+                        }
+                        break;
+                    case 2:
+                        displayContent = txtDevice2.getText().toString();
+                        if(!displayContent.equals(dbSlotStringContent))
+                        {
+                            if(analyzeForEmptyIDG(data,i))
+                            {
+                                txtDevice2.setText("");
+                            }else
+                            {
+                                txtDevice2.setText(dbSlotStringContent);
+                            }
+                        }
+                        break;
+                    case 3:
+                        displayContent = txtDevice3.getText().toString();
+                        if(!displayContent.equals(dbSlotStringContent))
+                        {
+                            if(analyzeForEmptyIDG(data,i))
+                            {
+                                txtDevice3.setText("");
+                            }else
+                            {
+                                txtDevice3.setText(dbSlotStringContent);
+                            }
+                        }
+                        break;
+                    case 4:
+                        displayContent = txtDevice4.getText().toString();
+                        if(!displayContent.equals(dbSlotStringContent))
+                        {
+                            if(analyzeForEmptyIDG(data,i))
+                            {
+                                txtDevice4.setText("");
+                            }else
+                            {
+                                txtDevice4.setText(dbSlotStringContent);
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
         int takenIDG = 0;
         for (int i=1; i<=data.getChildrenCount(); i++)
         {
             if(analyzeForFullIDG(data,i))
             {
-                //Ein voller IDG slot
                 takenIDG++;
             }
         }
-
-        if(takenIDG>=1 && takenIDG <=5)
-        {
-            //Kommt bei einer neuen vollen IDG ins Display
-            for(writtenDevices = writtenDevices; writtenDevices <= takenIDG; writtenDevices++)
-            {
-                setDisplayText(data,writtenDevices);
-                enableDisplayReset = true;  //Für DB zurücksetzen
-            }
-        }else
-        {
-            if(enableDisplayReset)
-            {
-                resetDisplayText();
-                enableDisplayReset = false;
-            }
-        }
-
-        //Bei genau 3 Einträgen:
         if(takenIDG >= 3 && allowCalculation)
         {
             Toast.makeText(MainActivity.this, "3 Geräte regisrtiert - Berechnung möglich!", Toast.LENGTH_SHORT).show();
@@ -414,7 +465,17 @@ public class MainActivity extends AppCompatActivity {
             btnEarthquake.setEnabled(true);
         }
     }
-
+    public String getSlotString(DataSnapshot data,int i)
+    {
+        String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
+        String localedatetime = data.child("IDG" + i).child("b_localdatetime").getValue().toString();
+        String breitengrad = data.child("IDG" + i).child("d_breitengrad").getValue().toString();
+        String laengengrad = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
+        String timestamp = data.child("IDG" + i).child("h_timestamp").getValue().toString();
+        String ampltiude = data.child("IDG" + i).child("i_amplitude").getValue().toString();
+        String databaseSlotString = "Device ID " + i + ": "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n";
+        return databaseSlotString;
+    }
     public boolean analyzeForFullIDG(DataSnapshot data, int i)
     {
         String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
@@ -434,50 +495,6 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    public void setDisplayText(DataSnapshot data, int i)
-    {
-        String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
-        String localedatetime = data.child("IDG" + i).child("b_localdatetime").getValue().toString();
-        String breitengrad = data.child("IDG" + i).child("d_breitengrad").getValue().toString();
-        String laengengrad = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
-        String timestamp = data.child("IDG" + i).child("h_timestamp").getValue().toString();
-        String ampltiude = data.child("IDG" + i).child("i_amplitude").getValue().toString();
-        TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
-        TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
-        TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
-        TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
-        switch (i){
-            case 1:
-                txtDevice1.setText("Device ID 1: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
-                break;
-            case 2:
-                txtDevice2.setText("Device ID 2: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
-                break;
-            case 3:
-                txtDevice3.setText("Device ID 3: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
-                break;
-            case 4:
-                txtDevice4.setText("Device ID 4: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void resetDisplayText()
-    {
-        Button btnEarthquake = (Button) findViewById(R.id.btnEarthquakeLocation);
-        btnEarthquake.setEnabled(false);
-        TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
-        TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
-        TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
-        TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
-        txtDevice1.setText("");
-        txtDevice2.setText("");
-        txtDevice3.setText("");
-        txtDevice4.setText("");
-    }
-
     public String getandroidid ()
     {
         return Settings.Secure.getString(this.getContentResolver(), Settings.Secure.ANDROID_ID);
@@ -549,6 +566,203 @@ public class MainActivity extends AppCompatActivity {
                 btnReadyToDetect.setEnabled(false);
             }
         });
+
+
+
+        //TODO Benötigt für Testzwecke (Epizentrum) für Jan
+
+        Button btnGerichtet = (Button) findViewById(R.id.btnGerichtet1);
+        btnGerichtet.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.O)
+            @Override
+            public void onClick(View v) {
+                getDataBaseValuesWithListener();
+                mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
+                mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
+                }
+                mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.448290362613854);
+                mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.097272994499544);
+                mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
+                }
+                mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.44466671859845);
+                mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.11073498515257);
+                mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
+                }
+                mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.44263735292373);
+                mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.124199910730779);
+                mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
+            }
+        });
+
+        Button btnDreiGoogle = (Button) findViewById(R.id.btnDreieckGoogle);
+        btnDreiGoogle.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.O)
+            @Override
+            public void onClick(View v) {
+                mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
+                mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
+                }
+                mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.449588027612);
+                mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.069961699379434);
+                mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
+                }
+                mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.45813339772139);
+                mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.105891230575331);
+                mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
+                }
+                mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.42208575064953);
+                mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.096983614292839);
+                mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
+            }
+        });
+
+        Button btnDreiEigen = (Button) findViewById(R.id.btnDreieckEigen);
+        btnDreiEigen.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.O)
+            @Override
+            public void onClick(View v) {
+                mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
+                mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
+                }
+                mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.44796056728842);
+                mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.069682589518582);
+                mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
+                }
+                mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.445169649958295);
+                mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.110874403601176);
+                mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
+                }
+                mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.42197662865119);
+                mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.07097763125116);
+                mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
+            }
+        });
+
+        Button btnLinieGoogle= (Button) findViewById(R.id.btnLinieGoogle);
+        btnLinieGoogle.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.O)
+            @Override
+            public void onClick(View v) {
+                mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
+                mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
+                }
+                mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.439093816961254);
+                mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.087992224141008);
+                mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
+                }
+                mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.43058961031174);
+                mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.092487606432716);
+                mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
+                }
+                mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.42208989434345);
+                mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.096991470517569);
+                mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
+
+            }
+        });
+
+        Button btnLinieEigen = (Button) findViewById(R.id.btnLinieEigen);
+        btnLinieEigen.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.O)
+            @Override
+            public void onClick(View v) {
+                mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
+                mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
+                }
+                mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.44709382725857);
+                mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.069646529622538);
+                mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
+                }
+                mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.446938212388574);
+                mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.055889659014166);
+                mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
+
+                mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
+                }
+                mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.447447927483005);
+                mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.042050722727316);
+                mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
+                mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
+                mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
+            }
+        });
+
     }
 
 
@@ -557,3 +771,53 @@ public class MainActivity extends AppCompatActivity {
 
 
 }
+
+/*
+    public void setDisplayText(DataSnapshot data, int i)
+    {
+        String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
+        String localedatetime = data.child("IDG" + i).child("b_localdatetime").getValue().toString();
+        String breitengrad = data.child("IDG" + i).child("d_breitengrad").getValue().toString();
+        String laengengrad = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
+        String timestamp = data.child("IDG" + i).child("h_timestamp").getValue().toString();
+        String ampltiude = data.child("IDG" + i).child("i_amplitude").getValue().toString();
+        TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
+        TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
+        TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
+        TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
+        switch (i){
+            case 1:
+                txtDevice1.setText("Device ID 1: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
+                break;
+            case 2:
+                txtDevice2.setText("Device ID 2: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
+                break;
+            case 3:
+                txtDevice3.setText("Device ID 3: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
+                break;
+            case 4:
+                txtDevice4.setText("Device ID 4: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
+                break;
+            default:
+                break;
+        }
+    }
+
+ */
+
+/*
+    public void resetDisplayText()
+    {
+        Button btnEarthquake = (Button) findViewById(R.id.btnEarthquakeLocation);
+        btnEarthquake.setEnabled(false);
+        TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
+        TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
+        TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
+        TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
+        txtDevice1.setText("");
+        txtDevice2.setText("");
+        txtDevice3.setText("");
+        txtDevice4.setText("");
+        allowCalculation=true;
+    }
+ */

app/src/main/java/de/edotzlaff/detection/detektion/Erdbeben.java

@@ -17,7 +17,7 @@ import java.util.Objects;
 public class Erdbeben {
 
     //ToDO anpassen an Szenario umso mehr umso wahrscheinlich ein Ergebnis, oder Abbruchbedingung mit do while
-    public static final Integer SCHLEIFENDURCHLAUFTE = 8000;
+    public static final Integer SCHLEIFENDURCHLAUFTE = 2000;
     private static final String TAG = "ERDBEBEN";
 
     private Epizentrum epizentrum;

app/src/main/java/de/edotzlaff/detection/detektion/berechnung/EpizentrumRechnung.java

@@ -26,10 +26,10 @@ import java.util.Set;
 public class EpizentrumRechnung {
 
     //ToDo Schrittweite und Abstand auf Szenario anpassen
-    private static final double SCHRITTWEITE = 0.000050;
+    private static final double SCHRITTWEITE = 2;
-    private static final double MAX_ABSTAND = 0.000058;
+    private static final double MAX_ABSTAND = 0.5;
-    private static final int DOUBLESTELLEN = 24;
+    private static final int DOUBLESTELLEN = 15;
-    private static final int SCHLEIFENDURCHLAUFTE = 5000;
+    private static final int SCHLEIFENDURCHLAUFTE = 8000;
 
     private static final String TAG = "EPIZENTRUMRECHNUNG";
 
@@ -41,7 +41,7 @@ public class EpizentrumRechnung {
             int zeitunterschied = aufzeichnung.getAnkunftsZeit().getHour() * 3600 + aufzeichnung.getAnkunftsZeit().getMinute() * 60 + aufzeichnung.getAnkunftsZeit().getSecond()
                     - ersteMessung.getAnkunftsZeit().getHour() * 3600 - ersteMessung.getAnkunftsZeit().getMinute() * 60 - ersteMessung.getAnkunftsZeit().getSecond();
 
-            double startradius = zeitunterschied * aufzeichnung.getGeschwErdbeben()*0.0000114130224932113000000;
+            double startradius = zeitunterschied * aufzeichnung.getGeschwErdbeben();
 
             Log.i(TAG, "Init Daten: " + aufzeichnung.getDeviceId() + "Startradius: " + startradius);
             Endpunkt tempEndpunkt = new Endpunkt(aufzeichnung.getDeviceId());
@@ -154,11 +154,12 @@ public class EpizentrumRechnung {
         double x = 0;
         double y = 0;
         for (Schnittpunkt s : schnittpunkte) {
+            Log.i(TAG, "Koordinaten der Schnittpunkte: "+ s.getKoordinaten().getX() + " " + s.getKoordinaten().getY());
             x+= s.getKoordinaten().getX();
             y+= s.getKoordinaten().getY();
         }
-        x = new BigDecimal(x/schnittpunkte.size()).setScale(DOUBLESTELLEN, RoundingMode.HALF_UP).doubleValue()*0.999308681;
+        x = new BigDecimal(x/schnittpunkte.size()).setScale(DOUBLESTELLEN, RoundingMode.HALF_UP).doubleValue();
-        y = new BigDecimal(y/schnittpunkte.size()).setScale(DOUBLESTELLEN, RoundingMode.HALF_UP).doubleValue()*1.000831381;
+        y = new BigDecimal(y/schnittpunkte.size()).setScale(DOUBLESTELLEN, RoundingMode.HALF_UP).doubleValue();
         return new Koordinaten(x,y);
     }
 

app/src/main/java/de/edotzlaff/detection/detektion/berechnung/mathObjekte/Deg2UTM.java

@@ -0,0 +1,76 @@
+package de.edotzlaff.detection.detektion.berechnung.mathObjekte;
+
+public class Deg2UTM {
+
+    double Easting;
+    double Northing;
+    int Zone;
+    char Letter;
+
+    public Deg2UTM(double Lat, double Lon) {
+        Zone = (int) Math.floor(Lon / 6 + 31);
+        if (Lat < -72)
+            Letter = 'C';
+        else if (Lat < -64)
+            Letter = 'D';
+        else if (Lat < -56)
+            Letter = 'E';
+        else if (Lat < -48)
+            Letter = 'F';
+        else if (Lat < -40)
+            Letter = 'G';
+        else if (Lat < -32)
+            Letter = 'H';
+        else if (Lat < -24)
+            Letter = 'J';
+        else if (Lat < -16)
+            Letter = 'K';
+        else if (Lat < -8)
+            Letter = 'L';
+        else if (Lat < 0)
+            Letter = 'M';
+        else if (Lat < 8)
+            Letter = 'N';
+        else if (Lat < 16)
+            Letter = 'P';
+        else if (Lat < 24)
+            Letter = 'Q';
+        else if (Lat < 32)
+            Letter = 'R';
+        else if (Lat < 40)
+            Letter = 'S';
+        else if (Lat < 48)
+            Letter = 'T';
+        else if (Lat < 56)
+            Letter = 'U';
+        else if (Lat < 64)
+            Letter = 'V';
+        else if (Lat < 72)
+            Letter = 'W';
+        else
+            Letter = 'X';
+        Easting = 0.5 * Math.log((1 + Math.cos(Lat * Math.PI / 180) * Math.sin(Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180)) / (1 - Math.cos(Lat * Math.PI / 180) * Math.sin(Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180))) * 0.9996 * 6399593.62 / Math.pow((1 + Math.pow(0.0820944379, 2) * Math.pow(Math.cos(Lat * Math.PI / 180), 2)), 0.5) * (1 + Math.pow(0.0820944379, 2) / 2 * Math.pow((0.5 * Math.log((1 + Math.cos(Lat * Math.PI / 180) * Math.sin(Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180)) / (1 - Math.cos(Lat * Math.PI / 180) * Math.sin(Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180)))), 2) * Math.pow(Math.cos(Lat * Math.PI / 180), 2) / 3) + 500000;
+        Easting = Math.round(Easting * 100) * 0.01;
+        Northing = (Math.atan(Math.tan(Lat * Math.PI / 180) / Math.cos((Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180))) - Lat * Math.PI / 180) * 0.9996 * 6399593.625 / Math.sqrt(1 + 0.006739496742 * Math.pow(Math.cos(Lat * Math.PI / 180), 2)) * (1 + 0.006739496742 / 2 * Math.pow(0.5 * Math.log((1 + Math.cos(Lat * Math.PI / 180) * Math.sin((Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180))) / (1 - Math.cos(Lat * Math.PI / 180) * Math.sin((Lon * Math.PI / 180 - (6 * Zone - 183) * Math.PI / 180)))), 2) * Math.pow(Math.cos(Lat * Math.PI / 180), 2)) + 0.9996 * 6399593.625 * (Lat * Math.PI / 180 - 0.005054622556 * (Lat * Math.PI / 180 + Math.sin(2 * Lat * Math.PI / 180) / 2) + 4.258201531e-05 * (3 * (Lat * Math.PI / 180 + Math.sin(2 * Lat * Math.PI / 180) / 2) + Math.sin(2 * Lat * Math.PI / 180) * Math.pow(Math.cos(Lat * Math.PI / 180), 2)) / 4 - 1.674057895e-07 * (5 * (3 * (Lat * Math.PI / 180 + Math.sin(2 * Lat * Math.PI / 180) / 2) + Math.sin(2 * Lat * Math.PI / 180) * Math.pow(Math.cos(Lat * Math.PI / 180), 2)) / 4 + Math.sin(2 * Lat * Math.PI / 180) * Math.pow(Math.cos(Lat * Math.PI / 180), 2) * Math.pow(Math.cos(Lat * Math.PI / 180), 2)) / 3);
+        if (Letter < 'M')
+            Northing = Northing + 10000000;
+        Northing = Math.round(Northing * 100) * 0.01;
+    }
+
+    public double getEasting() {
+        return Easting;
+    }
+
+    public void setEasting(double easting) {
+        Easting = easting;
+    }
+
+    public double getNorthing() {
+        return Northing;
+    }
+
+    public void setNorthing(double northing) {
+        Northing = northing;
+    }
+}
+

app/src/main/java/de/edotzlaff/detection/detektion/berechnung/mathObjekte/UTM2Deg.java

@@ -0,0 +1,50 @@
+package de.edotzlaff.detection.detektion.berechnung.mathObjekte;
+
+public class UTM2Deg {
+
+    double latitude;
+    double longitude;
+
+
+    public void convertToDeg(int zone, char letter, double easting, double northing)
+    {
+        int Zone=zone;
+        char Letter=letter;
+        double Easting=easting;
+        double Northing=northing;
+        double Hem;
+        if (Letter>'M')
+            Hem='N';
+        else
+            Hem='S';
+        double north;
+        if (Hem == 'S')
+            north = Northing - 10000000;
+        else
+            north = Northing;
+        latitude = (north/6366197.724/0.9996+(1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)-0.006739496742*Math.sin(north/6366197.724/0.9996)*Math.cos(north/6366197.724/0.9996)*(Math.atan(Math.cos(Math.atan(( Math.exp((Easting - 500000) / (0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting - 500000) / (0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2)/3))-Math.exp(-(Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*( 1 -  0.006739496742*Math.pow((Easting - 500000) / (0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2)/3)))/2/Math.cos((north-0.9996*6399593.625*(north/6366197.724/0.9996-0.006739496742*3/4*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.pow(0.006739496742*3/4,2)*5/3*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996 )/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4-Math.pow(0.006739496742*3/4,3)*35/27*(5*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/3))/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2))+north/6366197.724/0.9996)))*Math.tan((north-0.9996*6399593.625*(north/6366197.724/0.9996 - 0.006739496742*3/4*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.pow(0.006739496742*3/4,2)*5/3*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996 )*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4-Math.pow(0.006739496742*3/4,3)*35/27*(5*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/3))/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2))+north/6366197.724/0.9996))-north/6366197.724/0.9996)*3/2)*(Math.atan(Math.cos(Math.atan((Math.exp((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2)/3))-Math.exp(-(Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2)/3)))/2/Math.cos((north-0.9996*6399593.625*(north/6366197.724/0.9996-0.006739496742*3/4*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.pow(0.006739496742*3/4,2)*5/3*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4-Math.pow(0.006739496742*3/4,3)*35/27*(5*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/3))/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2))+north/6366197.724/0.9996)))*Math.tan((north-0.9996*6399593.625*(north/6366197.724/0.9996-0.006739496742*3/4*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.pow(0.006739496742*3/4,2)*5/3*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4-Math.pow(0.006739496742*3/4,3)*35/27*(5*(3*(north/6366197.724/0.9996+Math.sin(2*north/63Line truncated
+        latitude=Math.round(latitude*10000000);
+        latitude=latitude/10000000;
+        longitude =Math.atan((Math.exp((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2)/3))-Math.exp(-(Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2)/3)))/2/Math.cos((north-0.9996*6399593.625*( north/6366197.724/0.9996-0.006739496742*3/4*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.pow(0.006739496742*3/4,2)*5/3*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2* north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4-Math.pow(0.006739496742*3/4,3)*35/27*(5*(3*(north/6366197.724/0.9996+Math.sin(2*north/6366197.724/0.9996)/2)+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/4+Math.sin(2*north/6366197.724/0.9996)*Math.pow(Math.cos(north/6366197.724/0.9996),2)*Math.pow(Math.cos(north/6366197.724/0.9996),2))/3)) / (0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2))))*(1-0.006739496742*Math.pow((Easting-500000)/(0.9996*6399593.625/Math.sqrt((1+0.006739496742*Math.pow(Math.cos(north/6366197.724/0.9996),2)))),2)/2*Math.pow(Math.cos(north/6366197.724/0.9996),2))+north/6366197.724/0.9996))*180/Math.PI+Zone*6-183;
+        longitude=Math.round(longitude*10000000);
+        longitude=longitude/10000000;
+    }
+
+
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+}

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

@@ -86,6 +86,57 @@
         android:textColor="@color/black"
         android:text="@string/db_zur_cksetzen" />
 
+    <Button
+        android:id="@+id/btnGerichtet1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/btnResetDB"
+        android:backgroundTint="@color/design_default_color_secondary_variant"
+        android:layout_alignParentStart="false"
+        android:layout_alignParentEnd="false"
+        android:layout_alignParentBottom="false"
+        android:layout_centerInParent="true"
+        android:layout_marginBottom="1dp"
+        android:text="@string/gerichtett"
+        android:textColor="@color/white" />
+
+    <Button
+        android:id="@+id/btnLinieGoogle"
+        android:backgroundTint="@color/design_default_color_secondary_variant"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/btnGerichtet1"
+        android:layout_toStartOf="@id/btnGerichtet1"
+        android:text="@string/linie_g" />
+
+    <Button
+        android:id="@+id/btnDreieckGoogle"
+        android:backgroundTint="@color/design_default_color_secondary_variant"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/btnGerichtet1"
+        android:layout_toEndOf="@id/btnGerichtet1"
+        android:text="@string/gerichtet_g"
+        tools:text="Dreieck_G" />
+
+    <Button
+        android:id="@+id/btnDreieckEigen"
+        android:backgroundTint="@color/design_default_color_secondary_variant"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/btnGerichtet1"
+        android:layout_toEndOf="@id/btnGerichtet1"
+        android:text="@string/dreieck_e"
+        tools:text="Dreieck_E" />
+
+    <Button
+        android:id="@+id/btnLinieEigen"
+        android:backgroundTint="@color/design_default_color_secondary_variant"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/btnGerichtet1"
+        android:layout_toStartOf="@id/btnGerichtet1"
+        android:text="@string/linie_e" />
 
 
 

app/src/main/res/values/strings.xml

@@ -9,4 +9,9 @@
     <string name="device_2">Device 2</string>
     <string name="device_1">Device 1</string>
     <string name="db_zur_cksetzen">DB zurücksetzen</string>
+    <string name="gerichtet_g">Gerichtet_G</string>
+    <string name="dreieck_e">Dreieck_E</string>
+    <string name="linie_e">Linie_E</string>
+    <string name="linie_g">Linie_G</string>
+    <string name="gerichtett">Gerichtett</string>
 </resources>