WORK IN PROGRESS DO NOT MERGE - Rewrite the settings page

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.support.kotlinCompilerOptions
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -211,6 +213,8 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.test.manifest)
     detektPlugins(libs.detekt.compose)
 
+    implementation(libs.androidx.datastore.preferences)
+
     add("androidTestScreenshotImplementation", libs.junit)
     add("androidTestScreenshotImplementation", libs.fastlane.screengrab)
     add("androidTestScreenshotImplementation", libs.androidx.test.rules)

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -8,43 +9,58 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
-    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"  />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
 
-    <application android:name="de.rwth_aachen.phyphox.App"
+    <application
+        android:name="de.rwth_aachen.phyphox.App"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Theme.Phyphox.DayNight"
-        android:enableOnBackInvokedCallback="true"
         android:localeConfig="@xml/locales_config"
+        android:theme="@style/Theme.Phyphox.DayNight"
         android:usesCleartextTraffic="true"><!-- While not recommended, there are plenty of use cases for phyphox on local networks where unencrypted communication is not unreasonable. -->
 
         <activity
             android:name="de.rwth_aachen.phyphox.ExperimentList.ExperimentListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
-            android:theme="@style/splashTheme"
-            android:configChanges="keyboardHidden|orientation|screenSize">
+            android:theme="@style/splashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:host="*" />
                 <data android:scheme="file" />
                 <data android:scheme="content" />
@@ -62,14 +78,18 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="phyphox" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:host="*" />
                 <data android:scheme="file" />
                 <data android:scheme="content" />
@@ -86,8 +106,8 @@
         </activity>
         <activity
             android:name="de.rwth_aachen.phyphox.Experiment"
-            android:label="@string/title_activity_experiment"
             android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/title_activity_experiment"
             android:parentActivityName="de.rwth_aachen.phyphox.ExperimentList.ExperimentListActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -105,7 +125,13 @@
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="unspecified"
             tools:replace="screenOrientation" />
-        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+        <activity
+            android:name="de.rwth_aachen.phyphox.features.settings.presentation.NewSettingsActivity"
+            android:label="@string/settings" />
+
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="de.rwth_aachen.phyphox.exportProvider"
@@ -140,12 +166,16 @@
         <!-- Youtube videos may be opened in the Youtube app -->
         <intent>
             <action android:name="android.intent.action.VIEW" />
-            <data  android:scheme="https" android:host="youtube.com" />
+            <data
+                android:host="youtube.com"
+                android:scheme="https" />
         </intent>
 
         <intent>
             <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="https" android:host="youtu.be" />
+            <data
+                android:host="youtu.be"
+                android:scheme="https" />
         </intent>
 
         <!-- Share states and screenshots -->

app/src/main/java/de/rwth_aachen/phyphox/App.kt

@@ -2,12 +2,37 @@ package de.rwth_aachen.phyphox
 
 import androidx.multidex.MultiDexApplication
 import dagger.hilt.android.HiltAndroidApp
+import de.rwth_aachen.phyphox.common.AppDelegate
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Inject
 
 //This extension to application is only used to store measured data in memory as this may easily exceed the amount of data allowed on the transaction stack
 @HiltAndroidApp
 class App : MultiDexApplication() {
 
+    private val applicationScope = CoroutineScope(SupervisorJob())
+
+    @Inject
+    lateinit var appDelegates: Set<@JvmSuppressWildcards AppDelegate>
+
+
+
     //Need to get rid off of this ASAP
     @JvmField
     var experiment: PhyphoxExperiment? = null
+
+    override fun onCreate() {
+        super.onCreate()
+
+        appDelegates.forEach { it.start(applicationScope) }
+    }
+
+    override fun onTerminate() {
+        appDelegates.forEach { it.stop() }
+        super.onTerminate()
+    }
+
 }
+
+

app/src/main/java/de/rwth_aachen/phyphox/ExperimentList/ExperimentListActivity.java

