Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 0 additions & 129 deletions app/build.gradle

This file was deleted.

138 changes: 138 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt.android)
}

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
}

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)

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)

testImplementation(libs.junit)
testImplementation(libs.google.truth)
}
11 changes: 0 additions & 11 deletions app/src/main/java/de/rwth_aachen/phyphox/App.java

This file was deleted.

13 changes: 13 additions & 0 deletions app/src/main/java/de/rwth_aachen/phyphox/App.kt
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/de/rwth_aachen/phyphox/di/AppModule.kt
Original file line number Diff line number Diff line change
@@ -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 {}

24 changes: 0 additions & 24 deletions build.gradle

This file was deleted.

7 changes: 7 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.hilt.android) apply false
alias(libs.plugins.ksp) apply false
}
Loading