From d5547849c0e870af0a96920802ef5e97bf03dbf1 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Sat, 20 May 2023 22:07:21 +0200
Subject: [PATCH] Add Android App

---
 .idea/artifacts/client_js_1_2_2.xml           |  8 ++++
 .idea/artifacts/client_js_1_2_3.xml           |  8 ++++
 .idea/artifacts/client_jvm_1_2_2.xml          |  8 ++++
 .idea/artifacts/client_jvm_1_2_3.xml          |  8 ++++
 .idea/artifacts/common_js_1_2_2.xml           |  8 ++++
 .idea/artifacts/common_js_1_2_3.xml           |  8 ++++
 .idea/artifacts/common_jvm_1_2_2.xml          |  8 ++++
 .idea/artifacts/common_jvm_1_2_3.xml          |  8 ++++
 .idea/artifacts/shared_desktop_1_2_2.xml      |  8 ++++
 .idea/artifacts/shared_desktop_1_2_3.xml      |  8 ++++
 .idea/artifacts/shared_js_1_2_2.xml           |  8 ++++
 .idea/artifacts/shared_js_1_2_3.xml           |  8 ++++
 .idea/artifacts/web_js_1_2_2.xml              |  8 ++++
 .idea/artifacts/web_js_1_2_3.xml              |  8 ++++
 .idea/gradle.xml                              | 15 ++----
 .idea/misc.xml                                |  3 +-
 app/android/build.gradle.kts                  | 46 ++++++++++++++++++
 app/android/src/main/AndroidManifest.xml      | 29 ++++++++++++
 app/android/src/main/java/AppActivity.kt      | 28 +++++++++++
 app/android/src/main/java/MainActivity.kt     | 47 +++++++++++++++++++
 .../src/main/res/layout/activity_main.xml     | 22 +++++++++
 app/android/src/main/res/values/strings.xml   |  3 ++
 app/build.gradle.kts                          |  2 -
 app/desktop/src/main/kotlin/Main.kt           | 31 +++++++-----
 app/shared/build.gradle.kts                   | 38 ++++++++++++++-
 .../tonbrett/app/api/Authentication.kt        | 22 +++++++++
 .../src/commonMain/kotlin/TonbrettApp.kt      | 11 ++---
 app/shared/src/commonMain/kotlin/api/Api.kt   | 39 +++++++++++----
 .../kotlin/components/SoundContainer.kt       |  3 +-
 .../commonMain/kotlin/components/SoundList.kt | 28 ++++++++---
 .../tonbrett/app/api/Authentication.kt        | 11 ++---
 .../tonbrett/app/api/Authentication.kt        | 14 +++---
 .../dev/schlaubi/tonbrett/app/api/ApiUrl.kt   |  6 +++
 .../dev/schlaubi/tonbrett/app/web/Main.kt     | 10 +++-
 .../dev/schlaubi/tonbrett/bot/server/Ktor.kt  |  6 ++-
 build.gradle.kts                              |  6 ++-
 buildSrc/src/main/kotlin/Android.kt           |  4 ++
 buildSrc/src/main/kotlin/LocalProperties.kt   | 10 ++--
 client/build.gradle.kts                       | 31 +++++++++++-
 .../dev/schlaubi/tonbrett/common/Route.kt     |  3 +-
 gradle.properties                             |  2 +
 gradle/libs.versions.toml                     |  9 +++-
 local.properties                              |  9 ++++
 settings.gradle.kts                           |  3 +-
 44 files changed, 525 insertions(+), 78 deletions(-)
 create mode 100644 .idea/artifacts/client_js_1_2_2.xml
 create mode 100644 .idea/artifacts/client_js_1_2_3.xml
 create mode 100644 .idea/artifacts/client_jvm_1_2_2.xml
 create mode 100644 .idea/artifacts/client_jvm_1_2_3.xml
 create mode 100644 .idea/artifacts/common_js_1_2_2.xml
 create mode 100644 .idea/artifacts/common_js_1_2_3.xml
 create mode 100644 .idea/artifacts/common_jvm_1_2_2.xml
 create mode 100644 .idea/artifacts/common_jvm_1_2_3.xml
 create mode 100644 .idea/artifacts/shared_desktop_1_2_2.xml
 create mode 100644 .idea/artifacts/shared_desktop_1_2_3.xml
 create mode 100644 .idea/artifacts/shared_js_1_2_2.xml
 create mode 100644 .idea/artifacts/shared_js_1_2_3.xml
 create mode 100644 .idea/artifacts/web_js_1_2_2.xml
 create mode 100644 .idea/artifacts/web_js_1_2_3.xml
 create mode 100644 app/android/build.gradle.kts
 create mode 100644 app/android/src/main/AndroidManifest.xml
 create mode 100644 app/android/src/main/java/AppActivity.kt
 create mode 100644 app/android/src/main/java/MainActivity.kt
 create mode 100644 app/android/src/main/res/layout/activity_main.xml
 create mode 100644 app/android/src/main/res/values/strings.xml
 create mode 100644 app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
 create mode 100644 app/shared/src/nonWebMain/kotlin/dev/schlaubi/tonbrett/app/api/ApiUrl.kt
 create mode 100644 buildSrc/src/main/kotlin/Android.kt
 create mode 100644 local.properties

