diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 5813d7c6a88c438dd2454a30b98a03e8d4979e99..0000000000000000000000000000000000000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="deploymentTargetDropDown"> - <targetSelectedWithDropDown> - <Target> - <type value="QUICK_BOOT_TARGET" /> - <deviceKey> - <Key> - <type value="VIRTUAL_DEVICE_PATH" /> - <value value="C:\Users\GSB- Surface\.android\avd\Pixel_5_API_30.avd" /> - </Key> - </deviceKey> - </Target> - </targetSelectedWithDropDown> - <timeTargetWasSelectedWithDropDown value="2022-04-28T09:33:56.027584300Z" /> - </component> -</project> \ No newline at end of file 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 337111a2c815c5688293f7f3cb1636df376f703b..dc76ee3cf0595d8cc0f177d37e3857db70ad51b6 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 @@ -75,8 +75,8 @@ public class MainActivity extends AppCompatActivity { // App Logo in das View einbinden ImageView imageview = findViewById(R.id.adenia_logo); imageview.setImageResource(R.drawable.adenia_logo); - imageview = findViewById(R.id.background_logo); - imageview.setImageResource(R.drawable.adenia_logo); + ImageView imageview2 = findViewById(R.id.background_logo); + imageview2.setImageResource(R.drawable.adenia_logo); mLabelInterfaceTime = findViewById(R.id.tV_information); @@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity { @Override public void onClick(View v) { //Abfrage, ob Flugmodus aktiviert ist, wenn Magnetsensor aufgenommen wird - if (magnetic && !isAirplaneModeOn(getApplicationContext())) { + if (magnetic == true && isAirplaneModeOn(getApplicationContext())==false) { alertDialog.setMessage(R.string.main_confirm_send_airplanemode); alertDialog.setPositiveButton("OK", null); alertDialog.show(); @@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity { .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // Aktion bei Ja: löschen des Datenpfades und starten der Aufnahme - deleteDatapath(); + deleteDir(new File(myPrefs.getString("datapath", ""))); startService(); startRecording(); @@ -242,7 +242,7 @@ public class MainActivity extends AppCompatActivity { //new DataSendActivity(textView).execute("someParams"); if (!myPrefs.getString("datapath", "").equals("")) { if (!myPrefs.getString("SensorAppID", "").equals("")) { - deleteDatapath(); + deleteDir(new File(myPrefs.getString("datapath", ""))); } else { alertDialog.setMessage(R.string.no_sensorappid); alertDialog.setPositiveButton("OK", null); @@ -259,17 +259,7 @@ public class MainActivity extends AppCompatActivity { initializeSettings(); } - //delete Datapath - private void deleteDatapath() { - deleteDir(new File(realPath)); - realPath = null; - SharedPreferences.Editor editor = myPrefs.edit(); - editor.putString("datapath", realPath); - editor.apply(); - showToast("Datapath deleted!!!"); - } - - //delete file + //delete files public void deleteDir(File dir) { Log.v("Filelöschen", dir.getAbsolutePath()); File[] files = dir.listFiles(); @@ -286,6 +276,11 @@ public class MainActivity extends AppCompatActivity { dir.delete(); // Ordner löschen Log.v("Filelöschen", "Ordner gelöscht"); } + realPath = null; + SharedPreferences.Editor editor = myPrefs.edit(); + editor.putString("datapath", realPath); + editor.apply(); + showToast("Datapath deleted!!!"); } // View zu Einstellungen wechseln diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingActivity.java b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingActivity.java index 3a6b61848a70d8995443259e40766e017b54867e..53c669f6ea0b74493bbf76987bbbb0e4bb1617cf 100644 --- a/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingActivity.java +++ b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingActivity.java @@ -24,10 +24,10 @@ public class OnboardingActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.fragment_onboarding); - ImageView imageview = findViewById(R.id.adenia_logo); - imageview.setImageResource(R.drawable.adenia_logo); - imageview = findViewById(R.id.background_logo); + ImageView imageview = findViewById(R.id.onboarding_adenia_logo); imageview.setImageResource(R.drawable.adenia_logo); + ImageView imageview2 = findViewById(R.id.onboarding_background_logo); + imageview2.setImageResource(R.drawable.adenia_logo); // Initialize ViewPager view ViewPager viewPager = findViewById(R.id.viewPagerOnBoarding); diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/SettingsActivity.java b/app/src/main/java/de/hbrs/adenia_sensor_app/SettingsActivity.java index e76a9829f7acf5797aed5185e26df6285a7acd43..30c5ccfa5dad5f7dde139fdb362ab5b111f74ebb 100644 --- a/app/src/main/java/de/hbrs/adenia_sensor_app/SettingsActivity.java +++ b/app/src/main/java/de/hbrs/adenia_sensor_app/SettingsActivity.java @@ -17,10 +17,10 @@ public class SettingsActivity extends AppCompatActivity { setContentView(R.layout.activity_settings); //displays app logo as toolbar and logo in background - ImageView imageview = findViewById(R.id.adenia_logo); - imageview.setImageResource(R.drawable.adenia_logo); - imageview = findViewById(R.id.background_logo); + ImageView imageview = findViewById(R.id.settings_adenia_logo); imageview.setImageResource(R.drawable.adenia_logo); + ImageView imageview2 = findViewById(R.id.settings_background_logo); + imageview2.setImageResource(R.drawable.adenia_logo); if (savedInstanceState == null) { getSupportFragmentManager() diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ac5753f15e0383e4efbaa8d1da42b36eadf766b0..e50416215d402bbe0cb882a57a30e5c8c331fcda 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -8,7 +8,7 @@ android:orientation="horizontal"> <ImageView - android:id="@+id/adenia_logo" + android:id="@+id/settings_adenia_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" @@ -20,7 +20,7 @@ tools:src="@drawable/adenia_logo" /> <TextView - android:id="@+id/sensor_app" + android:id="@+id/settings_sensor_app" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" @@ -29,7 +29,7 @@ android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/adenia_logo" /> + app:layout_constraintTop_toBottomOf="@+id/settings_adenia_logo" /> <ImageButton android:id="@+id/bt_close" @@ -38,13 +38,13 @@ android:layout_marginEnd="8dp" android:onClick="changeToHome" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/adenia_logo" - app:layout_constraintBottom_toBottomOf="@+id/adenia_logo" + app:layout_constraintTop_toTopOf="@+id/settings_adenia_logo" + app:layout_constraintBottom_toBottomOf="@+id/settings_adenia_logo" app:srcCompat="@drawable/ic_baseline_home_24" android:contentDescription="@string/description_home_button" /> <ImageView - android:id="@+id/background_logo" + android:id="@+id/settings_background_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:alpha="0.07" @@ -60,6 +60,6 @@ android:id="@+id/settings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@+id/sensor_app" /> + app:layout_constraintTop_toBottomOf="@+id/settings_sensor_app" /> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml index ade20c8c7eac899ee17feaa37e45c3bae11f305c..7e2fee63ba7df005b8233a3ff82060c12f79b139 100644 --- a/app/src/main/res/layout/fragment_onboarding.xml +++ b/app/src/main/res/layout/fragment_onboarding.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent"> <ImageView - android:id="@+id/adenia_logo" + android:id="@+id/onboarding_adenia_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" @@ -19,7 +19,7 @@ tools:src="@drawable/adenia_logo" /> <TextView - android:id="@+id/sensor_app" + android:id="@+id/onboarding_sensor_app" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" @@ -28,10 +28,10 @@ android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/adenia_logo" /> + app:layout_constraintTop_toBottomOf="@+id/onboarding_adenia_logo" /> <ImageView - android:id="@+id/background_logo" + android:id="@+id/onboarding_background_logo" android:layout_width="match_parent" android:layout_height="wrap_content" android:alpha="0.07"