Edited Name and icon

app/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
+    id("com.google.devtools.ksp") version "2.3.4"// apply false
 }
 
 android {
@@ -60,4 +61,8 @@ dependencies {
 
     //Manually added
     implementation("androidx.datastore:datastore-preferences:1.2.0")
+
+    val room_version = "2.8.4"
+    implementation("androidx.room:room-runtime:$room_version")
+    ksp("androidx.room:room-compiler:$room_version")
 }

app/src/main/java/de/miaurizius/shap_planner/activities/MainActivity.kt

@@ -3,25 +3,47 @@ package de.miaurizius.shap_planner.activities
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import de.miaurizius.shap_planner.UserPreferences
+import de.miaurizius.shap_planner.entities.Account
+import de.miaurizius.shap_planner.room.AppDatabase
 import de.miaurizius.shap_planner.ui.theme.ShapPlannerTheme
 import de.miaurizius.shap_planner.viewmodels.LoginViewModel
+import de.miaurizius.shap_planner.viewmodels.MainViewModel
+import java.util.UUID
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -29,33 +51,90 @@ class MainActivity : ComponentActivity() {
 //        enableEdgeToEdge()
 
         val prefs = UserPreferences(this)
-        val viewModel = LoginViewModel(prefs)
+        val loginViewModel = LoginViewModel(prefs)
+
+        val database = AppDatabase.getDatabase(applicationContext)
+        val dao = database.accountDao()
+        val mainViewModel = MainViewModel(dao)
 
         setContent {
             ShapPlannerTheme {
-                val isLoggedIn by viewModel.isLoggedIn.collectAsState()
+                val isLoggedIn by loginViewModel.isLoggedIn.collectAsState()
-                if(isLoggedIn) MainScreen()
+                val accountList by mainViewModel.accounts.collectAsState()
-                else LoginScreen { userId -> viewModel.login(userId) }
+                val selectedAccount = mainViewModel.selectedAccount
+
+                when {
+                    !isLoggedIn || accountList.isEmpty() -> {
+                        LoginScreen { userId ->
+                            val acc = Account(userId, "MiauRizius", "Pfadi-WG") //TODO: get data from backend
+                            mainViewModel.addAccount(acc)
+                            loginViewModel.login(acc.id.toString())
+                        }
+                    }
+
+                    selectedAccount != null -> {
+                        DashboardScreen(
+                            account = selectedAccount,
+                            onBack = { mainViewModel.logoutFromAccount() }
+                        )
+                    }
+
+                    else -> {
+                        AccountSelectionScreen(
+                            accounts = accountList,
+                            onAccountClick = { account ->
+                                mainViewModel.selectAccount(account)
+                            },
+                            onAddAccountClick = {
+                                loginViewModel.logout()
+                            }
+                        )
+                    }
+                }
             }
         }
     }
 }
 
 @Composable