diff --git a/.idea/artifacts/client_js_1_2_2.xml b/.idea/artifacts/client_js_1_2_2.xml
new file mode 100644
index 0000000..fd0761c
--- /dev/null
+++ b/.idea/artifacts/client_js_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="client-js-1.2.2">
+    <output-path>$PROJECT_DIR$/client/build/libs</output-path>
+    <root id="archive" name="client-js-1.2.2.jar">
+      <element id="module-output" name="tonbrett.client.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/client_js_1_2_3.xml b/.idea/artifacts/client_js_1_2_3.xml
new file mode 100644
index 0000000..2988379
--- /dev/null
+++ b/.idea/artifacts/client_js_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="client-js-1.2.3">
+    <output-path>$PROJECT_DIR$/client/build/libs</output-path>
+    <root id="archive" name="client-js-1.2.3.jar">
+      <element id="module-output" name="tonbrett.client.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/client_jvm_1_2_2.xml b/.idea/artifacts/client_jvm_1_2_2.xml
new file mode 100644
index 0000000..6fc6c16
--- /dev/null
+++ b/.idea/artifacts/client_jvm_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="client-jvm-1.2.2">
+    <output-path>$PROJECT_DIR$/client/build/libs</output-path>
+    <root id="archive" name="client-jvm-1.2.2.jar">
+      <element id="module-output" name="tonbrett.client.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/client_jvm_1_2_3.xml b/.idea/artifacts/client_jvm_1_2_3.xml
new file mode 100644
index 0000000..a88ba98
--- /dev/null
+++ b/.idea/artifacts/client_jvm_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="client-jvm-1.2.3">
+    <output-path>$PROJECT_DIR$/client/build/libs</output-path>
+    <root id="archive" name="client-jvm-1.2.3.jar">
+      <element id="module-output" name="tonbrett.client.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/common_js_1_2_2.xml b/.idea/artifacts/common_js_1_2_2.xml
new file mode 100644
index 0000000..796167a
--- /dev/null
+++ b/.idea/artifacts/common_js_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="common-js-1.2.2">
+    <output-path>$PROJECT_DIR$/common/build/libs</output-path>
+    <root id="archive" name="common-js-1.2.2.jar">
+      <element id="module-output" name="tonbrett.common.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/common_js_1_2_3.xml b/.idea/artifacts/common_js_1_2_3.xml
new file mode 100644
index 0000000..17dbe6a
--- /dev/null
+++ b/.idea/artifacts/common_js_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="common-js-1.2.3">
+    <output-path>$PROJECT_DIR$/common/build/libs</output-path>
+    <root id="archive" name="common-js-1.2.3.jar">
+      <element id="module-output" name="tonbrett.common.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/common_jvm_1_2_2.xml b/.idea/artifacts/common_jvm_1_2_2.xml
new file mode 100644
index 0000000..c0682c3
--- /dev/null
+++ b/.idea/artifacts/common_jvm_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="common-jvm-1.2.2">
+    <output-path>$PROJECT_DIR$/common/build/libs</output-path>
+    <root id="archive" name="common-jvm-1.2.2.jar">
+      <element id="module-output" name="tonbrett.common.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/common_jvm_1_2_3.xml b/.idea/artifacts/common_jvm_1_2_3.xml
new file mode 100644
index 0000000..a0b1db0
--- /dev/null
+++ b/.idea/artifacts/common_jvm_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="common-jvm-1.2.3">
+    <output-path>$PROJECT_DIR$/common/build/libs</output-path>
+    <root id="archive" name="common-jvm-1.2.3.jar">
+      <element id="module-output" name="tonbrett.common.jvmMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/shared_desktop_1_2_2.xml b/.idea/artifacts/shared_desktop_1_2_2.xml
new file mode 100644
index 0000000..b537874
--- /dev/null
+++ b/.idea/artifacts/shared_desktop_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="shared-desktop-1.2.2">
+    <output-path>$PROJECT_DIR$/app/shared/build/libs</output-path>
+    <root id="archive" name="shared-desktop-1.2.2.jar">
+      <element id="module-output" name="tonbrett.app.shared.desktopMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/shared_desktop_1_2_3.xml b/.idea/artifacts/shared_desktop_1_2_3.xml
new file mode 100644
index 0000000..c3d7a4f
--- /dev/null
+++ b/.idea/artifacts/shared_desktop_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="shared-desktop-1.2.3">
+    <output-path>$PROJECT_DIR$/app/shared/build/libs</output-path>
+    <root id="archive" name="shared-desktop-1.2.3.jar">
+      <element id="module-output" name="tonbrett.app.shared.desktopMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/shared_js_1_2_2.xml b/.idea/artifacts/shared_js_1_2_2.xml
new file mode 100644
index 0000000..d1aa925
--- /dev/null
+++ b/.idea/artifacts/shared_js_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="shared-js-1.2.2">
+    <output-path>$PROJECT_DIR$/app/shared/build/libs</output-path>
+    <root id="archive" name="shared-js-1.2.2.jar">
+      <element id="module-output" name="tonbrett.app.shared.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/shared_js_1_2_3.xml b/.idea/artifacts/shared_js_1_2_3.xml
new file mode 100644
index 0000000..dfdd918
--- /dev/null
+++ b/.idea/artifacts/shared_js_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="shared-js-1.2.3">
+    <output-path>$PROJECT_DIR$/app/shared/build/libs</output-path>
+    <root id="archive" name="shared-js-1.2.3.jar">
+      <element id="module-output" name="tonbrett.app.shared.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/web_js_1_2_2.xml b/.idea/artifacts/web_js_1_2_2.xml
new file mode 100644
index 0000000..ca066a1
--- /dev/null
+++ b/.idea/artifacts/web_js_1_2_2.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="web-js-1.2.2">
+    <output-path>$PROJECT_DIR$/app/web/build/libs</output-path>
+    <root id="archive" name="web-js-1.2.2.jar">
+      <element id="module-output" name="tonbrett.app.web.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/web_js_1_2_3.xml b/.idea/artifacts/web_js_1_2_3.xml
new file mode 100644
index 0000000..868f000
--- /dev/null
+++ b/.idea/artifacts/web_js_1_2_3.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="web-js-1.2.3">
+    <output-path>$PROJECT_DIR$/app/web/build/libs</output-path>
+    <root id="archive" name="web-js-1.2.3.jar">
+      <element id="module-output" name="tonbrett.app.web.jsMain" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 989313c..5aeec1c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,22 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT">
-            <builds>
-              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
-                <projects>
-                  <project path="$PROJECT_DIR$/buildSrc" />
-                </projects>
-              </build>
-            </builds>
-          </compositeBuild>
-        </compositeConfiguration>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="temurin-19" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/app/android" />
             <option value="$PROJECT_DIR$/app/desktop" />
             <option value="$PROJECT_DIR$/app/shared" />
             <option value="$PROJECT_DIR$/app/web" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3274a9a..281b521 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ArendSettings">
     <option name="consolePrintingOptions">
