diff --git a/.idea/misc.xml b/.idea/misc.xml index 0cdb5e8661e474b404bd4fee44606c8409ac0831..2a1dd60599b99db37ac42196bd0860ce2ed1a76b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -14,6 +14,8 @@ <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.137" /> <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/drawable/ic_launcher_background.xml" value="0.137" /> <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/layout/activity_infopage.xml" value="0.18802083333333333" /> + <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/layout/activity_main.xml" value="0.18802083333333333" /> + <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/layout/activity_settings.xml" value="0.18802083333333333" /> <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_one.xml" value="0.18802083333333333" /> <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_three.xml" value="0.18802083333333333" /> <entry key="..\:/Private/Uni/Bachelorarbeit/App/final/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_two.xml" value="0.18802083333333333" /> diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/MainActivity.java b/app/src/main/java/de/hbrs/adenia_sensor_app/MainActivity.java index f5e85e88443e0deb7f5249fd4db022cc14a12680..419c5b454c31d64b68301e0ac74ca2c89165ec74 100644 --- a/app/src/main/java/de/hbrs/adenia_sensor_app/MainActivity.java +++ b/app/src/main/java/de/hbrs/adenia_sensor_app/MainActivity.java @@ -126,6 +126,14 @@ public class MainActivity extends AppCompatActivity { alertDialog.show(); return; } + + // Abfrage, ob mindestens ein Sensor zur Aufzeichnung ausgewählt + if (!myPrefs.getBoolean("magnetic", false) && !myPrefs.getBoolean("gyroscope", false) && !myPrefs.getBoolean("pressure", false)){ + alertDialog.setMessage(R.string.select_sensor); + alertDialog.setPositiveButton("OK", null); + alertDialog.show(); + return; + } // Abfrage, ob ein alter Datenpfad existiert, wenn ja wird dieser gelöscht if ((!myPrefs.getString("datapath", "").equals(""))) { builder.setMessage(R.string.main_confirm_start) @@ -396,6 +404,7 @@ public class MainActivity extends AppCompatActivity { } tVUserID.setText(String.format("%s %s", getString(R.string.SensorAppID), userID)); + // Abfrage ob Datenpfad vorhanden und entsprechende Einstellung des Senden-Buttons if (!myPrefs.getString("datapath", "").equals("")) { bt_send.setEnabled(true); bt_send.setAlpha(1.0f); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8d0e7235cbd8d539ec574d9b024741e788bff1b1..c403f8b88f2900be4ddab0bde1d5293a920f1bc8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -187,6 +187,8 @@ android:text="@string/main_button_stop" android:textSize="20sp" android:background="@color/stop" + android:enabled="false" + android:alpha="0.5" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6f9e83909e6b5b7ec7471fb3bbd2c68f6b82fc23..32595f1c4e2b508d43d79f1502454b714842bcd9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -59,4 +59,5 @@ <string name="error">Fehler</string> <string name="uploading">Hochladen…</string> <string name="main_desabel_send_airplanemode">Bitte schalten Sie den Flugmodus aus zum senden der Daten.</string> + <string name="select_sensor">Bitte wählen Sie mindestens einen Sensor zur Aufzeichnung aus.</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 81d5526465e80198a1b52fce0dac269198d0b9aa..9c7730bdea3ec43353156a1100c3ed73f2955eeb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,6 +57,7 @@ <string name="recordingtime">Recordingtime: %1$s</string> <string name="ready_to_send_data">Ready to send data (Time: %1$s)</string> <string name="uploading">Uploading…</string> - <string name="error">Error</string> + <string name="error">Error, please try again later.</string> <string name="main_desabel_send_airplanemode">Please turn off flight mode to send data.</string> + <string name="select_sensor">Please select at least one sensor for recording.</string> </resources>