@@ -48,7 +48,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.activity.EdgeToEdge;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
@@ -57,9 +56,6 @@
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.preference.PreferenceManager;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -87,6 +83,7 @@
 
 import de.rwth_aachen.phyphox.Bluetooth.BluetoothExperimentLoader;
 import de.rwth_aachen.phyphox.Bluetooth.BluetoothScanDialog;
+import de.rwth_aachen.phyphox.BuildConfig;
 import de.rwth_aachen.phyphox.Experiment;
 import de.rwth_aachen.phyphox.ExperimentList.datasource.AssetExperimentLoader;
 import de.rwth_aachen.phyphox.ExperimentList.handler.BluetoothScanner;
@@ -107,6 +104,7 @@
 import de.rwth_aachen.phyphox.SettingsActivity.SettingsFragment;
 import de.rwth_aachen.phyphox.camera.depth.DepthInput;
 import de.rwth_aachen.phyphox.camera.helper.CameraHelper;
+import de.rwth_aachen.phyphox.features.settings.presentation.NewSettingsActivity;
 
 public class ExperimentListActivity extends AppCompatActivity {
 
@@ -282,6 +280,13 @@ public void onBluetoothScanError(String msg, Boolean isError, Boolean isFatal) {
             }
         });
 
+        if(BuildConfig.DEBUG){
+            creditsV.setOnLongClickListener(v -> {
+                startActivity(new Intent(this, NewSettingsActivity.class));
+                return true;
+            });
+        }
+
     }
 
     private void showPopupMenu(View v) {

app/src/main/java/de/rwth_aachen/phyphox/Helper/Helper.java

@@ -1,15 +1,13 @@
 package de.rwth_aachen.phyphox.Helper;
 
 import static android.content.Context.BATTERY_SERVICE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
 
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -28,20 +26,15 @@
 import android.os.Build;
 import android.os.Handler;
 import android.util.Base64;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.PixelCopy;
-import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.preference.PreferenceManager;
 
 import org.w3c.dom.Document;
@@ -55,7 +48,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Vector;
 import java.util.zip.CRC32;
 

app/src/main/java/de/rwth_aachen/phyphox/SettingsActivity/SettingsActivity.java

@@ -5,19 +5,14 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 
 import android.os.Bundle;
-import android.view.ViewGroup;
 
 
-import dagger.hilt.android.AndroidEntryPoint;
-import de.rwth_aachen.phyphox.Helper.Helper;
 import de.rwth_aachen.phyphox.Helper.WindowInsetHelper;
 import de.rwth_aachen.phyphox.R;
 
-@AndroidEntryPoint
+
 public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/de/rwth_aachen/phyphox/common/AppDelegate.kt

@@ -0,0 +1,8 @@
+package de.rwth_aachen.phyphox.common
+
+import kotlinx.coroutines.CoroutineScope
+
+interface AppDelegate {
+    fun start(coroutineScope: CoroutineScope)
+    fun stop()
+}

app/src/main/java/de/rwth_aachen/phyphox/di/AppModule.kt

@@ -3,8 +3,9 @@ package de.rwth_aachen.phyphox.di
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import de.rwth_aachen.phyphox.features.settings.di.SettingsModule
 
-@Module(includes = [])
+@Module(includes = [SettingsModule::class])
 @InstallIn(SingletonComponent::class)
 abstract class AppModule {}
 

app/src/main/java/de/rwth_aachen/phyphox/di/ApplicationScope.kt

@@ -0,0 +1,7 @@
+package de.rwth_aachen.phyphox.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ApplicationScope

app/src/main/java/de/rwth_aachen/phyphox/di/CoroutineScopesModule.kt

@@ -0,0 +1,21 @@
+package de.rwth_aachen.phyphox.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutineScopesModule {
+
+    @Provides
+    @Singleton
+    @ApplicationScope
+    fun provideApplicationScope(): CoroutineScope =
+        CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+}