@@ -28,7 +27,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="temurin-19" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
new file mode 100644
index 0000000..edddce6
--- /dev/null
+++ b/app/android/build.gradle.kts
@@ -0,0 +1,46 @@
+import dev.schlaubi.tonbrett.gradle.sdkInt
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("android")
+    id("com.android.application")
+    id("org.jetbrains.compose")
+}
+
+dependencies {
+    implementation(projects.app.shared)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.browser)
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+}
+
+android {
+    namespace = "dev.schlaubi.tonbrett.app.android"
+    compileSdk = sdkInt
+    defaultConfig {
+        applicationId = "dev.schlaubi.tonbrett.android"
+        minSdk = 26
+        targetSdk = sdkInt
+        versionCode = 1
+        versionName = rootProject.version.toString()
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    buildFeatures {
+        compose = true
+    }
+}
+
+tasks {
+    withType<KotlinCompile> {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
+        }
+    }
+}
diff --git a/app/android/src/main/AndroidManifest.xml b/app/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..99baa4a
--- /dev/null
+++ b/app/android/src/main/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <application android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        <activity
+                android:name=".MainActivity"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <data android:scheme="tonbrett" />
+
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+                android:name=".AppActivity"
+                android:exported="false" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app/android/src/main/java/AppActivity.kt b/app/android/src/main/java/AppActivity.kt
new file mode 100644
index 0000000..b0e10de
--- /dev/null
+++ b/app/android/src/main/java/AppActivity.kt
@@ -0,0 +1,28 @@
+package dev.schlaubi.tonbrett.app.android
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import dev.schlaubi.tonbrett.app.TonbrettApp
+import dev.schlaubi.tonbrett.app.api.AppContext
+import dev.schlaubi.tonbrett.app.api.ProvideContext
+import dev.schlaubi.tonbrett.app.api.tokenKey
+
+class AppActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            val context = object : AppContext(applicationContext) {
+                override fun reAuthorize() {
+                    vault.deleteObject(tokenKey)
+                    startActivity(Intent(applicationContext, MainActivity::class.java))
+                }
+            }
+            context.resetApi()
+            ProvideContext(context) {
+                TonbrettApp()
+            }
+        }
+    }
+}
diff --git a/app/android/src/main/java/MainActivity.kt b/app/android/src/main/java/MainActivity.kt
new file mode 100644
index 0000000..3e963f2
--- /dev/null
+++ b/app/android/src/main/java/MainActivity.kt
@@ -0,0 +1,47 @@
+package dev.schlaubi.tonbrett.app.android
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import androidx.browser.customtabs.CustomTabsIntent
+import dev.schlaubi.tonbrett.app.api.AppContext
+import dev.schlaubi.tonbrett.app.api.getUrl
+import dev.schlaubi.tonbrett.app.api.tokenKey
+import dev.schlaubi.tonbrett.common.Route
+import io.ktor.http.URLBuilder
+import io.ktor.resources.href
+import io.ktor.resources.serialization.ResourcesFormat
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        val button = findViewById<Button>(R.id.btn_retry)
+        button.setOnClickListener {
+            onAttachedToWindow()
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        val context = AppContext(applicationContext)
+        if (intent.data?.scheme == "tonbrett" && intent.data?.host == "login") {
+            val token = intent.data?.getQueryParameter("token")
+            if (token != null) {
+                context.vault.set(tokenKey, token)
+                startActivity(Intent(this, AppActivity::class.java))
+                return
+            }
+        }
+        if (context.getTokenOrNull() == null) {
+            val urlBuilder = URLBuilder(getUrl())
+            href(ResourcesFormat(), Route.Auth(Route.Auth.Type.MOBILE_APP), urlBuilder)
+            val intent = CustomTabsIntent.Builder()
+                .build()
+            intent.launchUrl(this, Uri.parse(urlBuilder.buildString()))
+        } else {
+            startActivity(Intent(this, AppActivity::class.java))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/android/src/main/res/layout/activity_main.xml b/app/android/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..0add306
--- /dev/null
+++ b/app/android/src/main/res/layout/activity_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".MainActivity">
+
+    <LinearLayout
+            android:id="@+id/LinearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical" >
+
+        <Button
+                android:id="@+id/btn_retry"
+                android:text="@string/retry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/android/src/main/res/values/strings.xml b/app/android/src/main/res/values/strings.xml
new file mode 100644
index 0000000..20043fc
--- /dev/null
+++ b/app/android/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="retry">Retry</string>
+</resources>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bdb166c..ff6741d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,8 +4,6 @@ plugins {
     kotlin("jvm") apply false
     kotlin("multiplatform") apply false
     kotlin("android") apply false
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose) apply false
 }
 
diff --git a/app/desktop/src/main/kotlin/Main.kt b/app/desktop/src/main/kotlin/Main.kt
index 559338e..0f325bf 100644
--- a/app/desktop/src/main/kotlin/Main.kt
+++ b/app/desktop/src/main/kotlin/Main.kt
@@ -5,15 +5,15 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.schlaubi.tonbrett.app.TonbrettApp
+import dev.schlaubi.tonbrett.app.api.AppContext
+import dev.schlaubi.tonbrett.app.api.ProvideContext
 import dev.schlaubi.tonbrett.app.api.getConfig
 import dev.schlaubi.tonbrett.app.api.getUrl
-import dev.schlaubi.tonbrett.app.api.reAuthorize
-import dev.schlaubi.tonbrett.app.api.resetApi
 import dev.schlaubi.tonbrett.app.title
 import dev.schlaubi.tonbrett.common.Route
-import io.ktor.http.*
-import io.ktor.resources.*
-import io.ktor.resources.serialization.*
+import io.ktor.http.URLBuilder
+import io.ktor.resources.href
+import io.ktor.resources.serialization.ResourcesFormat
 import java.awt.Desktop
 import java.net.URI
 
@@ -34,14 +34,21 @@ fun main(reAuthorize: Boolean, onAuth: () -> Unit) {
 fun startApplication() = application {
     val sessionExpired = remember { mutableStateOf(false) }
     Window(onCloseRequest = ::exitApplication, title = title) {
-        reAuthorize = {
-            window.isMinimized = true
-            main(reAuthorize = true) {
-                resetApi()
-                window.isMinimized = false
-                sessionExpired.value = false
+        val context = remember {
+            object : AppContext() {
+                override fun reAuthorize() {
+                    window.isMinimized = true
+                    main(reAuthorize = true) {
+                        resetApi()
+                        window.isMinimized = false
+                        sessionExpired.value = false
+                    }
+                }
             }
         }
-        TonbrettApp(sessionExpired)
+        context.resetApi()
+        ProvideContext(context) {
+            TonbrettApp(sessionExpired)
+        }
     }
 }
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
index 92ee09a..dc073c8 100644
--- a/app/shared/build.gradle.kts
+++ b/app/shared/build.gradle.kts
@@ -1,9 +1,11 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import dev.schlaubi.tonbrett.gradle.apiUrl
+import dev.schlaubi.tonbrett.gradle.androidSdk
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
-    //id("com.android.library")
+    id("com.android.library")
     id("org.jetbrains.compose")
     kotlin("plugin.serialization")
     alias(libs.plugins.buildconfig)
@@ -19,6 +21,21 @@ kotlin {
                 withAndroid()
                 withJvm()
             }
+
+            group("jvm") {
+                withAndroid()
+                withJvm()
+            }
+
+            group("mobile") {
+                withApple()
+                withAndroid()
+            }
+        }
+    }
+    android {
+        compilations.all {
+            compilerOptions.options.jvmTarget = JvmTarget.JVM_1_8
         }
     }
     jvm("desktop")
@@ -52,12 +69,20 @@ kotlin {
             }
         }
 
-        named("desktopMain") {
+        named("jvmMain") {
             dependencies {
                 implementation(libs.kmongo.id.serialization)
                 implementation(libs.kord.common)
             }
         }
+
+        afterEvaluate {
+            named("mobileMain") {
+                dependencies {
+                    api(libs.kvault)
+                }
+            }
+        }
     }
 }
 
