04 - Add compose support

app/build.gradle.kts

@@ -0,0 +1,149 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = "de.rwth_aachen.phyphox"
+    testNamespace = "de.rwth_aachen.phyphoxTest"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        applicationId = "de.rwth_aachen.phyphox"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
+
+        versionName = "1.2.0"
+        //  format  WXXYYZZ, where WW is major, XX is minor, YY is patch, and ZZ is build
+        versionCode = 1020009 //1.02.00-09
+
+        val locales = listOf(
+            "en",
+            "cs",
+            "de",
+            "el",
+            "es",
+            "fr",
+            "hi",
+            "it",
+            "ja",
+            "ka",
+            "nl",
+            "pl",
+            "pt",
+            "ru",
+            "sr",
+            "b+sr+Latn",
+            "tr",
+            "vi",
+            "zh-rCN",
+            "zh-rTW"
+        )
+        buildConfigField(
+            "String[]",
+            "LOCALE_ARRAY",
+            "new String[]{\"" + locales.joinToString("\",\"") + "\"}"
+        )
+        resourceConfigurations.addAll(locales)
+
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        multiDexEnabled = true
+    }
+
+    buildTypes {
+        getByName("release") {
+            lint {
+                disable.add("MissingTranslation")
+            }
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path = file("src/main/cpp/CMakeLists.txt")
+        }
+    }
+
+    flavorDimensions.add("permissions")
+    productFlavors {
+        create("screenshot") {
+            dimension = "permissions"
+        }
+        create("regular") {
+            dimension = "permissions"
+        }
+    }
+
+    compileOptions {
+        encoding = "UTF-8"
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
+        compose = true
+    }
+
+    ndkVersion = "28.0.13004108"
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation(libs.androidx.multidex)
+    implementation(libs.google.material)
+    implementation(libs.androidx.annotation)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.appcompat.resources)
+    implementation(libs.androidx.preference)
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.fragment)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.viewpager)
+    implementation(libs.androidx.recyclerview.selection)
+    implementation(libs.androidx.recyclerview)
+    implementation(libs.bundles.camerax)// CameraX Bundle
+    implementation(libs.commons.io)
+    implementation(libs.zxing.android.embedded)//https://github.com/journeyapps/zxing-android-embedded/blob/master/CHANGES.md
+    implementation(libs.apache.poi)
+    implementation(libs.jlhttp)
+    implementation(libs.caverock.androidsvg)//https://bigbadaboom.github.io/androidsvg/release_notes.html
+    implementation(libs.paho.mqtt.android)
+
+    //hilt
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.android.compiler)
+
+    // Compose
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.bundles.compose)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
+
+    add("androidTestScreenshotImplementation", libs.junit)
+    add("androidTestScreenshotImplementation", libs.fastlane.screengrab)
+    add("androidTestScreenshotImplementation", libs.androidx.test.rules)
+    add("androidTestScreenshotImplementation", libs.androidx.test.ext.junit)
+    add("androidTestScreenshotImplementation", libs.androidx.test.espresso.core)
+
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.google.truth)
+}

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

@@ -0,0 +1,13 @@
+package de.rwth_aachen.phyphox
+
+import androidx.multidex.MultiDexApplication
+import dagger.hilt.android.HiltAndroidApp
+
+//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() {
+
+    //Need to get rid off of this ASAP
+    @JvmField
+    var experiment: PhyphoxExperiment? = null
+}

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

@@ -12,11 +12,12 @@
 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/di/AppModule.kt

@@ -0,0 +1,10 @@
+package de.rwth_aachen.phyphox.di
+
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module(includes = [])
+@InstallIn(SingletonComponent::class)
+abstract class AppModule {}
+

app/src/main/java/de/rwth_aachen/phyphox/ui/theme/Color.kt

@@ -0,0 +1,43 @@
+package de.rwth_aachen.phyphox.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val PhyphoxPrimary = Color(0xFFFF7E22)
+val PhyphoxPrimaryWeak = Color(0xFFFFA500)
+val PhyphoxRwthPrimary = Color(0xFF00549F)
+
+val PhyphoxWhite100 = Color(0xFFFFFFFF)
+val PhyphoxWhite90 = Color(0xFFF0F0F0)
+val PhyphoxWhite80 = Color(0xFFE0E0E0)
+val PhyphoxWhite70 = Color(0xFFD0D0D0)
+val PhyphoxWhite60 = Color(0xFFC4C4C4)
+val PhyphoxWhite50Black50 = Color(0xFF808080)
+val PhyphoxBlack40 = Color(0xFF404040)
+val PhyphoxBlack50 = Color(0xFF303030)
+val PhyphoxBlack60 = Color(0xFF202020)
+val PhyphoxBlack80 = Color(0xFF101010)
+val PhyphoxBlack100 = Color(0xFF000000)
+
+val PhyphoxBlue100 = Color(0xFF2260A5)
+val PhyphoxBlue60 = Color(0xFF39A2FF)
+val PhyphoxBlue40 = Color(0xFF9DD1FF)
+val PhyphoxBlueStrong = Color(0xFF0169C5)
+
+val PhyphoxRed = Color(0xFFFE005D)
+val PhyphoxRedWeak = Color(0xFFFF7CAC)
+
+val PhyphoxMagenta = Color(0xFFEB46F4)
+val PhyphoxMagentaWeak = Color(0xFFF6AAFA)
+
+val PhyphoxGreen = Color(0xFF2BFB4C)
+val PhyphoxGreenWeak = Color(0xFFA1FDAF)
+val PhyphoxGreenStrong = Color(0xFF00D425)
+
+val PhyphoxYellowWeak = Color(0xFFE7E09B)
+val PhyphoxYellow = Color(0xFFEDF668)
+val PhyphoxYellowStrong = Color(0xFF8D9709)
+
+// Helper aliases to match old definitions if any
+val PhyphoxBlack = PhyphoxBlack100
+val PhyphoxWhite = PhyphoxWhite100
+val PhyphoxBlue = PhyphoxBlue100