From 9b1a571ebf2669476d81790056c3e2f36d1da7e6 Mon Sep 17 00:00:00 2001
From: Mads Mogensen <mail@madsmogensen.dk>
Date: Thu, 4 Apr 2024 11:30:50 +0200
Subject: [PATCH] Setup project for Jetpack Compose

Add CI

Lint with ktlint

All gradle files now use kotlin for configuring.

Change libraries for Jetpack Compose

Change main activity to Jetpack Compose

Fix build error
---
 .editorconfig                                 |   2 +
 .github/workflows/gradle.yml                  |  30 +++++
 app/build.gradle.kts                          |  84 ++++++++++++++
 app/{build.gradle => build.gradle.orig}       |   0
 app/proguard-rules.pro                        |   2 +-
 .../ExampleInstrumentedTest.kt                |  13 ++-
 app/src/main/AndroidManifest.xml              |   4 +-
 .../schedulingfrontend/MainActivity.kt        |  67 +++++++-----
 .../{API => api}/ApiClient.kt                 |  27 +++--
 .../{API => api}/ApiService.kt                |   6 +-
 .../schedulingfrontend/loginpage/LoginPage.kt | 103 +++++++++++-------
 .../schedulingfrontend/ui/theme/Color.kt      |  11 ++
 .../schedulingfrontend/ui/theme/Theme.kt      |  72 ++++++++++++
 .../schedulingfrontend/ui/theme/Type.kt       |  36 ++++++
 .../ic_launcher_foreground.xml                |   0
 app/src/main/res/layout/activity_main.xml     |  30 -----
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   5 -
 .../ic_launcher.xml                           |   0
 .../ic_launcher_round.xml                     |   1 +
 app/src/main/res/values-night/themes.xml      |  16 ---
 app/src/main/res/values/themes.xml            |  18 +--
 .../schedulingfrontend/ExampleUnitTest.kt     |   9 +-
 build.gradle                                  |   6 -
 build.gradle.kts                              |   5 +
 24 files changed, 385 insertions(+), 162 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .github/workflows/gradle.yml
 create mode 100644 app/build.gradle.kts
 rename app/{build.gradle => build.gradle.orig} (100%)
 rename app/src/main/java/dk/scheduling/schedulingfrontend/{API => api}/ApiClient.kt (69%)
 rename app/src/main/java/dk/scheduling/schedulingfrontend/{API => api}/ApiService.kt (53%)
 create mode 100644 app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Color.kt
 create mode 100644 app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Theme.kt
 create mode 100644 app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Type.kt
 rename app/src/main/res/{drawable-v24 => drawable}/ic_launcher_foreground.xml (100%)
 delete mode 100644 app/src/main/res/layout/activity_main.xml
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 rename app/src/main/res/{mipmap-anydpi-v33 => mipmap-anydpi}/ic_launcher.xml (100%)
 rename app/src/main/res/{mipmap-anydpi-v26 => mipmap-anydpi}/ic_launcher_round.xml (79%)
 delete mode 100644 app/src/main/res/values-night/themes.xml
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6158e4d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,2 @@
+[*{kt,kts}]
+ktlint_function_naming_ignore_when_annotated_with=Composable
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
new file mode 100644
index 0000000..0b77cb4
--- /dev/null
+++ b/.github/workflows/gradle.yml
@@ -0,0 +1,30 @@
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Lint
+        run: |
+          ./gradlew lint
+          ./gradlew ktlintCheck
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..67c3e64
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,84 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
+}
+
+android {
+    namespace = "dk.scheduling.schedulingfrontend"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "dk.scheduling.schedulingfrontend"
+        minSdk = 28
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.11"
+    }
+
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation(platform("androidx.compose:compose-bom:2024.04.00"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material:material-icons-core")
+    implementation("androidx.compose.material:material-icons-extended")
+    implementation("org.apache.commons:commons-lang3:3.14.0")
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.04.00"))
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
+}
+
+ktlint {
+    dependencies {
+        ktlintRuleset("com.twitter.compose.rules:ktlint:0.0.26")
+    }
+}
diff --git a/app/build.gradle b/app/build.gradle.orig
similarity index 100%
rename from app/build.gradle
rename to app/build.gradle.orig
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..ff59496 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/androidTest/java/dk/scheduling/schedulingfrontend/ExampleInstrumentedTest.kt b/app/src/androidTest/java/dk/scheduling/schedulingfrontend/ExampleInstrumentedTest.kt
index 453cb20..9696866 100644
--- a/app/src/androidTest/java/dk/scheduling/schedulingfrontend/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/dk/scheduling/schedulingfrontend/ExampleInstrumentedTest.kt
@@ -1,11 +1,12 @@
+@file:Suppress("ktlint:standard:no-wildcard-imports")
+
 package dk.scheduling.schedulingfrontend
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.runner.RunWith
-
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * Instrumented test, which will execute on an Android device.
@@ -14,10 +15,10 @@ import org.junit.Assert.*
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    @org.junit.jupiter.api.Test
+    @Test
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("dk.scheduling.schedulingfrontend", appContext.packageName)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 30dbb70..d5d9bd2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,13 +9,15 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.SchedulingFrontend"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.SchedulingFrontend">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt
index f1bdbf2..107372e 100644
--- a/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/MainActivity.kt
@@ -1,39 +1,56 @@
 package dk.scheduling.schedulingfrontend
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
-import android.util.Log.ERROR
-import android.widget.Button
-import dk.scheduling.schedulingfrontend.API.ApiClient
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import dk.scheduling.schedulingfrontend.api.ApiClient
+import dk.scheduling.schedulingfrontend.ui.theme.SchedulingFrontendTheme
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-class MainActivity : AppCompatActivity() {
+
+class MainActivity : ComponentActivity() {
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val button = findViewById<Button>(R.id.button)
-        button.setOnClickListener {
-            val call = ApiClient.apiService.test()
+        setContent {
+            SchedulingFrontendTheme {
+                Button(onClick = {
+                    val call = ApiClient.apiService.test()
 
-            call.enqueue(object : Callback<String>{
-                override fun onResponse(call: Call<String>, response: Response<String>) {
-                    if (response.isSuccessful) {
-                        //val post = response.body()
-                        println("we got a response")
-                        // Handle the retrieved post data
-                    } else {
-                        println("we did not get a successful response")
-                        // Handle error
-                    }
-                }
+                    call.enqueue(
+                        object : Callback<String> {
+                            override fun onResponse(
+                                call: Call<String>,
+                                response: Response<String>,
+                            ) {
+                                if (response.isSuccessful) {
+                                    // val post = response.body()
+                                    Log.i("testAPI", "we got a response")
+                                    // Handle the retrieved post data
+                                } else {
+                                    Log.w("testAPI", "we did not get a successful response")
+                                    // Handle error
+                                }
+                            }
 
-                override fun onFailure(call: Call<String>, t: Throwable) {
-                    // Handle failure
-                    Log.e("error message", "could not get a response")
+                            override fun onFailure(
+                                call: Call<String>,
+                                t: Throwable,
+                            ) {
+                                // Handle failure
+                                Log.e("testAPI", "could not get a response")
+                            }
+                        },
+                    )
+                }) {
+                    Text("Test API")
                 }
-            })
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/API/ApiClient.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiClient.kt
similarity index 69%
rename from app/src/main/java/dk/scheduling/schedulingfrontend/API/ApiClient.kt
rename to app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiClient.kt
index d1560a5..ef05a42 100644
--- a/app/src/main/java/dk/scheduling/schedulingfrontend/API/ApiClient.kt
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiClient.kt
@@ -1,4 +1,4 @@
-package dk.scheduling.schedulingfrontend.API
+package dk.scheduling.schedulingfrontend.api
 
 import com.google.gson.GsonBuilder
 import okhttp3.OkHttpClient
@@ -19,11 +19,22 @@ object RetrofitClient {
     private const val BASE_URL = "http://10.0.2.2:2222/"
     private val gson = GsonBuilder().setLenient().create()
     private val okHttpClient: OkHttpClient by lazy {
-        val trustAllCertificates = arrayOf<TrustManager>(object : X509TrustManager {
-            override fun checkClientTrusted(chain: Array<out X509Certificate>?, authType: String?) {}
-            override fun checkServerTrusted(chain: Array<out X509Certificate>?, authType: String?) {}
-            override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
-        })
+        val trustAllCertificates =
+            arrayOf<TrustManager>(
+                object : X509TrustManager {
+                    override fun checkClientTrusted(
+                        chain: Array<out X509Certificate>?,
+                        authType: String?,
+                    ) {}
+
+                    override fun checkServerTrusted(
+                        chain: Array<out X509Certificate>?,
+                        authType: String?,
+                    ) {}
+
+                    override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+                },
+            )
 
         val sslContext = SSLContext.getInstance("SSL")
         sslContext.init(null, trustAllCertificates, SecureRandom())
@@ -44,10 +55,8 @@ object RetrofitClient {
     }
 }
 
-
-
 object ApiClient {
     val apiService: ApiService by lazy {
         RetrofitClient.retrofit.create(ApiService::class.java)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/API/ApiService.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiService.kt
similarity index 53%
rename from app/src/main/java/dk/scheduling/schedulingfrontend/API/ApiService.kt
rename to app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiService.kt
index d5c474b..ccb2fc6 100644
--- a/app/src/main/java/dk/scheduling/schedulingfrontend/API/ApiService.kt
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/api/ApiService.kt
@@ -1,8 +1,8 @@
-package dk.scheduling.schedulingfrontend.API
+package dk.scheduling.schedulingfrontend.api
 import retrofit2.Call
 import retrofit2.http.GET
 
 interface ApiService {
     @GET("test")
-    fun test() : Call<String>
-}
\ No newline at end of file
+    fun test(): Call<String>
+}
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/loginpage/LoginPage.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/loginpage/LoginPage.kt
index c324d72..d752ab1 100644
--- a/app/src/main/java/dk/scheduling/schedulingfrontend/loginpage/LoginPage.kt
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/loginpage/LoginPage.kt
@@ -35,7 +35,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
-fun LoginPage(modifier: Modifier = Modifier, navigateOnValidLogin: () -> Unit, navigateToSignUpPage: () -> Unit) {
+fun LoginPage(
+    modifier: Modifier = Modifier,
+    navigateOnValidLogin: () -> Unit,
+    navigateToSignUpPage: () -> Unit,
+) {
     var username by remember {
         mutableStateOf("")
     }
@@ -49,24 +53,31 @@ fun LoginPage(modifier: Modifier = Modifier, navigateOnValidLogin: () -> Unit, n
         mutableStateOf(false)
     }
 
-    Column(modifier = modifier
-        .fillMaxSize()
-        .padding(50.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
+    Column(
+        modifier =
+            modifier
+                .fillMaxSize()
+                .padding(50.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
         Column {
             TextLabel("Username")
-            TextField(value = username,
+            TextField(
+                value = username,
                 onValueChange = {
                     username = it
                     if (loginFail) loginFail = false
                 },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .border(
-                        color = if (loginFail) MaterialTheme.colorScheme.error else Color.Black,
-                        width = 1.dp
-                    ),
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .border(
+                            color = if (loginFail) MaterialTheme.colorScheme.error else Color.Black,
+                            width = 1.dp,
+                        ),
                 singleLine = true,
-                )
+            )
         }
         Spacer(modifier = Modifier.height(20.dp))
         Column {
@@ -78,29 +89,32 @@ fun LoginPage(modifier: Modifier = Modifier, navigateOnValidLogin: () -> Unit, n
                     if (loginFail) loginFail = false
                 },
                 visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .border(
-                        color = if (loginFail) MaterialTheme.colorScheme.error else Color.Black,
-                        width = 1.dp
-                    ),
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .border(
+                            color = if (loginFail) MaterialTheme.colorScheme.error else Color.Black,
+                            width = 1.dp,
+                        ),
                 trailingIcon = {
                     PasswordVisibilityToggleIcon(
                         showPassword = showPassword,
-                        onTogglePasswordVisibility = { showPassword = !showPassword })
-            })
+                        onTogglePasswordVisibility = { showPassword = !showPassword },
+                    )
+                },
+            )
         }
 
-
-        if(loginFail){
+        if (loginFail) {
             Spacer(modifier = Modifier.height(20.dp))
             Text(
                 text = "Wrong username or password",
                 color = MaterialTheme.colorScheme.error,
-                style = TextStyle(
-                    fontSize = 15.sp,
-                ))
-
+                style =
+                    TextStyle(
+                        fontSize = 15.sp,
+                    ),
+            )
         }
 
         Spacer(modifier = Modifier.height(30.dp))
@@ -109,8 +123,7 @@ fun LoginPage(modifier: Modifier = Modifier, navigateOnValidLogin: () -> Unit, n
             Button(onClick = {
                 if (login(username, password)) {
                     navigateOnValidLogin()
-                }
-                else {
+                } else {
                     loginFail = true
                 }
             }, modifier = Modifier.fillMaxWidth()) {
@@ -119,11 +132,14 @@ fun LoginPage(modifier: Modifier = Modifier, navigateOnValidLogin: () -> Unit, n
         }
     }
 
-    Column(modifier = Modifier
-        .fillMaxSize()
-        .padding(50.dp),
+    Column(
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .padding(50.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Bottom) {
+        verticalArrangement = Arrangement.Bottom,
+    ) {
         Row(horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) {
             Text("Don't have an account?")
             TextButton(onClick = { navigateToSignUpPage() }) { Text("Sign Up") }
@@ -133,16 +149,19 @@ fun LoginPage(modifier: Modifier = Modifier, navigateOnValidLogin: () -> Unit, n
 
 @Composable
 fun TextLabel(label: String) {
-    Text(label,
-        style = TextStyle(
-            fontSize = 15.sp,
-        ))
+    Text(
+        label,
+        style =
+            TextStyle(
+                fontSize = 15.sp,
+            ),
+    )
 }
 
 @Composable
 fun PasswordVisibilityToggleIcon(
     showPassword: Boolean,
-    onTogglePasswordVisibility: () -> Unit
+    onTogglePasswordVisibility: () -> Unit,
 ) {
     val image = if (showPassword) Icons.Filled.Visibility else Icons.Filled.VisibilityOff
     val contentDescription = if (showPassword) "Hide password" else "Show password"
@@ -152,14 +171,16 @@ fun PasswordVisibilityToggleIcon(
     }
 }
 
-fun login(username: String, password: String) : Boolean {
-    /* TODO: Send to server and if the login is valid return true */
+fun login(
+    username: String,
+    password: String,
+): Boolean {
+    // TODO: Send to server and if the login is valid return true
     return false
 }
 
-
 @Preview(showBackground = true, device = "spec:id=reference_phone,shape=Normal,width=411,height=891,unit=dp,dpi=420")
 @Composable
 fun LoginPagePreview() {
     LoginPage(navigateOnValidLogin = {}, navigateToSignUpPage = {})
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Color.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Color.kt
new file mode 100644
index 0000000..ae6e792
--- /dev/null
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package dk.scheduling.schedulingfrontend.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Theme.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Theme.kt
new file mode 100644
index 0000000..7e4290a
--- /dev/null
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Theme.kt
@@ -0,0 +1,72 @@
+package dk.scheduling.schedulingfrontend.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+private val DarkColorScheme =
+    darkColorScheme(
+        primary = Purple80,
+        secondary = PurpleGrey80,
+        tertiary = Pink80,
+    )
+
+private val LightColorScheme =
+    lightColorScheme(
+        primary = Purple40,
+        secondary = PurpleGrey40,
+        tertiary = Pink40,
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+     */
+    )
+
+@Composable
+fun SchedulingFrontendTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit,
+) {
+    val colorScheme =
+        when {
+            dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+                val context = LocalContext.current
+                if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+            }
+
+            darkTheme -> DarkColorScheme
+            else -> LightColorScheme
+        }
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            window.statusBarColor = colorScheme.primary.toArgb()
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+        }
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content,
+    )
+}
diff --git a/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Type.kt b/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Type.kt
new file mode 100644
index 0000000..c168832
--- /dev/null
+++ b/app/src/main/java/dk/scheduling/schedulingfrontend/ui/theme/Type.kt
@@ -0,0 +1,36 @@
+package dk.scheduling.schedulingfrontend.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography =
+    Typography(
+        bodyLarge =
+            TextStyle(
+                fontFamily = FontFamily.Default,
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp,
+                lineHeight = 24.sp,
+                letterSpacing = 0.5.sp,
+            ),
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+     */
+    )
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 231532b..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Button"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.51"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.26999998" />
-
-</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
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 79%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
index eca70cf..6f3b755 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <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" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index bbdcba8..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.SchedulingFrontend" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 599b370..9824a3d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,16 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.SchedulingFrontend" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+    <style name="Theme.SchedulingFrontend" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/dk/scheduling/schedulingfrontend/ExampleUnitTest.kt b/app/src/test/java/dk/scheduling/schedulingfrontend/ExampleUnitTest.kt
index 68d641d..5ca1b19 100644
--- a/app/src/test/java/dk/scheduling/schedulingfrontend/ExampleUnitTest.kt
+++ b/app/src/test/java/dk/scheduling/schedulingfrontend/ExampleUnitTest.kt
@@ -1,8 +1,9 @@
-package dk.scheduling.schedulingfrontend
+@file:Suppress("ktlint:standard:no-wildcard-imports")
 
-import org.junit.jupiter.api.Test
+package dk.scheduling.schedulingfrontend
 
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
@@ -10,8 +11,8 @@ import org.junit.Assert.*
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 class ExampleUnitTest {
-    @org.junit.jupiter.api.Test
+    @Test
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
\ No newline at end of file
+}
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 062eb52..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id 'com.android.application' version '8.3.1' apply false
-    id 'com.android.library' version '8.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..bcd2595
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.android.application") version "8.3.1" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+}
\ No newline at end of file