MiauRizius/shap-planner-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Edited Name and icon

Browse Source
This commit is contained in:
Maurice L.
2026-02-20 22:49:28 +01:00
parent a3ec3f16e1
commit 885d95991e
18 changed files with 206 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/ic_launcher-playstore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

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

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
@@ -58,26 +59,37 @@ class MainActivity : ComponentActivity() {
setContent { setContent {
ShapPlannerTheme { ShapPlannerTheme {
LaunchedEffect(Unit) { val isLoggedIn by loginViewModel.isLoggedIn.collectAsState()
mainViewModel.addAccount(Account(UUID.randomUUID(), "MiauRizius", "Pfadi-WG")) val accountList by mainViewModel.accounts.collectAsState()
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())
}
} }
val isLoggedIn by loginViewModel.isLoggedIn.collectAsState() selectedAccount != null -> {
val accountList by mainViewModel.accounts.collectAsState() // Lädt aus Room DashboardScreen(
account = selectedAccount,
onBack = { mainViewModel.logoutFromAccount() }
)
}
if (isLoggedIn) { else -> {
if (accountList.isEmpty()) {
// Zeige Button "Ersten Account erstellen"
} else {
AccountSelectionScreen( AccountSelectionScreen(
accounts = accountList, accounts = accountList,
onAccountClick = { account -> onAccountClick = { account ->
mainViewModel.selectAccount(account) mainViewModel.selectAccount(account)
},
onAddAccountClick = {
loginViewModel.logout()
} }
) )
} }
} else {
LoginScreen { userId -> loginViewModel.login(userId) }
} }
} }
} }
@@ -85,9 +97,9 @@ class MainActivity : ComponentActivity() {
} }
@Composable @Composable
fun AccountSelectionScreen(accounts: List<Account>, onAccountClick: (Account) -> Unit) { fun AccountSelectionScreen(accounts: List<Account>, onAccountClick: (Account) -> Unit, onAddAccountClick: () -> Unit) {
LazyColumn( LazyColumn(
modifier = Modifier.fillMaxSize().padding(16.dp), modifier = Modifier.fillMaxSize().padding(16.dp).statusBarsPadding(),
verticalArrangement = Arrangement.spacedBy(12.dp) verticalArrangement = Arrangement.spacedBy(12.dp)
) { ) {
item { item {
@@ -106,14 +118,23 @@ fun AccountSelectionScreen(accounts: List<Account>, onAccountClick: (Account) ->
} }
} }
} }
item {
Spacer(modifier = Modifier.height(8.dp))
Button(
onClick = onAddAccountClick,
modifier = Modifier.fillMaxWidth()
) {
Text("Anderen Account hinzufügen")
}
}
} }
} }
@Composable @Composable
fun LoginScreen(onLogin: (String) -> Unit) { fun LoginScreen(onLogin: (UUID) -> Unit) {
var userId by remember { mutableStateOf("") } var userId by remember { mutableStateOf("") }
Column(modifier = Modifier.padding(16.dp)) { Column(modifier = Modifier.padding(16.dp).statusBarsPadding()) {
Text("Bitte anmelden") Text("Bitte anmelden")
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
TextField( TextField(
@@ -122,8 +143,43 @@ fun LoginScreen(onLogin: (String) -> Unit) {
label = { Text("User ID") } label = { Text("User ID") }
) )
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
Button(onClick = { if(userId.isNotEmpty()) onLogin(userId) }) { Button(onClick = { if(userId.isNotEmpty()) onLogin(UUID.fromString(userId)) }) {
Text("Login") 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 🚀")
}
}
}

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

@@ -1,5 +1,8 @@
package de.miaurizius.shap_planner.viewmodels 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.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import de.miaurizius.shap_planner.entities.Account import de.miaurizius.shap_planner.entities.Account
@@ -23,5 +26,14 @@ class MainViewModel(private val accountDao: AccountDao) : ViewModel() {
} }
} }
fun selectAccount(account: Account) {} var selectedAccount by mutableStateOf<Account?>(null)
private set
fun selectAccount(account: Account) {
selectedAccount = account
}
fun logoutFromAccount() {
selectedAccount = null
}
} }

236
app/src/main/res/drawable/ic_launcher_background.xml
View File

@@ -1,170 +1,74 @@
<?xml version="1.0" encoding="utf-8"?> <?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:height="108dp"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="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> </vector>

70
app/src/main/res/drawable/ic_launcher_foreground.xml
View File

@@ -1,30 +1,50 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp" android:width="108dp"
android:height="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 <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"/>
<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> </vector>

5
app/src/main/res/mipmap-anydpi/ic_launcher.xml → app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <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> </adaptive-icon>

5
app/src/main/res/mipmap-anydpi/ic_launcher_round.xml → app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <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> </adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 982 B

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 14 KiB

2
app/src/main/res/values/strings.xml
View File

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