Fixes for currency, logo, render and more

README.md

@@ -1,7 +1,7 @@
 <!--suppress ALL -->
 <div align="center">
   <h1>Cowspent</h1>
-  <img width="100px" src="./metadata/en-US/images/icon.png" alt="Logo">
+  <img width="100px" src="./metadata/en-US/images/icon.webp" alt="Logo">
 
   <p>
   

app/build.gradle

@@ -82,18 +82,11 @@ android {
     androidResources {
         generateLocaleConfig = true
     }
-
-    dependenciesInfo {
-        // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
-        includeInApk = false
-        // Disables dependency metadata when building Android App Bundles (for Google Play)
-        includeInBundle = false
-    }
 }
 
 dependencies {
-    implementation 'androidx.compose.foundation:foundation:1.11.3'
-    implementation 'androidx.compose.runtime:runtime:1.11.3'
+    implementation 'androidx.compose.foundation:foundation:1.11.2'
+    implementation 'androidx.compose.runtime:runtime:1.11.2'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
     implementation 'androidx.preference:preference-ktx:1.2.1'
@@ -106,7 +99,7 @@ dependencies {
     implementation 'com.github.nextcloud:Android-SingleSignOn:1.1.0'
     implementation 'com.opencsv:opencsv:5.12.0'
 
-    implementation platform('androidx.compose:compose-bom:2026.06.00')
+    implementation platform('androidx.compose:compose-bom:2026.05.01')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.material:material'
     implementation 'androidx.compose.material:material-icons-extended'
@@ -114,5 +107,5 @@ dependencies {
     debugImplementation 'androidx.compose.ui:ui-tooling'
     implementation 'androidx.activity:activity-compose:1.13.0'
     implementation 'androidx.activity:activity-ktx:1.13.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0'
 }

app/src/main/java/net/helcel/cowspent/android/account/AccountActivity.kt

@@ -13,8 +13,8 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
-import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Box
@@ -33,6 +33,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.nextcloud.android.sso.AccountImporter
 import com.nextcloud.android.sso.helper.SingleAccountHelper
+import com.nextcloud.android.sso.model.SingleSignOnAccount
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

app/src/main/java/net/helcel/cowspent/android/bill_edit/EditBillActivity.kt

@@ -187,12 +187,7 @@ class EditBillActivity : AppCompatActivity() {
                 }
             }
             calendar.timeInMillis = bill.timestamp * 1000
-            val allMembers = db.getMembersOfProject(bill.projectId, null)
-            val billOwerIds = bill.billOwersIds
-            val members = allMembers.filter { m ->
-                m.isActivated || m.id == bill.payerId || billOwerIds.contains(m.id)
-            }
-            
+            val members = db.getMembersOfProject(bill.projectId, null)
             val project = db.getProject(bill.projectId)
             val currencies = db.getCurrencies(bill.projectId)
             withContext(Dispatchers.Main) {

app/src/main/java/net/helcel/cowspent/android/bill_edit/EditBillScreen.kt

@@ -117,7 +117,6 @@ fun EditBillScreen(
         Column(
             modifier = Modifier
                 .padding(padding)
-                .imePadding()
                 .padding(16.dp)
                 .fillMaxSize()
                 .verticalScroll(scrollState)
@@ -189,9 +188,7 @@ fun BillBasicInfoSection(
         placeholder = { Text("0") },
         modifier = Modifier.fillMaxWidth(),
         leadingIcon = {
-            val currencyToShow = viewModel.selectedCurrencyName.ifEmpty { 
-                viewModel.mainCurrencyName.ifEmpty { "$" } 
-            }
+            val currencyToShow = viewModel.selectedCurrencyName.ifEmpty { viewModel.mainCurrencyName }
             TextIconDisplay(
                 textIcon = TextIcon.Symbol(currencyToShow),
                 tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
@@ -201,7 +198,7 @@ fun BillBasicInfoSection(
             IconButton(
                 enabled = canEdit,
                 onClick = {
-                    val mainLabel = viewModel.mainCurrencyName.ifEmpty { "$" }
+                    val mainLabel = viewModel.mainCurrencyName.ifEmpty { "Main" }
                     val options = listOf("$mainLabel | Base") + viewModel.currencies.map { 
                         "${it.name} | 1 $mainLabel = ${it.exchangeRate} ${it.name}" 
                     }

app/src/main/java/net/helcel/cowspent/android/bill_edit/EditBillViewModel.kt

@@ -1,7 +1,6 @@
 package net.helcel.cowspent.android.bill_edit
 
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableDoubleStateOf
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateMapOf
@@ -11,7 +10,6 @@ import androidx.lifecycle.ViewModel
 import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.DBMember
 import net.helcel.cowspent.android.helper.DialogState
-import net.helcel.cowspent.android.helper.parseAmount
 import net.helcel.cowspent.util.SupportUtil
 import net.helcel.cowspent.util.evalMath
 
@@ -32,7 +30,7 @@ class EditBillViewModel : ViewModel() {
     var currencies by mutableStateOf<List<DBCurrency>>(emptyList())
     var mainCurrencyName by mutableStateOf("")
     var selectedCurrencyName by mutableStateOf("")
-    var selectedCurrencyRate by mutableDoubleStateOf(1.0)
+    var selectedCurrencyRate by mutableStateOf(1.0)
     var members by mutableStateOf<List<DBMember>>(emptyList())
 
     var owersSelection = mutableStateMapOf<Long, Boolean>()
@@ -43,8 +41,13 @@ class EditBillViewModel : ViewModel() {
 
     val amountAsDouble: Double
         get() {
-            return parseAmount(amount) ?: try {
-                evalMath(amount.replace(',', '.'))
+            val amountStr = amount.replace(',', '.')
+            return try {
+                if (amountStr.matches("[0-9.]+".toRegex())) {
+                    amountStr.toDouble()
+                } else {
+                    evalMath(amountStr)
+                }
             } catch (_: Exception) {
                 0.0
             }

app/src/main/java/net/helcel/cowspent/android/currencies/ManageCurrenciesActivity.kt

@@ -67,10 +67,8 @@ class ManageCurrenciesActivity : AppCompatActivity() {
                         viewModel = viewModel,
                         onBack = { finish() },
                         onSaveMain = { saveMainCurrency() },
-                        onAdd = { addOrUpdateCurrency() },
-                        onDelete = { deleteCurrency(it) },
-                        onEdit = { startEditing(it) },
-                        onCancelEdit = { cancelEditing() }
+                        onAdd = { addCurrency() },
+                        onDelete = { deleteCurrency(it) }
                     )
                 }
             }
@@ -107,44 +105,22 @@ class ManageCurrenciesActivity : AppCompatActivity() {
         }
     }
 
-    private fun addOrUpdateCurrency() {
+    private fun addCurrency() {
         val exchangeRate = try { viewModel.newCurrencyRate.toDouble() } catch (_: Exception) { 0.0 }
-        val currencyName = viewModel.newCurrencyName
-        val editingId = viewModel.editingCurrencyId
-
+        val newCurrency = DBCurrency(
+            0, 0, selectedProjectID,
+            viewModel.newCurrencyName, exchangeRate, DBBill.STATE_ADDED
+        )
         lifecycleScope.launch {
             withContext(Dispatchers.IO) {
-                if (editingId != null) {
-                    db!!.updateCurrency(editingId, currencyName, exchangeRate)
-                    val currency = db!!.getCurrency(editingId)
-                    if (currency != null) {
-                        db!!.setCurrencyStateSync(editingId, DBBill.STATE_EDITED)
-                    }
-                } else {
-                    val newCurrency = DBCurrency(
-                        0, 0, selectedProjectID,
-                        currencyName, exchangeRate, DBBill.STATE_ADDED
-                    )
-                    db!!.addCurrencyAndSync(newCurrency)
-                }
+                db!!.addCurrencyAndSync(newCurrency)
             }
-            cancelEditing()
+            viewModel.newCurrencyName = ""
+            viewModel.newCurrencyRate = ""
             updateCurrenciesList()
         }
     }
 
-    private fun startEditing(currency: DBCurrency) {
-        viewModel.editingCurrencyId = currency.id
-        viewModel.newCurrencyName = currency.name ?: ""
-        viewModel.newCurrencyRate = currency.exchangeRate.toString()
-    }
-
-    private fun cancelEditing() {
-        viewModel.editingCurrencyId = null
-        viewModel.newCurrencyName = ""
-        viewModel.newCurrencyRate = ""
-    }
-
     private fun deleteCurrency(currency: DBCurrency) {
         lifecycleScope.launch {
             withContext(Dispatchers.IO) {

app/src/main/java/net/helcel/cowspent/android/currencies/ManageCurrenciesScreen.kt

@@ -1,57 +1,24 @@
 package net.helcel.cowspent.android.currencies
 
 import android.annotation.SuppressLint
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-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.imePadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.delay
 import net.helcel.cowspent.R
 import net.helcel.cowspent.android.helper.AlertDialog
-import net.helcel.cowspent.android.helper.formatAmount
 import net.helcel.cowspent.model.DBCurrency
-import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
 fun ManageCurrenciesScreen(
@@ -59,9 +26,7 @@ fun ManageCurrenciesScreen(
     onBack: () -> Unit,
     onSaveMain: () -> Unit,
     onAdd: () -> Unit,
-    onDelete: (DBCurrency) -> Unit,
-    onEdit: (DBCurrency) -> Unit,
-    onCancelEdit: () -> Unit
+    onDelete: (DBCurrency) -> Unit
 ) {
     val dialogState = viewModel.dialogState
     if (dialogState != null) {
@@ -110,151 +75,78 @@ fun ManageCurrenciesScreen(
         Column(
             modifier = Modifier
                 .padding(padding)
-                .imePadding()
+                .padding(16.dp)
                 .fillMaxSize()
-                .background(MaterialTheme.colors.onSurface.copy(alpha = 0.02f))
         ) {
-            LaunchedEffect(viewModel.mainCurrencyName) {
-                if (viewModel.mainCurrencyName.isNotEmpty()) {
-                    delay(500.milliseconds)
-                    onSaveMain()
+            Text(stringResource(R.string.main_currency), style = MaterialTheme.typography.h6)
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                OutlinedTextField(
+                    value = viewModel.mainCurrencyName,
+                    onValueChange = { viewModel.mainCurrencyName = it },
+                    label = { Text(stringResource(R.string.currency_edit_name)) },
+                    modifier = Modifier.weight(1f)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Button(onClick = onSaveMain, enabled = viewModel.mainCurrencyName.isNotEmpty()) {
+                    Text(stringResource(R.string.save_or_discard_bill_dialog_save))
                 }
             }
 
-            Column(modifier = Modifier.padding(16.dp)) {
-                // Section 1: Main Currency
-                Text(
-                    text = stringResource(R.string.main_currency).uppercase(),
-                    style = MaterialTheme.typography.overline,
-                    color = MaterialTheme.colors.primary,
-                    fontWeight = FontWeight.Bold
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-                Card(
-                    shape = RoundedCornerShape(12.dp),
-                    elevation = 2.dp,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    OutlinedTextField(
-                        value = viewModel.mainCurrencyName,
-                        onValueChange = { viewModel.mainCurrencyName = it },
-                        modifier = Modifier.fillMaxWidth(),
-                        placeholder = { Text("e.g. EUR", fontSize = 14.sp) },
-                        colors = TextFieldDefaults.outlinedTextFieldColors(
-                            focusedBorderColor = Color.Transparent,
-                            unfocusedBorderColor = Color.Transparent
-                        )
-                    )
-                }
+            Spacer(modifier = Modifier.height(24.dp))
 
-                Spacer(modifier = Modifier.height(24.dp))
-
-                // Section 2: Exchange Rates
-                val isEditing = viewModel.editingCurrencyId != null
-                Text(
-                    text = (if (isEditing) "Edit exchange rate" else "Add exchange rate").uppercase(),
-                    style = MaterialTheme.typography.overline,
-                    color = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-                    fontWeight = FontWeight.Bold
-                )
-                Spacer(modifier = Modifier.height(8.dp))
-
-                // Integrated Add/Edit Ribbon
-                Surface(
-                    color = MaterialTheme.colors.surface,
-                    shape = RoundedCornerShape(12.dp),
-                    modifier = Modifier.fillMaxWidth(),
-                    elevation = 2.dp
-                ) {
-                    Row(
-                        modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Text("1 ", style = MaterialTheme.typography.body2, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f))
-                        Text(viewModel.mainCurrencyName.ifEmpty { "$" }, fontWeight = FontWeight.Bold)
-                        Text(
-                            text = " = ",
-                            style = MaterialTheme.typography.h6,
-                            color = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-                            modifier = Modifier.padding(horizontal = 4.dp)
-                        )
-                        
-                        OutlinedTextField(
-                            value = viewModel.newCurrencyRate,
-                            onValueChange = { viewModel.newCurrencyRate = it },
-                            modifier = Modifier.weight(1.2f).height(52.dp),
-                            placeholder = { Text("1", fontSize = 12.sp) },
-                            singleLine = true,
-                            textStyle = LocalTextStyle.current.copy(fontWeight = FontWeight.ExtraBold, fontSize = 14.sp),
-                            shape = RoundedCornerShape(8.dp),
-                            colors = TextFieldDefaults.outlinedTextFieldColors(
-                                focusedBorderColor = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-                                unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.02f)
-                            )
-                        )
-                        Spacer(modifier = Modifier.width(8.dp))
-                        OutlinedTextField(
-                            value = viewModel.newCurrencyName,
-                            onValueChange = { viewModel.newCurrencyName = it },
-                            modifier = Modifier.weight(1f).height(52.dp),
-                            placeholder = { Text(viewModel.mainCurrencyName.ifEmpty { "$" }, fontSize = 12.sp) },
-                            singleLine = true,
-                            textStyle = LocalTextStyle.current.copy(fontWeight = FontWeight.Bold, fontSize = 14.sp),
-                            shape = RoundedCornerShape(8.dp),
-                            colors = TextFieldDefaults.outlinedTextFieldColors(
-                                focusedBorderColor = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-                                unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.02f)
-                            )
-                        )
-                        
-                        Row(modifier = Modifier.padding(start = 4.dp)) {
-                            IconButton(
-                                onClick = onAdd,
-                                enabled = viewModel.isAddEnabled()
-                            ) {
-                                Icon(
-                                    imageVector = if (isEditing) Icons.Default.Done else Icons.Default.Add,
-                                    contentDescription = null,
-                                    tint = if (viewModel.isAddEnabled()) {
-                                        if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-                                    } else MaterialTheme.colors.onSurface.copy(alpha = 0.2f)
-                                )
-                            }
-                            
-                            if (isEditing) {
-                                IconButton(onClick = onCancelEdit) {
-                                    Icon(Icons.Default.Close, contentDescription = null, tint = MaterialTheme.colors.error)
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-                
-                Text(
-                    text = "SAVED RATES",
-                    style = MaterialTheme.typography.overline,
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.4f),
-                    fontWeight = FontWeight.Bold
-                )
-            }
-
-            LazyColumn(
-                modifier = Modifier.weight(1f).fillMaxWidth(),
-                contentPadding = PaddingValues(16.dp, 0.dp, 16.dp, 16.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
+            Text(stringResource(R.string.add_currency_title), style = MaterialTheme.typography.h6)
+            
+            // Visual relationship indicator
+            Surface(
+                color = MaterialTheme.colors.primary.copy(alpha = 0.05f),
+                shape = RoundedCornerShape(8.dp),
+                modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp)
             ) {
+                Row(
+                    modifier = Modifier.padding(12.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    Text("1 ", style = MaterialTheme.typography.body1)
+                    Text(viewModel.mainCurrencyName.ifEmpty { "Base" }, fontWeight = FontWeight.Bold)
+                    Text(" = ", style = MaterialTheme.typography.h6)
+                    Text(viewModel.newCurrencyRate.ifEmpty { "0.0" }, fontWeight = FontWeight.Bold, color = MaterialTheme.colors.primary)
+                    Text(" ")
+                    Text(viewModel.newCurrencyName.ifEmpty { "Currency" }, fontWeight = FontWeight.Bold)
+                }
+            }
+
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                OutlinedTextField(
+                    value = viewModel.newCurrencyName,
+                    onValueChange = { viewModel.newCurrencyName = it },
+                    label = { Text(stringResource(R.string.currency_edit_name)) },
+                    modifier = Modifier.weight(1f),
+                    placeholder = { Text("e.g. USD") }
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                OutlinedTextField(
+                    value = viewModel.newCurrencyRate,
+                    onValueChange = { viewModel.newCurrencyRate = it },
+                    label = { Text(stringResource(R.string.currency_rate)) },
+                    modifier = Modifier.weight(1f),
+                    placeholder = { Text("1.0") }
+                )
+            }
+            Spacer(modifier = Modifier.height(8.dp))
+            Button(
+                onClick = onAdd,
+                modifier = Modifier.fillMaxWidth(),
+                enabled = viewModel.isAddEnabled()
+            ) {
+                Text(stringResource(R.string.simple_add))
+            }
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            LazyColumn(modifier = Modifier.weight(1f)) {
                 items(viewModel.currencies) { currency ->
-                    CurrencyRow(
-                        currency = currency,
-                        mainCurrencyName = viewModel.mainCurrencyName,
-                        isEditing = viewModel.editingCurrencyId == currency.id,
-                        onEdit = { onEdit(currency) },
-                        onDelete = { onDelete(currency) }
-                    )
+                    CurrencyRow(currency, viewModel.mainCurrencyName, onDelete = { onDelete(currency) })
                 }
             }
         }
@@ -262,70 +154,52 @@ fun ManageCurrenciesScreen(
 }
 
 @Composable
-fun CurrencyRow(
-    currency: DBCurrency,
-    mainCurrencyName: String,
-    isEditing: Boolean,
-    onEdit: () -> Unit,
-    onDelete: () -> Unit
-) {
-    Card(
-        shape = RoundedCornerShape(12.dp),
-        elevation = if (isEditing) 4.dp else 1.dp,
-        border = if (isEditing) BorderStroke(1.dp, MaterialTheme.colors.secondary.copy(alpha = 0.5f)) else null,
-        modifier = Modifier.fillMaxWidth()
+fun CurrencyRow(currency: DBCurrency, mainCurrencyName: String, onDelete: () -> Unit) {
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically
     ) {
+        // Table-like layout
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable(onClick = onEdit)
-                .padding(16.dp, 12.dp),
+            modifier = Modifier.weight(1f),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Row(
-                modifier = Modifier.weight(1f),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
+            Text(
+                text = "1 ",
+                style = MaterialTheme.typography.body1,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+            )
+            Text(
+                text = mainCurrencyName,
+                style = MaterialTheme.typography.body1,
+                fontWeight = FontWeight.Bold
+            )
+            Text(
+                text = " = ",
+                style = MaterialTheme.typography.h6,
+                color = MaterialTheme.colors.primary,
+                modifier = Modifier.padding(horizontal = 8.dp)
+            )
+            Column {
                 Text(
-                    text = "1 ",
-                    style = MaterialTheme.typography.body2,
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
-                )
-                Text(
-                    text = mainCurrencyName.ifEmpty { "$" },
+                    text = currency.exchangeRate.toString(),
                     style = MaterialTheme.typography.body1,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.ExtraBold
                 )
                 Text(
-                    text = " = ",
-                    style = MaterialTheme.typography.h6,
-                    color = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-                    modifier = Modifier.padding(horizontal = 8.dp)
-                )
-                Text(
-                    text = formatAmount(currency.exchangeRate),
-                    style = MaterialTheme.typography.body1,
-                    fontWeight = FontWeight.ExtraBold,
-                    color = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.onSurface
-                )
-                Text(
-                    text = " ${currency.name ?: ""}",
-                    style = MaterialTheme.typography.body1,
+                    text = currency.name ?: "",
+                    style = MaterialTheme.typography.caption,
                     fontWeight = FontWeight.Bold,
                     color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
                 )
             }
-
-            IconButton(onClick = onDelete) {
-                Icon(
-                    imageVector = Icons.Default.Delete,
-                    contentDescription = null,
-                    tint = MaterialTheme.colors.error.copy(alpha = 0.7f),
-                    modifier = Modifier.size(20.dp)
-                )
-            }
+        }
+        
+        IconButton(onClick = onDelete) {
+            Icon(Icons.Default.Delete, contentDescription = null, tint = MaterialTheme.colors.error)
         }
     }
+    Divider()
 }
 
 @Preview(showBackground = true)
@@ -335,8 +209,6 @@ fun CurrencyRowPreview() {
         CurrencyRow(
             currency = DBCurrency(1, 0, 0, "USD", 1.0, 0),
             mainCurrencyName = "EUR",
-            isEditing = false,
-            onEdit = {},
             onDelete = {}
         )
     }
@@ -358,9 +230,7 @@ fun ManageCurrenciesScreenPreview() {
             onBack = {},
             onSaveMain = {},
             onAdd = {},
-            onDelete = {},
-            onEdit = {},
-            onCancelEdit = {}
+            onDelete = {}
         )
     }
 }

app/src/main/java/net/helcel/cowspent/android/currencies/ManageCurrenciesViewModel.kt

@@ -13,8 +13,6 @@ class ManageCurrenciesViewModel : ViewModel() {
     var newCurrencyName by mutableStateOf("")
     var newCurrencyRate by mutableStateOf("")
 
-    var editingCurrencyId by mutableStateOf<Long?>(null)
-
     var currencies by mutableStateOf<List<DBCurrency>>(emptyList())
 
     var dialogState by mutableStateOf<DialogState?>(null)

app/src/main/java/net/helcel/cowspent/android/drawer/Drawer.kt

@@ -100,11 +100,8 @@ fun Drawer(
 
                 // Members Section
                 val membersState = rememberLazyListState()
-                val sortedMembers = remember(members, memberBalances, selectedMemberId) {
-                    members.filter {
-                        val balance = memberBalances[it.id] ?: 0.0
-                        it.isActivated || balance > 0.01 || balance < -0.01 || it.id == selectedMemberId
-                    }.sortedWith(compareBy<DBMember> {
+                val sortedMembers = remember(members, memberBalances) {
+                    members.sortedWith(compareBy<DBMember> {
                         val balance = memberBalances[it.id] ?: 0.0
                         when {
                             balance > 0.01 -> 0

app/src/main/java/net/helcel/cowspent/android/helper/FormatUtils.kt

@@ -1,80 +1,20 @@
 package net.helcel.cowspent.android.helper
 
-import java.text.NumberFormat
+import net.helcel.cowspent.util.SupportUtil
 import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.round
 
-/**
- * Formats amount using k/M notation (e.g., 1.5k for 1500).
- */
 fun formatShortValue(value: Double): String {
-    val absValue = abs(value)
-    val sign = if (value < 0) "-" else ""
     return when {
-        absValue >= 1_000_000 -> sign + formatAmount(absValue / 1_000_000) + "M"
-        absValue >= 1_000 -> sign + formatAmount(absValue / 1_000) + "k"
-        else -> sign + formatAmount(absValue)
+        value >= 1_000_000 -> String.format(Locale.ROOT, "%.1fM", value / 1_000_000).replace(".0", "")
+        value >= 1_000 -> String.format(Locale.ROOT, "%.1fk", value / 1_000).replace(".0", "")
+        else -> String.format(Locale.ROOT, "%.0f", value)
     }
 }
 
-/**
- * Formats balance with sign and locale-aware number formatting.
- */
 fun formatBalance(balance: Double): String {
     val rbalance = round(abs(balance) * 100.0) / 100.0
     val balanceSign = if (balance > 0.01) "+" else if (balance < -0.01) "-" else ""
-    return if (rbalance == 0.0) "" else "$balanceSign${formatAmount(rbalance)}"
-}
-
-/**
- * Formats amount using system locale or specified locale.
- */
-fun formatAmount(value: Double, locale: Locale = Locale.getDefault()): String {
-    val formatter = NumberFormat.getNumberInstance(locale)
-    formatter.maximumFractionDigits = 2
-    formatter.minimumFractionDigits = 0
-    return formatter.format(value)
-}
-
-/**
- * Parses amount from string robustly.
- * Tries common separators and cleans up non-numeric characters (except separators).
- */
-fun parseAmount(input: String?): Double? {
-    if (input.isNullOrBlank()) return null
-    
-    // Remove non-numeric characters except for delimiters and minus sign
-    val cleaned = input.replace(Regex("[^0-9,.-]"), "").trim()
-    
-    if (cleaned.isEmpty()) return null
-
-    // If there's both a comma and a dot, we assume the last one is the decimal separator
-    val lastDot = cleaned.lastIndexOf('.')
-    val lastComma = cleaned.lastIndexOf(',')
-    
-    return if (lastDot != -1 && lastComma != -1) {
-        if (lastDot > lastComma) {
-            // Dot is decimal, comma is thousands
-            cleaned.replace(",", "").toDoubleOrNull()
-        } else {
-            // Comma is decimal, dot is thousands
-            cleaned.replace(".", "").replace(",", ".").toDoubleOrNull()
-        }
-    } else if (lastComma != -1) {
-        // Only comma. Could be decimal or thousands. 
-        if (cleaned.count { it == ',' } == 1) {
-            cleaned.replace(',', '.').toDoubleOrNull()
-        } else {
-            // Multiple commas -> thousands
-            cleaned.replace(",", "").toDoubleOrNull()
-        }
-    } else {
-        // Only dots or no separators
-        if (cleaned.count { it == '.' } > 1) {
-            cleaned.replace(".", "").toDoubleOrNull()
-        } else {
-            cleaned.toDoubleOrNull()
-        }
-    }
+    return if (rbalance == 0.0) "" else "$balanceSign${SupportUtil.normalNumberFormat.format(rbalance)}"
 }

app/src/main/java/net/helcel/cowspent/android/helper/QrCodeScannerActivity.kt

@@ -4,49 +4,37 @@ import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.os.VibrationEffect
+import android.os.Vibrator
 import android.util.Log
-import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.compose.setContent
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AppCompatActivity
-import androidx.camera.core.CameraSelector
-import androidx.camera.core.ExperimentalGetImage
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.ImageProxy
+import net.helcel.cowspent.theme.ThemeUtils
+import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.view.PreviewView
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.compose.LocalLifecycleOwner
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.BinaryBitmap
-import com.google.zxing.DecodeHintType
-import com.google.zxing.MultiFormatReader
-import com.google.zxing.PlanarYUVLuminanceSource
-import com.google.zxing.Result
+import com.google.zxing.*
 import com.google.zxing.common.HybridBinarizer
 import net.helcel.cowspent.R
 import net.helcel.cowspent.android.main.MainConstants
-import net.helcel.cowspent.theme.ThemeUtils
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 

app/src/main/java/net/helcel/cowspent/android/main/BillsListComponents.kt

@@ -2,25 +2,9 @@ package net.helcel.cowspent.android.main
 
 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.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Button
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Receipt
 import androidx.compose.material.icons.filled.Repeat

app/src/main/java/net/helcel/cowspent/android/main/BillsListViewActivity.kt

@@ -1,10 +1,12 @@
 package net.helcel.cowspent.android.main
 
+import android.Manifest
 import android.app.SearchManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
@@ -24,8 +26,10 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AddCircleOutline
 import androidx.compose.material.icons.filled.Sync
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.nextcloud.android.sso.helper.SingleAccountHelper
@@ -45,6 +49,7 @@ import net.helcel.cowspent.model.Category
 import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.DBProject
 import net.helcel.cowspent.model.GroupedBill
+import net.helcel.cowspent.model.ProjectType
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.persistence.CowspentServerSyncHelper
 import net.helcel.cowspent.theme.ThemeUtils

app/src/main/java/net/helcel/cowspent/android/project/create/NewProjectScreen.kt

@@ -63,7 +63,6 @@ fun NewProjectScreen(
         Column(
             modifier = Modifier
                 .padding(padding)
-                .imePadding()
                 .padding(16.dp)
                 .verticalScroll(rememberScrollState())
                 .fillMaxSize()

app/src/main/java/net/helcel/cowspent/android/project/edit/EditProjectScreen.kt

@@ -2,8 +2,6 @@ package net.helcel.cowspent.android.project.edit
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -82,14 +80,11 @@ fun EditProjectScreen(
             }
         }
     ) { padding ->
-        val scrollState = rememberScrollState()
         Column(
             modifier = Modifier
                 .padding(padding)
-                .imePadding()
                 .padding(16.dp)
                 .fillMaxSize()
-                .verticalScroll(scrollState)
         ) {
             OutlinedTextField(
                 value = viewModel.name,

app/src/main/java/net/helcel/cowspent/theme/ThemeUtils.kt

@@ -111,7 +111,6 @@ object ThemeUtils {
                                 modifier = Modifier
                                     .weight(1f)
                                     .navigationBarsPadding()
-                                    .imePadding()
                             ) {
                                 content()
                             }

app/src/main/java/net/helcel/cowspent/util/SupportUtil.kt

@@ -1,12 +1,11 @@
 package net.helcel.cowspent.util
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.Context
 import android.content.pm.PackageManager
 import android.util.Log
-import net.helcel.cowspent.model.CreditDebt
-import net.helcel.cowspent.model.DBBill
-import net.helcel.cowspent.model.DBMember
-import net.helcel.cowspent.model.Transaction
+import net.helcel.cowspent.model.*
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import org.json.JSONException
 import org.json.JSONObject

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

@@ -9,6 +9,17 @@
         android:translateX="13.153846"
         android:translateY="13.153846">
 
+        <!-- Circle Outline -->
+        <path
+            android:strokeColor="#000"
+            android:strokeWidth="2.5"
+            android:pathData="M36,2 C17.22,2 2,17.22 2,36 C2,54.78 17.22,70 36,70 C54.78,70 70,54.78 70,36 C70,17.22 54.78,2 36,2 Z" />
+
+        <path
+            android:strokeColor="#000"
+            android:strokeWidth="2.5"
+            android:pathData="M36,8 C20.54,8 8,20.54 8,36 C8,51.46 20.54,64 36,64 C51.46,64 64,51.46 64,36 C64,20.54 51.46,8 36,8 Z" />
+
         <!-- Cow Outlines -->
         <group android:name="color">
             <path android:fillColor="#000" android:pathData="m15,12.0211h0c0,.6116.3056,1.1827.8145,1.5219l4.2449,2.83c.5764.3843,1.774.8721,1.688,1.5596l-1.7051,6.7284c-.028.2241-.0143.4514.0405.6705l1.8343,7.3371c.0548.2191.0685.4464.0405.6705l-.9152,7.322c-.028.2241-.0143.4514.0405.6705l1.7456,6.9825c.1104.4414.3813.8259.7599,1.0783l1.7312,1.1541c.433.2887.7225.7481.7961,1.2632l-.2598,3.7979s-.2916,3.1088,2.3012,6.051c1.6332,1.8533,5.7148,3.8846,8.2656,3.8847,3.3409,0,5.9547-1.9378,7.3949-3.6465.8914-1.0576,2.5398-2.4978,3.2821-5.8244.2014-.9023-.0996-3.6967-.0996-3.6967,0-.2477.4009-1.311.4985-1.5386l1.3063-2.5077c.0158-.0369.0264-.0595.0389-.0795.5394-.8642.7885-1.8786.8851-2.8927,0,0,.9043-4.9747,1.1585-6.6406.005-.0325-.4996-5.5158-.4953-5.5485l1.5496-6.8172c.0386-.2315.0323-.4683-.0187-.6975l-1.5364-6.9139c-.2151-.9678.3801-1.9308,1.3419-2.1712l1.6416-.4104c.4075-.1019.7676-.341,1.0196-.677l2.2445-2.9927c.2375-.3166.3658-.7017.3658-1.0974v-.1102c0-1.1701-1.1152-1.1434-2.2575-.8896l-6.191.4868c-.3593.0798-.7343.0494-1.0761-.0873l-4.3602-1.7441c-.0767-.0307-.1555-.0562-.2357-.0762l-7.3628-1.8407c-.3375-.0844-.692-.0708-1.022.0393l-5.3714,1.7905c-.0821.0274-.1622.0605-.2396.0992l-3.4104,1.7052c-.3092.1546-.656.2184-1,.184l-7.4623-.7462c-1.0768-.1077-2.0111.7379-2.0111,1.82Z"/>
@@ -16,16 +27,5 @@
             <path android:fillColor="#000" android:pathData="m6.867,16.5746l3.5658.2422c.1304.0089.2591.0347.3828.077l7.081,2.42c.043.0147.0854.0314.1269.0499l2.6409,1.1807c.1171.0524.2341.0883.3607.1091,1.3737.2264,10.1731,1.8874,10.0194,7.2658,0,0,.4645,3.6003-1.951,6.1473-1.8803,1.9826-2.9889,4.6478-2.5192,7.3395.3101,1.7768,1.2515,3.5306,3.4702,4.594h0l-2.9104,1.0217c-.4295.1508-.767.4887-.9174.9183l-1.4763,4.2192-1.6616-1.7712c-1.1136-1.1945-2.0412-6.9083-2.0412-6.9083-.3413-3.1673-.1698-6.3689.5077-9.4817h0c.1234-.5672-.092-1.1546-.553-1.5075l-.4665-.3571c-.1858-.1422-.4024-.2389-.6323-.2824l-6.0587-1.1441c-.2049-.0387-.3994-.1197-.5711-.2379l-4.2616-2.9332c-.1811-.1247-.3326-.2877-.4436-.4775l-2.6005-4.4465c-.1016-.1737-.1671-.3661-.1927-.5657l-.485-3.7875c-.1198-.9359.6453-1.7481,1.5867-1.6841Z"/>
             <path android:fillColor="#000" android:pathData="m27.3197,47.9945l-.6598,1.1318c-.7217,2.1691-.9617,4.4695-.7033,6.7408h0c.1194,1.0495.9592,1.871,2.0111,1.9674l.0811.0074,6.4963-.5146c1.249-.0989,2.5045-.0796,3.7499.0577l5.9262.6536c.7598.0838,1.5171-.1772,2.064-.7112h0c.4669-.4559.7436-1.0718.7746-1.7237l.0484-1.0203c.1133-2.3893-.4008-4.7667-1.4912-6.8958h0c-.4317-.843-1.2874-1.3848-2.234-1.4148l-8.6286-.2728h-3.9632c-1.4296,0-2.7515.7595-3.4715,1.9945Z"/>
         </group>
-        <group android:name="line">
-            <path android:fillColor="#000" android:pathData="m26.1616,31.0595s-3.0474-.219-3.8284-1-.781-2.0474,0-2.8284,2.0474-.781,2.8284,0c.7811.781,1,3.8284,1,3.8284Z"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m19.6191,26.2353l2.0377-9.248s-7.6806-.627-6.505-7.4454c0,0,9.9534,3.2917,12.7748.4702,0,0,6.2375-6.6642,16.1956-.0429,3.3226,2.2093,12.7748-.4702,12.7748-.4702,1.1756,6.8184-6.505,7.4454-6.505,7.4454l2.0377,9.248"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m28.4825,46h15.7265c.272,0,.5324.1138.7082.3213.8467.9992,3.1442,4.3471,2.0943,10.2966-.1836,1.0404-1.1647,1.7418-2.2037,1.5503-3.4759-.6406-11.324-1.7893-16.7592-.3263-1.1058.2976-2.2065-.454-2.3432-1.5909-.302-2.5115-.3157-6.6284,2.0103-9.8682.1751-.2438.4667-.3828.7668-.3828Z"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m29.8671,50.277s-.6865,2.855,3.1538,2.926"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m29.1276,61.4663s6.3482,7.9157,13.7936.3135"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m17.5177,20.1544c-3.0642-1.9576-7.3791-4.5873-12.4353-3.3426,0,0-1.4891,14.0288,15.3611,15.5179l1.2133.881s-2.2906,8.9177,1.2618,16.1018"/>
-            <path android:fillColor="#000" android:pathData="m45.8871,31.0139s3.0474-.219,3.8284-1c.7811-.781.7811-2.0474,0-2.8284-.781-.781-2.0474-.781-2.8284,0-.781.781-1,3.8284-1,3.8284Z"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m43.1817,50.2341s.6865,2.855-3.1538,2.926"/>
-            <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m54.7743,19.9585c3.0474-1.888,7.2683-4.4017,12.1921-3.1896,0,0,1.4891,14.0288-15.3611,15.5179l-1.2133.881s2.5382,7.9772-1.0141,15.1613"/>
-        </group>
     </group>
 </vector>

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

@@ -0,0 +1,52 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+    <path
+        android:fillColor="#FFD700"
+        android:pathData="M36,2 C17.22,2 2,17.22 2,36 C2,54.78 17.22,70 36,70 C54.78,70 70,54.78 70,36 C70,17.22 54.78,2 36,2 Z" />
+
+    <!-- Inner Face (Expanded path) -->
+    <path
+        android:fillColor="#DAA520"
+        android:pathData="M36,8 C20.54,8 8,20.54 8,36 C8,51.46 20.54,64 36,64 C51.46,64 64,51.46 64,36 C64,20.54 51.46,8 36,8 Z" />
+
+    <!-- Center Detail (Pure path replacement for the center circle) -->
+    <path
+        android:fillColor="#FFD700"
+        android:pathData="M36,22 C28.27,22 22,28.27 22,36 C22,43.73 28.27,50 36,50 C43.73,50 50,43.73 50,36 C50,28.27 43.73,22 36,22 Z" />
+
+
+    <group android:name="color">
+        <path android:fillColor="#fff" android:pathData="m15,12.0211h0c0,.6116.3056,1.1827.8145,1.5219l4.2449,2.83c.5764.3843,1.774.8721,1.688,1.5596l-1.7051,6.7284c-.028.2241-.0143.4514.0405.6705l1.8343,7.3371c.0548.2191.0685.4464.0405.6705l-.9152,7.322c-.028.2241-.0143.4514.0405.6705l1.7456,6.9825c.1104.4414.3813.8259.7599,1.0783l1.7312,1.1541c.433.2887.7225.7481.7961,1.2632l-.2598,3.7979s-.2916,3.1088,2.3012,6.051c1.6332,1.8533,5.7148,3.8846,8.2656,3.8847,3.3409,0,5.9547-1.9378,7.3949-3.6465.8914-1.0576,2.5398-2.4978,3.2821-5.8244.2014-.9023-.0996-3.6967-.0996-3.6967,0-.2477.4009-1.311.4985-1.5386l1.3063-2.5077c.0158-.0369.0264-.0595.0389-.0795.5394-.8642.7885-1.8786.8851-2.8927,0,0,.9043-4.9747,1.1585-6.6406.005-.0325-.4996-5.5158-.4953-5.5485l1.5496-6.8172c.0386-.2315.0323-.4683-.0187-.6975l-1.5364-6.9139c-.2151-.9678.3801-1.9308,1.3419-2.1712l1.6416-.4104c.4075-.1019.7676-.341,1.0196-.677l2.2445-2.9927c.2375-.3166.3658-.7017.3658-1.0974v-.1102c0-1.1701-1.1152-1.1434-2.2575-.8896l-6.191.4868c-.3593.0798-.7343.0494-1.0761-.0873l-4.3602-1.7441c-.0767-.0307-.1555-.0562-.2357-.0762l-7.3628-1.8407c-.3375-.0844-.692-.0708-1.022.0393l-5.3714,1.7905c-.0821.0274-.1622.0605-.2396.0992l-3.4104,1.7052c-.3092.1546-.656.2184-1,.184l-7.4623-.7462c-1.0768-.1077-2.0111.7379-2.0111,1.82Z"/>
+        <path android:fillColor="#a57939" android:pathData="m65.1818,16.5746l-3.5658.2422c-.1304.0089-.2591.0347-.3828.077l-7.081,2.42c-.043.0147-.0854.0314-.1269.0499l-2.6409,1.1807c-.1171.0524-.2341.0883-.3607.1091-1.3737.2264-10.1731,1.8874-10.0194,7.2658,0,0-.4646,3.6003,1.951,6.1473,1.8803,1.9826,2.9889,4.6478,2.5192,7.3395-.3101,1.7768-1.2515,3.5306-3.4702,4.594h0l2.9104,1.0217c.4295.1508.767.4887.9174.9183l1.4763,4.2192,1.6616-1.7712c1.1136-1.1945,1.9689-5.8742,1.9689-5.8742.4855-3.6065.5032-7.264.0031-10.8685-.0148-.1064-.0287-.2031-.0417-.2889h0s1.2606-.965,1.2606-.965c.1608-.1231.3449-.2123.5411-.2622l5.5633-1.4149c.1716-.0436.3341-.1174.4799-.2177l4.3017-2.9608c.1811-.1247.3326-.2877.4436-.4775l2.6005-4.4465c.1016-.1737.1671-.3661.1927-.5658l.4849-3.7874c.1198-.9359-.6453-1.748-1.5867-1.6841Z"/>
+        <path android:fillColor="#a57939" android:pathData="m6.867,16.5746l3.5658.2422c.1304.0089.2591.0347.3828.077l7.081,2.42c.043.0147.0854.0314.1269.0499l2.6409,1.1807c.1171.0524.2341.0883.3607.1091,1.3737.2264,10.1731,1.8874,10.0194,7.2658,0,0,.4645,3.6003-1.951,6.1473-1.8803,1.9826-2.9889,4.6478-2.5192,7.3395.3101,1.7768,1.2515,3.5306,3.4702,4.594h0l-2.9104,1.0217c-.4295.1508-.767.4887-.9174.9183l-1.4763,4.2192-1.6616-1.7712c-1.1136-1.1945-2.0412-6.9083-2.0412-6.9083-.3413-3.1673-.1698-6.3689.5077-9.4817h0c.1234-.5672-.092-1.1546-.553-1.5075l-.4665-.3571c-.1858-.1422-.4024-.2389-.6323-.2824l-6.0587-1.1441c-.2049-.0387-.3994-.1197-.5711-.2379l-4.2616-2.9332c-.1811-.1247-.3326-.2877-.4436-.4775l-2.6005-4.4465c-.1016-.1737-.1671-.3661-.1927-.5657l-.485-3.7875c-.1198-.9359.6453-1.7481,1.5867-1.6841Z"/>
+        <path android:fillColor="#f4aa41" android:pathData="m27.3197,47.9945l-.6598,1.1318c-.7217,2.1691-.9617,4.4695-.7033,6.7408h0c.1194,1.0495.9592,1.871,2.0111,1.9674l.0811.0074,6.4963-.5146c1.249-.0989,2.5045-.0796,3.7499.0577l5.9262.6536c.7598.0838,1.5171-.1772,2.064-.7112h0c.4669-.4559.7436-1.0718.7746-1.7237l.0484-1.0203c.1133-2.3893-.4008-4.7667-1.4912-6.8958h0c-.4317-.843-1.2874-1.3848-2.234-1.4148l-8.6286-.2728h-3.9632c-1.4296,0-2.7515.7595-3.4715,1.9945Z"/>
+
+    </group>
+    <group android:name="line">
+        <path android:fillColor="#000" android:pathData="m26.1616,31.0595s-3.0474-.219-3.8284-1-.781-2.0474,0-2.8284,2.0474-.781,2.8284,0c.7811.781,1,3.8284,1,3.8284Z"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m19.6191,26.2353l2.0377-9.248s-7.6806-.627-6.505-7.4454c0,0,9.9534,3.2917,12.7748.4702,0,0,6.2375-6.6642,16.1956-.0429,3.3226,2.2093,12.7748-.4702,12.7748-.4702,1.1756,6.8184-6.505,7.4454-6.505,7.4454l2.0377,9.248"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m28.4825,46h15.7265c.272,0,.5324.1138.7082.3213.8467.9992,3.1442,4.3471,2.0943,10.2966-.1836,1.0404-1.1647,1.7418-2.2037,1.5503-3.4759-.6406-11.324-1.7893-16.7592-.3263-1.1058.2976-2.2065-.454-2.3432-1.5909-.302-2.5115-.3157-6.6284,2.0103-9.8682.1751-.2438.4667-.3828.7668-.3828Z"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m29.8671,50.277s-.6865,2.855,3.1538,2.926"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m29.1276,61.4663s6.3482,7.9157,13.7936.3135"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m17.5177,20.1544c-3.0642-1.9576-7.3791-4.5873-12.4353-3.3426,0,0-1.4891,14.0288,15.3611,15.5179l1.2133.881s-2.2906,8.9177,1.2618,16.1018"/>
+        <path android:fillColor="#000" android:pathData="m45.8871,31.0139s3.0474-.219,3.8284-1c.7811-.781.7811-2.0474,0-2.8284-.781-.781-2.0474-.781-2.8284,0-.781.781-1,3.8284-1,3.8284Z"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m43.1817,50.2341s.6865,2.855-3.1538,2.926"/>
+        <path android:strokeColor="#000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:pathData="m54.7743,19.9585c3.0474-1.888,7.2683-4.4017,12.1921-3.1896,0,0,1.4891,14.0288-15.3611,15.5179l-1.2133.881s2.5382,7.9772-1.0141,15.1613"/>
+    </group>
+
+
+    <!-- Massive Background Coin Base -->
+    <path
+        android:pathData="M 256,76 A 180,180 0 1,1 255.9,76 Z"
+        android:fillColor="#FBBF24"/>
+
+    <!-- Coin Decorative Dotted Inner Rim -->
+    <path
+        android:pathData="M 256,101 A 155,155 0 1,1 255.9,101 Z"
+        android:strokeColor="#D97706"
+        android:strokeWidth="4"/>
+
+</vector>

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

@@ -20,9 +20,14 @@
     <string name="save_or_discard_bill_dialog_save">Save</string>
     <string name="save_or_discard_bill_dialog_discard">Discard</string>
     <string name="currency_manager">Currency manager</string>
+    <string name="add_currency_title">Add currency</string>
+    <string name="currency_management_unavailable">Currency management is only available for Cospend projects</string>
     <string name="setting_comment">Comment</string>
     <string name="currency_dialog_title">Convert current amount from another currency into %s</string>
+    <string name="no_currency_error">There is no additional currency</string>
     <string name="main_currency">Main currency</string>
+    <string name="currency_edit_name">Name</string>
+    <string name="currency_rate">Exchange rate</string>
     <string name="setting_owers">For whom?</string>
     <string name="setting_project_id">Project ID/name</string>
 
@@ -70,6 +75,7 @@
     <string name="simple_ok" tools:ignore="ButtonCase,Typos">Ok</string>
     <string name="simple_yes">Yes</string>
     <string name="simple_no">No</string>
+    <string name="simple_add">Add</string>
     <string name="simple_edit_bill">Edit bill</string>
     <string name="simple_new_bill">New bill</string>
     <string name="simple_add_project">Add project in Cowspent</string>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500