@@ -65,3 +90,12 @@ buildConfig {
     packageName("dev.schlaubi.tonbrett.app.shared")
     buildConfigField("String", "API_URL", "\"${project.apiUrl}\"")
 }
+
+android {
+    namespace = "dev.schlaubi.tonbrett.app"
+    compileSdkVersion = androidSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+}
diff --git a/app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt b/app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
new file mode 100644
index 0000000..0926a72
--- /dev/null
+++ b/app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
@@ -0,0 +1,22 @@
+package dev.schlaubi.tonbrett.app.api
+
+import android.content.Context
+import com.liftric.kvault.KVault
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+const val tokenKey = "token"
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+actual val Dispatchers.IO: CoroutineDispatcher
+    get() = IO
+
+actual open class AppContext(androidContext: Context) : AppContextBase() {
+    val vault = KVault(androidContext)
+
+    fun getTokenOrNull() = vault.string(tokenKey)
+
+    override fun getToken(): String = getTokenOrNull() ?: error("Please sign in")
+
+    actual open fun reAuthorize() = Unit
+}
diff --git a/app/shared/src/commonMain/kotlin/TonbrettApp.kt b/app/shared/src/commonMain/kotlin/TonbrettApp.kt
index 6646b87..f158519 100644
--- a/app/shared/src/commonMain/kotlin/TonbrettApp.kt
+++ b/app/shared/src/commonMain/kotlin/TonbrettApp.kt
@@ -14,9 +14,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import dev.schlaubi.tonbrett.app.api.IO
-import dev.schlaubi.tonbrett.app.api.api
-import dev.schlaubi.tonbrett.app.api.getToken
-import dev.schlaubi.tonbrett.app.api.reAuthorize
+import dev.schlaubi.tonbrett.app.api.LocalContext
 import dev.schlaubi.tonbrett.app.components.ErrorText
 import dev.schlaubi.tonbrett.app.components.SoundList
 import dev.schlaubi.tonbrett.app.strings.LocalStrings