-fun MainScreen() {
+fun AccountSelectionScreen(accounts: List<Account>, onAccountClick: (Account) -> Unit, onAddAccountClick: () -> Unit) {
-    Column(modifier = Modifier.padding(16.dp)) {
+    LazyColumn(
-        Text("Willkommen zurück!")
+        modifier = Modifier.fillMaxSize().padding(16.dp).statusBarsPadding(),
-        Button(onClick = { /* TODO: Logout */ }) {
+        verticalArrangement = Arrangement.spacedBy(12.dp)
-            Text("Logout")
+    ) {
+        item {
+            Text("Wähle einen Account", style = MaterialTheme.typography.headlineSmall)
+        }
+
+        items(accounts) { account ->
+            Card(modifier = Modifier.fillMaxWidth().clickable{ onAccountClick(account) }) {
+                Row(modifier = Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
+                    Box(modifier = Modifier.size(40.dp).background(Color.Gray, shape = CircleShape))
+                    Spacer(modifier = Modifier.width(16.dp))
+                    Column {
+                        Text(text = account.name, fontWeight = FontWeight.Bold)
+                        Text(text = account.wgName, style = MaterialTheme.typography.bodyMedium)
+                    }
+                }
+            }
+        }
+        item {
+            Spacer(modifier = Modifier.height(8.dp))
+            Button(
+                onClick = onAddAccountClick,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Text("Anderen Account hinzufügen")
+            }
         }
     }
 }
 
 @Composable
-fun LoginScreen(onLogin: (String) -> Unit) {
+fun LoginScreen(onLogin: (UUID) -> Unit) {
     var userId by remember { mutableStateOf("") }
 
-    Column(modifier = Modifier.padding(16.dp)) {
+    Column(modifier = Modifier.padding(16.dp).statusBarsPadding()) {
         Text("Bitte anmelden")
         Spacer(modifier = Modifier.height(8.dp))
         TextField(
@@ -64,8 +143,43 @@ fun LoginScreen(onLogin: (String) -> Unit) {
             label = { Text("User ID") }
         )
         Spacer(modifier = Modifier.height(8.dp))
-        Button(onClick = { if(userId.isNotEmpty()) onLogin(userId) }) {
+        Button(onClick = { if(userId.isNotEmpty()) onLogin(UUID.fromString(userId)) }) {
             Text("Login")
         }
     }
+}
+
+@Composable
+fun DashboardScreen(account: Account, onBack: () -> Unit) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp)
+            .statusBarsPadding()
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Column {
+                Text(text = "Hallo, ${account.name}!", style = MaterialTheme.typography.headlineMedium)
+                Text(text = "WG: ${account.wgName}", style = MaterialTheme.typography.bodyLarge, color = Color.Gray)
+            }
+            Button(onClick = onBack) {
+                Text("Wechseln")
+            }
+        }
+
+        Spacer(modifier = Modifier.height(32.dp))
+
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.surfaceVariant, shape = MaterialTheme.shapes.medium),
+            contentAlignment = Alignment.Center
+        ) {
+            Text("Hier kommen bald deine WG-Kosten hin 🚀")
+        }
+    }
 }

app/src/main/java/de/miaurizius/shap_planner/entities/Account.kt

@@ -0,0 +1,31 @@
+package de.miaurizius.shap_planner.entities
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.PrimaryKey
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+import java.util.UUID
+
+@Entity(tableName = "accounts")
+data class Account (
+    @PrimaryKey val id: UUID,
+    val name: String,
+    val wgName: String,
+    val avatarUrl: String? = null
+)
+
+@Dao
+interface AccountDao {
+    @Query("SELECT * FROM accounts")
+    fun getAllAccounts(): Flow<List<Account>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAccount(account: Account)
+
+    @Delete
+    suspend fun deleteAccount(account: Account)
+}

app/src/main/java/de/miaurizius/shap_planner/room/AppDatabase.kt

@@ -0,0 +1,29 @@
+package de.miaurizius.shap_planner.room
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import de.miaurizius.shap_planner.entities.Account
+import de.miaurizius.shap_planner.entities.AccountDao
+
+@Database(entities = [Account::class], version = 1)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun accountDao(): AccountDao
+    companion object {
+        @Volatile
+        private var INSTANCE: AppDatabase? = null
+
+        fun getDatabase(context: Context): AppDatabase {
+            return INSTANCE ?: synchronized(this) {
+                val instance = Room.databaseBuilder(
+                    context.applicationContext,
+                    AppDatabase::class.java,
+                    "shap_planner_database"
+                ).build()
+                INSTANCE = instance
+                instance
+            }
+        }
+    }
+}

app/src/main/java/de/miaurizius/shap_planner/viewmodels/MainViewModel.kt

@@ -0,0 +1,39 @@
+package de.miaurizius.shap_planner.viewmodels
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import de.miaurizius.shap_planner.entities.Account
+import de.miaurizius.shap_planner.entities.AccountDao
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlin.collections.emptyList
+
+class MainViewModel(private val accountDao: AccountDao) : ViewModel() {
+
+    // Das ist der State, den dein SetContent beobachtet
+    val accounts: StateFlow<List<Account>> = accountDao.getAllAccounts()
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+
+    // Funktion zum Hinzufügen (z.B. nach Login)
+    fun addAccount(account: Account) {
+        viewModelScope.launch {
+            accountDao.insertAccount(account)
+        }
+    }
+
+    var selectedAccount by mutableStateOf<Account?>(null)
+        private set
+
+    fun selectAccount(account: Account) {
+        selectedAccount = account
+    }
+
+    fun logoutFromAccount() {
+        selectedAccount = null
+    }
+}

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
-    android:width="108dp"
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
+    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
+    <path android:fillColor="#3DDC84"
-        android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
-        android:pathData="M0,0h108v108h-108z" />
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-        android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M19,0L19,108"
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-        android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M39,0L39,108"
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-        android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M59,0L59,108"
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-        android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M79,0L79,108"
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-        android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M99,0L99,108"
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-        android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M0,19L108,19"
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-        android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,30 +1,50 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
+    android:viewportWidth="1024"
-    android:viewportHeight="108">
+    android:viewportHeight="1024">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+  <group android:scaleX="0.46"
-        <aapt:attr name="android:fillColor">
+      android:scaleY="0.46"
-            <gradient
+      android:translateX="276.48"
-                android:endX="85.84757"
+      android:translateY="276.48">
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
     <path
