diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6137c2d1015f903f3782a25bf6b1f1c1edc5ab7a..2906850995b28d81e180a115b1cd3f5932ecdc6e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -30,6 +30,7 @@
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_twow.xml" value="0.10960144927536232" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/settings_activity.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/toolbar_main.xml" value="0.13601823708206687" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/xml/root_preferences.xml" value="0.165" />
</map>
</option>
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/FileStreamer.java b/app/src/main/java/de/hbrs/adenia_sensor_app/FileStreamer.java
index 96b6e8a1763a352e2fd00cb3861e8e033d514e2e..c35550fc77004d544b9d34feb8372994de41ce55 100644
--- a/app/src/main/java/de/hbrs/adenia_sensor_app/FileStreamer.java
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/FileStreamer.java
@@ -11,49 +11,41 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.security.KeyException;
-import java.security.Timestamp;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
public class FileStreamer {
- // properties
private final static String LOG_TAG = FileStreamer.class.getName();
private Context mContext;
private HashMap<String, BufferedWriter> mFileWriters = new HashMap<>();
private String mOutputFolder;
- // constructor
public FileStreamer(Context mContext, final String mOutputFolder) {
this.mContext = mContext;
this.mOutputFolder = mOutputFolder;
}
- // methods
public void addFile(final String writerId, final String fileName) throws IOException {
- // check if there is a already generated text file
+ // prüfen ob Textfile schon vorhanden
if (mFileWriters.containsKey(writerId)) {
Log.w(LOG_TAG, "addFile: " + writerId + " already exist.");
return;
}
- // get current time information
- Calendar fileTimestamp = Calendar.getInstance();
+ // aktuelle Zeit im gewünschten Format auslesen
String timeHeader = "";
- Date date = new Date();
- SimpleDateFormat format = new SimpleDateFormat(
- "yyyy-MM-dd_HH:mm:ss.SSS");
- timeHeader = MainActivity.getUserID() + ", " + writerId + ", " + format.format(date) + "\n";
+ Date date = new Date();
+ SimpleDateFormat format = new SimpleDateFormat(
+ "yyyy-MM-dd_HH:mm:ss.SSS");
+ timeHeader = MainActivity.getUserID() + ", " + writerId + ", " + format.format(date) + "\n";
-
- // generate text file
+ // text file erstellen
BufferedWriter newWriter = createFile(mOutputFolder + "/" + fileName, timeHeader);
mFileWriters.put(writerId, newWriter);
}
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 4cf5ca0b3d8805ca15310276482a44d56cb88a5f..3a6b61848a70d8995443259e40766e017b54867e 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
@@ -1,17 +1,15 @@
package de.hbrs.adenia_sensor_app;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.hardware.SensorManager;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.preference.PreferenceManager;
+
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
@@ -26,9 +24,9 @@ public class OnboardingActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_onboarding);
- ImageView imageview = (ImageView) findViewById(R.id.adenia_logo);
+ ImageView imageview = findViewById(R.id.adenia_logo);
imageview.setImageResource(R.drawable.adenia_logo);
- imageview = (ImageView) findViewById(R.id.background_logo);
+ imageview = findViewById(R.id.background_logo);
imageview.setImageResource(R.drawable.adenia_logo);
// Initialize ViewPager view
@@ -63,6 +61,8 @@ class ViewPagerAdapter extends FragmentPagerAdapter {
public ViewPagerAdapter(FragmentManager supportFragmentManager) {
super(supportFragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
+
+ @NonNull
@Override
public Fragment getItem(int i) {
return mList.get(i);
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/SensorConfig.java b/app/src/main/java/de/hbrs/adenia_sensor_app/SensorConfig.java
index 41ccb40c5d34eb04e2a1c624fdea91bec16f68d8..d0de98c4d869f5a6ce58f761b42a0dd556628976 100644
--- a/app/src/main/java/de/hbrs/adenia_sensor_app/SensorConfig.java
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/SensorConfig.java
@@ -6,31 +6,15 @@ public class SensorConfig implements java.io.Serializable{
private Boolean mIsFileEnabled = true;
private String mFolderPrefix = "";
- private Boolean mIsWifiEnabled = true;
- private int mWifiScanInterval = 1;
-
- private int mStartDelay = 0;
private long mReferenceTimestamp = 0;
private String mOutputFolder = "";
- // getter and setter
+ // getter und setter
public Boolean getFileEnabled() {
return this.mIsFileEnabled;
}
- public Boolean getWifiEnabled() {
- return this.mIsWifiEnabled;
- }
-
- public int getWifiScanInterval() {
- return this.mWifiScanInterval;
- }
-
- public int getStartDelay() {
- return this.mStartDelay;
- }
-
public long getReferenceTimestamp() {
return this.mReferenceTimestamp;
}
@@ -51,18 +35,6 @@ public class SensorConfig implements java.io.Serializable{
this.mIsFileEnabled = v;
}
- public void setWifiEnabled(Boolean v) {
- this.mIsWifiEnabled = v;
- }
-
- public void setWifiScanInterval(int v) {
- this.mWifiScanInterval = v;
- }
-
- public void setStartDelay(int v) {
- this.mStartDelay = v;
- }
-
public void setFolderPrefix(String v) {
this.mFolderPrefix = v;
}
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 38a5340dfa5e742e2d9e64274f0924f254f148e5..e76a9829f7acf5797aed5185e26df6285a7acd43 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,9 +17,9 @@ public class SettingsActivity extends AppCompatActivity {
setContentView(R.layout.activity_settings);
//displays app logo as toolbar and logo in background
- ImageView imageview = (ImageView) findViewById(R.id.adenia_logo);
+ ImageView imageview = findViewById(R.id.adenia_logo);
imageview.setImageResource(R.drawable.adenia_logo);
- imageview = (ImageView) findViewById(R.id.background_logo);
+ imageview = findViewById(R.id.background_logo);
imageview.setImageResource(R.drawable.adenia_logo);
if (savedInstanceState == null) {
@@ -45,16 +45,16 @@ public class SettingsActivity extends AppCompatActivity {
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.root_preferences, rootKey);
- final SwitchPreferenceCompat switchPressure = (SwitchPreferenceCompat) findPreference("pressure");
- final SwitchPreferenceCompat switchGyroscope = (SwitchPreferenceCompat) findPreference("gyroscope");
- final SwitchPreferenceCompat switchMagnetic = (SwitchPreferenceCompat) findPreference("magnetic");
- if (MainActivity.getPressureAvailable() == false) {
+ final SwitchPreferenceCompat switchPressure = findPreference("pressure");
+ final SwitchPreferenceCompat switchGyroscope = findPreference("gyroscope");
+ final SwitchPreferenceCompat switchMagnetic = findPreference("magnetic");
+ if (!MainActivity.getPressureAvailable()) {
switchPressure.setEnabled(false);
}
- if (MainActivity.getGyroscopeAvailable() == false) {
+ if (!MainActivity.getGyroscopeAvailable()) {
switchGyroscope.setEnabled(false);
}
- if (MainActivity.getMagneticAvailable() == false) {
+ if (!MainActivity.getMagneticAvailable()) {
switchMagnetic.setEnabled(false);
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9e4ac5da09e538c93ccb4eec9f8b5f97b5f684a7..6c9ebb02c524257831410b0761e38650330f67ab 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -176,6 +176,7 @@
android:textSize="20sp"
android:background="@color/start"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@+id/bt_stop"/>
<Button
@@ -183,11 +184,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
android:text="@string/main_button_stop"
android:textSize="20sp"
android:background="@color/stop"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cfe52eac1ba66ba280a68ca7be8fcf88a16..036d09bc5fd523323794379703c4a111d1e28a04 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cfe52eac1ba66ba280a68ca7be8fcf88a16..036d09bc5fd523323794379703c4a111d1e28a04 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 898f3ed59ac9f3248734a00e5902736c9367d455..e24eb338cb771be1ed0aa5ac169ac1bfa8cdddfe 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index dffca3601eba7bf5f409bdd520820e2eb5122c75..cb78666cb4d0e59f0e1097e8f3e1a4c586db62f1 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 64ba76f75e9ce021aa3d95c213491f73bcacb597..f4bbdf5a46f4f09a7a45d1fbe79a70143cfe49d0 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index dae5e082342fcdeee5db8a6e0b27028e2d2808f5..4b0b687e0c9e06e398e454680c01fb9c53d9ea97 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index e5ed46597ea8447d91ab1786a34e30f1c26b18bd..edb84125b9d6bc1b2291a764b706b563a7fecc53 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 14ed0af35023e4f1901cf03487b6c524257b8483..40bba60389e4138a0e13b8588b79d83fdde5aeba 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b0907cac3bfd8fbfdc46e1108247f0a1055387ec..b0c12fcd5c7c2ca080e8b0a816edd56f109778aa 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index d8ae03154975f397f8ed1b84f2d4bf9783ecfa26..300b9bcbf155306ed6229d15c9e3033faf0e8a39 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 2c18de9e66108411737e910f5c1972476f03ddbf..4544bf081c9d353efc53afd0e4ff92136a628fec 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index beed3cdd2c32af5114a7dc70b9ef5b698eb8797e..b6e75c99357659d14c0a91e2dffca7ac080778d3 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf65f65c3b746138c172396921977fa82e90d700
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="ic_launcher_background">#95d1e9</color>
+</resources>
\ No newline at end of file