@@ -39,6 +37,7 @@ fun TonbrettApp(sessionExpiredState: MutableState<Boolean> = remember { mutableS
     val scaffoldState = rememberScaffoldState()
     var sessionExpired by sessionExpiredState
     var crashed by remember { mutableStateOf(false) }
+    val context = LocalContext.current
 
     val lyricist = rememberStrings()
     suspend fun reportError(exception: ClientRequestException) {
@@ -64,10 +63,10 @@ fun TonbrettApp(sessionExpiredState: MutableState<Boolean> = remember { mutableS
                 SoundList(::reportError)
             }
 
-            DisposableEffect(getToken()) {
+            DisposableEffect(context.getToken()) {
                 val job = scope.launch(Dispatchers.IO) {
                     try {
-                        api.connect()
+                        context.api.connect()
                     } catch (e: ClientRequestException) {
                         reportError(e)
                     }
@@ -84,7 +83,7 @@ fun TonbrettApp(sessionExpiredState: MutableState<Boolean> = remember { mutableS
             ) {
                 if (sessionExpired) {
                     CrashErrorScreen(LocalStrings.current.sessionExpiredExplainer) {
-                        Button({ reAuthorize() }) {
+                        Button({ context.reAuthorize() }) {
                             Icon(Icons.Default.Refresh, LocalStrings.current.reAuthorize)
                             Text(LocalStrings.current.reAuthorize, color = ColorScheme.textColor)
                         }
diff --git a/app/shared/src/commonMain/kotlin/api/Api.kt b/app/shared/src/commonMain/kotlin/api/Api.kt
index 5bd1f3b..2192528 100644
--- a/app/shared/src/commonMain/kotlin/api/Api.kt
+++ b/app/shared/src/commonMain/kotlin/api/Api.kt
@@ -1,23 +1,42 @@
 package dev.schlaubi.tonbrett.app.api
 
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import dev.schlaubi.tonbrett.client.Tonbrett
 import io.ktor.http.*
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
+expect fun getUrl(): Url
 
-expect val Dispatchers.IO: CoroutineDispatcher
+abstract class AppContextBase {
+    abstract fun getToken(): String
 
-expect fun getToken(): String
-expect fun getUrl(): Url
+    private val apiState = mutableStateOf<Tonbrett?>(null)
 
-expect fun reAuthorize()
+    val api: Tonbrett get() = apiState.value ?: error("App not initialized")
+
+    fun resetApi() {
+        apiState.value = Tonbrett(getToken(), getUrl())
+    }
+}
 
-fun resetApi() {
-    api = Tonbrett(getToken(), getUrl())
+expect open class AppContext : AppContextBase {
+    fun reAuthorize()
 }
 
-var api by mutableStateOf(Tonbrett(getToken(), getUrl()))
+expect val Dispatchers.IO: CoroutineDispatcher
+
+
+val LocalContext: ProvidableCompositionLocal<AppContext> =
+    compositionLocalOf { error("App context does not have default") }
+
+@Composable
+fun ProvideContext(
+    context: AppContext,
+    content: @Composable () -> Unit
+) {
+    CompositionLocalProvider(
+        LocalContext provides context,
+        content = content
+    )
+}
diff --git a/app/shared/src/commonMain/kotlin/components/SoundContainer.kt b/app/shared/src/commonMain/kotlin/components/SoundContainer.kt
index da0cecd..ebf877f 100644
--- a/app/shared/src/commonMain/kotlin/components/SoundContainer.kt
+++ b/app/shared/src/commonMain/kotlin/components/SoundContainer.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import dev.schlaubi.tonbrett.app.ColorScheme
 import dev.schlaubi.tonbrett.app.ErrorReporter
-import dev.schlaubi.tonbrett.app.api.api
+import dev.schlaubi.tonbrett.app.api.LocalContext
 import dev.schlaubi.tonbrett.common.Id
 import dev.schlaubi.tonbrett.common.Sound
 import io.ktor.client.plugins.*
@@ -54,6 +54,7 @@ fun SoundCard(
     val corners = RoundedCornerShape(10.dp)
     val interactionSource = remember { MutableInteractionSource() }
     val hovered by interactionSource.collectIsHoveredAsState()
+    val api = LocalContext.current.api
 
     ElevatedCard(
         colors = CardDefaults.cardColors(containerColor = ColorScheme.secondaryContainer),
diff --git a/app/shared/src/commonMain/kotlin/components/SoundList.kt b/app/shared/src/commonMain/kotlin/components/SoundList.kt
index a314cc0..732bd2a 100644
--- a/app/shared/src/commonMain/kotlin/components/SoundList.kt
+++ b/app/shared/src/commonMain/kotlin/components/SoundList.kt
@@ -5,16 +5,29 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import dev.schlaubi.tonbrett.app.ErrorReporter
 import dev.schlaubi.tonbrett.app.api.IO
-import dev.schlaubi.tonbrett.app.api.api
+import dev.schlaubi.tonbrett.app.api.LocalContext
 import dev.schlaubi.tonbrett.app.strings.LocalStrings
-import dev.schlaubi.tonbrett.common.*
-import io.ktor.client.plugins.*
+import dev.schlaubi.tonbrett.common.Id
+import dev.schlaubi.tonbrett.common.InterfaceAvailabilityChangeEvent
+import dev.schlaubi.tonbrett.common.Sound
+import dev.schlaubi.tonbrett.common.SoundCreatedEvent
+import dev.schlaubi.tonbrett.common.SoundDeletedEvent
+import dev.schlaubi.tonbrett.common.SoundUpdatedEvent
+import dev.schlaubi.tonbrett.common.User
+import dev.schlaubi.tonbrett.common.VoiceStateUpdateEvent
+import io.ktor.client.plugins.ClientRequestException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -32,6 +45,7 @@ fun SoundList(errorReporter: ErrorReporter) {
     var channelMismatch by remember { mutableStateOf(false) }
     var offline by remember { mutableStateOf(false) }
     val coroutineScope = rememberCoroutineScope()
+    val api = LocalContext.current.api
 
     fun reload() {
         loading = true
@@ -43,9 +57,9 @@ fun SoundList(errorReporter: ErrorReporter) {
 
     fun reload(voiceState: User.VoiceState?) {
         val didUpdate =
-            offline == (voiceState == null) &&
-                    available == voiceState?.playerAvailable &&
-                    playingSound == voiceState.playingSound
+            offline != (voiceState == null) ||
+                    available != voiceState?.playerAvailable ||
+                    playingSound != voiceState.playingSound
 
         if (voiceState == null) {
             offline = true
diff --git a/app/shared/src/desktopMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt b/app/shared/src/desktopMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
index 5f96865..127f7ab 100644
--- a/app/shared/src/desktopMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
+++ b/app/shared/src/desktopMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
@@ -1,18 +1,15 @@
 package dev.schlaubi.tonbrett.app.api
 
-import io.ktor.http.*
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
-import dev.schlaubi.tonbrett.app.shared.BuildConfig
 
-var reAuthorize: (() -> Unit)? = null
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 actual val Dispatchers.IO: CoroutineDispatcher
     get() = IO
 
-actual fun getToken(): String = getConfig().sessionToken ?: error("Please sign in")
+actual open class AppContext : AppContextBase() {
+    override fun getToken(): String = getConfig().sessionToken ?: error("Please sign in")
 
-actual fun getUrl(): Url = Url(BuildConfig.API_URL)
-
-actual fun reAuthorize() = reAuthorize?.invoke() ?: Unit
+    actual open fun reAuthorize() = Unit
+}
diff --git a/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt b/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
index 7f185c6..875c9d0 100644
--- a/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
+++ b/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
@@ -12,13 +12,15 @@ const val tokenKey = "token"
 actual val Dispatchers.IO: CoroutineDispatcher
     get() = Main
 
-actual fun getToken() = sessionStorage[tokenKey] ?: error("Please sign in")
+actual open class AppContext : AppContextBase() {
+    override fun getToken() = sessionStorage[tokenKey] ?: error("Please sign in")
+
+    actual fun reAuthorize() {
+        sessionStorage.removeItem(tokenKey)
+        window.location.reload()
+    }
+}
 
 actual fun getUrl() = URLBuilder(window.location.href).apply {
     pathSegments = emptyList()
 }.build()
-
-actual fun reAuthorize() {
-    sessionStorage.removeItem(tokenKey)
-    window.location.reload()
-}
diff --git a/app/shared/src/nonWebMain/kotlin/dev/schlaubi/tonbrett/app/api/ApiUrl.kt b/app/shared/src/nonWebMain/kotlin/dev/schlaubi/tonbrett/app/api/ApiUrl.kt
new file mode 100644
index 0000000..560a6c2
--- /dev/null
+++ b/app/shared/src/nonWebMain/kotlin/dev/schlaubi/tonbrett/app/api/ApiUrl.kt
@@ -0,0 +1,6 @@
+package dev.schlaubi.tonbrett.app.api
+
+import dev.schlaubi.tonbrett.app.shared.BuildConfig
+import io.ktor.http.*
+
+actual fun getUrl(): Url = Url(BuildConfig.API_URL)
diff --git a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt b/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
index 5a3349f..42253aa 100644
--- a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
+++ b/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
@@ -2,6 +2,8 @@ package dev.schlaubi.tonbrett.app.web
 
 import androidx.compose.ui.window.CanvasBasedWindow
 import dev.schlaubi.tonbrett.app.TonbrettApp
+import dev.schlaubi.tonbrett.app.api.AppContext
+import dev.schlaubi.tonbrett.app.api.ProvideContext
 import dev.schlaubi.tonbrett.app.api.tokenKey
 import dev.schlaubi.tonbrett.app.title
 import dev.schlaubi.tonbrett.common.Route
@@ -14,6 +16,10 @@ import org.jetbrains.skiko.wasm.onWasmReady
 import org.w3c.dom.get
 import org.w3c.dom.set
 
+private val context = AppContext().apply {
+    resetApi()
+}
+
 fun main() {
     val url = Url(window.location.href)
     val path = url.pathSegments.filter(String::isNotBlank)
@@ -27,7 +33,9 @@ fun main() {
         } else {
             onWasmReady {
                 CanvasBasedWindow(title) {
-                    TonbrettApp()
+                    ProvideContext(context) {
+                        TonbrettApp()
+                    }
                 }
             }
         }
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
index 7f7f3ad..8588d3c 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
 import dev.schlaubi.mikbot.plugin.api.config.Environment
 import dev.schlaubi.mikbot.util_plugins.ktor.api.KtorExtensionPoint
 import dev.schlaubi.tonbrett.common.Route
-import dev.schlaubi.mikbot.plugin.api.config.Config as BotConfig
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.*
 import io.ktor.server.application.*
@@ -20,6 +19,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
 import org.litote.kmongo.id.serialization.IdKotlinXSerializationModule
 import org.pf4j.Extension
+import dev.schlaubi.mikbot.plugin.api.config.Config as BotConfig
 
 @Extension
 class Ktor : KtorExtensionPoint, KordExKoinComponent {
@@ -70,6 +70,10 @@ class Ktor : KtorExtensionPoint, KordExKoinComponent {
         exception<OAuth2Exception> { call: ApplicationCall, cause: OAuth2Exception ->
             call.respond(HttpStatusCode.Unauthorized, cause.errorCode ?: "")
         }
+
+        exception<IllegalArgumentException> { call, cause ->
+            call.respond(HttpStatusCode.BadRequest, cause.message.toString())
+        }
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 56cd3d5..a9051df 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,13 @@
  plugins {
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
-}
+    alias(libs.plugins.android.library) apply false
+     id("org.jetbrains.kotlin.android") version "1.8.20" apply false
+ }
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.2.3"
+    version = "1.3.0"
 
     repositories {
         mavenCentral()
diff --git a/buildSrc/src/main/kotlin/Android.kt b/buildSrc/src/main/kotlin/Android.kt
new file mode 100644
index 0000000..1c0f2d0
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Android.kt
@@ -0,0 +1,4 @@
+package dev.schlaubi.tonbrett.gradle
+
+const val sdkInt = 33
+const val androidSdk = "android-$sdkInt"
diff --git a/buildSrc/src/main/kotlin/LocalProperties.kt b/buildSrc/src/main/kotlin/LocalProperties.kt
index 54fc13f..b05964e 100644
--- a/buildSrc/src/main/kotlin/LocalProperties.kt
+++ b/buildSrc/src/main/kotlin/LocalProperties.kt
@@ -6,13 +6,15 @@ import java.util.*
 val Project.apiUrl: String
     get() {
         val file = rootProject.file("local.properties")
-        return if (file.exists()) {
+        if (file.exists()) {
             val properties = Properties().apply {
                 load(file.bufferedReader())
             }
 
-            properties.getProperty("api.url")
-        } else {
-            "https://musikus.gutikus.schlau.bi"
+            val localUrl = properties.getProperty("api.url")
+            if(!localUrl.isNullOrBlank()) {
+                return localUrl
+            }
         }
+        return "https://musikus.gutikus.schlau.bi"
     }
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
index 880f87f..d72e85f 100644
--- a/client/build.gradle.kts
+++ b/client/build.gradle.kts
@@ -1,12 +1,36 @@
+import dev.schlaubi.tonbrett.gradle.androidSdk
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("multiplatform")
+    id("com.android.library")
+}
+
+repositories {
+    mavenCentral()
+    google()
 }
 
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
+    targetHierarchy.default {
+        common {
+            group("jvmShared") {
+                withAndroid()
+                withJvm()
+            }
+        }
+    }
     jvm()
     js(IR) {
         browser()
     }
+    android {
+        compilations.all {
+            compilerOptions.options.jvmTarget = JvmTarget.JVM_1_8
+        }
+    }
 
     sourceSets {
         commonMain {
@@ -26,10 +50,15 @@ kotlin {
             }
         }
 
-        named("jvmMain") {
+        named("jvmSharedMain") {
             dependencies {
                 implementation(libs.ktor.client.okhttp)
             }
         }
     }
 }
+
+android {
+    namespace = "dev.schlaubi.tonbrett.client"
+    compileSdkVersion = androidSdk
+}
diff --git a/common/src/commonMain/kotlin/dev/schlaubi/tonbrett/common/Route.kt b/common/src/commonMain/kotlin/dev/schlaubi/tonbrett/common/Route.kt
index 5803e5e..60278a5 100644
--- a/common/src/commonMain/kotlin/dev/schlaubi/tonbrett/common/Route.kt
+++ b/common/src/commonMain/kotlin/dev/schlaubi/tonbrett/common/Route.kt
@@ -62,7 +62,8 @@ public class Route {
         @Serializable
         public enum class Type(public val redirectTo: String) {
             WEB("/soundboard/ui/login?token="),
-            APP("http://localhost:12548/login?token=")
+            APP("http://localhost:12548/login?token="),
+            MOBILE_APP("tonbrett://login?token=")
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index ea5c294..0c7a5b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,3 +3,5 @@ systemProp.org.gradle.unsafe.kotlin.assignment=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.gradle.jvmargs=-Xmx2G
 kotlin.js.ir.output.granularity=whole-program
+kotlin.mpp.androidSourceSetLayoutVersion=2
+android.useAndroidX=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5afedcc..7bc04f8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kord = "0.9.0"
 mikbot = "3.17.3"
 ksp = "1.8.20-1.0.10"
 kordex = "1.5.7-SNAPSHOT"
-android = "7.1.3"
+android = "8.0.0"
 compose = "1.4.0-dev-wasm06"
 lyricist = "1.4.1"
 
@@ -41,6 +41,13 @@ lyricist-processor = { group = "cafe.adriel.lyricist", name = "lyricist-processo
 
 logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.3.6" }
 
+kvault = { group = "com.liftric", name = "kvault", version = "1.10.0" }
+
+androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.7.1" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
+androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.10.1" }
+androidx-browser = { group = "androidx.browser", name = "browser", version = "1.5.0" }
+
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..9c45c78
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,9 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Sat May 20 19:56:10 CEST 2023
+sdk.dir=C\:\\Users\\micha\\AppData\\Local\\Android\\Sdk
+#api.url=https://schlaubi.eu.ngrok.io
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e613fdb..9dd9b22 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,8 @@ include(
     ":app",
     ":app:shared",
     ":app:web",
-    ":app:desktop"
+    ":app:desktop",
+    ":app:android"
 )
 
 pluginManagement {