-        android:fillColor="#FFFFFF"
+        android:pathData="M764.8,146v119.9l69.5,53.4v-149c0,-13.4 -10.8,-24.2 -24.2,-24.2h-45.3z"
-        android:fillType="nonZero"
+        android:fillColor="#FF6339"/>
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+    <path
-        android:strokeWidth="1"
+        android:pathData="M226.2,926.8V498.4l312.5,-246.9 312.5,235.4 -3.5,434.1z"
-        android:strokeColor="#00000000" />
+        android:fillColor="#ECD300"/>
-</vector>
+    <path
+        android:pathData="M851.3,486.9l-312.5,-235.4 -31.1,24.6 271.8,211.6c6.3,4.9 9.9,12.4 9.9,20.4v340.7c0,14.1 -11.4,25.5 -25.5,25.5H226.2v52.5l621.6,-5.8 3.4,-434.1z"
+        android:fillColor="#E8A200"/>
+    <path
+        android:pathData="M799.5,150.5v137.8l25.1,18.2V154.3z"
+        android:fillColor="#F94A21"/>
+    <path
+        android:pathData="M904.5,498.4a50.5,50.5 0,0 1,-30.3 -10.1l-363.9,-270.8 -286.1,223c-22.1,17 -66.9,60.3 -83.9,38.2 -16.9,-22.1 -12.9,-53.7 9.2,-70.7l358.5,-275.7a50.5,50.5 0,0 1,61.1 -0.3l365.8,275.7c22.2,16.7 26.7,48.3 9.9,70.6a50.5,50.5 0,0 1,-40.3 20.1z"
+        android:fillColor="#76BFFF"/>
+    <path
+        android:pathData="M944.8,478.4a50.4,50.4 0,0 0,-9.9 -70.6l-365.8,-275.7a50.4,50.4 0,0 0,-55 -3.7c8.1,2.4 18.2,7.6 30.5,17.7 46.1,37.8 336.4,260.1 347,267.3 10.6,7.1 20.6,22.9 13,38.1 -7.4,14.8 -28.1,24.1 -61.6,8.4 0.8,3.1 17.2,16.2 18.6,19l12.6,9.4a50,50 0,0 0,30.3 10.1,50.3 50.3,0 0,0 40.2,-20.1z"
+        android:fillColor="#659CF8"/>
+    <path
+        android:pathData="M609.4,785.6H452.7a48,48 0,0 1,-48 -48v-156.7c0,-26.5 21.5,-48 48,-48h156.7c26.5,0 48,21.5 48,48v156.7c0.1,26.5 -21.5,48 -48,48z"
+        android:fillColor="#76BFFF"/>
+    <path
+        android:pathData="M657.5,737.5v-156.7c0,-22.5 -15.5,-41.4 -36.4,-46.6v191.3c0,11.6 -9.4,20.9 -20.9,20.9H405.5c4.2,22.3 23.7,39.2 47.2,39.2h156.7c26.5,-0.1 48,-21.6 48,-48.1z"
+        android:fillColor="#659CF8"/>
+    <path
+        android:pathData="M274.7,729a12.8,12.8 0,0 1,-12.8 -12.8v-19.5a12.8,12.8 0,0 1,25.6 0v19.5a12.8,12.8 0,0 1,-12.8 12.8zM274.7,659.7a12.8,12.8 0,0 1,-12.8 -12.8v-103.5c0,-9.2 4.5,-17.9 11.8,-23.3l38,-27.8c5.7,-4.1 13.7,-2.9 17.9,2.8s2.9,13.7 -2.8,17.9l-38,27.8c-0.9,0.6 -1.3,1.6 -1.3,2.7v103.5c0,7.1 -5.7,12.9 -12.8,12.9z"
+        android:fillColor="#FFFFFF"/>
+    <path
+        android:pathData="M206.4,330.6c3.3,0 6.6,-1 9.4,-3.2l12.7,-9.8a15.4,15.4 0,0 0,2.8 -21.6,15.4 15.4,0 0,0 -21.6,-2.8l-12.7,9.8a15.4,15.4 0,0 0,-2.8 21.6c3,3.9 7.6,6 12.2,6zM175.2,693.1c8.5,0 15.4,-6.9 15.4,-15.4v-15.7c0,-8.5 -6.9,-15.4 -15.4,-15.4s-15.4,6.9 -15.4,15.4v15.7c0,8.4 6.9,15.4 15.4,15.4z"
+        android:fillColor="#333333"/>
+    <path
+        android:pathData="M941.7,911.5h-75.1V504.6c10.4,6 22.2,9.2 34.4,9.2 22,0 42.1,-10 55.3,-27.5 23,-30.5 16.9,-74 -13.6,-97l-93.1,-70.2V170.2c0,-21.8 -17.7,-39.5 -39.5,-39.5h-52.6c-21.8,0 -39.5,17.7 -39.5,39.5v49.7l-166.3,-125.4c-24.8,-18.7 -59.3,-18.5 -83.9,0.4l-214,164.6c-6.7,5.2 -8,14.8 -2.8,21.6s14.8,8 21.6,2.8l214.1,-164.7a38.6,38.6 0,0 1,46.7 -0.2l391.1,294.8c16.9,12.8 20.4,37 7.6,54 -7.4,9.7 -18.6,15.4 -30.8,15.4 -8.4,0 -16.4,-2.7 -23.1,-7.8l-358.3,-270.1a15.4,15.4 0,0 0,-18.6 0.1L150.2,475.1a38.2,38.2 0,0 1,-28.5 7.7,38.4 38.4,0 0,1 -25.5,-14.7c-13,-16.8 -9.8,-41.1 7.1,-54l53.1,-40.8c6.7,-5.2 8,-14.8 2.8,-21.6s-14.8,-8 -21.6,-2.8L84.5,389.6c-30.3,23.3 -35.9,66.8 -12.7,97.1 11.3,14.6 27.6,24.1 45.9,26.5a68.7,68.7 0,0 0,42.1 -7.8v96.2c0,8.5 6.9,15.4 15.4,15.4s15.4,-6.9 15.4,-15.4V486.9c0,-1.3 -0.2,-2.5 -0.5,-3.7l320.4,-246.4 325.5,245.4v429.3H190.6v-151.3c0,-8.5 -6.9,-15.4 -15.4,-15.4s-15.4,6.9 -15.4,15.4v151.3H87.4c-8.5,0 -15.4,6.9 -15.4,15.4s6.9,15.4 15.4,15.4h854.3c8.5,0 15.4,-6.9 15.4,-15.4s-6.9,-15.3 -15.4,-15.3zM748.7,170.2c0,-4.9 3.9,-8.8 8.8,-8.8h52.6c4.9,0 8.8,3.9 8.8,8.8v125.7l-70.2,-52.9V170.2z"
+        android:fillColor="#333333"/>
+    <path
+        android:pathData="M439,673.3c-8.5,0 -15.4,6.9 -15.4,15.4s6.9,15.4 15.4,15.4H496.6v29.3c0,8.5 6.9,15.4 15.4,15.4s15.4,-6.9 15.4,-15.4v-29.3h57.6c8.5,0 15.4,-6.9 15.4,-15.4s-6.9,-15.4 -15.4,-15.4H527.4v-34.8h57.6c8.5,0 15.4,-6.9 15.4,-15.4s-6.9,-15.4 -15.4,-15.4h-43.3l31.2,-37.8c5.4,-6.6 4.5,-16.2 -2,-21.6a15.3,15.3 0,0 0,-21.6 2l-37.5,45.4 -37.8,-43.5a15.4,15.4 0,0 0,-21.7 -1.5,15.4 15.4,0 0,0 -1.5,21.7l30.6,35.2h-42.3c-8.5,0 -15.4,6.9 -15.4,15.4s6.9,15.4 15.4,15.4H496.6v34.8H439z"
+        android:fillColor="#333333"/>
+    <path
+        android:pathData="M609.4,800.9c35,0 63.4,-28.5 63.4,-63.4v-191c0,-35 -28.5,-63.4 -63.4,-63.4L418.4,483.1c-35,0 -63.4,28.5 -63.4,63.4v191c0,35 28.5,63.4 63.4,63.4h191.1zM385.7,737.5v-191c0,-18 14.6,-32.7 32.7,-32.7h191.1c18,0 32.7,14.6 32.7,32.7v191c0,18 -14.6,32.7 -32.7,32.7L418.4,770.2c-18,0 -32.7,-14.6 -32.7,-32.7z"
+        android:fillColor="#333333"/>
+  </group>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?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" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?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" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Shap-Planner</string>
+    <string name="app_name">ShAp-Planner</string>
 </resources>