diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 168aabda8b44f7c5a5bad9c0af15ef0ccf670507..5813d7c6a88c438dd2454a30b98a03e8d4979e99 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
- <runningDeviceTargetSelectedWithDropDown>
- <Target>
- <type value="RUNNING_DEVICE_TARGET" />
- <deviceKey>
- <Key>
- <type value="VIRTUAL_DEVICE_PATH" />
- <value value="C:\Users\GSB- Surface\.android\avd\Pixel_5_API_30.avd" />
- </Key>
- </deviceKey>
- </Target>
- </runningDeviceTargetSelectedWithDropDown>
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7a3552715472f3b39284dc84f06f1a7d77ed6e62..6137c2d1015f903f3782a25bf6b1f1c1edc5ab7a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,13 +13,21 @@
<entry key="..\:/Private/Uni/Bachelorarbeit/App/ADENiA Sensor App/app/src/main/res/menu/top_app_bar.xml" value="0.29791666666666666" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/background.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/customframe.xml" value="0.1" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/default_dot.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/ic_baseline_home_24.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/ic_baseline_settings_24.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/selected_dot.xml" value="0.1" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/drawable/tab_selector.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/activity_infopage.xml" value="0.1" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/activity_main.xml" value="0.1404494382022472" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/activity_settings.xml" value="0.1440443213296399" />
<entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/fragment_infopage.xml" value="0.165" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding.xml" value="0.10960144927536232" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_one.xml" value="0.10960144927536232" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_three.xml" value="0.10960144927536232" />
+ <entry key="..\:/Users/GSB- Surface/StudioProjects/adenia-sensor-app/app/src/main/res/layout/fragment_onboarding_two.xml" value="0.25" />
+ <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/xml/root_preferences.xml" value="0.165" />
diff --git a/.idea/other.xml b/.idea/other.xml
deleted file mode 100644
index f3d4a2e5d5398de87b4b7a324256c2a09677c566..0000000000000000000000000000000000000000
--- a/.idea/other.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ScreenshotViewer">
- <option name="frameScreenshot" value="true" />
- </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cbf3176d147eabee9262654067e563c929142c4f..0a5ffd835facbf333f496e86c54fa0ff64ddfcb0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="de.hbrs.adenia_sensor_app">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -28,11 +29,16 @@
android:name=".SettingsActivity"
android:exported="false"
android:label="@string/title_activity_settings" />
+ <activity
+ android:name=".OnboardingActivity"
+ android:exported="false"
+ android:label="welcomescreen" />
<activity
android:name=".MainActivity"
android:exported="true"
android:screenOrientation="portrait"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ tools:ignore="LockedOrientationActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/InfopageActivity.java b/app/src/main/java/de/hbrs/adenia_sensor_app/InfopageActivity.java
deleted file mode 100644
index b71d5dd6462f45f98b296bd7c957ea08f60940fc..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/hbrs/adenia_sensor_app/InfopageActivity.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.hbrs.adenia_sensor_app;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.viewpager.widget.ViewPager;
-
-public class InfopageActivity extends AppCompatActivity {
- ViewPager pager;
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState){
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_infopage);
- pager = findViewById(R.id.vpMain);
-
- }
-}
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/InfopageFragment.java b/app/src/main/java/de/hbrs/adenia_sensor_app/InfopageFragment.java
deleted file mode 100644
index a4bc617013984f2adb50f5e062eaced8670b37b6..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/hbrs/adenia_sensor_app/InfopageFragment.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package de.hbrs.adenia_sensor_app;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-
-import androidx.preference.PreferenceManager;
-
-public class InfopageFragment {
-
-// @Override
-// protected void onCreate(Bundle savedInstanceState) {
-// super.onCreate(savedInstanceState);
-// setContentView(R.layout.activity_main);
-// SharedPreferences sharedPreferences =
-// PreferenceManager.getDefaultSharedPreferences(this);
-// // Check if we need to display our OnboardingSupportFragment
-// if (!sharedPreferences.getBoolean(
-// MyOnboardingSupportFragment.COMPLETED_ONBOARDING_PREF_NAME, false)) {
-// // The user hasn't seen the OnboardingSupportFragment yet, so show it
-// startActivity(new Intent(this, OnboardingActivity.class));
-// }
-// }
-}
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 432d29a5c7c1bc878c1cccb52ba98c2081cfd530..399ad74d9fef1e636e7c2e623f5a4f6fc207a74b 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
@@ -10,6 +10,7 @@ import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
import android.os.Handler;
import android.preference.PreferenceManager;
@@ -20,6 +21,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
+import com.google.android.material.tabs.TabLayout;
+
import java.io.IOException;
import java.util.Calendar;
import java.util.Locale;
@@ -92,6 +95,15 @@ public class MainActivity extends AppCompatActivity {
mIMUSession = new SensorSession(this);
+ //
+ if(myPrefs.getBoolean("firstuse", true)) {
+ //SharedPreferences.Editor editor = myPrefs.edit();
+ //editor.putBoolean("firstuse", false);
+ //editor.apply();
+ Intent intent = new Intent(this, OnboardingActivity.class);
+ startActivity(intent);
+ }
+
//configuration start button
bt_start = (Button)findViewById(R.id.bt_start);
bt_start.setOnClickListener(new View.OnClickListener() {
@@ -103,6 +115,12 @@ public class MainActivity extends AppCompatActivity {
// alertDialog.show();
// return;
// }
+ if(myPrefs.getString("SensorAppID", "").equals("")){
+ alertDialog.setMessage(R.string.set_Sensor_App_ID);
+ alertDialog.setPositiveButton("OK", null);
+ alertDialog.show();
+ return;
+ }
if((!myPrefs.getString("datapath", "").equals(""))){
builder.setMessage(R.string.main_confirm_start)
.setCancelable(false)
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
new file mode 100644
index 0000000000000000000000000000000000000000..4cf5ca0b3d8805ca15310276482a44d56cb88a5f
--- /dev/null
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingActivity.java
@@ -0,0 +1,77 @@
+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.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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OnboardingActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.fragment_onboarding);
+
+ ImageView imageview = (ImageView) findViewById(R.id.adenia_logo);
+ imageview.setImageResource(R.drawable.adenia_logo);
+ imageview = (ImageView) findViewById(R.id.background_logo);
+ imageview.setImageResource(R.drawable.adenia_logo);
+
+ // Initialize ViewPager view
+ ViewPager viewPager = findViewById(R.id.viewPagerOnBoarding);
+ // create ViewPager adapter
+ ViewPagerAdapter viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
+
+ // Add All Fragments to ViewPager
+ viewPagerAdapter.addFragment(new OnboardingOneFragment());
+ viewPagerAdapter.addFragment(new OnboardingTwoFragment());
+ viewPagerAdapter.addFragment(new OnboardingThreeFragment());
+ //viewPagerAdapter.addFragment(new StepFourFragment());
+
+ // Set Adapter for ViewPager
+ viewPager.setAdapter(viewPagerAdapter);
+
+ // Setup dot's indicator
+ TabLayout tabLayout = findViewById(R.id.tabLayoutIndicator);
+ tabLayout.setupWithViewPager(viewPager);
+
+ }
+
+ public void changeToHome(View view) {
+ finish();
+ }
+}
+
+class ViewPagerAdapter extends FragmentPagerAdapter {
+
+ private final List<Fragment> mList = new ArrayList<>();
+
+ public ViewPagerAdapter(FragmentManager supportFragmentManager) {
+ super(supportFragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+ }
+ @Override
+ public Fragment getItem(int i) {
+ return mList.get(i);
+ }
+ @Override
+ public int getCount() {
+ return mList.size();
+ }
+ public void addFragment(Fragment fragment) {
+ mList.add(fragment);
+ }
+}
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingOneFragment.java b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingOneFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..b27c714eba7383580d37a7fd7438a5ab4f77a7c2
--- /dev/null
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingOneFragment.java
@@ -0,0 +1,20 @@
+package de.hbrs.adenia_sensor_app;
+
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+public class OnboardingOneFragment extends Fragment {
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_onboarding_one, container, false);
+ }
+ }
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingThreeFragment.java b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingThreeFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b1d2813909e318aed7199ecffd4106f47cd9806
--- /dev/null
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingThreeFragment.java
@@ -0,0 +1,18 @@
+package de.hbrs.adenia_sensor_app;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+
+public class OnboardingThreeFragment extends Fragment {
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_onboarding_three, container, false);
+ }
+}
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingTwoFragment.java b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingTwoFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..8e19fb219bdea9218c77ac177d873bc58ee8acf9
--- /dev/null
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/OnboardingTwoFragment.java
@@ -0,0 +1,18 @@
+package de.hbrs.adenia_sensor_app;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+
+public class OnboardingTwoFragment extends Fragment {
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_onboarding_two, container, false);
+ }
+ }
diff --git a/app/src/main/java/de/hbrs/adenia_sensor_app/SensorSession.java b/app/src/main/java/de/hbrs/adenia_sensor_app/SensorSession.java
index e2f968ba1d57b2800d041b424872efa3ea57a2fa..3ae50d6d7c390635046a25c651bccaddb7a988dd 100644
--- a/app/src/main/java/de/hbrs/adenia_sensor_app/SensorSession.java
+++ b/app/src/main/java/de/hbrs/adenia_sensor_app/SensorSession.java
@@ -50,13 +50,12 @@ public class SensorSession implements SensorEventListener {
public SensorSession(MainActivity context) {
// initialize object and sensor manager
- this.context = context;
- sensorManager = (SensorManager) this.context.getSystemService(Context.SENSOR_SERVICE);
- powerManager = (PowerManager) this.context.getSystemService(Context.POWER_SERVICE);
+ sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+ powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
wakelock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ADENiASensorApp::SensorWakelock");
// initialize SharedPreferences, read and safe Sensor-App-ID
- myPrefs = PreferenceManager.getDefaultSharedPreferences(this.context.getApplicationContext());
+ myPrefs = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
userID = myPrefs.getString("SesorAppID", "");
// setup and register various sensors
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 b5a5670d992eb4ab1efac77e36e19dcda8b96658..38a5340dfa5e742e2d9e64274f0924f254f148e5 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
@@ -37,6 +37,7 @@ public class SettingsActivity extends AppCompatActivity {
public void changeToHome(View view) {
finish();
+
}
public static class SettingsFragment extends PreferenceFragmentCompat {
diff --git a/app/src/main/res/drawable/default_dot.xml b/app/src/main/res/drawable/default_dot.xml
new file mode 100644
index 0000000000000000000000000000000000000000..612611212e2b584de2101fd138b90b1191f0b6f6
--- /dev/null
+++ b/app/src/main/res/drawable/default_dot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item>
+ <shape
+ android:innerRadius="0dp"
+ android:shape="ring"
+ android:thickness="8dp"
+ android:useLevel="false">
+ <solid android:color="@android:color/darker_gray"/>
+ </shape>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selected_dot.xml b/app/src/main/res/drawable/selected_dot.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ce93142cd92d0b764a55eb6a587d9a68f56ebb69
--- /dev/null
+++ b/app/src/main/res/drawable/selected_dot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item>
+ <shape
+ android:innerRadius="0dp"
+ android:shape="ring"
+ android:thickness="8dp"
+ android:useLevel="false">
+ <solid android:color="@color/accentBackground_logo_dark"/>
+ </shape>
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sensor_app_id_help_3.png b/app/src/main/res/drawable/sensor_app_id_help_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b9b887fcfabdfbdea4186919ea45485b8c07574
Binary files /dev/null and b/app/src/main/res/drawable/sensor_app_id_help_3.png differ
diff --git a/app/src/main/res/drawable/tab_selector.xml b/app/src/main/res/drawable/tab_selector.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa1e25f6485eadc07bca8f78e9eb80182c969f7c
--- /dev/null
+++ b/app/src/main/res/drawable/tab_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!--State Selected show pink dot-->
+ <item android:drawable="@drawable/selected_dot" android:state_selected="true" />
+ <!--Default State show gray dot-->
+ <item android:drawable="@drawable/default_dot" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 04a0e7ff57c8b92c94375a64ce346d6031110aca..ac5753f15e0383e4efbaa8d1da42b36eadf766b0 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -32,7 +32,7 @@
app:layout_constraintTop_toBottomOf="@+id/adenia_logo" />
<ImageButton
- android:id="@+id/bt_back"
+ android:id="@+id/bt_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_infopage.xml b/app/src/main/res/layout/fragment_onboarding.xml
similarity index 69%
rename from app/src/main/res/layout/fragment_infopage.xml
rename to app/src/main/res/layout/fragment_onboarding.xml
index b2821e80059ed8c18e6b6b00a847652e9e207616..ade20c8c7eac899ee17feaa37e45c3bae11f305c 100644
--- a/app/src/main/res/layout/fragment_infopage.xml
+++ b/app/src/main/res/layout/fragment_onboarding.xml
@@ -43,28 +43,20 @@
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/adenia_logo" />
- <Button
- android:id="@+id/finish"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:text="Weiter"
- android:textSize="20sp"
- android:background="@color/accentBackground_logo"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <androidx.viewpager.widget.ViewPager
+ android:id="@+id/viewPagerOnBoarding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="64dp"/>
- <EditText
- android:id="@+id/editTextTextMultiLine"
- android:layout_width="wrap_content"
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tabLayoutIndicator"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:ems="10"
- android:gravity="start|top"
- android:inputType="textMultiLine"
- android:text="@string/text_infopage"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/background_logo"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:layout_margin="8dp"
+ app:tabGravity="center"
+ app:tabIndicatorHeight="0dp"
+ app:tabBackground="@drawable/tab_selector" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_one.xml b/app/src/main/res/layout/fragment_onboarding_one.xml
new file mode 100644
index 0000000000000000000000000000000000000000..44a82a6239c9becad3eae7c0dc3a52f582b8eb68
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_one.xml
@@ -0,0 +1,35 @@
+<?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"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="320dp"
+ android:layout_height="320dp"
+ android:layout_gravity="center"
+ android:layout_margin="16dp"
+ android:src="@drawable/adenia_logo" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/welcome"
+ android:textAppearance="@style/TextAppearance.AppCompat.Large"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tv_sensorAppID_help_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/sensorAppID_help_1"
+ android:textAppearance="@style/TextAppearance.AppCompat.Small"
+ android:textStyle="bold"
+ android:autoLink="web"
+ android:maxWidth="350dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_three.xml b/app/src/main/res/layout/fragment_onboarding_three.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22e4bb4d97d196d534588505d6bd63575a8fbc9d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_three.xml
@@ -0,0 +1,43 @@
+<?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"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_margin="16dp"
+ android:layout_width="320dp"
+ android:layout_height="320dp"
+ android:layout_gravity="center"
+ android:src="@drawable/sensor_app_id_help_3" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/app_settings"
+ android:textAppearance="@style/TextAppearance.AppCompat.Large"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="350dp"
+ android:gravity="center"
+ android:text="@string/sensorAppID_help_3"
+ android:textAppearance="@style/TextAppearance.AppCompat.Small"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/bt_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="32dp"
+ android:onClick="changeToHome"
+ android:text="@string/ready"
+ android:background="@color/accentBackground_logo_dark"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_two.xml b/app/src/main/res/layout/fragment_onboarding_two.xml
new file mode 100644
index 0000000000000000000000000000000000000000..03b0b561e7291b1411890a99a12479c7d69e0109
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding_two.xml
@@ -0,0 +1,34 @@
+<?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"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="320dp"
+ android:layout_height="320dp"
+ android:layout_gravity="center"
+ android:layout_margin="16dp"
+ android:src="@drawable/adenia_logo" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/register"
+ android:textAppearance="@style/TextAppearance.AppCompat.Large"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/tv_sensorAppID_help_2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/sensorAppID_help_2"
+ android:textAppearance="@style/TextAppearance.AppCompat.Small"
+ android:textStyle="bold"
+ android:maxWidth="350dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2c5634aa7070fe0a381711a5786dcdddb3c9b188..5acbd6242a84ea6cc1b9f0b171349902f6d2a84c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -38,6 +38,11 @@
<string name="description_settings_button">Einstellungsknopf</string>
<string name="ready">Bereit</string>
<string name="description_home_button">Home-Knopf</string>
- <string name="text_infopage">gehen Sie auf die Webseite \"adenia.h-brs.de\" auf \"Teilnahme\"</string>
+ <string name="sensorAppID_help_1">Gehen Sie auf die Webseite \"https://adenia.h-brs.de\" auf \"Teilnahme\" (direkter Link: https://adenia.h-brs.de/de/Studienteilnahme/Studienteilnahme.html)</string>
<string name="set_Sensor_App_ID">Bitte Sensor-App-ID in den Einstellungen eingeben.</string>
+ <string name="app_settings">App Einstellungen</string>
+ <string name="sensorAppID_help_3">Geben Sie die erhaltene \"Sensor-App-ID\" in den Einstellungen der Sensor-App ein.</string>
+ <string name="sensorAppID_help_2">Klicken Sie auf \"JETZT NEU REGISTRIEREN\". Sie erhalten dort Ihre \"Sensor-App-ID\".</string>
+ <string name="register">Registrieren</string>
+ <string name="welcome">Willkommen</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 8b2cdce5e385f573014ae1b751938203db793de4..c6e4367c97bb2f0af4332eb444de402f72c53faf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,15 +29,20 @@
<string name="switch_Magnetic_on">Magneticfield switched on</string>
<string name="switch_Magnetic_off">Magneticfield switched off</string>
<string name="record_running">Recording sensors</string>
- <string name="yes">yes</string>
- <string name="main_confirm_start">started</string>
- <string name="no">no</string>
- <string name="main_confirm_stop">stopped</string>
+ <string name="yes">Yes</string>
+ <string name="main_confirm_start">Started</string>
+ <string name="no">No</string>
+ <string name="main_confirm_stop">Stoped</string>
<string name="main_confirm_send_airplanemode">Airplanemode</string>
<string name="tV_sensor_app">Sensor App</string>
<string name="description_settings_button">Settings button</string>
- <string name="ready">ready</string>
+ <string name="ready">Ready</string>
<string name="description_home_button">Home button</string>
- <string name="text_infopage">gehen Sie auf die Webseite \"adenia.h-brs.de\" auf \"Teilnahme\" (direkter Link: https://adenia.h-brs.de/de/Studienteilnahme/Studienteilnahme.html) - Klicken Sie auf \"JETZT NEU REGISTRIEREN\" - Sie erhalten dort Ihre \"Sensor-App-ID\". Geben Sie diese in den Einstellungen der Sensor-App an</string>
+ <string name="sensorAppID_help_1">Go to \"https://adenia.h-brs.de\" and click on \"Participation\" (direct link: https://adenia.h-brs.de/de/Studienteilnahme/Studienteilnahme.html)</string>
<string name="set_Sensor_App_ID">Please enter sensor app ID in the settings.</string>
+ <string name="sensorAppID_help_3">Enter received \"Sensor App ID\" in the settings of the sensor app.</string>
+ <string name="app_settings">App Settings</string>
+ <string name="sensorAppID_help_2">Click on \"REGISTER NOW\". You will receive your \"Sensor App ID\".</string>
+ <string name="welcome">Welcome</string>
+ <string name="register">Register</string>
</resources>