Fix stats render and add 'disabled-member' setting

Reviewed-on: #2

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -41,7 +41,7 @@ jobs:
         run: git checkout -B "$BRANCH"
 
       - name: set up JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: 21
           distribution: "temurin"
@@ -49,10 +49,27 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
 
+      - name: Run unit tests
+        run: ./gradlew testDebugUnitTest
+
       - name: Build APK
         run: |
           VERSION_CODE=$(git rev-list --count HEAD)
-          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE
+          VERSION_BASE=$(git describe --tags --abbrev=0 | sed 's/^v//')
+          VERSION_DEV=$(git rev-list --count $(git describe --tags --abbrev=0)..HEAD)
+          if [ $VERSION_DEV -gt 0 ]; then
+            VERSION_NAME="${VERSION_BASE}.${VERSION_DEV}"
+          else
+            VERSION_NAME="${VERSION_BASE}"
+          fi
+          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE -PVERSION_NAME=$VERSION_NAME
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v7
+        with:
+          path: app/build/outputs/apk/signedRelease/app-signedRelease.apk
+          compression-level: 0
+          archive: false
 
       - name: Release
         uses: softprops/action-gh-release@v3

README.md

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

app/build.gradle

@@ -1,7 +1,8 @@
 plugins {
-    id 'com.android.application' version '9.2.1'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '2.4.0'
-    id 'org.jetbrains.kotlin.plugin.compose' version '2.4.0'
+    id 'com.android.application' version '9.3.2'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.4.10'
+    id 'org.jetbrains.kotlin.plugin.compose' version '2.4.10'
+    id 'jacoco'
 }
 
 android {
@@ -14,8 +15,10 @@ android {
         applicationId "net.helcel.cowspent"
         minSdk = 26
         targetSdk = 37
-        versionName "1.0b"
+        versionName project.hasProperty('VERSION_NAME') ? project.property('VERSION_NAME') : "1.4"
         versionCode project.hasProperty('VERSION_CODE') ? project.property('VERSION_CODE').toInteger() : 1
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
@@ -40,6 +43,7 @@ android {
             debuggable true
             initWith(buildTypes.release)
             signingConfig = signingConfigs.debug
+            enableUnitTestCoverage true
         }
         release {
             minifyEnabled true
@@ -69,6 +73,24 @@ android {
         compose = true
     }
 
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            all {
+                maxParallelForks = 2
+                forkEvery = 50
+                maxHeapSize = "1024m"
+                // Robolectric loads classes through its own sandbox classloader, which leaves them
+                // without a code-source location. Without this JaCoCo skips them entirely and the
+                // report only sees the handful of plain JVM classes.
+                jacoco {
+                    includeNoLocationClasses = true
+                    excludes = ["jdk.internal.*"]
+                }
+            }
+        }
+    }
+
     kotlin {
         jvmToolchain(21)
     }
@@ -82,24 +104,35 @@ android {
     androidResources {
         generateLocaleConfig = true
     }
+
+    packaging {
+        jniLibs.keepDebugSymbols.add("**/*.so")
+    }
+
+    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.2'
-    implementation 'androidx.compose.runtime:runtime:1.11.2'
+    implementation 'androidx.compose.foundation:foundation:1.12.0'
+    implementation 'androidx.compose.runtime:runtime:1.12.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.work:work-runtime-ktx:2.11.2'
 
     implementation 'com.google.zxing:core:3.5.4'
-    implementation 'androidx.camera:camera-camera2:1.6.1'
-    implementation 'androidx.camera:camera-lifecycle:1.6.1'
-    implementation 'androidx.camera:camera-view:1.6.1'
-    implementation 'com.github.nextcloud:Android-SingleSignOn:1.1.0'
+    implementation 'androidx.camera:camera-camera2:1.6.2'
+    implementation 'androidx.camera:camera-lifecycle:1.6.2'
+    implementation 'androidx.camera:camera-view:1.6.2'
+    implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.4'
     implementation 'com.opencsv:opencsv:5.12.0'
 
-    implementation platform('androidx.compose:compose-bom:2026.05.01')
+    implementation platform('androidx.compose:compose-bom:2026.08.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.material:material'
     implementation 'androidx.compose.material:material-icons-extended'
@@ -107,5 +140,41 @@ 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.10.0'
+    implementation 'androidx.security:security-crypto:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0'
+    implementation "androidx.datastore:datastore-preferences:1.2.1"
+    implementation "com.google.crypto.tink:tink-android:1.23.0"
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'io.mockk:mockk:1.14.11'
+    testImplementation 'org.robolectric:robolectric:4.16.1'
+    testImplementation 'androidx.test:core:1.7.0'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0'
+    testImplementation 'androidx.compose.ui:ui-test-junit4'
+
+    androidTestImplementation platform('androidx.compose:compose-bom:2026.08.00')
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+    androidTestImplementation 'io.mockk:mockk-android:1.14.11'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+}
+
+tasks.register('jacocoTestReport', JacocoReport) {
+    dependsOn 'testDebugUnitTest'
+
+    reports {
+        xml.required = true
+        html.required = true
+    }
+
+    def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*']
+    def debugTree = fileTree(dir: "${project.layout.buildDirectory.asFile.get()}/intermediates/built_in_kotlinc/debug/compileDebugKotlin/classes", excludes: fileFilter)
+    def mainSrc = "${project.projectDir}/src/main/java"
+
+    sourceDirectories.from = files([mainSrc])
+    classDirectories.from = files([debugTree])
+    executionData.from = fileTree(dir: project.layout.buildDirectory.asFile.get(), includes: [
+            'jacoco/testDebugUnitTest.exec', 'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
+    ])
 }

app/src/main/AndroidManifest.xml

@@ -46,7 +46,7 @@
 
         <activity
             android:name="net.helcel.cowspent.android.account.AccountActivity"
-            android:label="@string/settings_server_settings"
+            android:label="@string/title_account"
             android:parentActivityName="net.helcel.cowspent.android.settings.PreferencesActivity"
             android:windowSoftInputMode="adjustResize|stateVisible"
             android:launchMode="standard"
@@ -67,7 +67,7 @@
 
         <activity
             android:name="net.helcel.cowspent.android.project.create.NewProjectActivity"
-            android:label="@string/simple_add_project"
+            android:label="@string/title_add_project"
             android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
             android:windowSoftInputMode="adjustResize"
             android:launchMode="standard"
@@ -94,7 +94,7 @@
 
         <activity
             android:name="net.helcel.cowspent.android.project.edit.EditProjectActivity"
-            android:label="@string/simple_edit_project"
+            android:label="@string/title_edit_project"
             android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
             android:windowSoftInputMode="adjustResize"
             android:launchMode="standard">
@@ -102,7 +102,7 @@
 
         <activity
             android:name="net.helcel.cowspent.android.bill_edit.EditBillActivity"
-            android:label="@string/simple_edit_bill"
+            android:label="@string/action_edit"
             android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
             android:windowSoftInputMode="adjustResize"
             android:launchMode="standard">
@@ -110,20 +110,32 @@
 
         <activity
             android:name="net.helcel.cowspent.android.about.AboutActivity"
-            android:label="@string/simple_about"
+            android:label="@string/title_about"
             android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity" />
 
         <activity
             android:name="net.helcel.cowspent.android.statistics.ProjectStatisticsActivity"
-            android:label="@string/statistic_title"
+            android:label="@string/title_stats"
             android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
             android:theme="@style/AppTheme.NoActionBar" />
 
         <activity
             android:name="net.helcel.cowspent.android.bill_label.LabelBillsActivity"
-            android:label="@string/label_bills_title"
+            android:label="@string/title_label_bills"
             android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
             android:theme="@style/AppTheme.NoActionBar" />
 
+        <activity
+            android:name="net.helcel.cowspent.android.label.LabelManagementActivity"
+            android:label="@string/title_labels"
+            android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
+            android:windowSoftInputMode="adjustResize" />
+
+        <activity
+            android:name="net.helcel.cowspent.android.project.member.MemberManagementActivity"
+            android:label="@string/action_members"
+            android:parentActivityName="net.helcel.cowspent.android.main.BillsListViewActivity"
+            android:windowSoftInputMode="adjustResize" />
+
     </application>
 </manifest>

app/src/main/java/net/helcel/cowspent/android/about/AboutScreen.kt

@@ -45,10 +45,10 @@ fun AboutScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.simple_about)) },
+                title = { Text(stringResource(R.string.title_about)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
                     }
                 },
                 backgroundColor = MaterialTheme.colors.primary,

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.enableEdgeToEdge
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Box
@@ -33,7 +33,6 @@ 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
@@ -42,13 +41,14 @@ import net.helcel.cowspent.android.main.MainConstants
 import net.helcel.cowspent.theme.ThemeUtils
 import net.helcel.cowspent.util.CospendClientUtil
 import net.helcel.cowspent.util.CospendClientUtil.LoginStatus
+import net.helcel.cowspent.util.SecureStorage
 import java.net.URLDecoder
 import java.util.Locale
 
 
 class AccountActivity : AppCompatActivity() {
 
-    private val viewModel: AccountViewModel by viewModels()
+    internal val viewModel: AccountViewModel by viewModels()
 
     companion object {
         private val TAG = AccountActivity::class.java.simpleName
@@ -69,7 +69,6 @@ class AccountActivity : AppCompatActivity() {
     }
 
     private lateinit var preferences: SharedPreferences
-    private var oldPassword = ""
     private var useWebLogin = true
     private var showLoginDialog by mutableStateOf(false)
 
@@ -129,8 +128,6 @@ class AccountActivity : AppCompatActivity() {
                 )
             }
         }
-        
-        oldPassword = preferences.getString(SETTINGS_PASSWORD, DEFAULT_SETTINGS) ?: ""
         viewModel.validateUrl()
     }
 
@@ -224,11 +221,7 @@ class AccountActivity : AppCompatActivity() {
     private fun legacyLogin() {
         val url = CospendClientUtil.formatURL(viewModel.serverUrl.trim())
         val username = viewModel.username
-        var password = viewModel.password
-
-        if (password.isEmpty()) {
-            password = oldPassword
-        }
+        val password = viewModel.password
 
         performLogin(url, username, password)
     }
@@ -311,10 +304,10 @@ class AccountActivity : AppCompatActivity() {
             }
 
             if (status == LoginStatus.OK) {
+                SecureStorage.savePassword(applicationContext, SETTINGS_PASSWORD, password)
                 preferences.edit {
                     putString(SETTINGS_URL, url)
                     putString(SETTINGS_USERNAME, username)
-                    putString(SETTINGS_PASSWORD, password)
                     remove(SETTINGS_KEY_ETAG)
                     remove(SETTINGS_KEY_LAST_MODIFIED)
                 }

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

@@ -4,39 +4,18 @@
 
 package net.helcel.cowspent.android.account
 
-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.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Button
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Link
-import androidx.compose.material.icons.filled.Lock
-import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 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.text.input.PasswordVisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
@@ -99,7 +78,7 @@ fun AccountScreenContent(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.settings_server_settings)) },
+                title = { Text(stringResource(R.string.title_account)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
@@ -123,30 +102,70 @@ fun AccountScreenContent(
                 }
             } else if (isLoggedIn) {
                 Text(
-                    text = stringResource(R.string.account_logged_in_as, username),
-                    style = MaterialTheme.typography.h6
-                )
-                Text(
-                    text = serverUrl,
-                    style = MaterialTheme.typography.body2,
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+                    text = "CURRENT ACCOUNT",
+                    style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 8.dp)
                 )
+                
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 8.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Icon(
+                        Icons.Default.Person, 
+                        contentDescription = null, 
+                        modifier = Modifier.size(24.dp),
+                        tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+                    )
+                    Spacer(modifier = Modifier.width(32.dp))
+                    Column {
+                        Text(
+                            text = stringResource(R.string.msg_logged_in_as, username),
+                            style = MaterialTheme.typography.subtitle1
+                        )
+                        Text(
+                            text = serverUrl,
+                            style = MaterialTheme.typography.caption,
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+                        )
+                    }
+                }
+
                 Spacer(modifier = Modifier.height(16.dp))
                 Button(
                     onClick = onLogout,
                     modifier = Modifier.fillMaxWidth()
                 ) {
-                    Text(stringResource(R.string.account_logout))
+                    Text(stringResource(R.string.action_logout))
                 }
                 Spacer(modifier = Modifier.height(24.dp))
             }
 
             if (!isValidatingLogin) {
+                Text(
+                    text = "CONNECTION SETTINGS",
+                    style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 8.dp, top = if (isLoggedIn) 16.dp else 0.dp)
+                )
+
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier.padding(vertical = 8.dp)
                 ) {
-                    Text(stringResource(R.string.use_sso_toggle), modifier = Modifier.weight(1f))
+                    Icon(
+                        Icons.Default.Sync, 
+                        contentDescription = null, 
+                        modifier = Modifier.size(24.dp),
+                        tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+                    )
+                    Spacer(modifier = Modifier.width(32.dp))
+                    Text(stringResource(R.string.label_use_sso), modifier = Modifier.weight(1f), style = MaterialTheme.typography.subtitle1)
                     Switch(
                         checked = useSso,
                         onCheckedChange = { onSsoClick(it) },
@@ -163,7 +182,7 @@ fun AccountScreenContent(
                     OutlinedTextField(
                         value = serverUrl,
                         onValueChange = onServerUrlChange,
-                        label = { Text(stringResource(R.string.settings_url)) },
+                        placeholder = { Text(stringResource(R.string.label_url)) },
                         modifier = Modifier.fillMaxWidth(),
                         leadingIcon = { Icon(Icons.Default.Link, contentDescription = null) },
                         trailingIcon = {
@@ -192,7 +211,7 @@ fun AccountScreenContent(
                     OutlinedTextField(
                         value = username,
                         onValueChange = onUsernameChange,
-                        label = { Text(stringResource(R.string.settings_username)) },
+                        placeholder = { Text(stringResource(R.string.label_username)) },
                         modifier = Modifier.fillMaxWidth(),
                         leadingIcon = { Icon(Icons.Default.Person, contentDescription = null) },
                         singleLine = true
@@ -204,7 +223,7 @@ fun AccountScreenContent(
                     OutlinedTextField(
                         value = password,
                         onValueChange = onPasswordChange,
-                        label = { Text(stringResource(R.string.settings_password)) },
+                        placeholder = { Text(stringResource(R.string.label_password)) },
                         modifier = Modifier.fillMaxWidth(),
                         leadingIcon = { Icon(Icons.Default.Lock, contentDescription = null) },
                         visualTransformation = PasswordVisualTransformation(),
@@ -221,7 +240,7 @@ fun AccountScreenContent(
                         if (isSubmitting) {
                             CustomCircularProgressIndicator(size = 24.dp, color = Color.White)
                         } else {
-                            Text(stringResource(R.string.settings_submit))
+                            Text(stringResource(R.string.action_connect))
                         }
                     }
                 }

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

@@ -13,6 +13,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.helcel.cowspent.util.CospendClientUtil
+import net.helcel.cowspent.util.SecureStorage
 
 class AccountViewModel(application: Application) : AndroidViewModel(application) {
     private val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(application)
@@ -60,14 +61,15 @@ class AccountViewModel(application: Application) : AndroidViewModel(application)
         } else {
             preferences.getString(AccountActivity.SETTINGS_USERNAME, "")
         }
-        val password = if (useSso) {
-            ""
-        } else {
-            preferences.getString(AccountActivity.SETTINGS_PASSWORD, "")
-        }
 
         if (!url.isNullOrEmpty() && !username.isNullOrEmpty()) {
             viewModelScope.launch {
+                val password = if (useSso) {
+                    ""
+                } else {
+                    SecureStorage.getPassword(getApplication(), AccountActivity.SETTINGS_PASSWORD)
+                }
+
                 isValidatingLogin = true
                 isLoggedIn = withContext(Dispatchers.IO) {
                     if (useSso) {
@@ -87,6 +89,9 @@ class AccountViewModel(application: Application) : AndroidViewModel(application)
     }
 
     fun logout() {
+        viewModelScope.launch {
+            SecureStorage.removePassword(getApplication(), AccountActivity.SETTINGS_PASSWORD)
+        }
         preferences.edit {
             remove(AccountActivity.SETTINGS_USE_SSO)
             remove(AccountActivity.SETTINGS_SSO_URL)

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

@@ -15,6 +15,7 @@ import androidx.compose.material.TextButton
 import androidx.compose.material.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
@@ -65,8 +66,10 @@ fun LoginDialogContent(
     ) {
         Column(modifier = Modifier.padding(24.dp)) {
             Text(
-                text = "Login",
-                style = MaterialTheme.typography.h6,
+                text = "LOGIN",
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface,
                 modifier = Modifier.padding(bottom = 16.dp)
             )
 

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

@@ -12,6 +12,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.remember
 import androidx.lifecycle.lifecycleScope
+import androidx.preference.PreferenceManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -26,7 +27,6 @@ import net.helcel.cowspent.model.ProjectType
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.theme.ThemeUtils
 import net.helcel.cowspent.util.BillParser
-import net.helcel.cowspent.util.CategoryUtils
 import net.helcel.cowspent.util.SupportUtil
 import java.text.ParseException
 import java.time.ZoneId
@@ -34,7 +34,7 @@ import java.util.Calendar
 
 class EditBillActivity : AppCompatActivity() {
 
-    private val viewModel: EditBillViewModel by viewModels()
+    internal val viewModel: EditBillViewModel by viewModels()
     private lateinit var db: CowspentSQLiteOpenHelper
     private lateinit var bill: DBBill
     private var projectType: ProjectType = ProjectType.LOCAL
@@ -52,23 +52,10 @@ class EditBillActivity : AppCompatActivity() {
                 ThemeUtils.CowspentTheme {
 
                     val categories = remember {
-                        val syncedCategories = db.getCategories(bill.projectId)
-                        val defaultCategories = CategoryUtils.getDefaultCategories(this@EditBillActivity, bill.projectId)
-                        val hardcoded = if (projectType == ProjectType.LOCAL) {
-                            defaultCategories
-                        } else {
-                            listOfNotNull(defaultCategories.find { it.remoteId.toInt() == DBBill.CATEGORY_REIMBURSEMENT })
-                        }
-                        syncedCategories + hardcoded
+                        db.getCategories(bill.projectId)
                     }
                     val paymentModes = remember {
-                        val syncedPaymentModes = db.getPaymentModes(bill.projectId)
-                        val defaultPaymentModes = CategoryUtils.getDefaultPaymentModes(this@EditBillActivity, bill.projectId)
-                        if (projectType == ProjectType.LOCAL) {
-                            syncedPaymentModes + defaultPaymentModes
-                        } else {
-                            syncedPaymentModes.ifEmpty { defaultPaymentModes }
-                        }
+                        db.getPaymentModes(bill.projectId)
                     }
 
                     EditBillScreen(
@@ -144,7 +131,7 @@ class EditBillActivity : AppCompatActivity() {
                     bill = DBBill(
                         first.id, 0, first.projectId, first.payerId, totalAmount,
                         first.timestamp, first.what, first.state, first.repeat,
-                        first.paymentMode, first.categoryRemoteId, first.comment, first.paymentModeRemoteId
+                        first.paymentMode, first.categoryId, first.comment, first.paymentModeId
                     )
                     
                     val splits = mutableMapOf<Long, Double>()
@@ -165,18 +152,32 @@ class EditBillActivity : AppCompatActivity() {
                 val billIdToDuplicate = intent.getLongExtra(PARAM_BILL_ID_TO_DUPLICATE, 0)
                 val timeNowSeconds = System.currentTimeMillis() / 1000
                 if (billIdToDuplicate == 0L) {
-                    bill = DBBill(
-                        0, 0, projectId, 0, 0.0, timeNowSeconds,
-                        "", DBBill.STATE_ADDED, DBBill.NON_REPEATED,
-                        DBBill.PAYMODE_NONE, DBBill.CATEGORY_NONE, "", DBBill.PAYMODE_ID_NONE
-                    )
+                    val preferences = PreferenceManager.getDefaultSharedPreferences(applicationContext)
+                    val fillFromLast = preferences.getBoolean(getString(R.string.pref_key_fill_new_bill_from_last), false)
+                    val lastBill = if (fillFromLast) db.getLastBillOfProject(projectId) else null
+
+                    if (lastBill != null) {
+                        bill = DBBill(
+                            0, 0, projectId, lastBill.payerId, 0.0, timeNowSeconds,
+                            "", DBBill.STATE_ADDED, lastBill.repeat ?: DBBill.NON_REPEATED,
+                            lastBill.paymentMode, lastBill.categoryId, "", lastBill.paymentModeId
+                        )
+                        bill.billOwers = lastBill.billOwers.map { DBBillOwer(0, 0, it.memberId) }
+                    } else {
+                        val project = db.getProject(projectId)
+                        bill = DBBill(
+                            0, 0, projectId, project?.lastPayerId ?: 0, 0.0, timeNowSeconds,
+                            "", DBBill.STATE_ADDED, DBBill.NON_REPEATED,
+                            DBBill.PAYMODE_NONE, DBBill.CATEGORY_NONE, "", DBBill.PAYMODE_ID_NONE
+                        )
+                    }
                 } else {
                     val btd = db.getBill(billIdToDuplicate)!!
                     bill = DBBill(
                         0, 0, projectId, btd.payerId, btd.amount,
                         timeNowSeconds, btd.what, DBBill.STATE_ADDED,
-                        btd.repeat, btd.paymentMode, btd.categoryRemoteId,
-                        btd.comment, btd.paymentModeRemoteId
+                        btd.repeat, btd.paymentMode, btd.categoryId,
+                        btd.comment, btd.paymentModeId
                     )
                     val btdOwers = btd.billOwers
                     val newBillOwers = btdOwers.filter {
@@ -195,6 +196,11 @@ class EditBillActivity : AppCompatActivity() {
             
             val project = db.getProject(bill.projectId)
             val currencies = db.getCurrencies(bill.projectId)
+            
+            if (project != null) {
+                db.ensureDefaultLabels(bill.projectId, project.type)
+            }
+
             withContext(Dispatchers.Main) {
                 viewModel.currencies = currencies
                 viewModel.mainCurrencyName = project?.currencyName ?: ""
@@ -239,8 +245,8 @@ class EditBillActivity : AppCompatActivity() {
         bill = DBBill(
             0, 0, bill.projectId, viewModel.payerId, viewModel.amountAsDouble,
             System.currentTimeMillis() / 1000, viewModel.what, DBBill.STATE_ADDED,
-            viewModel.repeat, bill.paymentMode, viewModel.categoryRemoteId,
-            viewModel.getFinalComment(), viewModel.paymentModeRemoteId
+            viewModel.repeat, bill.paymentMode, viewModel.categoryId,
+            viewModel.getFinalComment(), viewModel.paymentModeId
         )
         calendar.timeInMillis = System.currentTimeMillis()
         viewModel.timestamp = calendar.timeInMillis / 1000
@@ -255,22 +261,22 @@ class EditBillActivity : AppCompatActivity() {
             return
         }
         viewModel.showDialog(
-            title = getString(R.string.save_or_discard_bill_dialog_title),
-            message = getString(R.string.save_or_discard_bill_dialog_message),
-            positiveText = getString(R.string.save_or_discard_bill_dialog_save),
+            title = getString(R.string.dialog_unsaved_changes_title),
+            message = getString(R.string.dialog_unsaved_changes_msg),
+            positiveText = getString(R.string.action_save),
             onConfirm = { saveBillAsked() },
-            negativeText = getString(R.string.save_or_discard_bill_dialog_discard),
+            negativeText = getString(R.string.action_discard),
             onCancel = { finish() }
         )
     }
 
     private fun saveBillAsked() {
         val validationError = viewModel.getValidationError(
-            getString(R.string.error_invalid_bill_what),
+            getString(R.string.error_invalid_bill_name),
             getString(R.string.error_invalid_bill_date),
-            getString(R.string.error_invalid_bill_payerid),
+            getString(R.string.error_invalid_bill_payer),
             getString(R.string.error_invalid_bill_owers),
-            getString(R.string.simple_error)
+            getString(R.string.error_generic)
         )
 
         if (validationError != null) {
@@ -288,7 +294,7 @@ class EditBillActivity : AppCompatActivity() {
 
     private fun deleteBillAsked() {
         viewModel.showDialog(
-            title = getString(R.string.confirm_remove_project_dialog_title),
+            title = getString(R.string.title_confirm),
             message = bill.what,
             positiveText = getString(R.string.action_delete),
             onConfirm = {
@@ -325,23 +331,33 @@ class EditBillActivity : AppCompatActivity() {
                 bill.amount == viewModel.getFinalAmount() &&
                 bill.payerId == viewModel.payerId &&
                 bill.comment == viewModel.getFinalComment() &&
-                bill.repeat == viewModel.repeat &&
-                bill.categoryRemoteId == viewModel.categoryRemoteId &&
-                bill.paymentModeRemoteId == viewModel.paymentModeRemoteId &&
+                (bill.repeat ?: DBBill.NON_REPEATED) == viewModel.repeat &&
+                bill.categoryId == viewModel.categoryId &&
+                bill.paymentModeId == viewModel.paymentModeId &&
                 !owersChanged)
     }
 
     private suspend fun saveBill(): Long = withContext(Dispatchers.IO) {
         val groupedBillIds = intent.getLongArrayExtra(PARAM_GROUPED_BILL_IDS)
-        val isCustomSplit = viewModel.isCustomSplit
+        val splitMode = viewModel.splitMode
 
-        if (isCustomSplit) {
-            val splits: Map<Long, Double> = viewModel.owersCustomSplit.filter { (id, amountStr) ->
-                viewModel.owersSelection[id] == true && (amountStr.replace(',', '.').toDoubleOrNull()
-                    ?: 0.0) > 0
-            }.mapValues { 
-                val uiAmount = it.value.replace(',', '.').toDoubleOrNull() ?: 0.0
-                SupportUtil.round2(uiAmount / viewModel.selectedCurrencyRate)
+        if (splitMode != SplitMode.EVEN) {
+            val splits: Map<Long, Double> = if (splitMode == SplitMode.CUSTOM) {
+                viewModel.owersCustomSplit.filter { (id, amountStr) ->
+                    viewModel.owersSelection[id] == true && viewModel.parseAmountFromUi(amountStr) > 0
+                }.mapValues {
+                    val uiAmount = viewModel.parseAmountFromUi(it.value)
+                    SupportUtil.round2(uiAmount * viewModel.selectedCurrencyRate)
+                }
+            } else { // PERCENT
+                val totalAmount = viewModel.amountAsDouble
+                viewModel.owersPercentSplit.filter { (id, percentStr) ->
+                    viewModel.owersSelection[id] == true && viewModel.parseAmountFromUi(percentStr) > 0
+                }.mapValues {
+                    val percent = viewModel.parseAmountFromUi(it.value)
+                    val uiAmount = SupportUtil.round2(totalAmount * percent / 100.0)
+                    SupportUtil.round2(uiAmount * viewModel.selectedCurrencyRate)
+                }
             }
 
             if (splits.isEmpty()) return@withContext 0L
@@ -386,8 +402,8 @@ class EditBillActivity : AppCompatActivity() {
                         listOf(memberId),
                         viewModel.repeat,
                         existingBill.paymentMode,
-                        viewModel.paymentModeRemoteId,
-                        viewModel.categoryRemoteId,
+                        viewModel.paymentModeId,
+                        viewModel.categoryId,
                         finalComment
                     )
                     if (firstSavedId == 0L) firstSavedId = billToUseId
@@ -396,9 +412,11 @@ class EditBillActivity : AppCompatActivity() {
                     val newBill = DBBill(
                         0, 0, bill.projectId, viewModel.payerId, amount,
                         viewModel.timestamp, viewModel.what, DBBill.STATE_ADDED, viewModel.repeat,
-                        bill.paymentMode, viewModel.categoryRemoteId, finalComment, viewModel.paymentModeRemoteId
+                        bill.paymentMode, viewModel.categoryId, finalComment, viewModel.paymentModeId
                     )
                     newBill.billOwers = listOf(DBBillOwer(0, 0, memberId))
+                    newBill.categoryId = viewModel.categoryId
+                    newBill.paymentModeId = viewModel.paymentModeId
                     val newId = db.addBill(newBill)
                     if (firstSavedId == 0L) firstSavedId = newId
                 }
@@ -412,16 +430,8 @@ class EditBillActivity : AppCompatActivity() {
             val proj = db.getProject(bill.projectId)
             if (proj != null) db.syncIfRemote(proj)
             db.updateProject(
-                bill.projectId,
-                null,
-                null,
-                null,
-                viewModel.payerId,
-                null,
-                null,
-                null,
-                null,
-                null
+                projId = bill.projectId,
+                newLastPayerId = viewModel.payerId
             )
 
             return@withContext firstSavedId
@@ -441,8 +451,8 @@ class EditBillActivity : AppCompatActivity() {
                         newOwersIds,
                         viewModel.repeat,
                         bill.paymentMode,
-                        viewModel.paymentModeRemoteId,
-                        viewModel.categoryRemoteId,
+                        viewModel.paymentModeId,
+                        viewModel.categoryId,
                         finalComment
                     )
                     if (groupedBillIds != null) {
@@ -460,21 +470,13 @@ class EditBillActivity : AppCompatActivity() {
                 val newBill = DBBill(
                     0, 0, bill.projectId, viewModel.payerId, newAmount,
                     viewModel.timestamp, viewModel.what, DBBill.STATE_ADDED, viewModel.repeat,
-                    bill.paymentMode, viewModel.categoryRemoteId, finalComment, viewModel.paymentModeRemoteId
+                    bill.paymentMode, viewModel.categoryId, finalComment, viewModel.paymentModeId
                 )
                 newOwersIds.forEach { newBill.billOwers += DBBillOwer(0, 0, it) }
                 val newBillId = db.addBill(newBill)
                 db.updateProject(
-                    bill.projectId,
-                    null,
-                    null,
-                    null,
-                    viewModel.payerId,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null
+                    projId = bill.projectId,
+                    newLastPayerId = viewModel.payerId
                 )
                 val proj = db.getProject(bill.projectId)
                 if (proj != null) db.syncIfRemote(proj)

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

@@ -1,11 +1,13 @@
 package net.helcel.cowspent.android.bill_edit
 
 import android.annotation.SuppressLint
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
@@ -16,11 +18,18 @@ import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
@@ -30,6 +39,7 @@ import androidx.compose.ui.unit.sp
 import net.helcel.cowspent.R
 import net.helcel.cowspent.android.helper.*
 import net.helcel.cowspent.model.*
+import net.helcel.cowspent.util.CategoryUtils
 import net.helcel.cowspent.util.SupportUtil
 import java.util.Date
 import kotlin.math.abs
@@ -51,6 +61,13 @@ fun EditBillScreen(
 ) {
     val canEdit = accessLevel == DBProject.ACCESS_LEVEL_UNKNOWN || accessLevel >= DBProject.ACCESS_LEVEL_PARTICIPANT
     val context = LocalContext.current
+    val focusRequester = remember { FocusRequester() }
+
+    LaunchedEffect(Unit) {
+        if (viewModel.isNewBill) {
+            focusRequester.requestFocus()
+        }
+    }
 
     StatefulAlertDialog(
         state = viewModel.dialogState,
@@ -60,7 +77,7 @@ fun EditBillScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(if (viewModel.isNewBill) R.string.simple_new_bill else R.string.simple_edit_bill)) },
+                title = { Text(stringResource(if (viewModel.isNewBill) R.string.action_new_bill else R.string.action_edit)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
@@ -89,11 +106,11 @@ fun EditBillScreen(
         },
         floatingActionButton = {
             if (canEdit) {
-                val errorWhat = stringResource(R.string.error_invalid_bill_what)
+                val errorWhat = stringResource(R.string.error_invalid_bill_name)
                 val errorDate = stringResource(R.string.error_invalid_bill_date)
-                val errorPayer = stringResource(R.string.error_invalid_bill_payerid)
+                val errorPayer = stringResource(R.string.error_invalid_bill_payer)
                 val errorOwers = stringResource(R.string.error_invalid_bill_owers)
-                val errorInvalidForm = stringResource(R.string.simple_error)
+                val errorInvalidForm = stringResource(R.string.error_generic)
 
                 FloatingActionButton(onClick = {
                     val validationError = viewModel.getValidationError(
@@ -107,7 +124,7 @@ fun EditBillScreen(
                 }) {
                     Icon(
                         Icons.Default.Done,
-                        contentDescription = stringResource(R.string.action_save_bill)
+                        contentDescription = stringResource(R.string.action_save)
                     )
                 }
             }
@@ -126,7 +143,8 @@ fun EditBillScreen(
                 viewModel = viewModel,
                 canEdit = canEdit,
                 onDateClick = onDateClick,
-                onTimeClick = onTimeClick
+                onTimeClick = onTimeClick,
+                amountFocusRequester = focusRequester
             )
 
             Spacer(modifier = Modifier.height(8.dp))
@@ -162,32 +180,32 @@ fun BillBasicInfoSection(
     viewModel: EditBillViewModel,
     canEdit: Boolean,
     onDateClick: () -> Unit,
-    onTimeClick: () -> Unit
+    onTimeClick: () -> Unit,
+    amountFocusRequester: FocusRequester
 ) {
+    Text(
+        text = "GENERAL",
+        style = MaterialTheme.typography.subtitle1,
+        color = MaterialTheme.colors.onSurface,
+        fontWeight = FontWeight.Bold,
+        modifier = Modifier.padding(bottom = 8.dp)
+    )
+
     val context = LocalContext.current
+    val focusManager = LocalFocusManager.current
     val currencyDialogTitle =
         stringResource(R.string.currency_dialog_title, viewModel.mainCurrencyName)
 
-    OutlinedTextField(
-        value = viewModel.what,
-        onValueChange = { viewModel.what = it },
-        enabled = canEdit,
-        placeholder = { Text(stringResource(R.string.setting_what)) },
-        modifier = Modifier.fillMaxWidth(),
-        leadingIcon = { Icon(Icons.Default.Title, contentDescription = null) }
-    )
-
-    Spacer(modifier = Modifier.height(8.dp))
-
     OutlinedTextField(
         value = viewModel.amount,
-        onValueChange = {
-            viewModel.amount = it
+        onValueChange = { nv->
+            val filteredValue = nv.filter { it in "0123456789.+-*/" }
+            viewModel.amount = filteredValue
             viewModel.updateSplits()
         },
         enabled = canEdit,
         placeholder = { Text("0") },
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth().focusRequester(amountFocusRequester),
         leadingIcon = {
             val currencyToShow = viewModel.selectedCurrencyName.ifEmpty { 
                 viewModel.mainCurrencyName.ifEmpty { "$" } 
@@ -221,7 +239,21 @@ fun BillBasicInfoSection(
                 Icon(Icons.Default.SwapHoriz, contentDescription = "Change Currency")
             }
         },
-        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
+        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Phone, imeAction = ImeAction.Next),
+        keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Next) })
+    )
+
+    Spacer(modifier = Modifier.height(8.dp))
+
+    OutlinedTextField(
+        value = viewModel.what,
+        onValueChange = { viewModel.what = it },
+        enabled = canEdit,
+        placeholder = { Text(stringResource(R.string.label_what)) },
+        modifier = Modifier.fillMaxWidth(),
+        leadingIcon = { Icon(Icons.Default.Title, contentDescription = null) },
+        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+        keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Next) })
     )
 
     Spacer(modifier = Modifier.height(8.dp))
@@ -262,13 +294,13 @@ fun PayerSection(
 
     EditableExposedDropdownMenu(
         value = selectedPayer?.name ?: "",
-        placeholder = stringResource(R.string.setting_payer),
+        placeholder = stringResource(R.string.label_payer),
         expanded = payerExpanded,
         onExpandedChange = { payerExpanded = it },
         onDismissRequest = { payerExpanded = false },
         enabled = canEdit,
         leadingIcon = {
-            Box(modifier = Modifier.padding(start = 12.dp)) {
+            Box(modifier = Modifier) {
                 if (selectedPayer != null) {
                     MemberAvatar(
                         member = selectedPayer,
@@ -340,39 +372,61 @@ fun OwerSelectionSection(
         }
         Spacer(modifier = Modifier.width(8.dp))
         Text(
-            stringResource(R.string.setting_owers), fontSize = 12.sp,
-            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+            text = stringResource(R.string.label_owers).uppercase(),
+            style = MaterialTheme.typography.subtitle1,
+            color = MaterialTheme.colors.onSurface,
+            fontWeight = FontWeight.Bold
         )
         Spacer(Modifier.weight(1f))
 
-        if (viewModel.isCustomSplit) {
+        if (viewModel.splitMode != SplitMode.EVEN) {
             val diff = viewModel.getDiffSplit()
             if (abs(diff) > 0.01) {
+                val unit = if (viewModel.splitMode == SplitMode.PERCENT) "%" else ""
                 val diffText =
-                    if (diff > 0) "Missing: ${SupportUtil.normalNumberFormat.format(diff)}" else "Excess: ${
+                    if (diff > 0) "Missing: ${SupportUtil.normalNumberFormat.format(diff)}$unit" else "Excess: ${
                         SupportUtil.normalNumberFormat.format(-diff)
-                    }"
+                    }$unit"
                 Text(
                     diffText,
                     color = MaterialTheme.colors.error,
                     fontSize = 12.sp,
-                    modifier = Modifier.padding(horizontal = 16.dp)
+                    modifier = Modifier.padding(horizontal = 4.dp)
                 )
             }
-        } else {
-            Text("Even Split", fontSize = 12.sp)
         }
-        Switch(
-            checked = !viewModel.isCustomSplit,
-            enabled = canEdit,
-            onCheckedChange = {
-                viewModel.isCustomSplit = !it
-                viewModel.updateSplits()
-            },
-            colors = SwitchDefaults.colors(
-                uncheckedThumbColor = MaterialTheme.colors.onSurface,
-            )
-        )
+
+        val splitOptions = listOf(SplitMode.EVEN, SplitMode.CUSTOM, SplitMode.PERCENT)
+        Row(
+            modifier = Modifier
+                .padding(start = 8.dp)
+                .background(MaterialTheme.colors.onSurface.copy(alpha = 0.05f), MaterialTheme.shapes.small)
+        ) {
+            splitOptions.forEach { mode ->
+                val isSelected = viewModel.splitMode == mode
+                Box(
+                    modifier = Modifier
+                        .clip(MaterialTheme.shapes.small)
+                        .background(if (isSelected) MaterialTheme.colors.primary else Color.Transparent)
+                        .clickable(enabled = canEdit) {
+                            viewModel.splitMode = mode
+                            viewModel.updateSplits()
+                        }
+                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                ) {
+                    Text(
+                        text = when (mode) {
+                            SplitMode.EVEN -> "="
+                            SplitMode.CUSTOM -> "#"
+                            SplitMode.PERCENT -> "%"
+                        },
+                        color = if (isSelected) MaterialTheme.colors.onPrimary else MaterialTheme.colors.onSurface,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                }
+            }
+        }
     }
 
     viewModel.members.forEach { member ->
@@ -396,23 +450,39 @@ fun OwerSelectionSection(
                 size = 32.dp
             )
             Spacer(modifier = Modifier.width(8.dp))
-            Text(member.name, modifier = Modifier.weight(1f))
+            val weightSuffix = if (viewModel.hasDifferentWeights && member.weight != 1.0) {
+                " (x${member.weight.toString().removeSuffix(".0")})"
+            } else ""
+            Text("${member.name}$weightSuffix", modifier = Modifier.weight(1f))
 
-            if (isSelected || viewModel.isCustomSplit) {
+            if (isSelected || viewModel.splitMode != SplitMode.EVEN) {
+                val focusManager = LocalFocusManager.current
                 val interactionSource = remember { MutableInteractionSource() }
+                val value = if (viewModel.splitMode == SplitMode.PERCENT) {
+                    viewModel.owersPercentSplit[member.id] ?: ""
+                } else {
+                    viewModel.owersCustomSplit[member.id] ?: ""
+                }
+                
                 BasicTextField(
-                    value = viewModel.owersCustomSplit[member.id] ?: "",
-                    onValueChange = {
-                        viewModel.owersCustomSplit[member.id] = it
-                        viewModel.owersSelection[member.id] = (it != "")
+                    value = value,
+                    onValueChange = { nv ->
+                        val filteredValue = nv.filter { it in "0123456789.+-*/" }
+                        if (viewModel.splitMode == SplitMode.PERCENT) {
+                            viewModel.owersPercentSplit[member.id] = filteredValue
+                        } else {
+                            viewModel.owersCustomSplit[member.id] = filteredValue
+                        }
+                        viewModel.owersSelection[member.id] = (filteredValue != "")
                     },
                     modifier = Modifier
                         .width(80.dp)
                         .height(46.dp),
                     interactionSource = interactionSource,
                     singleLine = true,
-                    enabled = viewModel.isCustomSplit && canEdit,
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                    enabled = viewModel.splitMode != SplitMode.EVEN && canEdit,
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Next),
+                    keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Next) }),
                     cursorBrush = SolidColor(MaterialTheme.colors.onSurface),
                     textStyle = LocalTextStyle.current.copy(
                         textAlign = TextAlign.Right,
@@ -420,13 +490,13 @@ fun OwerSelectionSection(
                     ),
                 ) { innerTextField ->
                     TextFieldDefaults.OutlinedTextFieldDecorationBox(
-                        value = viewModel.owersCustomSplit[member.id] ?: "",
+                        value = value,
                         visualTransformation = VisualTransformation.None,
                         innerTextField = innerTextField,
                         singleLine = true,
-                        enabled = viewModel.isCustomSplit && canEdit,
+                        enabled = viewModel.splitMode != SplitMode.EVEN && canEdit,
                         interactionSource = interactionSource,
-                        contentPadding = PaddingValues(horizontal = 12.dp, vertical = 0.dp),
+                        contentPadding = PaddingValues(horizontal = 8.dp, vertical = 0.dp),
                         colors = TextFieldDefaults.textFieldColors(
                             cursorColor = MaterialTheme.colors.onSurface,
                             backgroundColor = Color.Transparent,
@@ -447,19 +517,28 @@ fun BillAdditionalDetailsSection(
     paymentModes: List<DBPaymentMode>,
     canEdit: Boolean
 ) {
+    Text(
+        text = "DETAILS",
+        style = MaterialTheme.typography.subtitle1,
+        color = MaterialTheme.colors.onSurface,
+        fontWeight = FontWeight.Bold,
+        modifier = Modifier.padding(bottom = 8.dp, top = 16.dp)
+    )
+
+    val context = LocalContext.current
     var categoryExpanded by remember { mutableStateOf(false) }
     val selectedCategory =
-        categories.find { it.remoteId.toInt() == viewModel.categoryRemoteId }
+        categories.find { it.id == viewModel.categoryId } ?: CategoryUtils.getCategoryById(context, viewModel.categoryId)
 
     EditableExposedDropdownMenu(
         value = selectedCategory?.name ?: "",
-        placeholder = stringResource(R.string.setting_category),
+        placeholder = stringResource(R.string.label_category),
         expanded = categoryExpanded,
         onExpandedChange = { categoryExpanded = it },
         onDismissRequest = { categoryExpanded = false },
         enabled = canEdit,
         leadingIcon = {
-            Box(modifier = Modifier.padding(start = 12.dp)) {
+            Box(modifier = Modifier) {
                 if (selectedCategory != null) {
                     Text(text = selectedCategory.icon, fontSize = 20.sp)
                 } else {
@@ -469,16 +548,26 @@ fun BillAdditionalDetailsSection(
         },
         content = {
             DropdownMenuItem(onClick = {
-                viewModel.categoryRemoteId = 0
+                viewModel.categoryId = 0
                 categoryExpanded = false
             }) {
                 Icon(Icons.Default.Close, tint = Color.Red, contentDescription = null)
                 Spacer(modifier = Modifier.width(12.dp))
                 Text(stringResource(R.string.category_none))
             }
-            categories.forEach { category ->
+            
+            DropdownMenuItem(onClick = {
+                viewModel.categoryId = DBBill.CATEGORY_REIMBURSEMENT
+                categoryExpanded = false
+            }) {
+                Text(text = "\uD83D\uDCB0", fontSize = 20.sp)
+                Spacer(modifier = Modifier.width(12.dp))
+                Text(stringResource(R.string.category_reimbursement))
+            }
+
+            categories.filter { it.remoteId != DBBill.CATEGORY_REIMBURSEMENT }.forEach { category ->
                 DropdownMenuItem(onClick = {
-                    viewModel.categoryRemoteId = category.remoteId.toInt()
+                    viewModel.categoryId = category.id
                     categoryExpanded = false
                 }) {
                     Text(text = category.icon, fontSize = 20.sp)
@@ -493,17 +582,17 @@ fun BillAdditionalDetailsSection(
 
     var pmExpanded by remember { mutableStateOf(false) }
     val selectedPm =
-        paymentModes.find { it.remoteId.toInt() == viewModel.paymentModeRemoteId }
+        paymentModes.find { it.id == viewModel.paymentModeId } ?: CategoryUtils.getPaymentModeById(context, viewModel.paymentModeId)
 
     EditableExposedDropdownMenu(
         value = selectedPm?.name ?: "",
-        placeholder = stringResource(R.string.setting_payment_mode),
+        placeholder = stringResource(R.string.label_mode),
         expanded = pmExpanded,
         onExpandedChange = { pmExpanded = it },
         onDismissRequest = { pmExpanded = false },
         enabled = canEdit,
         leadingIcon = {
-            Box(modifier = Modifier.padding(start = 12.dp)) {
+            Box(modifier = Modifier) {
                 if (selectedPm != null) {
                     Text(text = selectedPm.icon, fontSize = 20.sp)
                 } else {
@@ -513,7 +602,7 @@ fun BillAdditionalDetailsSection(
         },
         content = {
             DropdownMenuItem(onClick = {
-                viewModel.paymentModeRemoteId = 0
+                viewModel.paymentModeId = 0
                 pmExpanded = false
             }) {
                 Icon(Icons.Default.Close, tint = Color.Red, contentDescription = null)
@@ -522,7 +611,7 @@ fun BillAdditionalDetailsSection(
             }
             paymentModes.forEach { pm ->
                 DropdownMenuItem(onClick = {
-                    viewModel.paymentModeRemoteId = pm.remoteId.toInt()
+                    viewModel.paymentModeId = pm.id
                     pmExpanded = false
                 }) {
                     Text(text = pm.icon, fontSize = 20.sp)
@@ -548,7 +637,7 @@ fun BillAdditionalDetailsSection(
 
     EditableExposedDropdownMenu(
         value = selectedRepeat?.second ?: "",
-        placeholder = stringResource(R.string.setting_project_repetition),
+        placeholder = stringResource(R.string.label_repeat),
         expanded = repeatExpanded,
         onExpandedChange = { repeatExpanded = it },
         onDismissRequest = { repeatExpanded = false },
@@ -572,7 +661,7 @@ fun BillAdditionalDetailsSection(
         value = viewModel.comment,
         onValueChange = { viewModel.comment = it },
         enabled = canEdit,
-        placeholder = { Text(stringResource(R.string.setting_comment)) },
+        placeholder = { Text(stringResource(R.string.label_comment)) },
         modifier = Modifier.fillMaxWidth(),
         singleLine = false,
         leadingIcon = {
@@ -585,19 +674,115 @@ fun BillAdditionalDetailsSection(
 }
 
 @SuppressLint("ViewModelConstructorInComposable")
-@Preview(showBackground = true)
+@Preview(showBackground = true, name = "Standard Split")
 @Composable
 fun EditBillScreenPreview() {
     MaterialTheme {
         EditBillScreen(
             viewModel = EditBillViewModel().apply {
                 what = "Pizza"
-                amount = "12.50"
+                amount = "12.00"
                 mainCurrencyName = "EUR"
                 members = listOf(
                     DBMember(1, 0, 0, "Alice", true, 1.0, 0, null, null, null, null, null),
                     DBMember(2, 0, 0, "Bob", true, 1.0, 0, null, null, null, null, null)
                 )
+                owersSelection[1] = true
+                owersSelection[2] = true
+                updateSplits()
+            },
+            categories = emptyList(),
+            paymentModes = emptyList(),
+            onSave = {},
+            onBack = {},
+            onDateClick = {},
+            onTimeClick = {},
+            onScan = {}
+        )
+    }
+}
+
+@SuppressLint("ViewModelConstructorInComposable")
+@Preview(showBackground = true, name = "Weighted Split")
+@Composable
+fun EditBillScreenWeightedPreview() {
+    MaterialTheme {
+        EditBillScreen(
+            viewModel = EditBillViewModel().apply {
+                what = "Weighted Pizza"
+                amount = "60.00"
+                mainCurrencyName = "EUR"
+                members = listOf(
+                    DBMember(1, 0, 0, "Alice", true, 2.0, 0, null, null, null, null, null),
+                    DBMember(2, 0, 0, "Bob", true, 1.0, 0, null, null, null, null, null),
+                    DBMember(3, 0, 0, "Charlie", true, 1.0, 0, null, null, null, null, null)
+                )
+                owersSelection[1] = true
+                owersSelection[2] = true
+                owersSelection[3] = true
+                updateSplits()
+            },
+            categories = emptyList(),
+            paymentModes = emptyList(),
+            onSave = {},
+            onBack = {},
+            onDateClick = {},
+            onTimeClick = {},
+            onScan = {}
+        )
+    }
+}
+
+@SuppressLint("ViewModelConstructorInComposable")
+@Preview(showBackground = true, name = "Custom Split (#)")
+@Composable
+fun EditBillScreenCustomPreview() {
+    MaterialTheme {
+        EditBillScreen(
+            viewModel = EditBillViewModel().apply {
+                what = "Custom Split Pizza"
+                amount = "60.00"
+                mainCurrencyName = "EUR"
+                members = listOf(
+                    DBMember(1, 0, 0, "Alice", true, 1.0, 0, null, null, null, null, null),
+                    DBMember(2, 0, 0, "Bob", true, 1.0, 0, null, null, null, null, null)
+                )
+                splitMode = SplitMode.CUSTOM
+                owersSelection[1] = true
+                owersSelection[2] = true
+                owersCustomSplit[1] = "40.00"
+                owersCustomSplit[2] = "20.00"
+            },
+            categories = emptyList(),
+            paymentModes = emptyList(),
+            onSave = {},
+            onBack = {},
+            onDateClick = {},
+            onTimeClick = {},
+            onScan = {}
+        )
+    }
+}
+
+@SuppressLint("ViewModelConstructorInComposable")
+@Preview(showBackground = true, name = "Percent Split (%)")
+@Composable
+fun EditBillScreenPercentPreview() {
+    MaterialTheme {
+        EditBillScreen(
+            viewModel = EditBillViewModel().apply {
+                what = "Percent Split Pizza"
+                amount = "100.00"
+                mainCurrencyName = "EUR"
+                members = listOf(
+                    DBMember(1, 0, 0, "Alice", true, 1.0, 0, null, null, null, null, null),
+                    DBMember(2, 0, 0, "Bob", true, 1.0, 0, null, null, null, null, null)
+                )
+                splitMode = SplitMode.PERCENT
+                owersSelection[1] = true
+                owersSelection[2] = true
+                owersPercentSplit[1] = "70"
+                owersPercentSplit[2] = "30"
             },
             categories = emptyList(),
             paymentModes = emptyList(),

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

@@ -1,21 +1,24 @@
 package net.helcel.cowspent.android.bill_edit
 
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableDoubleStateOf
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.vector.ImageVector
 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.model.DBBill
+import net.helcel.cowspent.model.DBCurrency
+import net.helcel.cowspent.model.DBMember
 import net.helcel.cowspent.util.SupportUtil
 import net.helcel.cowspent.util.evalMath
 
-import net.helcel.cowspent.model.DBCurrency
-import androidx.compose.ui.graphics.vector.ImageVector
+enum class SplitMode {
+    EVEN, CUSTOM, PERCENT
+}
 
 class EditBillViewModel : ViewModel() {
     var what by mutableStateOf("")
@@ -24,59 +27,86 @@ class EditBillViewModel : ViewModel() {
     var timestamp by mutableLongStateOf(0L)
     var payerId by mutableLongStateOf(0L)
     var repeat by mutableStateOf(DBBill.NON_REPEATED)
-    var paymentModeRemoteId by mutableIntStateOf(0)
-    var categoryRemoteId by mutableIntStateOf(0)
+    var paymentModeId by mutableLongStateOf(0L)
+    var categoryId by mutableLongStateOf(0L)
     var isNewBill by mutableStateOf(false)
 
     var currencies by mutableStateOf<List<DBCurrency>>(emptyList())
     var mainCurrencyName by mutableStateOf("")
     var selectedCurrencyName by mutableStateOf("")
-    var selectedCurrencyRate by mutableStateOf(1.0)
+    var selectedCurrencyRate by mutableDoubleStateOf(1.0)
     var members by mutableStateOf<List<DBMember>>(emptyList())
 
     var owersSelection = mutableStateMapOf<Long, Boolean>()
-    var isCustomSplit by mutableStateOf(false)
+    var splitMode by mutableStateOf(SplitMode.EVEN)
     var owersCustomSplit = mutableStateMapOf<Long, String>()
+    var owersPercentSplit = mutableStateMapOf<Long, String>()
 
     var dialogState by mutableStateOf<DialogState?>(null)
 
-    val amountAsDouble: Double
-        get() {
-            return parseAmount(amount) ?: try {
-                evalMath(amount.replace(',', '.'))
-            } catch (_: Exception) {
-                0.0
-            }
+    fun parseAmountFromUi(input: String): Double {
+        if (input.isBlank()) return 0.0
+        val sanitized = input.replace(',', '.')
+        // If it contains any math operator, try evalMath first
+        if (sanitized.any { it in "+-*/" }) {
+            try {
+                val result = evalMath(sanitized)
+                if (result != 0.0) return SupportUtil.round2(result)
+            } catch (_: Exception) {}
         }
-
-    fun getEvenSplit(): Double {
-        val selectedOwersCount = owersSelection.count { it.value }
-        return if (selectedOwersCount > 0) amountAsDouble / selectedOwersCount else 0.0
+        val parsed = parseAmount(input) ?: 0.0
+        return SupportUtil.round2(parsed)
     }
 
+    val amountAsDouble: Double
+        get() = parseAmountFromUi(amount)
+
+    val hasDifferentWeights: Boolean
+        get() = members.isNotEmpty() && members.any { it.weight != members[0].weight }
+
     fun updateSplits() {
-        if (!isCustomSplit) {
-            val even = getEvenSplit()
-            val evenStr = if (even == 0.0) "" else SupportUtil.round2(even).toString()
+        if (splitMode == SplitMode.EVEN) {
+            val selectedMembers = members.filter { owersSelection[it.id] == true }
+            val totalWeight = selectedMembers.sumOf { it.weight }
+            val uiAmount = amountAsDouble
             members.forEach { m ->
                 if (owersSelection[m.id] == true) {
-                    owersCustomSplit[m.id] = evenStr
+                    val share = if (totalWeight > 0) (uiAmount * m.weight) / totalWeight else 0.0
+                    owersCustomSplit[m.id] = if (share == 0.0) "" else SupportUtil.round2(share).toString()
                 } else {
                     owersCustomSplit.remove(m.id)
                 }
             }
+        } else if (splitMode == SplitMode.PERCENT) {
+            val selectedCount = owersSelection.count { it.value }
+            if (selectedCount > 0) {
+                val evenPercent = 100.0 / selectedCount
+                val evenPercentStr = SupportUtil.round2(evenPercent).toString()
+                members.forEach { m ->
+                    if (owersSelection[m.id] == true) {
+                        if (owersPercentSplit[m.id].isNullOrEmpty()) {
+                            owersPercentSplit[m.id] = evenPercentStr
+                        }
+                    } else {
+                        owersPercentSplit.remove(m.id)
+                    }
+                }
+            }
         }
     }
 
     fun toggleMember(id: Long, selected: Boolean) {
         owersSelection[id] = selected
-        if (isCustomSplit) {
+        if (splitMode != SplitMode.EVEN) {
             if (selected) {
-                if (owersCustomSplit[id].isNullOrEmpty()) {
+                if (splitMode == SplitMode.CUSTOM && owersCustomSplit[id].isNullOrEmpty()) {
                     owersCustomSplit[id] = "0"
+                } else if (splitMode == SplitMode.PERCENT && owersPercentSplit[id].isNullOrEmpty()) {
+                    owersPercentSplit[id] = "0"
                 }
             } else {
                 owersCustomSplit.remove(id)
+                owersPercentSplit.remove(id)
             }
         } else {
             updateSplits()
@@ -84,10 +114,17 @@ class EditBillViewModel : ViewModel() {
     }
 
     fun getDiffSplit(): Double {
-        val customTotal = owersCustomSplit.entries
-            .filter { owersSelection[it.key] == true }
-            .sumOf { it.value.replace(',', '.').toDoubleOrNull() ?: 0.0 }
-        return amountAsDouble - customTotal
+        return if (splitMode == SplitMode.PERCENT) {
+            val customTotal = owersPercentSplit.entries
+                .filter { owersSelection[it.key] == true }
+                .sumOf { parseAmountFromUi(it.value) }
+            SupportUtil.round2(100.0 - customTotal)
+        } else {
+            val customTotal = owersCustomSplit.entries
+                .filter { owersSelection[it.key] == true }
+                .sumOf { parseAmountFromUi(it.value) }
+            SupportUtil.round2(amountAsDouble - customTotal)
+        }
     }
 
     fun getOwersIds(): List<Long> {
@@ -143,7 +180,7 @@ class EditBillViewModel : ViewModel() {
     }
 
     fun getFinalAmount(): Double {
-        return SupportUtil.round2(amountAsDouble / selectedCurrencyRate)
+        return SupportUtil.round2(amountAsDouble * selectedCurrencyRate)
     }
 
     fun getFinalComment(): String {
@@ -165,8 +202,8 @@ class EditBillViewModel : ViewModel() {
         timestamp = bill.timestamp
         payerId = bill.payerId
         repeat = bill.repeat ?: DBBill.NON_REPEATED
-        paymentModeRemoteId = bill.paymentModeRemoteId
-        categoryRemoteId = bill.categoryRemoteId
+        paymentModeId = bill.paymentModeId
+        categoryId = bill.categoryId
         
         val rawComment = bill.comment ?: ""
         
@@ -205,44 +242,45 @@ class EditBillViewModel : ViewModel() {
 
         owersSelection.clear()
         owersCustomSplit.clear()
+        owersPercentSplit.clear()
 
         if (customSplits != null) {
-            isCustomSplit = true
+            splitMode = SplitMode.CUSTOM
             for (member in members) {
                 val selected = customSplits.containsKey(member.id)
                 owersSelection[member.id] = selected
                 if (selected) {
                     // If we have metadata, the custom splits from DB are also converted. 
                     // We should show them as "Original" if possible? 
-                    // Actually, if we use metadata, we should probably store original splits too, 
-                    // but for now let's just reverse the rate for display.
+                    // Reverse calculation for display: UI Part = DB Part / Rate
                     val dbPart = customSplits[member.id]!!
-                    val uiPart = if (selectedCurrencyRate != 1.0) dbPart * selectedCurrencyRate else dbPart
+                    val uiPart = if (selectedCurrencyRate != 0.0) dbPart / selectedCurrencyRate else dbPart
                     owersCustomSplit[member.id] = SupportUtil.round2(uiPart).toString()
                 }
             }
         } else {
             // Even split logic
+            splitMode = SplitMode.EVEN
             val billOwerIds = bill.billOwersIds
-            val selectedCount = billOwerIds.size
+            val selectedMembers = members.filter { billOwerIds.contains(it.id) }
+            val totalWeight = selectedMembers.sumOf { it.weight }
             
             // Use UI amount for even split calculation
             val uiAmount = amountAsDouble
-            val evenSplit = if (selectedCount > 0) uiAmount / selectedCount else 0.0
-            val evenSplitStr = if (evenSplit == 0.0) "" else SupportUtil.round2(evenSplit).toString()
 
             for (member in members) {
                 val selected = billOwerIds.contains(member.id)
                 owersSelection[member.id] = selected
                 if (selected) {
-                    owersCustomSplit[member.id] = evenSplitStr
+                    val share = if (totalWeight > 0) (uiAmount * member.weight) / totalWeight else 0.0
+                    owersCustomSplit[member.id] = if (share == 0.0) "" else SupportUtil.round2(share).toString()
                 }
             }
         }
     }
 
     fun isFormValid(): Boolean {
-        return what.isNotEmpty() && !what.contains(",") &&
+        return what.isNotEmpty() &&
                 timestamp != 0L &&
                 payerId != 0L &&
                 owersSelection.any { it.value }
@@ -256,7 +294,7 @@ class EditBillViewModel : ViewModel() {
         errorInvalidForm: String
     ): String? {
         return when {
-            what.isEmpty() || what.contains(",") -> errorWhat
+            what.isEmpty() -> errorWhat
             timestamp == 0L -> errorDate
             payerId == 0L -> errorPayer
             owersSelection.none { it.value } -> errorOwers

app/src/main/java/net/helcel/cowspent/android/bill_label/LabelBillsActivity.kt

@@ -13,12 +13,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.theme.ThemeUtils
-import net.helcel.cowspent.util.CategoryUtils
 import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.ProjectType
 
 class LabelBillsActivity : AppCompatActivity() {
-    private val viewModel: LabelBillsViewModel by viewModels()
+    internal val viewModel: LabelBillsViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
@@ -39,24 +38,20 @@ class LabelBillsActivity : AppCompatActivity() {
 
                 val members = db.getMembersOfProject(projectId, null)
                 val allBills = db.getBillsOfProject(projectId)
-                val billsToLabel = allBills.filter { it.categoryRemoteId == 0 && it.state != DBBill.STATE_DELETED }
-                val allCategorized = allBills.filter { it.categoryRemoteId != 0 && it.state != DBBill.STATE_DELETED }
+                val billsToLabel = allBills.filter { it.categoryId == 0L && it.state != DBBill.STATE_DELETED }
+                val allCategorized = allBills.filter { it.categoryId != 0L && it.state != DBBill.STATE_DELETED }
                 
-                val syncedCategories = db.getCategories(projectId)
-                val defaultCategories = CategoryUtils.getDefaultCategories(this@LabelBillsActivity, projectId)
-                val hardcoded = if (projectType == ProjectType.LOCAL) {
-                    defaultCategories
-                } else {
-                    listOfNotNull(defaultCategories.find { it.remoteId.toInt() == DBBill.CATEGORY_REIMBURSEMENT })
-                }
-                val categories = syncedCategories + hardcoded
+                db.ensureDefaultLabels(projectId, projectType)
+                
+                // Reload from DB to get real IDs
+                val categories = db.getCategories(projectId)
                 
                 Quadruple(members, billsToLabel, categories, allCategorized)
             }
 
             viewModel.billsToLabel = billsToLabel
             viewModel.categories = categories
-            viewModel.categoriesMap = categories.associateBy { it.remoteId }
+            viewModel.categoriesMap = categories.associateBy { it.id }
             viewModel.allCategorizedBills = allCategorized
             viewModel.updateSuggestions()
 

app/src/main/java/net/helcel/cowspent/android/bill_label/LabelBillsScreen.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -42,10 +43,13 @@ fun LabelBillsScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.label_bills_title)) },
+                title = { Text(stringResource(R.string.title_label_bills)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+                        Icon(
+                            Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = stringResource(R.string.simple_back)
+                        )
                     }
                 },
                 backgroundColor = MaterialTheme.colors.primary,
@@ -64,10 +68,11 @@ fun LabelBillsScreen(
                 
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
-                    text = stringResource(R.string.label_bills_suggested),
+                    text = stringResource(R.string.label_bills_suggested).uppercase(),
                     style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
                     fontWeight = FontWeight.Bold,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth().padding(top = 8.dp)
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 
@@ -83,7 +88,7 @@ fun LabelBillsScreen(
                                     CategoryButton(
                                         icon = category.icon,
                                         name = category.name ?: "",
-                                        onClick = { viewModel.labelCurrentBill(db, category.remoteId.toInt()) }
+                                        onClick = { viewModel.labelCurrentBill(db, category.id) }
                                     )
                                 }
                             }
@@ -93,7 +98,7 @@ fun LabelBillsScreen(
                         }
                     } else {
                         Text(
-                            text = stringResource(R.string.label_bills_no_suggestions),
+                            text = stringResource(R.string.msg_no_suggestions),
                             style = MaterialTheme.typography.caption,
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.4f),
                             modifier = Modifier.fillMaxWidth(),
@@ -105,10 +110,11 @@ fun LabelBillsScreen(
                 Spacer(modifier = Modifier.height(8.dp))
 
                 Text(
-                    text = stringResource(R.string.setting_category),
+                    text = stringResource(R.string.label_category).uppercase(),
                     style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
                     fontWeight = FontWeight.Bold,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth().padding(top = 8.dp)
                 )
                 
                 Spacer(modifier = Modifier.height(8.dp))
@@ -124,7 +130,7 @@ fun LabelBillsScreen(
                         CategoryButton(
                             icon = category.icon,
                             name = category.name ?: "",
-                            onClick = { viewModel.labelCurrentBill(db, category.remoteId.toInt()) }
+                            onClick = { viewModel.labelCurrentBill(db, category.id) }
                         )
                     }
                 }
@@ -141,7 +147,7 @@ fun LabelBillsScreen(
                 Spacer(modifier = Modifier.height(8.dp))
             } else {
                 Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                    Text(stringResource(R.string.label_bills_no_more))
+                    Text(stringResource(R.string.msg_bill_labeled_done))
                 }
             }
         }
@@ -221,7 +227,10 @@ fun BillSummaryCard(bill: DBBill, members: List<DBMember>, remainingCount: Int)
 fun CategoryButton(icon: String, name: String, onClick: () -> Unit) {
     OutlinedButton(
         onClick = onClick,
-        modifier = Modifier.fillMaxWidth().height(60.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(60.dp)
+            .testTag("CategoryButton_$name"),
         contentPadding = PaddingValues(2.dp)
     ) {
         Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
@@ -243,16 +252,16 @@ fun CategoryButton(icon: String, name: String, onClick: () -> Unit) {
 fun LabelBillsScreenPreview() {
     val viewModel = LabelBillsViewModel().apply {
         billsToLabel = listOf(
-            DBBill(1L, 0, 1L, 1L, 120.5, System.currentTimeMillis() / 1000, "Groceries at Aldi", 0, null, null, 0, null, -1)
+            DBBill(1L, 0, 1L, 1L, 120.5, System.currentTimeMillis() / 1000, "Groceries at Aldi", 0, null, null, 0L, null, -1L)
         )
         val cats = listOf(
-            DBCategory(1, 1, 1, "Groceries", "🛒", ""),
-            DBCategory(2, 2, 1, "Leisure", "🥳", ""),
-            DBCategory(3, 3, 1, "Rent", "🏠", ""),
-            DBCategory(4, 4, 1, "Bills", "💸", "")
+            DBCategory(1L, 1L, 1L, "Groceries", "🛒", ""),
+            DBCategory(2L, 2L, 1L, "Leisure", "🥳", ""),
+            DBCategory(3L, 3L, 1L, "Rent", "🏠", ""),
+            DBCategory(4L, 4L, 1L, "Bills", "💸", "")
         )
         categories = cats
-        categoriesMap = cats.associateBy { it.remoteId }
+        categoriesMap = cats.associateBy { it.id }
     }
     val members = listOf(
         DBMember(1L, 0, 1L, "Alice", true, 1.0, 0, 255, 100, 100, null, null),

app/src/main/java/net/helcel/cowspent/android/bill_label/LabelBillsViewModel.kt

@@ -43,18 +43,18 @@ class LabelBillsViewModel : ViewModel() {
             otherName == name || (name.length > 3 && otherName.contains(name)) || (otherName.length > 3 && name.contains(otherName))
         }
 
-        val counts = matches.groupBy { it.categoryRemoteId }
+        val counts = matches.groupBy { it.categoryId }
             .mapValues { it.value.size }
             .toList()
             .sortedByDescending { it.second }
             .take(2)
 
         suggestedCategories = counts.mapNotNull { (catId, _) ->
-            categoriesMap[catId.toLong()]
+            categoriesMap[catId]
         }
     }
 
-    fun labelCurrentBill(db: CowspentSQLiteOpenHelper, categoryId: Int) {
+    fun labelCurrentBill(db: CowspentSQLiteOpenHelper, categoryId: Long) {
         currentBill?.let { bill ->
             db.updateBillAndSync(
                 bill = bill,
@@ -65,11 +65,11 @@ class LabelBillsViewModel : ViewModel() {
                 newOwersIds = bill.billOwersIds,
                 newRepeat = bill.repeat,
                 newPaymentMode = bill.paymentMode,
-                newPaymentModeRemoteId = bill.paymentModeRemoteId,
+                newPaymentModeId = bill.paymentModeId,
                 newCategoryId = categoryId,
                 newComment = bill.comment
             )
-            bill.categoryRemoteId = categoryId
+            bill.categoryId = categoryId
             onBillProcessed?.invoke(bill.id)
             moveToNext()
         }
@@ -87,11 +87,11 @@ class LabelBillsViewModel : ViewModel() {
 
         val start = currentBillIndex
         var next = (start + 1) % billsToLabel.size
-        while (next != start && billsToLabel[next].categoryRemoteId != 0) {
+        while (next != start && billsToLabel[next].categoryId != 0L) {
             next = (next + 1) % billsToLabel.size
         }
 
-        currentBillIndex = if (billsToLabel[next].categoryRemoteId == 0) {
+        currentBillIndex = if (billsToLabel[next].categoryId == 0L) {
             next
         } else {
             billsToLabel.size

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

@@ -7,14 +7,8 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import net.helcel.cowspent.R
 import net.helcel.cowspent.android.helper.showToast
-import net.helcel.cowspent.model.DBBill
-import net.helcel.cowspent.model.DBCurrency
 import net.helcel.cowspent.model.ProjectType
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.theme.ThemeUtils
@@ -23,9 +17,8 @@ import net.helcel.cowspent.util.ICallback
 
 class ManageCurrenciesActivity : AppCompatActivity() {
 
-    private val viewModel: ManageCurrenciesViewModel by viewModels()
+    internal val viewModel: ManageCurrenciesViewModel by viewModels()
     private var db: CowspentSQLiteOpenHelper? = null
-    private var selectedProjectID: Long = -1
 
     private val editMainCurrencyCallBack: ICallback = object : ICallback {
         override fun onFinish() {}
@@ -33,9 +26,11 @@ class ManageCurrenciesActivity : AppCompatActivity() {
             if (message.isEmpty()) {
                 showToast(this@ManageCurrenciesActivity,getString(R.string.currency_saved_success), Toast.LENGTH_LONG)
             } else {
-                viewModel.showDialog(title=getString(R.string.error_edit_remote_project_helper, message),
-                    message=getString(R.string.currency_manager),
-                    positiveText = getString(android.R.string.ok))
+                viewModel.showDialog(
+                    title = getString(R.string.dialog_sync_error_title),
+                    message = getString(R.string.error_edit_remote_project_helper, message),
+                    positiveText = getString(android.R.string.ok)
+                )
             }
         }
         override fun onScheduled() {}
@@ -45,125 +40,45 @@ class ManageCurrenciesActivity : AppCompatActivity() {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        intent.extras?.let {
-            selectedProjectID = it.getLong(EXTRA_PROJECT_ID)
-        }
+        val selectedProjectID = intent.getLongExtra(EXTRA_PROJECT_ID, -1L)
         if (selectedProjectID == -1L) {
             Log.e(TAG, "Missing project id")
             finish()
             return
         }
 
+        viewModel.projectId = selectedProjectID
+        viewModel.loadCurrencies()
+
         db = CowspentSQLiteOpenHelper.getInstance(this)
 
-        lifecycleScope.launch {
-            val project = withContext(Dispatchers.IO) { db!!.getProject(selectedProjectID) }
-            viewModel.mainCurrencyName = project?.currencyName?.let { if (it == "null") "" else it } ?: ""
-            updateCurrenciesList()
-
-            setContent {
-                ThemeUtils.CowspentTheme {
-                    ManageCurrenciesScreen(
-                        viewModel = viewModel,
-                        onBack = { finish() },
-                        onSaveMain = { saveMainCurrency() },
-                        onAdd = { addOrUpdateCurrency() },
-                        onDelete = { deleteCurrency(it) },
-                        onEdit = { startEditing(it) },
-                        onCancelEdit = { cancelEditing() }
-                    )
-                }
+        setContent {
+            ThemeUtils.CowspentTheme {
+                ManageCurrenciesScreen(
+                    viewModel = viewModel,
+                    onBack = { finish() },
+                    onSaveMain = { saveMainCurrency() },
+                    onAdd = { viewModel.addCurrency() },
+                    onDelete = { viewModel.deleteCurrency(it.id) },
+                    onEdit = { viewModel.startEditing(it) },
+                    onCancelEdit = { viewModel.cancelEditing() }
+                )
             }
         }
     }
 
     private fun saveMainCurrency() {
-        val newMainCurrencyName = viewModel.mainCurrencyName
-        lifecycleScope.launch {
-            withContext(Dispatchers.IO) {
-                db!!.updateProject(
-                    selectedProjectID, null, null, null,
-                    null, null, newMainCurrencyName,
-                    null, null, null
-                )
-                val project = db!!.getProject(selectedProjectID)
-                if (project != null) {
-                    db!!.syncIfRemote(project)
-                    if (project.type == ProjectType.COSPEND) {
-                        withContext(Dispatchers.Main) {
-                            if (!db!!.cowspentServerSyncHelper
-                                    .editRemoteProject(selectedProjectID, project.name, null, null, newMainCurrencyName, editMainCurrencyCallBack)
-                            ) {
-                                showToast(this@ManageCurrenciesActivity, getString(R.string.remote_project_operation_no_network), Toast.LENGTH_LONG)
-                            }
-                        }
-                    } else {
-                        withContext(Dispatchers.Main) {
-                            showToast(this@ManageCurrenciesActivity, getString(R.string.currency_saved_success), Toast.LENGTH_LONG)
-                        }
-                    }
+        val project = db?.getProject(viewModel.projectId)
+        if (project != null) {
+            if (project.type == ProjectType.COSPEND) {
+                if (!db!!.cowspentServerSyncHelper.isSyncPossible) {
+                    showToast(this, getString(R.string.remote_project_operation_no_network), Toast.LENGTH_LONG)
                 }
+            } else {
+                showToast(this, getString(R.string.currency_saved_success), Toast.LENGTH_LONG)
             }
         }
-    }
-
-    private fun addOrUpdateCurrency() {
-        val exchangeRate = try { viewModel.newCurrencyRate.toDouble() } catch (_: Exception) { 0.0 }
-        val currencyName = viewModel.newCurrencyName
-        val editingId = viewModel.editingCurrencyId
-
-        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)
-                }
-            }
-            cancelEditing()
-            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) {
-                db!!.setCurrencyStateSync(currency.id, DBBill.STATE_DELETED)
-            }
-            updateCurrenciesList()
-        }
-    }
-
-    private suspend fun updateCurrenciesList() {
-        val currenciesDB = withContext(Dispatchers.IO) {
-            val list = db!!.getCurrenciesOfProjectWithState(selectedProjectID, DBBill.STATE_ADDED).toMutableList()
-            list.addAll(db!!.getCurrenciesOfProjectWithState(selectedProjectID, DBBill.STATE_EDITED))
-            list.addAll(db!!.getCurrenciesOfProjectWithState(selectedProjectID, DBBill.STATE_OK))
-            list
-        }
-        withContext(Dispatchers.Main) {
-            viewModel.currencies = currenciesDB
-        }
+        viewModel.saveMainCurrency(editMainCurrencyCallBack)
     }
 
     override fun onSupportNavigateUp(): Boolean {

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

@@ -1,14 +1,36 @@
 package net.helcel.cowspent.android.currencies
 
 import android.annotation.SuppressLint
+import android.app.Application
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+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.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
+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.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -20,6 +42,8 @@ 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.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
@@ -27,11 +51,10 @@ 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.TextIcon
-import net.helcel.cowspent.android.helper.TextIconDisplay
+import net.helcel.cowspent.android.helper.StatefulAlertDialog
 import net.helcel.cowspent.android.helper.formatAmount
 import net.helcel.cowspent.model.DBCurrency
+import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
 fun ManageCurrenciesScreen(
@@ -43,40 +66,15 @@ fun ManageCurrenciesScreen(
     onEdit: (DBCurrency) -> Unit,
     onCancelEdit: () -> Unit
 ) {
-    val dialogState = viewModel.dialogState
-    if (dialogState != null) {
-        AlertDialog(
-            showDialog = true,
-            onDismissRequest = { viewModel.dismissDialog() },
-            title = dialogState.title,
-            message = dialogState.message,
-            icon = dialogState.icon,
-            items = dialogState.items,
-            positiveText = dialogState.positiveText,
-            negativeText = dialogState.negativeText,
-            neutralText = dialogState.neutralText,
-            onConfirm = {
-                dialogState.onConfirm?.invoke()
-                viewModel.dismissDialog()
-            },
-            onCancel = {
-                dialogState.onCancel?.invoke()
-                viewModel.dismissDialog()
-            },
-            onNeutral = {
-                dialogState.onNeutral?.invoke()
-                viewModel.dismissDialog()
-            }
-        ) {
-            dialogState.onItemSelected?.invoke(it)
-            viewModel.dismissDialog()
-        }
-    }
+    StatefulAlertDialog(
+        state = viewModel.dialogState,
+        onDismissRequest = { viewModel.dismissDialog() }
+    )
 
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.currency_manager)) },
+                title = { Text(stringResource(R.string.action_currencies)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
@@ -96,7 +94,7 @@ fun ManageCurrenciesScreen(
         ) {
             LaunchedEffect(viewModel.mainCurrencyName) {
                 if (viewModel.mainCurrencyName.isNotEmpty()) {
-                    delay(500)
+                    delay(500.milliseconds)
                     onSaveMain()
                 }
             }
@@ -105,11 +103,11 @@ fun ManageCurrenciesScreen(
                 // Section 1: Main Currency
                 Text(
                     text = stringResource(R.string.main_currency).uppercase(),
-                    style = MaterialTheme.typography.overline,
-                    color = MaterialTheme.colors.primary,
-                    fontWeight = FontWeight.Bold
+                    style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 8.dp)
                 )
-                Spacer(modifier = Modifier.height(8.dp))
                 Card(
                     shape = RoundedCornerShape(12.dp),
                     elevation = 2.dp,
@@ -133,11 +131,11 @@ fun ManageCurrenciesScreen(
                 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
+                    style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 8.dp)
                 )
-                Spacer(modifier = Modifier.height(8.dp))
 
                 // Integrated Add/Edit Ribbon
                 Surface(
@@ -196,7 +194,7 @@ fun ManageCurrenciesScreen(
                             ) {
                                 Icon(
                                     imageVector = if (isEditing) Icons.Default.Done else Icons.Default.Add,
-                                    contentDescription = null,
+                                    contentDescription = if (isEditing) "Done" else "Add",
                                     tint = if (viewModel.isAddEnabled()) {
                                         if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
                                     } else MaterialTheme.colors.onSurface.copy(alpha = 0.2f)
@@ -216,9 +214,10 @@ fun ManageCurrenciesScreen(
                 
                 Text(
                     text = "SAVED RATES",
-                    style = MaterialTheme.typography.overline,
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.4f),
-                    fontWeight = FontWeight.Bold
+                    style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 8.dp)
                 )
             }
 
@@ -253,7 +252,9 @@ fun CurrencyRow(
         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()
+        modifier = Modifier
+            .fillMaxWidth()
+            .testTag("CurrencyRow_${currency.name}")
     ) {
         Row(
             modifier = Modifier
@@ -283,7 +284,7 @@ fun CurrencyRow(
                     modifier = Modifier.padding(horizontal = 8.dp)
                 )
                 Text(
-                    text = formatAmount(currency.exchangeRate),
+                    text = formatAmount(if (currency.exchangeRate != 0.0) 1.0 / currency.exchangeRate else 0.0),
                     style = MaterialTheme.typography.body1,
                     fontWeight = FontWeight.ExtraBold,
                     color = if (isEditing) MaterialTheme.colors.secondary else MaterialTheme.colors.onSurface
@@ -299,7 +300,7 @@ fun CurrencyRow(
             IconButton(onClick = onDelete) {
                 Icon(
                     imageVector = Icons.Default.Delete,
-                    contentDescription = null,
+                    contentDescription = "Delete",
                     tint = MaterialTheme.colors.error.copy(alpha = 0.7f),
                     modifier = Modifier.size(20.dp)
                 )
@@ -326,9 +327,10 @@ fun CurrencyRowPreview() {
 @Preview(showBackground = true)
 @Composable
 fun ManageCurrenciesScreenPreview() {
+    val application = LocalContext.current.applicationContext as Application
     MaterialTheme {
         ManageCurrenciesScreen(
-            viewModel = ManageCurrenciesViewModel().apply {
+            viewModel = ManageCurrenciesViewModel(application).apply {
                 mainCurrencyName = "EUR"
                 currencies = listOf(
                     DBCurrency(1, 0, 0, "USD", 1.1, 0),

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

@@ -1,14 +1,24 @@
 package net.helcel.cowspent.android.currencies
 
+import android.app.Application
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.lifecycle.ViewModel
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.helcel.cowspent.android.helper.DialogState
+import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.DBCurrency
+import net.helcel.cowspent.model.ProjectType
+import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
+import net.helcel.cowspent.util.ICallback
 
-class ManageCurrenciesViewModel : ViewModel() {
+class ManageCurrenciesViewModel(application: Application) : AndroidViewModel(application) {
+    var projectId: Long = -1
     var mainCurrencyName by mutableStateOf("")
     var newCurrencyName by mutableStateOf("")
     var newCurrencyRate by mutableStateOf("")
@@ -19,6 +29,105 @@ class ManageCurrenciesViewModel : ViewModel() {
 
     var dialogState by mutableStateOf<DialogState?>(null)
 
+    private val db = CowspentSQLiteOpenHelper.getInstance(application)
+
+    fun loadCurrencies() {
+        if (projectId == -1L) return
+        viewModelScope.launch {
+            val project = withContext(Dispatchers.IO) { db.getProject(projectId) }
+            mainCurrencyName = project?.currencyName?.let { if (it == "null") "" else it } ?: ""
+            updateCurrenciesList()
+        }
+    }
+
+    suspend fun updateCurrenciesList() {
+        val currenciesDB = withContext(Dispatchers.IO) {
+            val list = db.getCurrenciesOfProjectWithState(projectId, DBBill.STATE_ADDED).toMutableList()
+            list.addAll(db.getCurrenciesOfProjectWithState(projectId, DBBill.STATE_EDITED))
+            list.addAll(db.getCurrenciesOfProjectWithState(projectId, DBBill.STATE_OK))
+            list
+        }
+        withContext(Dispatchers.Main) {
+            currencies = currenciesDB
+        }
+    }
+
+    fun saveMainCurrency(callback: ICallback) {
+        val newMainCurrencyName = mainCurrencyName
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.updateProject(
+                    projId = projectId,
+                    newCurrencyName = newMainCurrencyName
+                )
+                val project = db.getProject(projectId)
+                if (project != null) {
+                    db.syncIfRemote(project)
+                    if (project.type == ProjectType.COSPEND) {
+                        withContext(Dispatchers.Main) {
+                            if (!db.cowspentServerSyncHelper
+                                    .editRemoteProject(
+                                        projId = projectId,
+                                        newName = project.name,
+                                        newMainCurrencyName = newMainCurrencyName,
+                                        callback = callback
+                                    )
+                            ) {
+                                // Handled by activity showing toast
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fun addCurrency() {
+        val uiRate = try { newCurrencyRate.toDouble() } catch (_: Exception) { 0.0 }
+        val exchangeRate = if (uiRate != 0.0) 1.0 / uiRate else 0.0
+        val currencyName = newCurrencyName
+        val editingId = editingCurrencyId
+
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                if (editingId != null) {
+                    db.updateCurrency(editingId, currencyName, exchangeRate)
+                    db.setCurrencyStateSync(editingId, DBBill.STATE_EDITED)
+                } else {
+                    val newCurrency = DBCurrency(
+                        0, 0, projectId,
+                        currencyName, exchangeRate, DBBill.STATE_ADDED
+                    )
+                    db.addCurrencyAndSync(newCurrency)
+                }
+            }
+            cancelEditing()
+            updateCurrenciesList()
+        }
+    }
+
+    fun deleteCurrency(currencyId: Long) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.setCurrencyStateSync(currencyId, DBBill.STATE_DELETED)
+            }
+            updateCurrenciesList()
+        }
+    }
+
+    fun startEditing(currency: DBCurrency) {
+        editingCurrencyId = currency.id
+        newCurrencyName = currency.name ?: ""
+        val uiRate = if (currency.exchangeRate != 0.0) 1.0 / currency.exchangeRate else 0.0
+        newCurrencyRate = uiRate.toString()
+    }
+
+    fun cancelEditing() {
+        editingCurrencyId = null
+        newCurrencyName = ""
+        newCurrencyRate = ""
+    }
+
     fun showDialog(
         title: String? = null,
         message: String? = null,

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

@@ -100,8 +100,11 @@ fun Drawer(
 
                 // Members Section
                 val membersState = rememberLazyListState()
-                val sortedMembers = remember(members, memberBalances) {
-                    members.sortedWith(compareBy<DBMember> {
+                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 balance = memberBalances[it.id] ?: 0.0
                         when {
                             balance > 0.01 -> 0
@@ -157,20 +160,27 @@ private fun DrawerHeader(
         modifier = Modifier
             .fillMaxWidth()
             .background(MaterialTheme.colors.primary)
-            .padding(16.dp, 4.dp)
+            .padding(4.dp, 4.dp)
     ) {
         Column {
             Row(verticalAlignment = Alignment.CenterVertically) {
-                Image(
-                    painter = painterResource(id = R.drawable.ic_launcher_foreground),
-                    contentDescription = null,
-                    modifier = Modifier.size(48.dp)
-                )
+                Box(modifier = Modifier.size(48.dp)) {
+                    Image(
+                        painter = painterResource(id = R.drawable.ic_launcher_background),
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize()
+                    )
+                    Image(
+                        painter = painterResource(id = R.drawable.ic_launcher_foreground),
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize()
+                    )
+                }
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
-                    stringResource(id = R.string.app_name),
+                    text = stringResource(id = R.string.app_name),
                     color = MaterialTheme.colors.onPrimary,
-                    fontSize = 18.sp,
+                    style = MaterialTheme.typography.subtitle1,
                     fontWeight = FontWeight.Bold
                 )
                 Spacer(modifier = Modifier.weight(1f))
@@ -197,6 +207,7 @@ private fun DrawerHeader(
             }
             if (lastSyncText.isNotEmpty()) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
+                    Spacer(Modifier.width(16.dp))
                     Icon(
                         Icons.Default.Sync,
                         contentDescription = null,
@@ -288,7 +299,7 @@ fun DrawerItem(
             Icon(icon, contentDescription = null, tint = contentColor.copy(alpha = 0.6f * alpha))
         }
         
-        Spacer(modifier = Modifier.width(8.dp))
+        Spacer(modifier = Modifier.width(32.dp))
         
         val itemText = text ?: member?.name ?: ""
         Text(

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

@@ -230,7 +230,12 @@ fun AlertDialogContent(
                         Spacer(Modifier.width(8.dp))
                     }
                     if (title != null) {
-                        Text(text = title, style = MaterialTheme.typography.h6)
+                        Text(
+                            text = title.uppercase(),
+                            style = MaterialTheme.typography.subtitle1,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colors.onSurface
+                        )
                     }
                 }
             }

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

@@ -61,11 +61,7 @@ fun ColorPicker(
     var chroma by remember { mutableFloatStateOf(initialLch[1]) }
     var hue by remember { mutableFloatStateOf(initialLch[2]) }
 
-    val currentColorInt = remember(lightness, chroma, hue) {
-        val color = mLCHtoRBG(lightness,chroma,hue)
-        onColorChanged(color)
-        color
-    }
+    val currentColorInt = remember(lightness, chroma, hue) { mLCHtoRBG(lightness, chroma, hue) }
     
     val currentColor = Color(currentColorInt)
 
@@ -74,8 +70,9 @@ fun ColorPicker(
     var isHexValid by remember { mutableStateOf(true) }
     val interactionSource = remember { MutableInteractionSource() }
 
-    // Sync HEX with LCH
+    // Report the colour, and keep the HEX field in step with the LCH sliders.
     LaunchedEffect(currentColorInt) {
+        onColorChanged(currentColorInt)
         val newHex = "%06X".format(0xFFFFFF and currentColorInt)
         if (hexText.uppercase() != newHex) {
             hexText = newHex
@@ -188,12 +185,13 @@ fun ColorPicker(
 
         Spacer(modifier = Modifier.height(16.dp))
 
-        val hueBrush = remember {
-            Brush.horizontalGradient(
-                listOf(
-                    Color.Red, Color.Yellow, Color.Green, Color.Cyan, Color.Blue, Color.Magenta, Color.Red
-                )
-            )
+        val hueBrush = remember(lightness, chroma) {
+            val hueSteps = 36 // More steps for smoother gradient
+            val colors = (0..hueSteps).map { step ->
+                val h = (step.toFloat() / hueSteps) * 360f
+                Color(mLCHtoRBG(lightness, chroma, h))
+            }
+            Brush.horizontalGradient(colors)
         }
         LchSlider(
             label = "H",

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

@@ -4,37 +4,49 @@ 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.enableEdgeToEdge
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AppCompatActivity
-import net.helcel.cowspent.theme.ThemeUtils
-import androidx.camera.core.*
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ExperimentalGetImage
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageProxy
 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.*
+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.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 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 com.google.zxing.*
+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.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
 
@@ -122,7 +134,7 @@ fun QrCodeScannerScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.scan_qrcode)) },
+                title = { Text(stringResource(R.string.action_scan_qrcode)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)

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

@@ -1,7 +1,6 @@
 package net.helcel.cowspent.android.helper
 
-import android.graphics.*
-import android.graphics.drawable.Drawable
+import android.graphics.Color
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.util.*
@@ -11,209 +10,143 @@ import kotlin.math.round
 import kotlin.math.sqrt
 
 /**
- * A Drawable object that draws text (1 character) on top of a circular/filled background.
+ * The color a member's avatar gets, derived from their name.
  */
-class TextDrawable private constructor(
-    private val mText: String,
-    r: Int,
-    g: Int,
-    b: Int,
-    private val mRadius: Float,
-    private val mDisabled: Boolean
-) : Drawable() {
-    private val mTextPaint: Paint = Paint()
-    private val mBackground: Paint = Paint()
-    private val mDisabledCircle: Paint = Paint()
+object TextDrawable {
+    private const val INDEX_RED = 0
+    private const val INDEX_GREEN = 1
+    private const val INDEX_BLUE = 2
+    private const val INDEX_HUE = 0
+    private const val INDEX_SATURATION = 1
+    private const val INDEX_LUMINATION = 2
 
-    init {
-        mBackground.style = Paint.Style.FILL
-        mBackground.isAntiAlias = true
-        mBackground.color = Color.rgb(r, g, b)
-
-        if ((r + g + b) / 3 < 220) {
-            mTextPaint.color = Color.WHITE
-        } else {
-            mTextPaint.color = Color.BLACK
+    fun getColorFromName(name: String): Int {
+        return try {
+            val hsl = calculateHSL(name)
+            val rgb = hslToRgb(hsl[0].toFloat(), hsl[1].toFloat(), hsl[2].toFloat(), 1f)
+            Color.rgb(rgb[0], rgb[1], rgb[2])
+        } catch (_: NoSuchAlgorithmException) {
+            Color.WHITE
         }
-        mTextPaint.textSize = mRadius
-        mTextPaint.isAntiAlias = true
-        mTextPaint.textAlign = Paint.Align.CENTER
-
-        mDisabledCircle.style = Paint.Style.STROKE
-        mDisabledCircle.strokeWidth = mRadius * 0.2f
-        mDisabledCircle.isAntiAlias = true
-        mDisabledCircle.color = Color.DKGRAY
     }
 
-    override fun draw(canvas: Canvas) {
-        canvas.drawCircle(mRadius, mRadius, mRadius, mBackground)
-        canvas.drawText(
-            mText,
-            mRadius,
-            mRadius - (mTextPaint.descent() + mTextPaint.ascent()) / 2,
-            mTextPaint
+    @Throws(NoSuchAlgorithmException::class)
+    private fun calculateHSL(name: String): IntArray {
+        val result = arrayOf("0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0")
+        val rgb = doubleArrayOf(0.0, 0.0, 0.0)
+        var sat = 70
+        val lum = 68
+        val modulo = 16
+
+        var hash = name.lowercase(Locale.ROOT).replace("[^0-9a-f]".toRegex(), "")
+        if (!hash.matches("^[0-9a-f]{32}$".toRegex())) {
+            hash = md5(hash)
+        }
+
+        for (i in hash.indices) {
+            result[i % modulo] = (result[i % modulo].toInt() + hash.substring(i, i + 1).toInt(16)).toString()
+        }
+
+        for (count in 1 until modulo) {
+            rgb[count % 3] += result[count].toDouble()
+        }
+
+        rgb[INDEX_RED] = rgb[INDEX_RED] % 255
+        rgb[INDEX_GREEN] = rgb[INDEX_GREEN] % 255
+        rgb[INDEX_BLUE] = rgb[INDEX_BLUE] % 255
+
+        val hsl = rgbToHsl(rgb[INDEX_RED], rgb[INDEX_GREEN], rgb[INDEX_BLUE])
+
+        val bright = sqrt(
+            0.299 * rgb[INDEX_RED].pow(2.0) + 0.587 * rgb[INDEX_GREEN].pow(2.0) + 0.114 * rgb[INDEX_BLUE].pow(2.0)
         )
-        if (mDisabled) {
-            canvas.drawCircle(mRadius, mRadius, mRadius * 0.9f, mDisabledCircle)
-            canvas.drawLine(
-                mRadius * 0.4f,
-                mRadius * 1.6f,
-                mRadius * 1.6f,
-                mRadius * 0.4f,
-                mDisabledCircle
-            )
+
+        if (bright >= 200) {
+            sat = 60
         }
+
+        return intArrayOf((hsl[INDEX_HUE] * 360).toInt(), sat, lum)
     }
 
-    override fun setAlpha(alpha: Int) {
-        mTextPaint.alpha = alpha
+    private fun hslToRgb(hParam: Float, sParam: Float, lParam: Float, alpha: Float): IntArray {
+        var h = hParam
+        var s = sParam
+        var l = lParam
+        if (s !in 0.0f..100.0f) {
+            throw IllegalArgumentException("Color parameter outside of expected range - Saturation")
+        }
+        if (l !in 0.0f..100.0f) {
+            throw IllegalArgumentException("Color parameter outside of expected range - Luminance")
+        }
+        if (alpha !in 0.0f..1.0f) {
+            throw IllegalArgumentException("Color parameter outside of expected range - Alpha")
+        }
+
+        h %= 360.0f
+        h /= 360f
+        s /= 100f
+        l /= 100f
+
+        val q = if (l < 0.5) {
+            l * (1 + s)
+        } else {
+            (l + s) - s * l
+        }
+        val p = 2 * l - q
+        val r = round(max(0f, hueToRgb(p, q, h + 1.0f / 3.0f)) * 256).toInt()
+        val g = round(max(0f, hueToRgb(p, q, h)) * 256).toInt()
+        val b = round(max(0f, hueToRgb(p, q, h - 1.0f / 3.0f)) * 256).toInt()
+        return intArrayOf(r, g, b)
     }
 
-    override fun setColorFilter(cf: ColorFilter?) {
-        mTextPaint.colorFilter = cf
+    private fun hueToRgb(p: Float, q: Float, hParam: Float): Float {
+        var h = hParam
+        if (h < 0) h += 1f
+        if (h > 1) h -= 1f
+        if (6 * h < 1) return p + (q - p) * 6 * h
+        if (2 * h < 1) return q
+        if (3 * h < 2) return p + (q - p) * 6 * (2.0f / 3.0f - h)
+        return p
     }
 
-    @Deprecated("Deprecated in Java")
-    override fun getOpacity(): Int {
-        return PixelFormat.TRANSLUCENT
-    }
-
-    companion object {
-        private const val INDEX_RED = 0
-        private const val INDEX_GREEN = 1
-        private const val INDEX_BLUE = 2
-        private const val INDEX_HUE = 0
-        private const val INDEX_SATURATION = 1
-        private const val INDEX_LUMINATION = 2
-
-        fun getColorFromName(name: String): Int {
-            return try {
-                val hsl = calculateHSL(name)
-                val rgb = hslToRgb(hsl[0].toFloat(), hsl[1].toFloat(), hsl[2].toFloat(), 1f)
-                Color.rgb(rgb[0], rgb[1], rgb[2])
-            } catch (_: NoSuchAlgorithmException) {
-                Color.WHITE
-            }
-        }
-
-        @Throws(NoSuchAlgorithmException::class)
-        private fun calculateHSL(name: String): IntArray {
-            val result = arrayOf("0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0")
-            val rgb = doubleArrayOf(0.0, 0.0, 0.0)
-            var sat = 70
-            val lum = 68
-            val modulo = 16
-
-            var hash = name.lowercase(Locale.ROOT).replace("[^0-9a-f]".toRegex(), "")
-            if (!hash.matches("^[0-9a-f]{32}$".toRegex())) {
-                hash = md5(hash)
-            }
-
-            for (i in hash.indices) {
-                result[i % modulo] = (result[i % modulo].toInt() + hash.substring(i, i + 1).toInt(16)).toString()
-            }
-
-            for (count in 1 until modulo) {
-                rgb[count % 3] += result[count].toDouble()
-            }
-
-            rgb[INDEX_RED] = rgb[INDEX_RED] % 255
-            rgb[INDEX_GREEN] = rgb[INDEX_GREEN] % 255
-            rgb[INDEX_BLUE] = rgb[INDEX_BLUE] % 255
-
-            val hsl = rgbToHsl(rgb[INDEX_RED], rgb[INDEX_GREEN], rgb[INDEX_BLUE])
-
-            val bright = sqrt(
-                0.299 * rgb[INDEX_RED].pow(2.0) + 0.587 * rgb[INDEX_GREEN].pow(2.0) + 0.114 * rgb[INDEX_BLUE].pow(2.0)
-            )
-
-            if (bright >= 200) {
-                sat = 60
-            }
-
-            return intArrayOf((hsl[INDEX_HUE] * 360).toInt(), sat, lum)
-        }
-
-        private fun hslToRgb(hParam: Float, sParam: Float, lParam: Float, alpha: Float): IntArray {
-            var h = hParam
-            var s = sParam
-            var l = lParam
-            if (s !in 0.0f..100.0f) {
-                throw IllegalArgumentException("Color parameter outside of expected range - Saturation")
-            }
-            if (l !in 0.0f..100.0f) {
-                throw IllegalArgumentException("Color parameter outside of expected range - Luminance")
-            }
-            if (alpha !in 0.0f..1.0f) {
-                throw IllegalArgumentException("Color parameter outside of expected range - Alpha")
-            }
-
-            h %= 360.0f
-            h /= 360f
-            s /= 100f
-            l /= 100f
-
-            val q = if (l < 0.5) {
-                l * (1 + s)
-            } else {
-                (l + s) - s * l
-            }
-            val p = 2 * l - q
-            val r = round(max(0f, hueToRgb(p, q, h + 1.0f / 3.0f)) * 256).toInt()
-            val g = round(max(0f, hueToRgb(p, q, h)) * 256).toInt()
-            val b = round(max(0f, hueToRgb(p, q, h - 1.0f / 3.0f)) * 256).toInt()
-            return intArrayOf(r, g, b)
-        }
-
-        private fun hueToRgb(p: Float, q: Float, hParam: Float): Float {
-            var h = hParam
-            if (h < 0) h += 1f
-            if (h > 1) h -= 1f
-            if (6 * h < 1) return p + (q - p) * 6 * h
-            if (2 * h < 1) return q
-            if (3 * h < 2) return p + (q - p) * 6 * (2.0f / 3.0f - h)
-            return p
-        }
-
-        private fun rgbToHsl(rUntrimmed: Double, gUntrimmed: Double, bUntrimmed: Double): DoubleArray {
-            val r = rUntrimmed / 255
-            val g = gUntrimmed / 255
-            val b = bUntrimmed / 255
-            val max = max(r, max(g, b))
-            val min = r.coerceAtMost(g.coerceAtMost(b))
-            var h = (max + min) / 2
-            val s: Double
-            val l = (max + min) / 2
-            if (max == min) {
-                s = 0.0
-                h = s // achromatic
-            } else {
-                val d = max - min
-                s = if (l > 0.5) d / (2 - max - min) else d / (max + min)
-                when (max) {
-                    r -> {
-                        h = (g - b) / d + (if (g < b) 6 else 0)
-                    }
-                    g -> {
-                        h = (b - r) / d + 2
-                    }
-                    b -> {
-                        h = (r - g) / d + 4
-                    }
+    private fun rgbToHsl(rUntrimmed: Double, gUntrimmed: Double, bUntrimmed: Double): DoubleArray {
+        val r = rUntrimmed / 255
+        val g = gUntrimmed / 255
+        val b = bUntrimmed / 255
+        val max = max(r, max(g, b))
+        val min = r.coerceAtMost(g.coerceAtMost(b))
+        var h = (max + min) / 2
+        val s: Double
+        val l = (max + min) / 2
+        if (max == min) {
+            s = 0.0
+            h = s // achromatic
+        } else {
+            val d = max - min
+            s = if (l > 0.5) d / (2 - max - min) else d / (max + min)
+            when (max) {
+                r -> {
+                    h = (g - b) / d + (if (g < b) 6 else 0)
+                }
+                g -> {
+                    h = (b - r) / d + 2
+                }
+                b -> {
+                    h = (r - g) / d + 4
                 }
-                h /= 6.0
             }
-            val hsl = DoubleArray(3)
-            hsl[INDEX_HUE] = h
-            hsl[INDEX_SATURATION] = s
-            hsl[INDEX_LUMINATION] = l
-            return hsl
+            h /= 6.0
         }
+        val hsl = DoubleArray(3)
+        hsl[INDEX_HUE] = h
+        hsl[INDEX_SATURATION] = s
+        hsl[INDEX_LUMINATION] = l
+        return hsl
+    }
 
-        @Throws(NoSuchAlgorithmException::class)
-        private fun md5(string: String): String {
-            val md5 = MessageDigest.getInstance("MD5").digest(string.toByteArray())
-            return md5.joinToString("") { "%02x".format(it) }
-        }
+    @Throws(NoSuchAlgorithmException::class)
+    private fun md5(string: String): String {
+        val md5 = MessageDigest.getInstance("MD5").digest(string.toByteArray())
+        return md5.joinToString("") { "%02x".format(it) }
     }
 }

app/src/main/java/net/helcel/cowspent/android/label/LabelManagementActivity.kt

@@ -0,0 +1,46 @@
+package net.helcel.cowspent.android.label
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import net.helcel.cowspent.theme.ThemeUtils
+
+class LabelManagementActivity : AppCompatActivity() {
+    internal val viewModel: LabelManagementViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
+        super.onCreate(savedInstanceState)
+
+        val projectId = intent.getLongExtra(EXTRA_PROJECT_ID, 0L)
+        if (projectId == 0L) {
+            finish()
+            return
+        }
+
+        viewModel.loadLabels(projectId)
+
+        setContent {
+            ThemeUtils.CowspentTheme {
+                LabelManagementScreen(
+                    viewModel = viewModel,
+                    onBack = { finish() }
+                )
+            }
+        }
+    }
+
+    companion object {
+        const val EXTRA_PROJECT_ID = "EXTRA_PROJECT_ID"
+
+        fun createIntent(context: Context, projectId: Long): Intent {
+            return Intent(context, LabelManagementActivity::class.java).apply {
+                putExtra(EXTRA_PROJECT_ID, projectId)
+            }
+        }
+    }
+}

app/src/main/java/net/helcel/cowspent/android/label/LabelManagementScreen.kt

@@ -0,0 +1,430 @@
+package net.helcel.cowspent.android.label
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.ui.window.Dialog
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+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.Delete
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.graphics.toColorInt
+import net.helcel.cowspent.R
+import net.helcel.cowspent.android.helper.ColorPicker
+import net.helcel.cowspent.android.helper.StatefulAlertDialog
+import net.helcel.cowspent.model.DBBill
+import net.helcel.cowspent.model.DBCategory
+import net.helcel.cowspent.model.DBPaymentMode
+
+@Composable
+fun LabelManagementScreen(
+    viewModel: LabelManagementViewModel,
+    onBack: () -> Unit
+) {
+    LabelManagementScreenContent(
+        categories = viewModel.categories,
+        paymentModes = viewModel.paymentModes,
+        dialogState = viewModel.dialogState,
+        onBack = onBack,
+        onAddCategory = viewModel::addCategory,
+        onUpdateCategory = viewModel::updateCategory,
+        onDeleteCategory = viewModel::deleteCategory,
+        onAddPaymentMode = viewModel::addPaymentMode,
+        onUpdatePaymentMode = viewModel::updatePaymentMode,
+        onDeletePaymentMode = viewModel::deletePaymentMode,
+        onDismissDialog = { viewModel.dialogState = null },
+        onShowDialog = { viewModel.dialogState = it }
+    )
+}
+
+@Composable
+fun LabelManagementScreenContent(
+    categories: List<DBCategory>,
+    paymentModes: List<DBPaymentMode>,
+    dialogState: net.helcel.cowspent.android.helper.DialogState?,
+    onBack: () -> Unit,
+    onAddCategory: (String, String, String) -> Unit,
+    onUpdateCategory: (DBCategory, String, String, String) -> Unit,
+    onDeleteCategory: (Long) -> Unit,
+    onAddPaymentMode: (String, String, String) -> Unit,
+    onUpdatePaymentMode: (DBPaymentMode, String, String, String) -> Unit,
+    onDeletePaymentMode: (Long) -> Unit,
+    onDismissDialog: () -> Unit,
+    onShowDialog: (net.helcel.cowspent.android.helper.DialogState) -> Unit,
+    initialTab: Int = 0
+) {
+    var selectedTab by remember { mutableIntStateOf(initialTab) }
+    val tabs = listOf(
+        stringResource(R.string.label_categories),
+        stringResource(R.string.label_payment_modes)
+    )
+
+    val deleteLabelTitle = stringResource(R.string.delete_label_confirmation_title)
+    val deleteLabelMessage = stringResource(R.string.delete_label_confirmation_message)
+    val yesText = stringResource(R.string.simple_yes)
+    val noText = stringResource(R.string.simple_no)
+
+    var showEditDialog by remember { mutableStateOf(false) }
+    var editingCategory by remember { mutableStateOf<DBCategory?>(null) }
+    var editingPaymentMode by remember { mutableStateOf<DBPaymentMode?>(null) }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(stringResource(R.string.title_labels)) },
+                navigationIcon = {
+                    IconButton(onClick = onBack) {
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.simple_back))
+                    }
+                },
+                backgroundColor = MaterialTheme.colors.primary,
+                elevation = 0.dp
+            )
+        },
+        floatingActionButton = {
+            FloatingActionButton(onClick = {
+                if (selectedTab == 0) {
+                    editingCategory = null
+                    showEditDialog = true
+                } else {
+                    editingPaymentMode = null
+                    showEditDialog = true
+                }
+            }) {
+                Icon(Icons.Default.Add, contentDescription = "Add Label")
+            }
+        }
+    ) { padding ->
+        Column(modifier = Modifier.padding(padding)) {
+            TabRow(selectedTabIndex = selectedTab) {
+                tabs.forEachIndexed { index, title ->
+                    Tab(
+                        selected = selectedTab == index,
+                        onClick = { selectedTab = index },
+                        text = { Text(title) }
+                    )
+                }
+            }
+
+            if (selectedTab == 0) {
+                CategoryList(
+                    categories = categories.filter { it.remoteId != DBBill.CATEGORY_REIMBURSEMENT },
+                    onEdit = { 
+                        editingCategory = it
+                        showEditDialog = true
+                    },
+                    onDelete = { category ->
+                        onShowDialog(net.helcel.cowspent.android.helper.DialogState(
+                            title = deleteLabelTitle,
+                            message = deleteLabelMessage,
+                            positiveText = yesText,
+                            negativeText = noText,
+                            onConfirm = { onDeleteCategory(category.id) }
+                        ))
+                    }
+                )
+            } else {
+                PaymentModeList(
+                    paymentModes = paymentModes,
+                    onEdit = { 
+                        editingPaymentMode = it
+                        showEditDialog = true
+                    },
+                    onDelete = { pm ->
+                        onShowDialog(net.helcel.cowspent.android.helper.DialogState(
+                            title = deleteLabelTitle,
+                            message = deleteLabelMessage,
+                            positiveText = yesText,
+                            negativeText = noText,
+                            onConfirm = { onDeletePaymentMode(pm.id) }
+                        ))
+                    }
+                )
+            }
+        }
+    }
+
+    if (showEditDialog) {
+        if (selectedTab == 0) {
+            EditLabelDialog(
+                title = if (editingCategory == null) stringResource(R.string.title_add_category) else stringResource(R.string.action_edit),
+                initialName = editingCategory?.name ?: "",
+                initialIcon = editingCategory?.icon ?: "",
+                initialColor = editingCategory?.color ?: "#FF0000",
+                onDismiss = { showEditDialog = false },
+                onSave = { name, icon, color ->
+                    if (editingCategory == null) {
+                        onAddCategory(name, icon, color)
+                    } else {
+                        onUpdateCategory(editingCategory!!, name, icon, color)
+                    }
+                    showEditDialog = false
+                }
+            )
+        } else {
+            EditLabelDialog(
+                title = if (editingPaymentMode == null) stringResource(R.string.title_add_payment_mode) else stringResource(R.string.action_edit),
+                initialName = editingPaymentMode?.name ?: "",
+                initialIcon = editingPaymentMode?.icon ?: "",
+                initialColor = editingPaymentMode?.color ?: "#00FF00",
+                onDismiss = { showEditDialog = false },
+                onSave = { name, icon, color ->
+                    if (editingPaymentMode == null) {
+                        onAddPaymentMode(name, icon, color)
+                    } else {
+                        onUpdatePaymentMode(editingPaymentMode!!, name, icon, color)
+                    }
+                    showEditDialog = false
+                }
+            )
+        }
+    }
+
+    StatefulAlertDialog(
+        state = dialogState,
+        onDismissRequest = onDismissDialog
+    )
+}
+
+@Composable
+fun CategoryList(
+    categories: List<DBCategory>,
+    onEdit: (DBCategory) -> Unit,
+    onDelete: (DBCategory) -> Unit
+) {
+    LazyColumn {
+        items(categories) { category ->
+            LabelItem(
+                name = category.name ?: "",
+                icon = category.icon,
+                color = category.color,
+                onEdit = { onEdit(category) },
+                onDelete = { onDelete(category) }
+            )
+        }
+    }
+}
+
+@Composable
+fun PaymentModeList(
+    paymentModes: List<DBPaymentMode>,
+    onEdit: (DBPaymentMode) -> Unit,
+    onDelete: (DBPaymentMode) -> Unit
+) {
+    LazyColumn {
+        items(paymentModes) { pm ->
+            LabelItem(
+                name = pm.name ?: "",
+                icon = pm.icon,
+                color = pm.color,
+                onEdit = { onEdit(pm) },
+                onDelete = { onDelete(pm) }
+            )
+        }
+    }
+}
+
+@Composable
+fun LabelItem(
+    name: String,
+    icon: String,
+    color: String,
+    onEdit: () -> Unit,
+    onDelete: () -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onEdit() }
+            .padding(16.dp, 8.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Box(
+            modifier = Modifier
+                .size(24.dp)
+                .clip(CircleShape)
+                .background(parseColor(color)),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(text = icon, fontSize = 12.sp)
+        }
+        Spacer(modifier = Modifier.width(32.dp))
+        Text(text = name, modifier = Modifier.weight(1f), style = MaterialTheme.typography.subtitle1)
+        IconButton(onClick = onEdit) {
+            Icon(Icons.Default.Edit, contentDescription = stringResource(R.string.action_edit), tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f))
+        }
+        IconButton(onClick = onDelete) {
+            Icon(Icons.Default.Delete, contentDescription = stringResource(R.string.action_delete), tint = MaterialTheme.colors.error.copy(alpha = 0.6f))
+        }
+    }
+}
+
+/**
+ * Split into a window and its content, the same way MemberEditDialogContent is.
+ *
+ * A Compose text field inside a Material AlertDialog never reaches idle under Robolectric: the
+ * composition spins in measure/layout until Espresso gives up 60s later, having exhausted the
+ * test heap and taken every later test class in that worker with it. A plain Dialog holding a
+ * Surface behaves, so the dialog body lives there instead - which is also what makes it testable.
+ */
+@Composable
+fun EditLabelDialog(
+    title: String,
+    initialName: String,
+    initialIcon: String,
+    initialColor: String,
+    onDismiss: () -> Unit,
+    onSave: (String, String, String) -> Unit
+) {
+    Dialog(onDismissRequest = onDismiss) {
+        EditLabelDialogContent(title, initialName, initialIcon, initialColor, onDismiss, onSave)
+    }
+}
+
+@Composable
+fun EditLabelDialogContent(
+    title: String,
+    initialName: String,
+    initialIcon: String,
+    initialColor: String,
+    onDismiss: () -> Unit,
+    onSave: (String, String, String) -> Unit
+) {
+    var name by remember { mutableStateOf(initialName) }
+    var icon by remember { mutableStateOf(initialIcon) }
+    var color by remember { mutableStateOf(initialColor) }
+
+    Surface(
+        shape = MaterialTheme.shapes.medium,
+        color = MaterialTheme.colors.surface,
+        contentColor = contentColorFor(MaterialTheme.colors.surface)
+    ) {
+        Column(modifier = Modifier.padding(24.dp)) {
+            Text(title, style = MaterialTheme.typography.h6)
+            Spacer(modifier = Modifier.height(16.dp))
+            Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+                OutlinedTextField(
+                    value = name,
+                    onValueChange = { name = it },
+                    placeholder = { Text(stringResource(R.string.label_name)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    singleLine = true
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                OutlinedTextField(
+                    value = icon,
+                    onValueChange = { if (it.length <= 2) icon = it },
+                    placeholder = { Text(stringResource(R.string.label_icon)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    singleLine = true
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                Text(text = stringResource(R.string.label_color), style = MaterialTheme.typography.caption)
+                ColorPicker(
+                    initialColor = parseColorInt(color),
+                    onColorChanged = { color = String.format("#%06X", 0xFFFFFF and it) }
+                )
+            }
+            Spacer(modifier = Modifier.height(16.dp))
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.End,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                TextButton(onClick = onDismiss) {
+                    Text(stringResource(R.string.simple_cancel))
+                }
+                Spacer(modifier = Modifier.width(8.dp))
+                Button(
+                    onClick = { onSave(name, icon, color) },
+                    enabled = name.isNotBlank()
+                ) {
+                    Text(stringResource(R.string.action_save))
+                }
+            }
+        }
+    }
+}
+
+fun parseColor(colorString: String): Color {
+    return try {
+        Color(colorString.toColorInt())
+    } catch (_: Exception) {
+        Color.Gray
+    }
+}
+
+fun parseColorInt(colorString: String): Int {
+    return try {
+        colorString.toColorInt()
+    } catch (_: Exception) {
+        Color.Gray.toArgb()
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun LabelManagementCategoriesPreview() {
+    MaterialTheme {
+        LabelManagementScreenContent(
+            categories = listOf(
+                DBCategory(1L, 1L, 1L, "Groceries", "🛒", "#FF0000"),
+                DBCategory(2L, 2L, 1L, "Rent", "🏠", "#00FF00")
+            ),
+            paymentModes = emptyList(),
+            dialogState = null,
+            onBack = {},
+            onAddCategory = { _, _, _ -> },
+            onUpdateCategory = { _, _, _, _ -> },
+            onDeleteCategory = { _ -> },
+            onAddPaymentMode = { _, _, _ -> },
+            onUpdatePaymentMode = { _, _, _, _ -> },
+            onDeletePaymentMode = { _ -> },
+            onDismissDialog = {},
+            onShowDialog = {},
+            initialTab = 0
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun LabelManagementPaymentModesPreview() {
+    MaterialTheme {
+        LabelManagementScreenContent(
+            categories = emptyList(),
+            paymentModes = listOf(
+                DBPaymentMode(1L, 1L, 1L, "Cash", "💵", "#0000FF"),
+                DBPaymentMode(2L, 2L, 1L, "Credit Card", "💳", "#FFFF00")
+            ),
+            dialogState = null,
+            onBack = {},
+            onAddCategory = { _, _, _ -> },
+            onUpdateCategory = { _, _, _, _ -> },
+            onDeleteCategory = { _ -> },
+            onAddPaymentMode = { _, _, _ -> },
+            onUpdatePaymentMode = { _, _, _, _ -> },
+            onDeletePaymentMode = { _ -> },
+            onDismissDialog = {},
+            onShowDialog = {},
+            initialTab = 1
+        )
+    }
+}

app/src/main/java/net/helcel/cowspent/android/label/LabelManagementViewModel.kt

@@ -0,0 +1,95 @@
+package net.helcel.cowspent.android.label
+
+import android.app.Application
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import net.helcel.cowspent.android.helper.DialogState
+import net.helcel.cowspent.model.DBCategory
+import net.helcel.cowspent.model.DBPaymentMode
+import net.helcel.cowspent.model.DBBill
+import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
+
+class LabelManagementViewModel(application: Application) : AndroidViewModel(application) {
+    private val db = CowspentSQLiteOpenHelper.getInstance(application)
+
+    var projectId by mutableLongStateOf(0L)
+    var categories by mutableStateOf<List<DBCategory>>(emptyList())
+    var paymentModes by mutableStateOf<List<DBPaymentMode>>(emptyList())
+
+    var dialogState by mutableStateOf<DialogState?>(null)
+
+    fun loadLabels(projId: Long) {
+        projectId = projId
+        viewModelScope.launch {
+            val project = withContext(Dispatchers.IO) { db.getProject(projId) }
+            if (project != null) {
+                withContext(Dispatchers.IO) {
+                    db.ensureDefaultLabels(projId, project.type)
+                }
+            }
+            categories = withContext(Dispatchers.IO) { db.getCategories(projId) }
+            paymentModes = withContext(Dispatchers.IO) { db.getPaymentModes(projId) }
+        }
+    }
+
+    fun addCategory(name: String, icon: String, color: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.addCategoryAndSync(DBCategory(0, 0, projectId, name, icon, color, DBBill.STATE_ADDED))
+            }
+            loadLabels(projectId)
+        }
+    }
+
+    fun updateCategory(cat: DBCategory, name: String, icon: String, color: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.updateCategoryAndSync(cat, name, icon, color)
+            }
+            loadLabels(projectId)
+        }
+    }
+
+    fun deleteCategory(id: Long) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.deleteCategoryAndSync(id)
+            }
+            loadLabels(projectId)
+        }
+    }
+
+    fun addPaymentMode(name: String, icon: String, color: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.addPaymentModeAndSync(DBPaymentMode(0, 0, projectId, name, icon, color, DBBill.STATE_ADDED))
+            }
+            loadLabels(projectId)
+        }
+    }
+
+    fun updatePaymentMode(pm: DBPaymentMode, name: String, icon: String, color: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.updatePaymentModeAndSync(pm, name, icon, color)
+            }
+            loadLabels(projectId)
+        }
+    }
+
+    fun deletePaymentMode(id: Long) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.deletePaymentModeAndSync(id)
+            }
+            loadLabels(projectId)
+        }
+    }
+}

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

@@ -2,9 +2,25 @@ package net.helcel.cowspent.android.main
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+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.shape.CircleShape
-import androidx.compose.material.*
+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.icons.Icons
 import androidx.compose.material.icons.filled.Receipt
 import androidx.compose.material.icons.filled.Repeat
@@ -13,10 +29,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import net.helcel.cowspent.R
-import net.helcel.cowspent.android.helper.formatAmount
 import net.helcel.cowspent.android.helper.MemberAvatar
 import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.DBMember
@@ -29,15 +45,25 @@ fun EmptyProjectsState(onConfigureNextcloud: () -> Unit, onAddManually: () -> Un
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(stringResource(R.string.no_projects_title), style = MaterialTheme.typography.h6)
+        Text(
+            text = stringResource(R.string.error_no_projects).uppercase(), 
+            style = MaterialTheme.typography.subtitle1, 
+            fontWeight = FontWeight.Bold,
+            color = MaterialTheme.colors.onSurface
+        )
         Spacer(modifier = Modifier.height(8.dp))
-        Text(stringResource(R.string.no_projects_text))
-        Spacer(modifier = Modifier.height(16.dp))
-        Button(onClick = onConfigureNextcloud) {
+        Text(
+            text = stringResource(R.string.no_projects_text),
+            style = MaterialTheme.typography.body2,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+        )
+        Spacer(modifier = Modifier.height(24.dp))
+        Button(onClick = onConfigureNextcloud, modifier = Modifier.fillMaxWidth()) {
             Text(stringResource(R.string.configure_account_choice))
         }
         Spacer(modifier = Modifier.height(8.dp))
-        Button(onClick = onAddManually) {
+        Button(onClick = onAddManually, modifier = Modifier.fillMaxWidth()) {
             Text(stringResource(R.string.add_project_choice))
         }
     }
@@ -50,9 +76,19 @@ fun EmptyMembersState() {
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(stringResource(R.string.no_members_title), style = MaterialTheme.typography.h6)
+        Text(
+            text = stringResource(R.string.error_no_members).uppercase(), 
+            style = MaterialTheme.typography.subtitle1, 
+            fontWeight = FontWeight.Bold,
+            color = MaterialTheme.colors.onSurface
+        )
         Spacer(modifier = Modifier.height(8.dp))
-        Text(stringResource(R.string.no_members_text))
+        Text(
+            text = stringResource(R.string.no_members_text),
+            style = MaterialTheme.typography.body2,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+        )
     }
 }
 
@@ -63,9 +99,19 @@ fun EmptyBillsState() {
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(stringResource(R.string.no_bills_title), style = MaterialTheme.typography.h6)
+        Text(
+            text = stringResource(R.string.error_no_bills).uppercase(), 
+            style = MaterialTheme.typography.subtitle1, 
+            fontWeight = FontWeight.Bold,
+            color = MaterialTheme.colors.onSurface
+        )
         Spacer(modifier = Modifier.height(8.dp))
-        Text(stringResource(R.string.no_bills_text))
+        Text(
+            text = stringResource(R.string.no_bills_text),
+            style = MaterialTheme.typography.body2,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+        )
     }
 }
 
@@ -107,15 +153,21 @@ fun BillItemRow(bill: DBBill, payer: DBMember?, onClick: () -> Unit) {
                 Icons.Default.Receipt,
                 contentDescription = null,
                 modifier = Modifier.size(40.dp),
-                tint = MaterialTheme.colors.primary
+                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
             )
         }
         Spacer(modifier = Modifier.width(16.dp))
         Column(modifier = Modifier.weight(1f)) {
-            Text(bill.formattedWhat.ifEmpty { bill.what }, fontWeight = FontWeight.Bold)
+            Text(
+                text = bill.formattedWhat.ifEmpty { bill.what }, 
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface
+            )
             Text(
                 text = bill.formattedSubtitle.ifEmpty { bill.comment ?: "" },
                 style = MaterialTheme.typography.caption,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f),
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
@@ -136,13 +188,16 @@ fun SectionHeader(title: String) {
         color = MaterialTheme.colors.background,
         modifier = Modifier.fillMaxWidth()
     ) {
-        Divider(thickness = 2.dp)
-        Text(
-            text = title,
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            style = MaterialTheme.typography.caption.copy(fontWeight = FontWeight.Bold),
-            color = MaterialTheme.colors.primary
-        )
+        Column {
+            Divider(thickness = 1.dp, color = MaterialTheme.colors.onSurface.copy(alpha = 0.08f))
+            Text(
+                text = title.uppercase(),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface
+            )
+        }
     }
 }
 
@@ -153,7 +208,18 @@ fun EmptyState() {
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(stringResource(R.string.no_bills_title), style = MaterialTheme.typography.h6)
-        Text(stringResource(R.string.no_bills_text), modifier = Modifier.padding(16.dp))
+        Text(
+            text = stringResource(R.string.error_no_bills).uppercase(), 
+            style = MaterialTheme.typography.subtitle1, 
+            fontWeight = FontWeight.Bold,
+            color = MaterialTheme.colors.onSurface
+        )
+        Text(
+            text = stringResource(R.string.no_bills_text), 
+            modifier = Modifier.padding(16.dp),
+            style = MaterialTheme.typography.body2,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+        )
     }
 }

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

@@ -2,11 +2,12 @@ package net.helcel.cowspent.android.main
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.widget.Toast
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+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.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -46,6 +47,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.platform.LocalContext
 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.window.Dialog
@@ -57,14 +59,12 @@ import net.helcel.cowspent.android.drawer.Drawer
 import net.helcel.cowspent.android.helper.StatefulAlertDialog
 import net.helcel.cowspent.android.project.ProjectOptionsDialogContent
 import net.helcel.cowspent.android.project.ProjectShareDialogContent
-import net.helcel.cowspent.android.project.member.MemberAddDialogContent
-import net.helcel.cowspent.android.project.member.MemberEditDialogContent
-import net.helcel.cowspent.android.project.member.MemberManagementDialogContent
 import net.helcel.cowspent.android.project.settle.ProjectSettlementDialogContent
 import net.helcel.cowspent.android.statistics.ProjectStatisticsActivity
 import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.DBMember
 import net.helcel.cowspent.model.DBProject
+import net.helcel.cowspent.model.ProjectType
 import net.helcel.cowspent.model.SectionItem
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.util.IRefreshBillsListCallback
@@ -103,9 +103,12 @@ fun BillsListScreen(
 
     val pullRefreshState = rememberPullRefreshState(viewModel.isRefreshing, onRefresh)
     val context = LocalContext.current
-    val memberAlreadyExistsError = stringResource(R.string.member_already_exists)
     val sharedPreferences = remember { PreferenceManager.getDefaultSharedPreferences(context) }
     val showArchived = sharedPreferences.getBoolean(stringResource(R.string.pref_key_show_archived), false)
+    val keyBetaFeatures = stringResource(R.string.pref_key_beta_features)
+    var showBetaFeatures by remember(keyBetaFeatures) {
+        mutableStateOf(sharedPreferences.getBoolean(keyBetaFeatures, false))
+    }
 
     StatefulAlertDialog(
         state = viewModel.dialogState,
@@ -137,6 +140,10 @@ fun BillsListScreen(
                     onProjectAction(projectOptionsProjectId, 3)
                     viewModel.showProjectOptionsDialogByProjectId = null
                 },
+                onManageLabels = {
+                    onProjectAction(projectOptionsProjectId, 8)
+                    viewModel.showProjectOptionsDialogByProjectId = null
+                },
                 onStatistics = {
                     onProjectAction(projectOptionsProjectId, 4)
                     viewModel.showProjectOptionsDialogByProjectId = null
@@ -155,8 +162,10 @@ fun BillsListScreen(
                 },
                 onDismiss = { viewModel.showProjectOptionsDialogByProjectId = null },
                 isArchived = proj?.isArchived == true,
+                projectType = proj?.type ?: ProjectType.LOCAL,
                 accessLevel = proj?.myAccessLevel ?: DBProject.ACCESS_LEVEL_ADMIN,
-                isShareable = proj?.isShareable() ?: true
+                isShareable = proj?.isShareable() ?: true,
+                showBetaFeatures = showBetaFeatures
             )
         }
     }
@@ -208,114 +217,17 @@ fun BillsListScreen(
 
     val manageMembersProjectId = viewModel.showMemberManagementDialogByProjectId
     if (manageMembersProjectId != null) {
-        val members = viewModel.members // Use members from ViewModel as they are already loaded
-        Dialog(
-            onDismissRequest = { viewModel.showMemberManagementDialogByProjectId = null },
-            properties = DialogProperties(usePlatformDefaultWidth = false)
-        ) {
-            MemberManagementDialogContent(
-                members = members,
-                onAddMember = {
-                    viewModel.showAddMemberDialogByProjectId = manageMembersProjectId
-                    viewModel.showMemberManagementDialogByProjectId = null
-                },
-                onEditMember = { member ->
-                    viewModel.showEditMemberDialogByProjectId = member.id
-                    viewModel.showMemberManagementDialogByProjectId = null
-                },
-                onDismiss = { viewModel.showMemberManagementDialogByProjectId = null }
-            )
-        }
+        viewModel.showMemberManagementDialogByProjectId = null
     }
 
     val addMemberProjectId = viewModel.showAddMemberDialogByProjectId
     if (addMemberProjectId != null) {
-        Dialog(
-            onDismissRequest = { viewModel.showAddMemberDialogByProjectId = null },
-            properties = DialogProperties(usePlatformDefaultWidth = false)
-        ) {
-            MemberAddDialogContent(
-                onAdd = { memberName ->
-                    val memberNames =
-                        db.getMembersOfProject(addMemberProjectId, null).map { it.name }
-                    if (memberNames.contains(memberName)) {
-                        Toast.makeText(
-                            context,
-                            memberAlreadyExistsError,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    } else {
-                        val color = net.helcel.cowspent.android.helper.TextDrawable.getColorFromName(memberName)
-                        db.addMemberAndSync(
-                            DBMember(
-                                0,
-                                0,
-                                addMemberProjectId,
-                                memberName,
-                                true,
-                                1.0,
-                                DBBill.STATE_ADDED,
-                                android.graphics.Color.red(color),
-                                android.graphics.Color.green(color),
-                                android.graphics.Color.blue(color),
-                                null,
-                                null
-                            )
-                        )
-                        refreshCallback.refreshLists(false)
-                        viewModel.showAddMemberDialogByProjectId = null
-                        viewModel.showMemberManagementDialogByProjectId = addMemberProjectId
-                    }
-                },
-                onDismiss = { 
-                    viewModel.showAddMemberDialogByProjectId = null
-                    viewModel.showMemberManagementDialogByProjectId = addMemberProjectId
-                }
-            )
-        }
+        viewModel.showAddMemberDialogByProjectId = null
     }
 
     val editMemberId = viewModel.showEditMemberDialogByProjectId
     if (editMemberId != null) {
-        val memberToEdit = remember(editMemberId, viewModel.members) {
-            viewModel.members.find { it.id == editMemberId }
-        }
-        if (memberToEdit != null) {
-            Dialog(
-                onDismissRequest = { viewModel.showEditMemberDialogByProjectId = null },
-                properties = DialogProperties(usePlatformDefaultWidth = false)
-            ) {
-                MemberEditDialogContent(
-                    member = memberToEdit,
-                    onSave = { name, weight, isActivated, r, g, b ->
-                        db.updateMemberAndSync(
-                            memberToEdit,
-                            name,
-                            weight,
-                            isActivated,
-                            r,
-                            g,
-                            b,
-                            "",
-                            ""
-                        )
-                        refreshCallback.refreshLists(false)
-                        viewModel.showEditMemberDialogByProjectId = null
-                        viewModel.showMemberManagementDialogByProjectId = memberToEdit.projectId
-                    },
-                    onDelete = {
-                        db.deleteMember(editMemberId)
-                        refreshCallback.refreshLists(false)
-                        viewModel.showEditMemberDialogByProjectId = null
-                        viewModel.showMemberManagementDialogByProjectId = memberToEdit.projectId
-                    },
-                    onDismiss = { 
-                        viewModel.showEditMemberDialogByProjectId = null
-                        viewModel.showMemberManagementDialogByProjectId = memberToEdit.projectId
-                    }
-                )
-            }
-        }
+        viewModel.showEditMemberDialogByProjectId = null
     }
 
     val shareProjectId = viewModel.showShareDialogByProjectId
@@ -324,8 +236,8 @@ fun BillsListScreen(
             viewModel.projects.find { it.id == shareProjectId }
         }
         if (proj != null) {
-            val shareIntentTitle = stringResource(R.string.share_share_intent_title, proj.name)
-            val shareChooserTitle = stringResource(R.string.share_share_chooser_title, proj.name)
+            val shareIntentTitle = stringResource(R.string.share_intent_title, proj.name)
+            val shareChooserTitle = stringResource(R.string.share_chooser_title, proj.name)
             Dialog(
                 onDismissRequest = { viewModel.showShareDialogByProjectId = null },
                 properties = DialogProperties(usePlatformDefaultWidth = false)
@@ -358,7 +270,13 @@ fun BillsListScreen(
                         TextField(
                             value = viewModel.searchQuery,
                             onValueChange = { viewModel.searchQuery = it },
-                            placeholder = { Text(stringResource(R.string.action_search), color = MaterialTheme.colors.onPrimary.copy(alpha = 0.7f)) },
+                            placeholder = { 
+                                Text(
+                                    text = stringResource(R.string.action_search), 
+                                    color = MaterialTheme.colors.onPrimary.copy(alpha = 0.7f),
+                                    style = MaterialTheme.typography.subtitle1
+                                ) 
+                            },
                             modifier = Modifier
                                 .fillMaxWidth()
                                 .focusRequester(focusRequester),
@@ -375,14 +293,26 @@ fun BillsListScreen(
                                     isSearchExpanded = false
                                     viewModel.searchQuery = ""
                                 }) {
-                                    Icon(Icons.Default.Close, contentDescription = null, tint = MaterialTheme.colors.onPrimary)
+                                    Icon(Icons.Default.Close, contentDescription = stringResource(R.string.action_clear_search), tint = MaterialTheme.colors.onPrimary)
                                 }
                             }
                         )
                     } else {
                         Column {
-                            if (viewModel.title.isNotEmpty()) Text(viewModel.title)
-                            else Text(stringResource(R.string.app_name))
+                            if (viewModel.title.isNotEmpty()) {
+                                Text(
+                                    text = viewModel.title,
+                                    style = MaterialTheme.typography.subtitle1,
+                                    fontWeight = FontWeight.Bold
+                                )
+                            }
+                            else {
+                                Text(
+                                    text = stringResource(R.string.app_name),
+                                    style = MaterialTheme.typography.subtitle1,
+                                    fontWeight = FontWeight.Bold
+                                )
+                            }
                         }
                     }
                 },
@@ -392,19 +322,19 @@ fun BillsListScreen(
                             isSearchExpanded = false
                             viewModel.searchQuery = ""
                         }) {
-                            Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+                            Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.action_close_search))
                         }
                     } else {
                         IconButton(onClick = {
                             scope.launch { scaffoldState.drawerState.open() }
                         }) {
-                            Icon(Icons.Default.Menu, contentDescription = null)
+                            Icon(Icons.Default.Menu, contentDescription = stringResource(R.string.action_open_menu))
                         }
                     }
                 },
                 actions = {
                     if (!isSearchExpanded) {
-                        if (viewModel.hasUnlabeledBills) {
+                        if (showBetaFeatures && viewModel.hasUnlabeledBills) {
                             IconButton(onClick = onLabelBillsClick) {
                                 Icon(
                                     Icons.Default.Category,
@@ -413,7 +343,10 @@ fun BillsListScreen(
                             }
                         }
                         IconButton(onClick = { isSearchExpanded = true }) {
-                            Icon(Icons.Default.Search, contentDescription = null)
+                            Icon(
+                                Icons.Default.Search,
+                                contentDescription = stringResource(R.string.action_search)
+                            )
                         }
                     }
                 },
@@ -425,7 +358,7 @@ fun BillsListScreen(
             val selectedProject = viewModel.projects.find { it.id == viewModel.selectedProjectId }
             if (selectedProject != null && !selectedProject.isArchived) {
                 FloatingActionButton(onClick = onAddBillClick) {
-                    Icon(Icons.Default.Add, contentDescription = stringResource(R.string.action_create_bill))
+                    Icon(Icons.Default.Add, contentDescription = stringResource(R.string.action_new_bill))
                 }
             }
         },
@@ -489,6 +422,9 @@ fun BillsListScreen(
                                 is SectionItem -> SectionHeader(item.title)
                             }
                         }
+                        item {
+                            Spacer(modifier = Modifier.height(64.dp).fillMaxWidth())
+                        }
                     }
                 }
             }

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

@@ -5,6 +5,7 @@ import android.content.Intent
 import net.helcel.cowspent.R
 import net.helcel.cowspent.model.*
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
+import net.helcel.cowspent.util.CategoryUtils
 import net.helcel.cowspent.util.IRefreshBillsListCallback
 import java.text.SimpleDateFormat
 import java.util.*
@@ -65,11 +66,11 @@ object BillsListUtils {
         memberIdToName: Map<Long, String>
     ) {
         val projectName = proj.name.ifEmpty { proj.remoteId }
-        var text = context.getString(R.string.share_settle_intro, projectName) + "\n"
+        var text = context.getString(R.string.msg_settle_intro, projectName) + "\n"
         for (t in transactions) {
             val amount = round(t.amount * 100.0) / 100.0
             text += "\n" + context.getString(
-                R.string.share_settle_sentence,
+                R.string.msg_settle_sentence,
                 memberIdToName[t.owerMemberId],
                 memberIdToName[t.receiverMemberId],
                 amount
@@ -80,13 +81,14 @@ object BillsListUtils {
         shareIntent.type = "text/plain"
         shareIntent.putExtra(
             Intent.EXTRA_SUBJECT,
-            context.getString(R.string.share_settle_title, projectName)
+            context.getString(R.string.title_settle)
         )
         shareIntent.putExtra(Intent.EXTRA_TEXT, text)
         val chooserIntent = Intent.createChooser(
             shareIntent,
-            context.getString(R.string.share_settle_title, projectName)
+            context.getString(R.string.title_settle)
         )
+        chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         context.startActivity(chooserIntent)
     }
 
@@ -98,6 +100,10 @@ object BillsListUtils {
         context: Context
     ) {
         val timestamp = System.currentTimeMillis() / 1000
+        val proj = db.getProject(projectId)
+        val categories = db.getCategories(projectId)
+        val reimbursementCategoryId = CategoryUtils.getReimbursementCategoryId(categories, projectId, proj?.remoteId)
+        
         for (t in transactions) {
             val owerId = t.owerMemberId
             val receiverId = t.receiverMemberId
@@ -106,7 +112,7 @@ object BillsListUtils {
                 0, 0, projectId, owerId, amount,
                 timestamp, context.getString(R.string.settle_bill_what),
                 DBBill.STATE_ADDED, DBBill.NON_REPEATED,
-                DBBill.PAYMODE_NONE, DBBill.CATEGORY_NONE,
+                DBBill.PAYMODE_NONE, reimbursementCategoryId,
                 "", DBBill.PAYMODE_ID_NONE
             )
             bill.billOwers += DBBillOwer(0, 0, receiverId)

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

@@ -1,12 +1,11 @@
 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.SharedPreferences
 import android.content.IntentFilter
-import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
@@ -20,16 +19,13 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 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
@@ -54,11 +50,14 @@ import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.persistence.CowspentServerSyncHelper
 import net.helcel.cowspent.theme.ThemeUtils
 import net.helcel.cowspent.util.BillFormatter
+import net.helcel.cowspent.util.CategoryUtils
 import net.helcel.cowspent.util.CospendClientUtil
 import net.helcel.cowspent.util.ExportUtil
 import net.helcel.cowspent.util.ICallback
 import net.helcel.cowspent.util.IRefreshBillsListCallback
+import net.helcel.cowspent.util.SyncSettings
 import net.helcel.cowspent.util.SupportUtil
+import net.helcel.cowspent.util.VersatileProjectSyncClient
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -68,13 +67,16 @@ class BillsListViewActivity :
     AppCompatActivity(),
     IRefreshBillsListCallback {
 
-    private val viewModel: BillsListViewModel by viewModels()
+    internal val viewModel: BillsListViewModel by viewModels()
 
     companion object {
         var DEBUG = false
 
         private val TAG = BillsListViewActivity::class.java.simpleName
 
+        // Opening a project only re-syncs it if it has not synced within this window.
+        private const val SELECTED_PROJECT_SYNC_INTERVAL_MS = 60 * 1000L
+
         private const val SAVED_STATE_NAVIGATION_SELECTION = "navigationSelection"
         private const val SAVED_STATE_NAVIGATION_OPEN = "navigationOpen"
 
@@ -119,18 +121,8 @@ class BillsListViewActivity :
                 Log.d(TAG, "CREATED project id: $pid")
                 lifecycleScope.launch {
                     val addedProj = withContext(Dispatchers.IO) { db.getProject(pid) }
-                    val message: String
-                    val title: String
-                    if (created) {
-                        Log.e(TAG, "CREATED !!!")
-                        title = getString(R.string.project_create_success_title)
-                        message = getString(R.string.project_create_success_message, addedProj?.remoteId)
-                    } else {
-                        Log.e(TAG, "ADDED !!!")
-                        title = getString(R.string.project_add_success_title)
-                        message = getString(R.string.project_add_success_message, addedProj?.remoteId)
-                    }
-                    showDialog(message, title, Icons.Default.AddCircleOutline)
+                    val message = getString(R.string.msg_project_added, addedProj?.name?.ifEmpty { addedProj.remoteId } ?: pid.toString())
+                    showToast(this@BillsListViewActivity, message)
                 }
             }
         }
@@ -146,7 +138,7 @@ class BillsListViewActivity :
             }
             if (!db.cowspentServerSyncHelper.isSyncPossible) {
                 if (CowspentServerSyncHelper.isNextcloudAccountConfigured(applicationContext)) {
-                    Toast.makeText(applicationContext, getString(R.string.error_sync, getString(CospendClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG).show()
+                    showToast(this@BillsListViewActivity, getString(R.string.error_sync, getString(CospendClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG)
                 }
             }
         }
@@ -225,7 +217,7 @@ class BillsListViewActivity :
                             lifecycleScope.launch {
                                 val members = withContext(Dispatchers.IO) { db.getActivatedMembersOfProject(selectedProjectId) }
                                 if (members.isEmpty()) {
-                                    showToast(this@BillsListViewActivity, getString(R.string.add_bill_impossible_no_member))
+                                    showToast(this@BillsListViewActivity, getString(R.string.error_no_members))
                                 } else {
                                     val proj = withContext(Dispatchers.IO) { db.getProject(selectedProjectId) }
                                     val createIntent = Intent(applicationContext, EditBillActivity::class.java).apply {
@@ -259,13 +251,23 @@ class BillsListViewActivity :
                     onProjectAction = { pid, actionIndex ->
                         when (actionIndex) {
                             0 -> onEditProjectClick(pid)
-                            1 -> onRemoveProjectClick(pid)
+                            1 -> {
+                                val proj = db.getProject(pid)
+                                if (proj?.type == ProjectType.COSPEND) {
+                                    onArchiveProjectClick(pid)
+                                } else {
+                                    onRemoveProjectClick(pid)
+                                }
+                            }
                             2 -> onManageMembersClick(pid)
                             3 -> onManageCurrenciesClick(pid)
                             4 -> onProjectStatisticsClick(pid)
                             5 -> onSettleProjectClick(pid)
                             6 -> onShareProjectClick(pid)
                             7 -> onExportProjectClick(pid)
+                            8 -> {
+                                startActivity(net.helcel.cowspent.android.label.LabelManagementActivity.createIntent(this@BillsListViewActivity, pid))
+                            }
                         }
                     },
                     onAccountSwitcherClick = {
@@ -281,7 +283,7 @@ class BillsListViewActivity :
                             labelBillsLauncher.launch(LabelBillsActivity.createIntent(this, selectedProjectId))
                         }
                     },
-                    onRefresh = { synchronize(true) }
+                    onRefresh = { synchronize(SyncTrigger.MANUAL) }
                 )
             }
         }
@@ -335,10 +337,7 @@ class BillsListViewActivity :
         }
         viewModel.isRefreshing = false
 
-        if (db.cowspentServerSyncHelper.isSyncPossible) {
-            db.cowspentServerSyncHelper.addCallbackPull(syncCallBack)
-            synchronize()
-        }
+        synchronize(SyncTrigger.APP_OPEN)
 
         registerBroadcastReceiver()
         updateAvatarInDrawer(CowspentServerSyncHelper.isNextcloudAccountConfigured(this))
@@ -352,6 +351,9 @@ class BillsListViewActivity :
         } catch (_: RuntimeException) {
             if (DEBUG) Log.d(TAG, "RECEIVER PROBLEM, let's ignore it...")
         }
+        // The helper outlives the activity, and it only drains its pull callbacks when a task
+        // starts; drop ours so a paused activity is not retained by it.
+        db.cowspentServerSyncHelper.removeCallbackPull(syncCallBack)
         isActivityVisible = false
     }
 
@@ -378,7 +380,7 @@ class BillsListViewActivity :
         navigationSelection = Category(null, null)
         refreshLists(true)
 
-        synchronize()
+        synchronize(SyncTrigger.PROJECT_OPEN)
     }
 
     fun onManageProjectClick(projectId: Long) {
@@ -387,17 +389,10 @@ class BillsListViewActivity :
 
     private fun onEditProjectClick(projectId: Long) {
         if (projectId == 0L) return
-        lifecycleScope.launch {
-            val proj = withContext(Dispatchers.IO) { db.getProject(projectId) }
-            if (proj?.isLocal == false) {
-                val intent = Intent(applicationContext, EditProjectActivity::class.java).apply {
-                    putExtra(EditProjectActivity.PARAM_PROJECT_ID, projectId)
-                }
-                editProjectLauncher.launch(intent)
-            } else {
-                showToast(this@BillsListViewActivity, getString(R.string.edit_project_local_impossible))
-            }
+        val intent = Intent(applicationContext, EditProjectActivity::class.java).apply {
+            putExtra(EditProjectActivity.PARAM_PROJECT_ID, projectId)
         }
+        editProjectLauncher.launch(intent)
     }
 
     private fun onRemoveProjectClick(projectId: Long) {
@@ -406,19 +401,21 @@ class BillsListViewActivity :
             val proj = withContext(Dispatchers.IO) { db.getProject(projectId) } ?: return@launch
             
             viewModel.showDialog(
-                title = getString(R.string.confirm_remove_project_dialog_title),
-                message = if (!proj.isLocal) getString(R.string.confirm_remove_project_dialog_message) else null,
+                title = getString(R.string.title_confirm),
+                message = if (!proj.isLocal) getString(R.string.dialog_confirm_remove_project_msg) else null,
                 positiveText = getString(R.string.simple_yes),
                 onConfirm = {
                     lifecycleScope.launch {
                         withContext(Dispatchers.IO) {
                             db.deleteProject(projectId)
+                            PreferenceManager.getDefaultSharedPreferences(applicationContext)
+                                .edit { remove(lastProjectSyncKey(projectId)) }
                             val dbProjects = db.projects
                             if (dbProjects.isNotEmpty()) setSelectedProject(dbProjects[0].id) else setSelectedProject(0)
                         }
                         setupDrawerProjects()
                         refreshLists()
-                        synchronize()
+                        synchronize(SyncTrigger.PROJECT_OPEN)
                         val projectNameString = proj.name.ifEmpty { proj.remoteId }
                         showToast(this@BillsListViewActivity, getString(R.string.remove_project_confirmation, projectNameString))
                     }
@@ -428,6 +425,50 @@ class BillsListViewActivity :
         }
     }
 
+    private fun onArchiveProjectClick(projectId: Long) {
+        if (projectId == 0L) return
+        lifecycleScope.launch {
+            val proj = withContext(Dispatchers.IO) { db.getProject(projectId) } ?: return@launch
+            val isArchiving = !proj.isArchived
+
+            val localArchivedTs = if (isArchiving) System.currentTimeMillis() / 1000 else 0L
+            val remoteArchivedTs = if (isArchiving) {
+               localArchivedTs
+            } else {
+                VersatileProjectSyncClient.REMOTE_ARCHIVED_TS_UNSET
+            }
+
+            withContext(Dispatchers.IO) {
+                db.updateProject(
+                    projId = projectId,
+                    newArchivedTs = localArchivedTs
+                )
+            }
+            
+            if (!proj.isLocal) {
+                db.cowspentServerSyncHelper.editRemoteProject(
+                    projId = projectId,
+                    newArchivedTs = remoteArchivedTs,
+                    callback = object : ICallback {
+                        override fun onFinish() {}
+                        override fun onFinish(result: String, message: String) {
+                            if (message.isNotEmpty()) {
+                                showToast(this@BillsListViewActivity, getString(R.string.error_sync, message))
+                            }
+                        }
+                        override fun onScheduled() {}
+                    }
+                )
+            }
+            
+            setupDrawerProjects()
+            refreshLists()
+            
+            val msgRes = if (isArchiving) R.string.action_archive else R.string.action_unarchive
+            showToast(this@BillsListViewActivity, getString(msgRes))
+        }
+    }
+
     fun onManageMembersClick(projectId: Long) {
         if (projectId == 0L) return
         lifecycleScope.launch {
@@ -437,7 +478,7 @@ class BillsListViewActivity :
                 return@launch
             }
 
-            viewModel.showMemberManagementDialogByProjectId = projectId
+            startActivity(net.helcel.cowspent.android.project.member.MemberManagementActivity.createIntent(this@BillsListViewActivity, projectId))
         }
     }
 
@@ -464,7 +505,7 @@ class BillsListViewActivity :
         lifecycleScope.launch {
             val proj = withContext(Dispatchers.IO) { db.getProject(projectId) }
             if (projectId != 0L && proj?.isShareable() == true) viewModel.showShareDialogByProjectId = projectId
-            else showToast(this@BillsListViewActivity, getString(R.string.share_impossible), Toast.LENGTH_LONG)
+            else showToast(this@BillsListViewActivity, getString(R.string.error_share_impossible), Toast.LENGTH_LONG)
         }
     }
 
@@ -534,11 +575,13 @@ class BillsListViewActivity :
 
                 val members = db.getMembersOfProject(proj.id, null)
                 val bills = db.getBillsOfProject(proj.id)
+                val categories = db.getCategories(proj.id)
+                val reimbursementCategoryId = CategoryUtils.getReimbursementCategoryId(categories, proj.id, proj.remoteId)
                 val balances = HashMap<Long, Double>()
                 SupportUtil.getStats(
                     members, bills,
                     mutableMapOf(), balances, mutableMapOf(), mutableMapOf(),
-                    -1000, -1000, null, null
+                    -1000L, -1000L, reimbursementCategoryId, null, null
                 )
                 Triple(proj, members, balances)
             }
@@ -565,7 +608,7 @@ class BillsListViewActivity :
         } else {
             val lastSyncTimestamp = proj.lastSyncedTimestamp ?: 0
             val cal = Calendar.getInstance().apply { timeInMillis = lastSyncTimestamp * 1000 }
-            val text = getString(R.string.drawer_last_sync_text, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE))
+            val text = getString(R.string.drawer_last_sync, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE))
             viewModel.lastSyncText = text
         }
     }
@@ -605,13 +648,13 @@ class BillsListViewActivity :
                     mid == null || mid == it.payerId || it.billOwersIds.contains(mid)
                 }
 
-                viewModel.hasUnlabeledBills = bills.any { it.categoryRemoteId == 0 && it.state != DBBill.STATE_DELETED }
+                viewModel.hasUnlabeledBills = bills.any { it.categoryId == 0L && it.state != DBBill.STATE_DELETED }
 
                 val projectMembers = db.getMembersOfProject(projId, null)
                 val memberMap = projectMembers.associateBy { it.id }
 
-                val projectPaymentModes = db.getPaymentModes(projId).associateBy { it.remoteId }
-                val projectCategories = db.getCategories(projId).associateBy { it.remoteId }
+                val projectPaymentModes = db.getPaymentModes(projId).associateBy { it.id }
+                val projectCategories = db.getCategories(projId).associateBy { it.id }
 
                 BillFormatter.formatBills(
                     bills,
@@ -663,7 +706,7 @@ class BillsListViewActivity :
             lifecycleScope.launch {
                 val members = withContext(Dispatchers.IO) { db.getActivatedMembersOfProject(selectedProjectId) }
                 if (members.isEmpty()) {
-                    showToast(this@BillsListViewActivity, getString(R.string.add_bill_impossible_no_member))
+                    showToast(this@BillsListViewActivity, getString(R.string.error_no_member))
                 } else {
                     val projType = withContext(Dispatchers.IO) { db.getProject(selectedProjectId)?.type?.id }
                     val intent = Intent(applicationContext, EditBillActivity::class.java).apply {
@@ -677,15 +720,6 @@ class BillsListViewActivity :
         }
     }
 
-    private fun showDialog(msg: String, title: String, icon: ImageVector) {
-        viewModel.showDialog(
-            title = title,
-            message = msg,
-            positiveText = getString(android.R.string.ok),
-            icon = icon
-        )
-    }
-
     private fun updateUsernameInDrawer() {
         if (!CowspentServerSyncHelper.isNextcloudAccountConfigured(this)) {
             val text = getString(R.string.drawer_no_account)
@@ -726,31 +760,73 @@ class BillsListViewActivity :
         }
     }
 
-    private fun synchronize(manual: Boolean = false) {
+    /**
+     * What prompted a sync. Only [APP_OPEN] may refresh the account and every project, and only
+     * then when the SyncOnOpen interval has elapsed; the other triggers touch the selected
+     * project alone.
+     */
+    @VisibleForTesting
+    internal enum class SyncTrigger { APP_OPEN, PROJECT_OPEN, MANUAL }
+
+    @VisibleForTesting
+    internal fun synchronize(trigger: SyncTrigger) {
         val preferences = PreferenceManager.getDefaultSharedPreferences(applicationContext)
-        val offlineMode = preferences.getBoolean(getString(R.string.pref_key_offline_mode), false)
-        if (offlineMode && !manual) {
-            return
-        }
+        // isSyncPossible is networkConnected && !offlineMode, so offline mode is already covered
+        // here - including for a manual refresh, which cannot currently override it.
+        if (!db.cowspentServerSyncHelper.isSyncPossible) return
+
+        val selectedProjectId = preferences.getLong("selected_project", 0)
+        val now = System.currentTimeMillis()
+
+        // The account and all-projects refresh belongs to opening the app, throttled by the
+        // SyncOnOpen interval so that resuming within the interval does not repeat it.
+        val intervalMinutes = SyncSettings.intervalMinutes(applicationContext)
+        val lastAccountSync = preferences.getLong(getString(R.string.pref_key_last_account_sync_timestamp), 0L)
+        val accountSyncDue = trigger == SyncTrigger.APP_OPEN &&
+            now - lastAccountSync > intervalMinutes * 60 * 1000L
+
+        lifecycleScope.launch {
+            val remoteProjects = withContext(Dispatchers.IO) { db.projects }
+                .filter { !it.isLocal && !it.isArchived }
 
-        if (db.cowspentServerSyncHelper.isSyncPossible) {
             viewModel.isRefreshing = true
-            val selectedProjectId = PreferenceManager.getDefaultSharedPreferences(applicationContext).getLong("selected_project", 0)
-            if (selectedProjectId != 0L) {
-                lifecycleScope.launch {
-                    val proj = withContext(Dispatchers.IO) { db.getProject(selectedProjectId) }
-                    if (proj != null && !proj.isLocal) {
-                        db.cowspentServerSyncHelper.addCallbackPull(syncCallBack)
-                        db.cowspentServerSyncHelper.scheduleSync(false, selectedProjectId)
-                    } else viewModel.isRefreshing = false
+            db.cowspentServerSyncHelper.addCallbackPull(syncCallBack)
+
+            val started = if (accountSyncDue) {
+                if (CowspentServerSyncHelper.isNextcloudAccountConfigured(applicationContext)) {
+                    db.cowspentServerSyncHelper.runAccountProjectsSync()
                 }
-            } else viewModel.isRefreshing = false
-            if (CowspentServerSyncHelper.isNextcloudAccountConfigured(applicationContext)) {
-                db.cowspentServerSyncHelper.runAccountProjectsSync()
+                remoteProjects.count {
+                    val scheduled = db.cowspentServerSyncHelper.scheduleSync(false, it, false) != null
+                    if (scheduled) markProjectSynced(preferences, it.id, now)
+                    scheduled
+                }
+            } else {
+                val selectedProj = remoteProjects.find { it.id == selectedProjectId }
+                val lastSync = preferences.getLong(lastProjectSyncKey(selectedProjectId), 0L)
+                val due = trigger == SyncTrigger.MANUAL ||
+                    now - lastSync > SELECTED_PROJECT_SYNC_INTERVAL_MS
+                if (selectedProj != null && due &&
+                    db.cowspentServerSyncHelper.scheduleSync(
+                        false, selectedProj, trigger == SyncTrigger.MANUAL
+                    ) != null
+                ) {
+                    markProjectSynced(preferences, selectedProj.id, now)
+                    1
+                } else 0
             }
+
+            // Only a task that actually started reports back through syncCallBack, so clear
+            // the indicator here when none did - nothing else would.
+            if (started == 0) viewModel.isRefreshing = false
         }
     }
 
+    private fun lastProjectSyncKey(projectId: Long) = "lastProjectSyncTimestamp_$projectId"
+    private fun markProjectSynced(preferences: SharedPreferences, projectId: Long, at: Long) {
+        preferences.edit { putLong(lastProjectSyncKey(projectId), at) }
+    }
+
     private fun registerBroadcastReceiver() {
         val filter = IntentFilter().apply {
             addAction(MainConstants.BROADCAST_PROJECT_SYNC_FAILED)
@@ -777,8 +853,8 @@ class BillsListViewActivity :
                         lifecycleScope.launch {
                             val project = withContext(Dispatchers.IO) { db.getProject(projectId) } ?: return@launch
                             viewModel.showDialog(
-                                title = getString(R.string.sync_error_dialog_title),
-                                message = getString(R.string.sync_error_dialog_full_content, project.name, errorMessage),
+                                title = getString(R.string.dialog_sync_error_title),
+                                message = getString(R.string.dialog_sync_error_msg, project.name, errorMessage),
                                 positiveText = getString(R.string.simple_close),
                                 icon = Icons.Default.Sync
                             )
@@ -790,7 +866,7 @@ class BillsListViewActivity :
                     refreshLists()
                 }
                 MainConstants.BROADCAST_SYNC_PROJECT -> {
-                    synchronize()
+                    synchronize(SyncTrigger.PROJECT_OPEN)
                 }
                 MainConstants.BROADCAST_NETWORK_AVAILABLE -> {
                 }
@@ -798,7 +874,7 @@ class BillsListViewActivity :
                 }
                 MainConstants.BROADCAST_SSO_TOKEN_MISMATCH -> {
                     viewModel.showDialog(
-                        title = getString(R.string.sync_error_dialog_title),
+                        title = getString(R.string.dialog_sync_error_title),
                         message = getString(R.string.error_token_mismatch),
                         positiveText = getString(R.string.simple_close),
                         icon = Icons.Default.Sync
@@ -818,7 +894,7 @@ class BillsListViewActivity :
                             refreshLists()
                             if (db.cowspentServerSyncHelper.isSyncPossible) {
                                 db.cowspentServerSyncHelper.addCallbackPull(syncCallBack)
-                                synchronize()
+                                synchronize(SyncTrigger.PROJECT_OPEN)
                             }
                         }
                     }

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

@@ -17,8 +17,6 @@ object MainConstants {
     const val BROADCAST_AVATAR_UPDATED = "net.helcel.cowspent.broadcast.avatar_updated"
     const val BROADCAST_AVATAR_UPDATED_MEMBER = "net.helcel.cowspent.broadcast.avatar_updated_for_member"
 
-    const val MAIN_CHANNEL_ID = 1234567890
-
     const val PARAM_DIALOG_CONTENT = "net.helcel.cowspent.PARAM_DIALOG_CONTENT"
     const val PARAM_PROJECT_TO_SELECT = "net.helcel.cowspent.PARAM_PROJECT_TO_SELECT"
 

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

@@ -114,16 +114,18 @@ object ProjectImportHelper {
                                 }
                                 else -> 0
                             }
-                            val payerName = if (columns.containsKey("payer_name")) line[columns["payer_name"]!!] else ""
+                            val payerName = if (columns.containsKey("payer_name")) line[columns["payer_name"]!!].trim() else ""
                             val payerWeight = if (columns.containsKey("payer_weight")) line[columns["payer_weight"]!!].toDouble() else 1.0
                             val owersStr = if (columns.containsKey("owers")) line[columns["owers"]!!] else ""
                             val payerActive = columns.containsKey("payer_active") && line[columns["payer_active"]!!] == "1"
-                            val catId = if (columns.containsKey("categoryid") && line[columns["categoryid"]!!].isNotEmpty()) line[columns["categoryid"]!!].toInt() else 0
-                            val pmId = if (columns.containsKey("paymentmodeid") && line[columns["paymentmodeid"]!!].isNotEmpty()) line[columns["paymentmodeid"]!!].toInt() else 0
+                            val catId = if (columns.containsKey("categoryid") && line[columns["categoryid"]!!].isNotEmpty()) line[columns["categoryid"]!!].toLong() else 0L
+                            val pmId = if (columns.containsKey("paymentmodeid") && line[columns["paymentmodeid"]!!].isNotEmpty()) line[columns["paymentmodeid"]!!].toLong() else 0L
                             val pm = if (columns.containsKey("paymentmode")) line[columns["paymentmode"]!!] else null
                             
-                            membersActive[payerName] = payerActive
-                            membersWeight[payerName] = payerWeight
+                            if (payerName.isNotEmpty()) {
+                                membersActive[payerName] = payerActive
+                                membersWeight[payerName] = payerWeight
+                            }
                             
                             if (owersStr.trim().isEmpty()) {
                                 onError(context.getString(R.string.import_error_owers, row))
@@ -132,10 +134,10 @@ object ProjectImportHelper {
                             
                             if (what != "deleteMeIfYouWant") {
                                 billRemoteIdToOwerStr[row.toLong()] = owersStr
-                                val owersArray = owersStr.split(", ").filter { it.isNotEmpty() }
+                                val owersArray = owersStr.split(",").map { it.trim() }.filter { it.isNotEmpty() }
                                 for (ower in owersArray) {
-                                    if (!membersWeight.containsKey(ower.trim())) {
-                                        membersWeight[ower.trim()] = 1.0
+                                    if (!membersWeight.containsKey(ower)) {
+                                        membersWeight[ower] = 1.0
                                     }
                                 }
                                 bills.add(DBBill(0, row.toLong(), 0, 0, amount, timestamp, what, DBBill.STATE_OK, "n", pm, catId, comment, pmId))
@@ -149,9 +151,20 @@ object ProjectImportHelper {
             
             val memberNameToId = mutableMapOf<String, Long>()
             val pid = db.addProject(DBProject(0, projectRemoteId, "", projectRemoteId, null, null, null, ProjectType.LOCAL, 0L, mainCurrencyName, false, DBProject.ACCESS_LEVEL_UNKNOWN, null))
+            // addProject only inserts a subset of the row, currency not among it, so the main
+            // currency the file declared has to be written separately or it is lost.
+            if (mainCurrencyName != null) db.updateProject(pid, newCurrencyName = mainCurrencyName)
 
-            paymentModes.forEach { db.addPaymentMode(DBPaymentMode(0, it.remoteId, pid, it.name, it.icon, it.color)) }
-            categories.forEach { db.addCategory(DBCategory(0, it.remoteId, pid, it.name, it.icon, it.color)) }
+            val pmRemoteToLocal = mutableMapOf<Long, Long>()
+            paymentModes.forEach {
+                val newId = db.addPaymentMode(DBPaymentMode(0, it.remoteId, pid, it.name, it.icon, it.color))
+                pmRemoteToLocal[it.remoteId] = newId
+            }
+            val catRemoteToLocal = mutableMapOf<Long, Long>()
+            categories.forEach {
+                val newId = db.addCategory(DBCategory(0, it.remoteId, pid, it.name, it.icon, it.color))
+                catRemoteToLocal[it.remoteId] = newId
+            }
             currencies.forEach { db.addCurrency(DBCurrency(0, 0, pid, it.name, it.exchangeRate, DBBill.STATE_OK)) }
             
             membersWeight.keys.forEach { mName ->
@@ -160,9 +173,11 @@ object ProjectImportHelper {
             
             bills.forEach { b ->
                 val payerId = memberNameToId[billRemoteIdToPayerName[b.remoteId]] ?: 0L
-                val billId = db.addBill(DBBill(0, 0, pid, payerId, b.amount, b.timestamp, b.what, DBBill.STATE_OK, b.repeat, b.paymentMode, b.categoryRemoteId, b.comment, b.paymentModeRemoteId))
-                billRemoteIdToOwerStr[b.remoteId]?.split(", ")?.filter { it.isNotEmpty() }?.forEach { ower ->
-                    memberNameToId[ower.trim()]?.let { owerId -> db.addBillower(billId, owerId) }
+                val localCatId = catRemoteToLocal[b.categoryId] ?: 0L
+                val localPmId = pmRemoteToLocal[b.paymentModeId] ?: 0L
+                val billId = db.addBill(DBBill(0, 0, pid, payerId, b.amount, b.timestamp, b.what, DBBill.STATE_OK, b.repeat, b.paymentMode, localCatId, b.comment, localPmId))
+                billRemoteIdToOwerStr[b.remoteId]?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }?.forEach { ower ->
+                    memberNameToId[ower]?.let { owerId -> db.addBillower(billId, owerId) }
                 }
             }
             onSuccess(pid)

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

@@ -4,19 +4,21 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Label
 import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import net.helcel.cowspent.R
-
 import net.helcel.cowspent.model.DBProject
+import net.helcel.cowspent.model.ProjectType
 
 @Composable
 fun ProjectOptionsDialogContent(
@@ -24,14 +26,17 @@ fun ProjectOptionsDialogContent(
     onRemoveProject: () -> Unit,
     onManageMembers: () -> Unit,
     onManageCurrencies: () -> Unit,
+    onManageLabels: () -> Unit,
     onStatistics: () -> Unit,
     onSettle: () -> Unit,
     onShareProject: () -> Unit,
     onExportProject: () -> Unit,
     onDismiss: () -> Unit,
     isArchived: Boolean = false,
+    projectType: ProjectType = ProjectType.LOCAL,
     accessLevel: Int = DBProject.ACCESS_LEVEL_ADMIN,
-    isShareable: Boolean = true
+    isShareable: Boolean = true,
+    showBetaFeatures: Boolean = false
 ) {
     Surface(
         shape = MaterialTheme.shapes.large,
@@ -44,46 +49,71 @@ fun ProjectOptionsDialogContent(
                 .fillMaxWidth()
         ) {
             Text(
-                text = stringResource(R.string.choose_project_management_action),
-                style = MaterialTheme.typography.h6,
+                text = stringResource(R.string.choose_project_management_action).uppercase(),
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface,
                 modifier = Modifier.padding(bottom = 8.dp)
             )
 
-            val options = mutableListOf<ProjectOption>()
             val isMaintainer = accessLevel >= DBProject.ACCESS_LEVEL_MAINTAINER || accessLevel == DBProject.ACCESS_LEVEL_UNKNOWN
             val isParticipant = accessLevel >= DBProject.ACCESS_LEVEL_PARTICIPANT || accessLevel == DBProject.ACCESS_LEVEL_UNKNOWN
 
+            val row1 = mutableListOf<ProjectOption>()
+            val row2 = mutableListOf<ProjectOption>()
+            val row3 = mutableListOf<ProjectOption>()
+
             if (!isArchived && isMaintainer) {
-                options.add(ProjectOption(stringResource(R.string.action_edit_project), Icons.Default.Edit, onEditProject))
-            }
-            options.add(ProjectOption(stringResource(R.string.fab_rm_project), Icons.Default.Delete, onRemoveProject))
-            if (!isArchived && isMaintainer) {
-                options.add(ProjectOption(stringResource(R.string.fab_manage_members), Icons.Default.Group, onManageMembers))
-                options.add(ProjectOption(stringResource(R.string.fab_manage_currencies), Icons.Default.MonetizationOn, onManageCurrencies))
-            }
-            options.add(ProjectOption(stringResource(R.string.fab_statistics), Icons.Default.BarChart, onStatistics))
-            if (!isArchived && isParticipant) {
-                options.add(ProjectOption(stringResource(R.string.fab_settle), Icons.Default.Handshake, onSettle))
+                row1.add(ProjectOption(stringResource(R.string.action_edit), Icons.Default.Edit, onEditProject))
             }
             if (isShareable && isParticipant) {
-                options.add(ProjectOption(stringResource(R.string.action_share_project), Icons.Default.Share, onShareProject))
+                row1.add(ProjectOption(stringResource(R.string.action_share), Icons.Default.Share, onShareProject))
+            }
+            if (projectType == ProjectType.COSPEND) {
+                val archiveLabel = if (isArchived) stringResource(R.string.action_unarchive) else stringResource(R.string.action_archive)
+                val archiveIcon = if (isArchived) Icons.Default.Unarchive else Icons.Default.Archive
+                row1.add(ProjectOption(archiveLabel, archiveIcon, onRemoveProject))
+            } else {
+                row1.add(ProjectOption(stringResource(R.string.action_delete), Icons.Default.Delete, onRemoveProject))
             }
-            options.add(ProjectOption(stringResource(R.string.fab_export_project), Icons.Default.Download, onExportProject))
 
-            // Simple 2-column grid using Rows
-            for (i in options.indices step 2) {
-                Row(modifier = Modifier.fillMaxWidth()) {
-                    ProjectOptionItem(
-                        option = options[i],
-                        modifier = Modifier.weight(1f)
-                    )
-                    if (i + 1 < options.size) {
+            // Row 2: Manage Member, Manage Labels, Manage Currencies
+            if (!isArchived && isMaintainer) {
+                row2.add(ProjectOption(stringResource(R.string.action_members), Icons.Default.Group, onManageMembers))
+                if (showBetaFeatures && (projectType == ProjectType.LOCAL || projectType == ProjectType.COSPEND)) {
+                    row2.add(ProjectOption(stringResource(R.string.action_labels), Icons.AutoMirrored.Filled.Label, onManageLabels))
+                }
+                row2.add(ProjectOption(stringResource(R.string.action_currencies), Icons.Default.MonetizationOn, onManageCurrencies))
+            }
+
+            // Row 3: Statistics, Settle, Export
+            row3.add(ProjectOption(stringResource(R.string.action_stats), Icons.Default.BarChart, onStatistics))
+            if (!isArchived && isParticipant) {
+                row3.add(ProjectOption(stringResource(R.string.action_settle), Icons.Default.Handshake, onSettle))
+            }
+            row3.add(ProjectOption(stringResource(R.string.action_export), Icons.Default.Download, onExportProject))
+
+            val allRows = listOf(row1, row2, row3).filter { it.isNotEmpty() }
+
+            allRows.forEach { rowOptions ->
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    val emptySpace = 3 - rowOptions.size
+                    if (emptySpace > 0) {
+                        Spacer(modifier = Modifier.weight(emptySpace / 2f))
+                    }
+
+                    rowOptions.forEach { option ->
                         ProjectOptionItem(
-                            option = options[i + 1],
+                            option = option,
                             modifier = Modifier.weight(1f)
                         )
-                    } else {
-                        Spacer(modifier = Modifier.weight(1f))
+                    }
+
+                    if (emptySpace > 0) {
+                        Spacer(modifier = Modifier.weight(emptySpace / 2f))
                     }
                 }
             }
@@ -145,12 +175,64 @@ fun ProjectOptionsDialogPreview() {
             onManageCurrencies = {},
             onStatistics = {},
             onSettle = {},
+            onManageLabels = {},
             onShareProject = {},
             onExportProject = {},
             onDismiss = {},
             isArchived = false,
+            projectType = ProjectType.COSPEND,
             accessLevel = DBProject.ACCESS_LEVEL_ADMIN,
-            isShareable = true
+            isShareable = true,
+            showBetaFeatures = true
+        )
+    }
+}
+
+
+@Preview(showBackground = true)
+@Composable
+fun ProjectOptionsDialogPreview2() {
+    MaterialTheme {
+        ProjectOptionsDialogContent(
+            onEditProject = {},
+            onRemoveProject = {},
+            onManageMembers = {},
+            onManageCurrencies = {},
+            onStatistics = {},
+            onSettle = {},
+            onManageLabels = {},
+            onShareProject = {},
+            onExportProject = {},
+            onDismiss = {},
+            isArchived = true,
+            projectType = ProjectType.COSPEND,
+            accessLevel = DBProject.ACCESS_LEVEL_ADMIN,
+            isShareable = true,
+            showBetaFeatures = true
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun ProjectOptionsDialogPreview3() {
+    MaterialTheme {
+        ProjectOptionsDialogContent(
+            onEditProject = {},
+            onRemoveProject = {},
+            onManageMembers = {},
+            onManageCurrencies = {},
+            onStatistics = {},
+            onSettle = {},
+            onManageLabels = {},
+            onShareProject = {},
+            onExportProject = {},
+            onDismiss = {},
+            isArchived = false,
+            projectType = ProjectType.LOCAL,
+            accessLevel = DBProject.ACCESS_LEVEL_ADMIN,
+            isShareable = true,
+            showBetaFeatures = true
         )
     }
 }

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

@@ -11,6 +11,7 @@ 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.heightIn
@@ -31,8 +32,6 @@ import androidx.compose.material.Text
 import androidx.compose.material.contentColorFor
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ContentCopy
-import androidx.compose.material.icons.filled.Link
-import androidx.compose.material.icons.filled.QrCode
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -42,10 +41,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
@@ -69,7 +66,7 @@ fun ProjectShareDialogContent(
 ) {
     val context = LocalContext.current
     val clipboardManager = LocalClipboardManager.current
-    val qrCodeLinkWarn = stringResource(R.string.qrcode_link_open_attempt_warning)
+    val qrCodeLinkWarn = stringResource(R.string.msg_share_qr_warn)
     
     val shareUrl = remember { proj.getShareUrl() }
     val publicWebUrl = remember { proj.getPublicWebUrl() }
@@ -93,35 +90,24 @@ fun ProjectShareDialogContent(
                 .heightIn(max = 650.dp)
                 .padding(16.dp)
         ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.padding(bottom =  8.dp)
-            ) {
-                Icon(
-                    Icons.Default.Share,
-                    contentDescription = null,
-                    tint = MaterialTheme.colors.primary,
-                    modifier = Modifier.size(24.dp)
-                )
-                Spacer(modifier = Modifier.width(12.dp))
-                Text(
-                    text = stringResource(R.string.share_dialog_title),
-                    style = MaterialTheme.typography.h6,
-                    fontWeight = FontWeight.Bold
-                )
-            }
+            Text(
+                text = stringResource(R.string.title_share).uppercase(),
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface,
+                modifier = Modifier.padding(bottom = 16.dp)
+            )
 
             Column(
                 modifier = Modifier
                     .weight(1f, fill = false)
                     .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
+                verticalArrangement = Arrangement.spacedBy(24.dp)
             ) {
                 ShareCard(
-                    title = stringResource(R.string.share_project_public_url_title),
+                    title = stringResource(R.string.title_share_web),
                     url = publicWebUrl,
-                    description = stringResource(R.string.share_project_public_url_dialog_message),
-                    icon = Icons.Default.Link,
+                    description = stringResource(R.string.msg_share_web),
                     onUrlClick = {
                         val i = Intent(Intent.ACTION_VIEW).apply {
                             data = publicWebUrl.toUri()
@@ -130,22 +116,21 @@ fun ProjectShareDialogContent(
                     },
                     onCopyClick = {
                         clipboardManager.setText(AnnotatedString(publicWebUrl))
-                        Toast.makeText(context, "Link copied to clipboard", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(context, R.string.msg_link_copied, Toast.LENGTH_SHORT).show()
                     }
                 )
 
                 ShareCard(
-                    title = stringResource(R.string.share_project_public_qrcode_title),
+                    title = stringResource(R.string.title_share_qr),
                     url = shareUrl,
-                    description = stringResource(R.string.share_project_dialog_message),
-                    icon = Icons.Default.QrCode,
+                    description = stringResource(R.string.msg_share_qr),
                     qrBitmap = qrBitmap,
                     onUrlClick = {
                         Toast.makeText(context, qrCodeLinkWarn, Toast.LENGTH_SHORT).show()
                     },
                     onCopyClick = {
                         clipboardManager.setText(AnnotatedString(shareUrl))
-                        Toast.makeText(context, "Link copied to clipboard", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(context, R.string.msg_link_copied, Toast.LENGTH_SHORT).show()
                     }
                 )
             }
@@ -165,43 +150,31 @@ private fun ShareCard(
     title: String,
     url: String,
     description: String,
-    icon: ImageVector,
     onUrlClick: () -> Unit,
     onCopyClick: () -> Unit,
     qrBitmap: Bitmap? = null
 ) {
-    Surface(
-        shape = MaterialTheme.shapes.medium,
-        color = colorResource(R.color.fg_default_low).copy(alpha = 0.04f),
+    Column(
         modifier = Modifier.fillMaxWidth()
     ) {
-        Column(
-            modifier = Modifier.padding(8.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Icon(
-                    imageVector = icon,
-                    contentDescription = null,
-                    modifier = Modifier.size(18.dp),
-                    tint = MaterialTheme.colors.primary.copy(alpha = 0.7f)
-                )
-                Spacer(modifier = Modifier.width(8.dp))
-                Text(
-                    text = title,
-                    style = MaterialTheme.typography.subtitle2,
-                    fontWeight = FontWeight.Bold,
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.8f)
-                )
-            }
+        Text(
+            text = title.uppercase(),
+            style = MaterialTheme.typography.subtitle1,
+            fontWeight = FontWeight.Bold,
+            color = MaterialTheme.colors.onSurface,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
 
-            if (qrBitmap != null) {
-                Spacer(modifier = Modifier.height(8.dp))
+        if (qrBitmap != null) {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 12.dp),
+                contentAlignment = Alignment.Center
+            ) {
                 Box(
-                    modifier = Modifier.size(128.dp)
+                    modifier = Modifier
+                        .size(128.dp)
                         .clip(MaterialTheme.shapes.small)
                         .background(Color.White),
                     contentAlignment = Alignment.Center
@@ -209,55 +182,53 @@ private fun ShareCard(
                     Image(
                         bitmap = qrBitmap.asImageBitmap(),
                         contentDescription = null,
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxSize()
                     )
                 }
             }
+        }
 
-            Spacer(modifier = Modifier.height(8.dp))
-
-            Surface(
-                shape = MaterialTheme.shapes.small,
-                color = MaterialTheme.colors.surface,
-                modifier = Modifier.fillMaxWidth()
+        Surface(
+            shape = MaterialTheme.shapes.small,
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.05f),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Row(
+                modifier = Modifier
+                    .clickable { onUrlClick() }
+                    .padding(start = 12.dp, end = 4.dp),
+                verticalAlignment = Alignment.CenterVertically
             ) {
-                Row(
-                    modifier = Modifier
-                        .clickable { onUrlClick() }
-                        .padding(start = 12.dp, end = 4.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = url,
-                        modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.primary,
-                        style = MaterialTheme.typography.body2,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        fontWeight = FontWeight.Medium
+                Text(
+                    text = url,
+                    modifier = Modifier.weight(1f),
+                    color = MaterialTheme.colors.primary,
+                    style = MaterialTheme.typography.body2,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    fontWeight = FontWeight.Medium
+                )
+                IconButton(onClick = onCopyClick) {
+                    Icon(
+                        Icons.Default.ContentCopy,
+                        contentDescription = "Copy",
+                        modifier = Modifier.size(18.dp),
+                        tint = MaterialTheme.colors.onSurface.copy(alpha = 0.4f)
                     )
-                    IconButton(onClick = onCopyClick) {
-                        Icon(
-                            Icons.Default.ContentCopy,
-                            contentDescription = "Copy",
-                            modifier = Modifier.size(18.dp),
-                            tint = colorResource(R.color.fg_default_low)
-                        )
-                    }
                 }
             }
+        }
 
-            Spacer(modifier = Modifier.height(12.dp))
+        Spacer(modifier = Modifier.height(4.dp))
 
-            CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
-                Text(
-                    text = description,
-                    style = MaterialTheme.typography.caption,
-                    textAlign = TextAlign.Center,
-                    lineHeight = 16.sp,
-                    modifier = Modifier.padding(horizontal = 8.dp)
-                )
-            }
+        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+            Text(
+                text = description,
+                style = MaterialTheme.typography.caption,
+                textAlign = TextAlign.Start,
+                lineHeight = 16.sp,
+                modifier = Modifier.padding(horizontal = 4.dp)
+            )
         }
     }
 }
@@ -291,7 +262,7 @@ private fun DialogActions(
                 Icon(Icons.Default.Share, contentDescription = null, modifier = Modifier.size(16.dp))
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
-                    text = stringResource(R.string.simple_share_share).uppercase(),
+                    text = stringResource(R.string.action_share).uppercase(),
                     style = MaterialTheme.typography.button,
                     fontWeight = FontWeight.Bold
                 )

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

@@ -10,10 +10,8 @@ import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import net.helcel.cowspent.R
@@ -31,7 +29,7 @@ import net.helcel.cowspent.android.project.ProjectImportHelper
 
 class NewProjectActivity : AppCompatActivity() {
 
-    private val viewModel: NewProjectViewModel by viewModels()
+    internal val viewModel: NewProjectViewModel by viewModels()
     private lateinit var db: CowspentSQLiteOpenHelper
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -57,9 +55,6 @@ class NewProjectActivity : AppCompatActivity() {
                             .setAction(Intent.ACTION_GET_CONTENT)
                         importFileLauncher.launch(Intent.createChooser(intent, "Select a file"))
                     },
-                    onChooseFromNextcloud = {
-                        chooseFromNextcloud()
-                    },
                     onOkPressed = { onPressOk() },
                     onBack = { finish() },
                     onFieldsChanged = { updateAuthStatus() }
@@ -130,19 +125,6 @@ class NewProjectActivity : AppCompatActivity() {
             }
         }
 
-    private fun chooseFromNextcloud() {
-        lifecycleScope.launch {
-            val accountProjects = withContext(Dispatchers.IO) { db.accountProjects }
-            if (accountProjects.isEmpty()) {
-                showToast(getString(R.string.choose_account_project_dialog_impossible), Toast.LENGTH_LONG)
-                return@launch
-            }
-
-            viewModel.nextcloudProjects = accountProjects
-            viewModel.showNextcloudProjectDialog = true
-        }
-    }
-
     private fun updateAuthStatus() {
         val url = getFormattedUrl()
         val fakeProj = DBProject(
@@ -154,27 +136,7 @@ class NewProjectActivity : AppCompatActivity() {
         viewModel.isAuthenticatedAccount = db.cowspentServerSyncHelper.canCreateAuthenticatedProject(fakeProj)
     }
 
-    private fun onPressOk() {
-        val type = viewModel.projectType
-        val todoCreate = viewModel.whatTodoIsCreate
-        val url = getFormattedUrl()
-
-        val fakeProj = DBProject(
-            0, "", "", "", url,
-            "", 0L, type, 0L,
-            null, false, DBProject.ACCESS_LEVEL_UNKNOWN,
-            ""
-        )
-
-        if (isValidUrl(url) && todoCreate && ProjectType.COSPEND == type &&
-            db.cowspentServerSyncHelper.canCreateAuthenticatedProject(fakeProj) &&
-            !viewModel.showAuthWarningDialog // Avoid infinite loop
-        ) {
-            viewModel.showAuthWarningDialog = true
-        } else {
-            createProject()
-        }
-    }
+    private fun onPressOk() = createProject()
 
     private fun getFormattedUrl(): String {
         var url = viewModel.projectUrl.trim()
@@ -213,7 +175,7 @@ class NewProjectActivity : AppCompatActivity() {
 
         val rid = viewModel.projectId
         if (!isCospendScheme && (rid == "" || rid.contains(",") || rid.contains("/"))) {
-            showToast(getString(R.string.error_invalid_project_remote_id), Toast.LENGTH_LONG)
+            showToast(getString(R.string.error_invalid_project_id), Toast.LENGTH_LONG)
             return
         }
 
@@ -320,7 +282,6 @@ class NewProjectActivity : AppCompatActivity() {
                 pid
             )
         }
-        showToast(getString(R.string.project_added_success), Toast.LENGTH_LONG)
         return pid
     }
 

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

@@ -3,7 +3,6 @@ package net.helcel.cowspent.android.project.create
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -19,6 +18,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 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
@@ -30,7 +30,6 @@ fun NewProjectScreen(
     viewModel: NewProjectViewModel,
     onScanQrCode: () -> Unit,
     onImportFile: () -> Unit,
-    onChooseFromNextcloud: () -> Unit,
     onOkPressed: () -> Unit,
     onBack: () -> Unit,
     onFieldsChanged: () -> Unit
@@ -42,7 +41,7 @@ fun NewProjectScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.action_add_project)) },
+                title = { Text(stringResource(R.string.title_add_project)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
@@ -55,7 +54,7 @@ fun NewProjectScreen(
         floatingActionButton = {
             if (viewModel.isFormValid()) {
                 FloatingActionButton(onClick = onOkPressed) {
-                    Icon(Icons.Default.Done, contentDescription = stringResource(R.string.action_save_bill))
+                    Icon(Icons.Default.Done, contentDescription = stringResource(R.string.action_save))
                 }
             }
         }
@@ -70,11 +69,11 @@ fun NewProjectScreen(
         ) {
             // What to do
             SectionRow(
-                label = stringResource(R.string.new_project_what_todo)
+                label = stringResource(R.string.new_project_action)
             ) {
                 Row {
                     ToggleButton(
-                        text = stringResource(R.string.todo_join_label),
+                        text = stringResource(R.string.todo_join),
                         selected = !viewModel.whatTodoIsCreate,
                         onClick = {
                             viewModel.whatTodoIsCreate = false
@@ -84,7 +83,7 @@ fun NewProjectScreen(
                     )
                     Spacer(modifier = Modifier.width(8.dp))
                     ToggleButton(
-                        text = stringResource(R.string.todo_create_label),
+                        text = stringResource(R.string.todo_create),
                         selected = viewModel.whatTodoIsCreate,
                         onClick = { viewModel.whatTodoIsCreate = true }
                     )
@@ -99,20 +98,20 @@ fun NewProjectScreen(
                 Row {
                     if (viewModel.whatTodoIsCreate) {
                         ToggleButton(
-                            text = stringResource(R.string.where_local_short),
+                            text = stringResource(R.string.where_local),
                             selected = viewModel.projectType == ProjectType.LOCAL,
                             onClick = { viewModel.projectType = ProjectType.LOCAL }
                         )
                         Spacer(modifier = Modifier.width(8.dp))
                     }
                     ToggleButton(
-                        text = stringResource(R.string.where_cospend_short),
+                        text = stringResource(R.string.where_cospend),
                         selected = viewModel.projectType == ProjectType.COSPEND,
                         onClick = { viewModel.projectType = ProjectType.COSPEND }
                     )
                     Spacer(modifier = Modifier.width(8.dp))
                     ToggleButton(
-                        text = stringResource(R.string.where_ihatemoney_short),
+                        text = stringResource(R.string.where_ihatemoney),
                         selected = viewModel.projectType == ProjectType.IHATEMONEY,
                         onClick = { viewModel.projectType = ProjectType.IHATEMONEY }
                     )
@@ -121,13 +120,7 @@ fun NewProjectScreen(
             Spacer(modifier = Modifier.height(8.dp))
 
             if (viewModel.whatTodoIsCreate) {
-                if (viewModel.projectType == ProjectType.COSPEND) {
-                    Button(
-                        onClick = onChooseFromNextcloud
-                    ) {
-                        Text(stringResource(R.string.new_project_from_nextcloud_tooltip))
-                    }
-                } else if (viewModel.projectType == ProjectType.LOCAL) {
+                if (viewModel.projectType == ProjectType.LOCAL) {
                     Button(
                         onClick = onImportFile
                     ) {
@@ -137,7 +130,7 @@ fun NewProjectScreen(
             } else {
                 Spacer(modifier = Modifier.width(16.dp))
                 Button(onClick = onScanQrCode) {
-                    Text(text = stringResource(R.string.scan_qrcode))
+                    Text(text = stringResource(R.string.action_scan_qrcode))
                     Spacer(modifier = Modifier.width(4.dp))
                     Icon(
                         Icons.Default.QrCode2,
@@ -154,13 +147,8 @@ fun NewProjectScreen(
                 OutlinedTextField(
                     value = viewModel.projectUrl,
                     onValueChange = { viewModel.projectUrl = it },
-                    label = {
-                        Text(
-                            stringResource(
-                                if (viewModel.projectType == ProjectType.COSPEND) R.string.setting_cospend_project_url
-                                else R.string.setting_ihatemoney_project_url
-                            )
-                        )
+                    placeholder = {
+                        Text(stringResource(R.string.label_url))
                     },
                     modifier = Modifier.fillMaxWidth(),
                     leadingIcon = { Icon(Icons.Default.Link, contentDescription = null) }
@@ -172,7 +160,7 @@ fun NewProjectScreen(
                 OutlinedTextField(
                     value = viewModel.projectId,
                     onValueChange = { viewModel.projectId = it },
-                    label = { Text(stringResource(R.string.setting_project_id)) },
+                    placeholder = { Text(stringResource(R.string.label_project_id)) },
                     modifier = Modifier.fillMaxWidth(),
                     leadingIcon = { Icon(Icons.AutoMirrored.Filled.LibraryBooks, contentDescription = null) }
                 )
@@ -183,7 +171,7 @@ fun NewProjectScreen(
                 OutlinedTextField(
                     value = viewModel.projectPassword,
                     onValueChange = { viewModel.projectPassword = it },
-                    label = { Text(stringResource(R.string.setting_new_project_password)) },
+                    placeholder = { Text(stringResource(R.string.label_password)) },
                     modifier = Modifier.fillMaxWidth(),
                     leadingIcon = { Icon(Icons.Default.Lock, contentDescription = null) }
                 )
@@ -194,7 +182,7 @@ fun NewProjectScreen(
                 OutlinedTextField(
                     value = viewModel.projectName,
                     onValueChange = { viewModel.projectName = it },
-                    label = { Text(stringResource(R.string.setting_new_project_name)) },
+                    placeholder = { Text(stringResource(R.string.label_project_title)) },
                     modifier = Modifier.fillMaxWidth(),
                     leadingIcon = { Icon(Icons.Default.Title, contentDescription = null) }
                 )
@@ -204,7 +192,7 @@ fun NewProjectScreen(
                     OutlinedTextField(
                         value = viewModel.projectEmail,
                         onValueChange = { viewModel.projectEmail = it },
-                        label = { Text(stringResource(R.string.setting_new_project_email)) },
+                        placeholder = { Text(stringResource(R.string.label_email)) },
                         modifier = Modifier.fillMaxWidth(),
                         leadingIcon = { Icon(Icons.Default.Email, contentDescription = null) }
                     )
@@ -216,8 +204,8 @@ fun NewProjectScreen(
     if (viewModel.showAuthWarningDialog) {
         AlertDialog(
             onDismissRequest = { viewModel.showAuthWarningDialog = false },
-            title = { Text(stringResource(R.string.auth_project_creation_title)) },
-            text = { Text(stringResource(R.string.warning_auth_project_creation)) },
+            title = { Text(stringResource(R.string.app_name)) },
+            text = { Text(stringResource(R.string.msg_auth_warning)) },
             confirmButton = {
                 TextButton(onClick = {
                     viewModel.showAuthWarningDialog = false
@@ -234,49 +222,15 @@ fun NewProjectScreen(
         )
     }
 
-    if (viewModel.showNextcloudProjectDialog) {
-        AlertDialog(
-            onDismissRequest = { viewModel.showNextcloudProjectDialog = false },
-            title = { Text(stringResource(R.string.choose_account_project_dialog_title)) },
-            text = {
-                Column {
-                    viewModel.nextcloudProjects.forEach { project ->
-                        Row(
-                            Modifier
-                                .fillMaxWidth()
-                                .selectable(
-                                    selected = false,
-                                    onClick = {
-                                        viewModel.projectId = project.remoteId
-                                        viewModel.projectUrl = project.ncUrl
-                                        viewModel.showNextcloudProjectDialog = false
-                                    }
-                                )
-                                .padding(16.dp)
-                        ) {
-                            Text(text = project.name)
-                        }
-                    }
-                }
-            },
-            confirmButton = {},
-            dismissButton = {
-                TextButton(onClick = { viewModel.showNextcloudProjectDialog = false }) {
-                    Text(stringResource(R.string.simple_cancel))
-                }
-            }
-        )
-    }
-
     if (viewModel.isCreatingRemoteProject) {
         AlertDialog(
             onDismissRequest = { },
-            title = { Text(stringResource(R.string.simple_loading)) },
+            title = { Text(stringResource(R.string.error_loading)) },
             text = {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     CircularProgressIndicator()
                     Spacer(modifier = Modifier.width(16.dp))
-                    Text(stringResource(R.string.creating_remote_project))
+                    Text(stringResource(R.string.action_add_project))
                 }
             },
             confirmButton = {}
@@ -286,7 +240,7 @@ fun NewProjectScreen(
     if (viewModel.errorDialogMessage != null) {
         AlertDialog(
             onDismissRequest = { viewModel.errorDialogMessage = null },
-            title = { Text(stringResource(R.string.simple_error)) },
+            title = { Text(stringResource(R.string.error_generic)) },
             text = { Text(viewModel.errorDialogMessage!!) },
             confirmButton = {
                 TextButton(onClick = { viewModel.errorDialogMessage = null }) {
@@ -302,11 +256,15 @@ fun SectionRow(
     label: String,
     content: @Composable () -> Unit
 ) {
-    Row(verticalAlignment = Alignment.Top) {
-        Column {
-            Text(label, fontSize = 12.sp, color = MaterialTheme.colors.onSurface)
-            content()
-        }
+    Column(modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp)) {
+        Text(
+            text = label.uppercase(),
+            style = MaterialTheme.typography.subtitle1,
+            color = MaterialTheme.colors.onSurface,
+            fontWeight = FontWeight.Bold,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
+        content()
     }
 }
 
@@ -343,7 +301,6 @@ fun NewProjectScreenPreview() {
         },
         onScanQrCode = {},
         onImportFile = {},
-        onChooseFromNextcloud = {},
         onOkPressed = {},
         onBack = {},
         onFieldsChanged = {}

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

@@ -5,7 +5,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import net.helcel.cowspent.model.DBAccountProject
 import net.helcel.cowspent.model.ProjectType
 
 class NewProjectViewModel : ViewModel() {
@@ -33,8 +32,6 @@ class NewProjectViewModel : ViewModel() {
     var isAuthenticatedAccount by mutableStateOf(false)
 
     var showAuthWarningDialog by mutableStateOf(false)
-    var showNextcloudProjectDialog by mutableStateOf(false)
-    var nextcloudProjects by mutableStateOf<List<DBAccountProject>>(emptyList())
 
     var isCreatingRemoteProject by mutableStateOf(false)
     var errorDialogMessage by mutableStateOf<String?>(null)

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

@@ -3,8 +3,8 @@ package net.helcel.cowspent.android.project.edit
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
@@ -13,17 +13,16 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.helcel.cowspent.R
 import net.helcel.cowspent.android.helper.showToast
+import net.helcel.cowspent.android.main.MainConstants
 import net.helcel.cowspent.model.DBProject
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
 import net.helcel.cowspent.theme.ThemeUtils
 import net.helcel.cowspent.util.ICallback
-import net.helcel.cowspent.util.SupportUtil
-import net.helcel.cowspent.android.main.MainConstants
 
 
 class EditProjectActivity : AppCompatActivity() {
 
-    private val viewModel: EditProjectViewModel by viewModels()
+    internal val viewModel: EditProjectViewModel by viewModels()
     private lateinit var db: CowspentSQLiteOpenHelper
     private lateinit var project: DBProject
 
@@ -56,39 +55,44 @@ class EditProjectActivity : AppCompatActivity() {
     }
 
     private fun onSave() {
+        when (viewModel.validate()) {
+            EditProjectViewModel.ValidationError.EMPTY_NAME -> {
+                showToast(this, getString(R.string.error_invalid_project_name), Toast.LENGTH_LONG)
+                return
+            }
+            EditProjectViewModel.ValidationError.INVALID_EMAIL -> {
+                showToast(this, getString(R.string.error_invalid_email), Toast.LENGTH_LONG)
+                return
+            }
+            null -> Unit
+        }
+
+        val changes = viewModel.changesFrom(project)
+        if (!changes.any) {
+            showToast(this, getString(R.string.project_edition_no_change), Toast.LENGTH_LONG)
+            return
+        }
+
         val currentPwd = viewModel.password
         val newPwd = viewModel.newPassword
         val newName = viewModel.name
         val newEmail = viewModel.email
 
-        if (newName.isEmpty()) {
-            showToast(this, getString(R.string.error_invalid_project_name), Toast.LENGTH_LONG)
-            return
-        }
-        if (newEmail.isNotEmpty() && !SupportUtil.isValidEmail(newEmail)) {
-            showToast(this, getString(R.string.error_invalid_email), Toast.LENGTH_LONG)
-            return
-        }
-
-        val nameChanged = newName != project.name
-        val emailChanged = newEmail != project.email
-        val pwdChanged = newPwd != project.password
-        val currentPwdChanged = currentPwd != project.password
-
-        if (!nameChanged && !emailChanged && !pwdChanged && !currentPwdChanged) {
-            showToast(this, getString(R.string.project_edition_no_change), Toast.LENGTH_LONG)
-            return
-        }
+        val nameChanged = changes.name
+        val emailChanged = changes.email
+        val pwdChanged = changes.newPassword
+        val currentPwdChanged = changes.currentPassword
 
         if (project.isLocal) {
             val targetPwd = if (pwdChanged) newPwd else currentPwd
             lifecycleScope.launch {
                 withContext(Dispatchers.IO) {
                     db.updateProject(
-                        project.id, newName, newEmail, targetPwd,
-                        null, project.type, null,
-                        null, null,
-                        null, null
+                        projId = project.id,
+                        newName = newName,
+                        newEmail = newEmail,
+                        newPassword = targetPwd,
+                        projectType = project.type
                     )
                 }
                 closeOnEdit(project.id)
@@ -103,18 +107,21 @@ class EditProjectActivity : AppCompatActivity() {
                 project.password = currentPwd
                 lifecycleScope.launch {
                     withContext(Dispatchers.IO) {
-                        db.updateProject(project.id, null, null, currentPwd, null, project.type, null, null, null, null, null)
+                        db.updateProject(
+                            projId = project.id,
+                            newPassword = currentPwd,
+                            projectType = project.type
+                        )
                     }
                 }
             }
 
             if (!db.cowspentServerSyncHelper.editRemoteProject(
-                    project.id,
-                    newName,
-                    newEmail,
-                    if (pwdChanged) newPwd else null,
-                    null,
-                    editCallBack
+                    projId = project.id,
+                    newName = newName,
+                    newEmail = newEmail,
+                    newPassword = if (pwdChanged) newPwd else null,
+                    callback = editCallBack
                 )
             ) {
                 showToast(this, getString(R.string.remote_project_operation_no_network), Toast.LENGTH_LONG)
@@ -124,10 +131,9 @@ class EditProjectActivity : AppCompatActivity() {
             lifecycleScope.launch {
                 withContext(Dispatchers.IO) {
                     db.updateProject(
-                        project.id, null, null, currentPwd,
-                        null, project.type, null,
-                        null, null,
-                        null, null
+                        projId = project.id,
+                        newPassword = currentPwd,
+                        projectType = project.type
                     )
                 }
                 closeOnEdit(project.id)
@@ -137,7 +143,7 @@ class EditProjectActivity : AppCompatActivity() {
 
     private fun onDeleteRemote() {
         viewModel.showDialog(
-            message = getString(R.string.confirm_delete_project_dialog_title),
+            message = getString(R.string.title_confirm),
             positiveText = getString(R.string.simple_yes),
             onConfirm = {
                 if (!db.cowspentServerSyncHelper.deleteRemoteProject(project.id, deleteCallBack)) {

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

@@ -16,6 +16,7 @@ import androidx.compose.material.icons.filled.Title
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 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 net.helcel.cowspent.R
@@ -61,24 +62,26 @@ fun EditProjectScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.simple_edit_project)) },
+                title = { Text(stringResource(R.string.title_edit_project)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
                     }
                 },
                 actions = {
-                    IconButton(onClick = onDeleteRemote) {
-                        Icon(Icons.Default.DeleteForever, contentDescription = stringResource(R.string.menu_delete_project_remote))
+                    if (!viewModel.isLocal) {
+                        IconButton(onClick = onDeleteRemote) {
+                            Icon(Icons.Default.DeleteForever, contentDescription = stringResource(R.string.action_delete))
+                        }
                     }
                 },
-                backgroundColor = MaterialTheme.colors.surface,
+                backgroundColor = MaterialTheme.colors.primary,
                 elevation = 0.dp
             )
         },
         floatingActionButton = {
             FloatingActionButton(onClick = onSave) {
-                Icon(Icons.Default.Done, contentDescription = stringResource(R.string.menu_save_project))
+                Icon(Icons.Default.Done, contentDescription = stringResource(R.string.action_save))
             }
         }
     ) { padding ->
@@ -91,43 +94,59 @@ fun EditProjectScreen(
                 .fillMaxSize()
                 .verticalScroll(scrollState)
         ) {
+            Text(
+                text = "GENERAL",
+                style = MaterialTheme.typography.subtitle1,
+                color = MaterialTheme.colors.onSurface,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.padding(bottom = 8.dp)
+            )
+
             OutlinedTextField(
                 value = viewModel.name,
                 onValueChange = { viewModel.name = it },
-                label = { Text(stringResource(R.string.setting_new_project_name)) },
+                placeholder = { Text(stringResource(R.string.label_project_title)) },
                 modifier = Modifier.fillMaxWidth(),
                 leadingIcon = { Icon(Icons.Default.Title, contentDescription = null) }
             )
 
-            Spacer(modifier = Modifier.height(8.dp))
+            if (!viewModel.isLocal) {
+                Spacer(modifier = Modifier.height(8.dp))
 
-            OutlinedTextField(
-                value = viewModel.password,
-                onValueChange = { viewModel.password = it },
-                label = { Text(stringResource(R.string.setting_password)) },
-                modifier = Modifier.fillMaxWidth(),
-                leadingIcon = { Icon(Icons.Default.Lock, contentDescription = null) }
-            )
+                OutlinedTextField(
+                    value = viewModel.email,
+                    onValueChange = { viewModel.email = it },
+                    placeholder = { Text(stringResource(R.string.label_email)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    leadingIcon = { Icon(Icons.Default.Email, contentDescription = null) }
+                )
 
-            Spacer(modifier = Modifier.height(8.dp))
+                Text(
+                    text = "SECURITY",
+                    style = MaterialTheme.typography.subtitle1,
+                    color = MaterialTheme.colors.onSurface,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 8.dp, top = 24.dp)
+                )
 
-            OutlinedTextField(
-                value = viewModel.newPassword,
-                onValueChange = { viewModel.newPassword = it },
-                label = { Text(stringResource(R.string.setting_new_project_password)) },
-                modifier = Modifier.fillMaxWidth(),
-                leadingIcon = { Icon(Icons.Default.LockOpen, contentDescription = null) }
-            )
+                OutlinedTextField(
+                    value = viewModel.password,
+                    onValueChange = { viewModel.password = it },
+                    placeholder = { Text("Old " + stringResource(R.string.label_password)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    leadingIcon = { Icon(Icons.Default.Lock, contentDescription = null) }
+                )
 
-            Spacer(modifier = Modifier.height(8.dp))
+                Spacer(modifier = Modifier.height(8.dp))
 
-            OutlinedTextField(
-                value = viewModel.email,
-                onValueChange = { viewModel.email = it },
-                label = { Text(stringResource(R.string.setting_new_project_email)) },
-                modifier = Modifier.fillMaxWidth(),
-                leadingIcon = { Icon(Icons.Default.Email, contentDescription = null) }
-            )
+                OutlinedTextField(
+                    value = viewModel.newPassword,
+                    onValueChange = { viewModel.newPassword = it },
+                    placeholder = { Text("New " + stringResource(R.string.label_password)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    leadingIcon = { Icon(Icons.Default.LockOpen, contentDescription = null) }
+                )
+            }
         }
     }
 }

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

@@ -7,15 +7,42 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.lifecycle.ViewModel
 import net.helcel.cowspent.android.helper.DialogState
 import net.helcel.cowspent.model.DBProject
+import net.helcel.cowspent.util.SupportUtil
 
 class EditProjectViewModel : ViewModel() {
     var name by mutableStateOf("")
     var password by mutableStateOf("")
     var newPassword by mutableStateOf("")
     var email by mutableStateOf("")
+    var isLocal by mutableStateOf(false)
 
     var dialogState by mutableStateOf<DialogState?>(null)
 
+    enum class ValidationError { EMPTY_NAME, INVALID_EMAIL }
+
+    fun validate(): ValidationError? = when {
+        name.isBlank() -> ValidationError.EMPTY_NAME
+        email.isNotEmpty() && !SupportUtil.isValidEmail(email) -> ValidationError.INVALID_EMAIL
+        else -> null
+    }
+    
+    data class Changes(
+        val name: Boolean,
+        val email: Boolean,
+        val newPassword: Boolean,
+        val currentPassword: Boolean
+    ) {
+        val any: Boolean get() = name || email || newPassword || currentPassword
+    }
+
+    fun changesFrom(project: DBProject) = Changes(
+        name = name != project.name,
+        // initFromProject maps a null or "null" email to "", so treat those as unchanged
+        email = email != project.email && !(email.isEmpty() && project.email == null),
+        newPassword = newPassword != project.password,
+        currentPassword = password != project.password
+    )
+
     fun showDialog(
         title: String? = null,
         message: String? = null,
@@ -53,5 +80,6 @@ class EditProjectViewModel : ViewModel() {
         password = project.password
         newPassword = project.password
         email = project.email?.let { if (it == "null") "" else it } ?: ""
+        isLocal = project.isLocal
     }
 }

app/src/main/java/net/helcel/cowspent/android/project/member/MemberAddDialog.kt

@@ -6,6 +6,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.tooling.preview.Preview
@@ -29,15 +30,17 @@ fun MemberAddDialogContent(
                 .padding(16.dp)
         ) {
             Text(
-                text = stringResource(R.string.add_member_dialog_title),
-                style = MaterialTheme.typography.h6,
+                text = stringResource(R.string.add_member_dialog_title).uppercase(),
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface,
                 modifier = Modifier.padding(bottom = 16.dp)
             )
 
             OutlinedTextField(
                 value = name,
                 onValueChange = { name = it },
-                label = { Text(stringResource(R.string.member_edit_name)) },
+                placeholder = { Text(stringResource(R.string.label_name)) },
                 modifier = Modifier.fillMaxWidth(),
                 keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.Sentences),
                 singleLine = true

app/src/main/java/net/helcel/cowspent/android/project/member/MemberEditDialog.kt

@@ -12,7 +12,9 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
@@ -57,8 +59,10 @@ fun MemberEditDialogContent(
                 .verticalScroll(rememberScrollState())
         ) {
             Text(
-                text = stringResource(R.string.edit_member_dialog_title),
-                style = MaterialTheme.typography.h6,
+                text = stringResource(R.string.edit_member_dialog_title).uppercase(),
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface,
                 modifier = Modifier.padding(bottom = 16.dp)
             )
 
@@ -66,7 +70,7 @@ fun MemberEditDialogContent(
             OutlinedTextField(
                 value = name,
                 onValueChange = { name = it },
-                label = { Text(stringResource(R.string.member_edit_name)) },
+                placeholder = { Text(stringResource(R.string.label_name)) },
                 modifier = Modifier.fillMaxWidth(),
                 leadingIcon = {
                     Icon(Icons.Default.Person, contentDescription = null)
@@ -80,7 +84,7 @@ fun MemberEditDialogContent(
             OutlinedTextField(
                 value = weight,
                 onValueChange = { weight = it },
-                label = { Text(stringResource(R.string.member_edit_weight)) },
+                placeholder = { Text(stringResource(R.string.label_weight)) },
                 modifier = Modifier.fillMaxWidth(),
                 leadingIcon = {
                     Icon(Icons.Default.LineWeight, contentDescription = null)
@@ -97,10 +101,19 @@ fun MemberEditDialogContent(
                     .fillMaxWidth()
                     .clickable { isActivated = !isActivated }
                     .padding(vertical = 8.dp)
+                    .testTag("member_activated_row")
             ) {
-                Icon(Icons.Default.Block, contentDescription = null)
-                Spacer(modifier = Modifier.width(16.dp))
-                Text(stringResource(R.string.member_edit_toggle), modifier = Modifier.weight(1f))
+                Icon(
+                    imageVector = Icons.Default.Block, 
+                    contentDescription = null,
+                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+                )
+                Spacer(modifier = Modifier.width(32.dp))
+                Text(
+                    text = stringResource(R.string.label_activated), 
+                    modifier = Modifier.weight(1f),
+                    style = MaterialTheme.typography.subtitle1
+                )
                 Checkbox(checked = isActivated, onCheckedChange = { isActivated = it })
             }
 
@@ -113,9 +126,17 @@ fun MemberEditDialogContent(
                     .fillMaxWidth()
                     .padding(vertical = 8.dp)
             ) {
-                Icon(Icons.Default.Palette, contentDescription = null)
-                Spacer(modifier = Modifier.width(16.dp))
-                Text(stringResource(R.string.member_edit_color), modifier = Modifier.weight(1f))
+                Icon(
+                    imageVector = Icons.Default.Palette, 
+                    contentDescription = null,
+                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.6f)
+                )
+                Spacer(modifier = Modifier.width(32.dp))
+                Text(
+                    text = stringResource(R.string.label_color), 
+                    modifier = Modifier.weight(1f),
+                    style = MaterialTheme.typography.subtitle1
+                )
                 Box(
                     modifier = Modifier
                         .size(40.dp)

app/src/main/java/net/helcel/cowspent/android/project/member/MemberManagementActivity.kt

@@ -0,0 +1,122 @@
+package net.helcel.cowspent.android.project.member
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import net.helcel.cowspent.R
+import net.helcel.cowspent.model.DBBill
+import net.helcel.cowspent.model.DBMember
+import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
+import net.helcel.cowspent.theme.ThemeUtils
+
+class MemberManagementActivity : AppCompatActivity() {
+
+    internal val viewModel: MemberManagementViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
+        super.onCreate(savedInstanceState)
+
+        val projectId = intent.getLongExtra(EXTRA_PROJECT_ID, 0)
+        if (projectId == 0L) {
+            finish()
+            return
+        }
+
+        val db = CowspentSQLiteOpenHelper.getInstance(this)
+        viewModel.loadMembers(projectId)
+
+        setContent {
+            ThemeUtils.CowspentTheme {
+                var showAddMemberDialog by remember { mutableStateOf(false) }
+                var editingMember by remember { mutableStateOf<DBMember?>(null) }
+
+                MemberManagementScreen(
+                    members = viewModel.members,
+                    onAddMember = { showAddMemberDialog = true },
+                    onEditMember = { editingMember = it },
+                    onToggleMember = { member, isActivated ->
+                        db.updateMemberAndSync(member, member.name, member.weight, isActivated, member.r, member.g, member.b, "", "")
+                        viewModel.loadMembers(projectId)
+                    },
+                    onBack = { finish() }
+                )
+
+                if (showAddMemberDialog) {
+                    Dialog(
+                        onDismissRequest = { showAddMemberDialog = false },
+                        properties = DialogProperties(usePlatformDefaultWidth = false)
+                    ) {
+                        MemberAddDialogContent(
+                            onAdd = { memberName ->
+                                val memberNames = db.getMembersOfProject(projectId, null).map { it.name }
+                                if (memberNames.contains(memberName)) {
+                                    Toast.makeText(this, R.string.member_already_exists, Toast.LENGTH_SHORT).show()
+                                } else {
+                                    val color = net.helcel.cowspent.android.helper.TextDrawable.getColorFromName(memberName)
+                                    db.addMemberAndSync(
+                                        DBMember(
+                                            0, 0, projectId, memberName, true, 1.0,
+                                            DBBill.STATE_ADDED,
+                                            android.graphics.Color.red(color),
+                                            android.graphics.Color.green(color),
+                                            android.graphics.Color.blue(color),
+                                            null, null
+                                        )
+                                    )
+                                    viewModel.loadMembers(projectId)
+                                    showAddMemberDialog = false
+                                }
+                            },
+                            onDismiss = { showAddMemberDialog = false }
+                        )
+                    }
+                }
+
+                if (editingMember != null) {
+                    val member = editingMember!!
+                    Dialog(
+                        onDismissRequest = { editingMember = null },
+                        properties = DialogProperties(usePlatformDefaultWidth = false)
+                    ) {
+                        MemberEditDialogContent(
+                            member = member,
+                            onSave = { name, weight, isActivated, r, g, b ->
+                                db.updateMemberAndSync(member, name, weight, isActivated, r, g, b, "", "")
+                                viewModel.loadMembers(projectId)
+                                editingMember = null
+                            },
+                            onDelete = {
+                                db.deleteMember(member.id)
+                                viewModel.loadMembers(projectId)
+                                editingMember = null
+                            },
+                            onDismiss = { editingMember = null }
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        const val EXTRA_PROJECT_ID = "project_id"
+
+        fun createIntent(context: Context, projectId: Long): Intent {
+            return Intent(context, MemberManagementActivity::class.java).apply {
+                putExtra(EXTRA_PROJECT_ID, projectId)
+            }
+        }
+    }
+}

app/src/main/java/net/helcel/cowspent/android/project/member/MemberManagementDialog.kt

@@ -1,127 +0,0 @@
-package net.helcel.cowspent.android.project.member
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
-import androidx.compose.material.contentColorFor
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import net.helcel.cowspent.R
-import net.helcel.cowspent.android.helper.MemberAvatar
-import net.helcel.cowspent.android.helper.lazyVerticalScrollbar
-import net.helcel.cowspent.model.DBMember
-
-@Composable
-fun MemberManagementDialogContent(
-    members: List<DBMember>,
-    onAddMember: () -> Unit,
-    onEditMember: (DBMember) -> Unit,
-    onDismiss: () -> Unit
-) {
-    val listState = rememberLazyListState()
-    Surface(
-        shape = MaterialTheme.shapes.large,
-        color = MaterialTheme.colors.surface,
-        contentColor = contentColorFor(MaterialTheme.colors.surface)
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .heightIn(max = 500.dp)
-                .padding(16.dp)
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Text(
-                    text = stringResource(R.string.fab_manage_members),
-                    style = MaterialTheme.typography.h6
-                )
-                IconButton(onClick = onAddMember) {
-                    Icon(Icons.Default.Add,modifier=Modifier.size(32.dp),
-                        contentDescription = stringResource(R.string.fab_add_member))
-                }
-            }
-
-            Spacer(modifier = Modifier.height(8.dp))
-
-            LazyColumn(
-                state = listState,
-                modifier = Modifier
-                    .weight(1f, fill = false)
-                    .lazyVerticalScrollbar(listState)
-            ) {
-                items(members) { member ->
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clickable { onEditMember(member) }
-                            .padding(vertical = 12.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        MemberAvatar(
-                            member = member,
-                            size = 40.dp
-                        )
-                        Spacer(modifier = Modifier.width(16.dp))
-                        Text(
-                            text = member.name,
-                            style = MaterialTheme.typography.body1
-                        )
-                    }
-                }
-            }
-
-            Spacer(modifier = Modifier.height(8.dp))
-
-            Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
-                TextButton(onClick = onDismiss) {
-                    Text(stringResource(R.string.simple_close).uppercase())
-                }
-            }
-        }
-    }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun MemberManagementDialogContentPreview() {
-    MaterialTheme {
-        MemberManagementDialogContent(
-            members = listOf(
-                DBMember(1, 0, 1, "Alice", true, 1.0, 0, 255, 100, 100, null, null),
-                DBMember(2, 0, 1, "Bob", true, 1.0, 0, 100, 255, 100, null, null),
-                DBMember(3, 0, 1, "Charlie", false, 1.0, 0, 100, 100, 255, null, null)
-            ),
-            onAddMember = {},
-            onEditMember = {},
-            onDismiss = {}
-        )
-    }
-}
-

app/src/main/java/net/helcel/cowspent/android/project/member/MemberManagementScreen.kt

@@ -0,0 +1,162 @@
+package net.helcel.cowspent.android.project.member
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+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.Delete
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+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 net.helcel.cowspent.R
+import net.helcel.cowspent.android.helper.MemberAvatar
+import net.helcel.cowspent.android.helper.lazyVerticalScrollbar
+import net.helcel.cowspent.model.DBMember
+
+@Composable
+fun MemberManagementScreen(
+    members: List<DBMember>,
+    onAddMember: () -> Unit,
+    onEditMember: (DBMember) -> Unit,
+    onToggleMember: (DBMember, Boolean) -> Unit,
+    onBack: () -> Unit
+) {
+    val listState = rememberLazyListState()
+    val activatedMembers = members.filter { it.isActivated }
+    val deactivatedMembers = members.filter { !it.isActivated }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(stringResource(R.string.action_members)) },
+                navigationIcon = {
+                    IconButton(onClick = onBack) {
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+                    }
+                },
+                backgroundColor = MaterialTheme.colors.primary,
+                elevation = 0.dp
+            )
+        },
+        floatingActionButton = {
+            FloatingActionButton(onClick = onAddMember) {
+                Icon(Icons.Default.Add, contentDescription = stringResource(R.string.action_save))
+            }
+        }
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(padding)
+        ) {
+            LazyColumn(
+                state = listState,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .lazyVerticalScrollbar(listState)
+            ) {
+                item {
+                    Text(
+                        text = "ACTIVATED MEMBERS",
+                        style = MaterialTheme.typography.subtitle1,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colors.onSurface,
+                        modifier = Modifier.padding(16.dp)
+                    )
+                }
+
+                items(activatedMembers) { member ->
+                    MemberRow(
+                        member = member,
+                        onEditMember = onEditMember,
+                        onToggleMember = { onToggleMember(member, it) }
+                    )
+                }
+
+                if (deactivatedMembers.isNotEmpty()) {
+                    item {
+                        Text(
+                            text = "DEACTIVATED MEMBERS",
+                            style = MaterialTheme.typography.subtitle1,
+                            fontWeight = FontWeight.Bold,
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f),
+                            modifier = Modifier.padding(start = 16.dp, top = 24.dp, end = 16.dp, bottom = 16.dp)
+                        )
+                    }
+
+                    items(deactivatedMembers) { member ->
+                        MemberRow(
+                            member = member,
+                            onEditMember = onEditMember,
+                            onToggleMember = { onToggleMember(member, it) },
+                            alpha = 0.6f
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun MemberRow(
+    member: DBMember,
+    onEditMember: (DBMember) -> Unit,
+    onToggleMember: (Boolean) -> Unit,
+    alpha: Float = 1f
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onEditMember(member) }
+            .padding(horizontal = 16.dp, vertical = 0.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        MemberAvatar(
+            member = member,
+            size = 24.dp,
+            alpha = alpha
+        )
+        Spacer(modifier = Modifier.width(32.dp))
+        Text(
+            text = member.name,
+            style = MaterialTheme.typography.subtitle1,
+            modifier = Modifier.weight(1f),
+            color = MaterialTheme.colors.onSurface.copy(alpha = alpha)
+        )
+        IconButton(onClick = { onToggleMember(!member.isActivated) }) {
+            Icon(
+                imageVector = if (member.isActivated) Icons.Default.Delete else Icons.Default.Add,
+                contentDescription = if (member.isActivated) "Deactivate" else "Activate",
+                tint = if (member.isActivated) MaterialTheme.colors.error.copy(alpha = 0.6f) else MaterialTheme.colors.primary.copy(alpha = 0.6f)
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun MemberManagementScreenPreview() {
+    MaterialTheme {
+        MemberManagementScreen(
+            members = listOf(
+                DBMember(1, 0, 1, "Alice", true, 1.0, 0, 255, 100, 100, null, null),
+                DBMember(2, 0, 1, "Bob", true, 1.0, 0, 100, 255, 100, null, null),
+                DBMember(3, 0, 1, "Charlie", false, 1.0, 0, 100, 100, 255, null, null)
+            ),
+            onAddMember = {},
+            onEditMember = {},
+            onToggleMember = { _, _ -> },
+            onBack = {}
+        )
+    }
+}

app/src/main/java/net/helcel/cowspent/android/project/member/MemberManagementViewModel.kt

@@ -0,0 +1,40 @@
+package net.helcel.cowspent.android.project.member
+
+import android.app.Application
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import net.helcel.cowspent.android.helper.DialogState
+import net.helcel.cowspent.model.DBMember
+import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
+
+class MemberManagementViewModel(application: Application) : AndroidViewModel(application) {
+    private val db = CowspentSQLiteOpenHelper.getInstance(application)
+
+    var projectId by mutableLongStateOf(0L)
+    var members by mutableStateOf<List<DBMember>>(emptyList())
+
+    var dialogState by mutableStateOf<DialogState?>(null)
+
+    fun loadMembers(projId: Long) {
+        projectId = projId
+        viewModelScope.launch {
+            members = withContext(Dispatchers.IO) { db.getMembersOfProject(projId, null) }
+        }
+    }
+
+    fun deleteMember(id: Long) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                db.deleteMember(id)
+            }
+            loadMembers(projectId)
+        }
+    }
+}

app/src/main/java/net/helcel/cowspent/android/project/settle/ProjectSettlementScreen.kt

@@ -129,8 +129,10 @@ fun ProjectSettlementUI(
                 .padding(16.dp)
         ) {
             Text(
-                text = stringResource(R.string.settle_dialog_title),
-                style = MaterialTheme.typography.h6,
+                text = stringResource(R.string.title_settle).uppercase(),
+                style = MaterialTheme.typography.subtitle1,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface,
                 modifier = Modifier.padding(bottom = 16.dp)
             )
 
@@ -174,7 +176,7 @@ private fun BalancedStateMessage() {
         contentAlignment = Alignment.Center
     ) {
         Text(
-            text = stringResource(R.string.settle_dialog_balanced),
+            text = stringResource(R.string.dialog_balanced_msg),
             style = MaterialTheme.typography.body1
         )
     }
@@ -279,9 +281,9 @@ private fun TableHeaderText(
     Text(
         text = text.uppercase(),
         modifier = modifier,
-        fontWeight = FontWeight.SemiBold,
+        fontWeight = FontWeight.Bold,
         style = MaterialTheme.typography.overline,
-        color = colorResource(R.color.fg_default_low),
+        color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f),
         textAlign = textAlign,
         letterSpacing = 0.8.sp
     )

app/src/main/java/net/helcel/cowspent/android/settings/SettingsScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.RadioButton
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Slider
 import androidx.compose.material.Switch
 import androidx.compose.material.SwitchDefaults
 import androidx.compose.material.Text
@@ -30,6 +31,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.Archive
 import androidx.compose.material.icons.filled.Brightness2
+import androidx.compose.material.icons.filled.Group
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.filled.Sync
@@ -49,13 +51,16 @@ 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 kotlin.math.roundToInt
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import net.helcel.cowspent.R
 import net.helcel.cowspent.android.helper.ColorPicker
 import net.helcel.cowspent.persistence.CowspentSQLiteOpenHelper
+import net.helcel.cowspent.persistence.CowspentServerSyncHelper
 import net.helcel.cowspent.util.ColorUtils
 import net.helcel.cowspent.util.Cowspent
+import net.helcel.cowspent.util.SyncSettings
 
 @Composable
 fun SettingsScreen(
@@ -79,22 +84,32 @@ fun SettingsScreen(
     val keyColor = stringResource(R.string.pref_key_color)
     val keyOfflineMode = stringResource(R.string.pref_key_offline_mode)
     val keyShowArchived = stringResource(R.string.pref_key_show_archived)
+    val keyBetaFeatures = stringResource(R.string.pref_key_beta_features)
+    val keyStatsIncludeDeactivated = stringResource(R.string.pref_key_stats_include_deactivated)
+    val keyAutoSyncOnOpen = stringResource(R.string.pref_key_auto_sync_on_open)
+    val keyFillNewBillFromLast = stringResource(R.string.pref_key_fill_new_bill_from_last)
+    val keyLastAccountSync = stringResource(R.string.pref_key_last_account_sync_timestamp)
+
+    val isNextcloudConfigured = CowspentServerSyncHelper.isNextcloudAccountConfigured(context)
 
     // States for preferences
     var nightMode by remember(keyNightMode) {
         mutableStateOf(sharedPreferences.getString(keyNightMode, "-1") ?: "-1")
     }
 
-    var colorMode by remember(keyColorMode, keyUseServerColor, keyUseSystemColor) {
-        mutableStateOf(sharedPreferences.getString(keyColorMode, null) ?: run {
-            val useServer = sharedPreferences.getBoolean(keyUseServerColor, true)
+    var colorMode by remember(keyColorMode, keyUseServerColor, keyUseSystemColor, isNextcloudConfigured) {
+        val savedMode = sharedPreferences.getString(keyColorMode, null)
+        val mode = savedMode ?: run {
+            val useServer = sharedPreferences.getBoolean(keyUseServerColor, false)
             val useSystem = sharedPreferences.getBoolean(keyUseSystemColor, true)
             when {
-                useServer -> "server"
+                useServer && isNextcloudConfigured -> "server"
                 useSystem -> "system"
                 else -> "manual"
             }
-        })
+        }
+        // Fallback to system if server is selected but not configured
+        mutableStateOf(if (mode == "server" && !isNextcloudConfigured) "system" else mode)
     }
 
     // Apply theme globally only when leaving settings to avoid flickering/restarts during selection
@@ -113,6 +128,27 @@ fun SettingsScreen(
     var showArchived by remember(keyShowArchived) {
         mutableStateOf(sharedPreferences.getBoolean(keyShowArchived, false))
     }
+    var betaFeatures by remember(keyBetaFeatures) {
+        mutableStateOf(sharedPreferences.getBoolean(keyBetaFeatures, false))
+    }
+    var fillNewBillFromLast by remember(keyFillNewBillFromLast) {
+        mutableStateOf(sharedPreferences.getBoolean(keyFillNewBillFromLast, false))
+    }
+    var statsIncludeDeactivated by remember(keyStatsIncludeDeactivated) {
+        mutableStateOf(sharedPreferences.getBoolean(keyStatsIncludeDeactivated, false))
+    }
+    
+    val syncIntervals = SyncSettings.INTERVAL_CHOICES_MINUTES
+    val syncIntervalLabels = listOf(
+        stringResource(R.string.pref_value_sync_1m),
+        stringResource(R.string.pref_value_sync_10m),
+        stringResource(R.string.pref_value_sync_1h),
+        stringResource(R.string.pref_value_sync_1d)
+    )
+    
+    var syncInterval by remember(keyAutoSyncOnOpen) {
+        mutableIntStateOf(SyncSettings.intervalMinutes(context))
+    }
 
     Scaffold(
         topBar = {
@@ -120,7 +156,7 @@ fun SettingsScreen(
                 title = { Text(stringResource(R.string.action_settings)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
                     }
                 },
                 backgroundColor = MaterialTheme.colors.primary,
@@ -135,10 +171,10 @@ fun SettingsScreen(
                 .verticalScroll(rememberScrollState())
         ) {
             // Appearance
-            SettingsCategory(stringResource(R.string.settings_appearance_category))
+            SettingsCategory(stringResource(R.string.settings_appearance))
 
             SettingsSwitchPreference(
-                title = stringResource(R.string.setting_show_archived),
+                title = stringResource(R.string.settings_show_archived),
                 icon = Icons.Default.Archive,
                 checked = showArchived,
                 onCheckedChange = {
@@ -160,7 +196,7 @@ fun SettingsScreen(
             )
 
             SettingsListPreference(
-                title = stringResource(R.string.settings_night_mode_title),
+                title = stringResource(R.string.settings_night_mode),
                 icon = Icons.Default.Brightness2,
                 value = nightMode,
                 entries = mapOf(
@@ -177,15 +213,19 @@ fun SettingsScreen(
                 }
             )
 
+            val colorModeEntries = buildMap {
+                put("system", stringResource(R.string.pref_value_color_system))
+                if (isNextcloudConfigured) {
+                    put("server", stringResource(R.string.pref_value_color_server))
+                }
+                put("manual", stringResource(R.string.pref_value_color_manual))
+            }
+
             SettingsListPreference(
-                title = stringResource(R.string.settings_color_mode_title),
+                title = stringResource(R.string.settings_color_mode),
                 icon = Icons.Default.Palette,
                 value = colorMode,
-                entries = mapOf(
-                    "system" to stringResource(R.string.pref_value_color_system),
-                    "server" to stringResource(R.string.pref_value_color_server),
-                    "manual" to stringResource(R.string.pref_value_color_manual)
-                ),
+                entries = colorModeEntries,
                 onValueChange = { mode ->
                     colorMode = mode
                     sharedPreferences.edit {
@@ -203,8 +243,8 @@ fun SettingsScreen(
 
             if (colorMode == "manual") {
                 SettingsColorPreference(
-                    title = stringResource(R.string.settings_color_title),
-                    summary = stringResource(R.string.settings_color_summary),
+                    title = stringResource(R.string.settings_color_custom),
+                    summary = stringResource(R.string.settings_color_custom),
                     icon = Icons.Default.Palette,
                     initialColor = appColor,
                     onColorSelected = {
@@ -218,10 +258,10 @@ fun SettingsScreen(
             }
 
             // Network
-            SettingsCategory(stringResource(R.string.settings_network_category))
+            SettingsCategory(stringResource(R.string.settings_network))
 
             SettingsSwitchPreference(
-                title = stringResource(R.string.settings_offline_mode_title),
+                title = stringResource(R.string.settings_offline_mode),
                 summary = stringResource(R.string.settings_offline_mode_summary),
                 icon = Icons.Default.Sync,
                 checked = offlineMode,
@@ -234,16 +274,74 @@ fun SettingsScreen(
             )
 
             SettingsPreference(
-                title = stringResource(R.string.settings_server_settings),
+                title = stringResource(R.string.title_account),
                 icon = Icons.Default.AccountCircle,
                 onClick = onAccountSettingsClick
             )
 
             // Other
-            SettingsCategory(stringResource(R.string.settings_other_category))
+            SettingsCategory(stringResource(R.string.settings_other))
+
+            SettingsSwitchPreference(
+                title = stringResource(R.string.settings_beta_features),
+                summary = stringResource(R.string.settings_beta_features_summary),
+                icon = Icons.Default.Info,
+                checked = betaFeatures,
+                onCheckedChange = {
+                    betaFeatures = it
+                    sharedPreferences.edit {
+                        putBoolean(keyBetaFeatures, it)
+                    }
+                }
+            )
+
+            if (betaFeatures) {
+                SettingsSwitchPreference(
+                    title = stringResource(R.string.settings_fill_new_bill_from_last),
+                    summary = stringResource(R.string.settings_fill_new_bill_from_last_summary),
+                    icon = Icons.Default.Info,
+                    checked = fillNewBillFromLast,
+                    onCheckedChange = {
+                        fillNewBillFromLast = it
+                        sharedPreferences.edit {
+                            putBoolean(keyFillNewBillFromLast, it)
+                        }
+                    }
+                )
+
+                SettingsSwitchPreference(
+                    title = stringResource(R.string.settings_stats_include_deactivated),
+                    icon = Icons.Default.Group,
+                    checked = statsIncludeDeactivated,
+                    onCheckedChange = {
+                        statsIncludeDeactivated = it
+                        sharedPreferences.edit {
+                            putBoolean(keyStatsIncludeDeactivated, it)
+                        }
+                    }
+                )
+
+                SettingsSliderPreference(
+                    title = stringResource(R.string.settings_auto_sync_on_open),
+                    summary = stringResource(R.string.settings_auto_sync_on_open_summary),
+                    icon = Icons.Default.Sync,
+                    value = syncInterval,
+                    values = syncIntervals,
+                    labels = syncIntervalLabels,
+                    onValueChange = { newInterval ->
+                        // Slider reports every drag delta, not just the snapped steps.
+                        if (newInterval != syncInterval) {
+                            syncInterval = newInterval
+                            sharedPreferences.edit {
+                                putInt(keyAutoSyncOnOpen, newInterval)
+                            }
+                        }
+                    }
+                )
+            }
 
             SettingsPreference(
-                title = stringResource(R.string.settings_about),
+                title = stringResource(R.string.title_about),
                 icon = Icons.Default.Info,
                 onClick = onAboutClick
             )
@@ -255,9 +353,9 @@ fun SettingsScreen(
 fun SettingsCategory(title: String) {
     Text(
         text = title.uppercase(),
-        modifier = Modifier.padding(start = 16.dp, top = 16.dp, bottom = 8.dp),
-        color = MaterialTheme.colors.primary,
-        style = MaterialTheme.typography.overline,
+        modifier = Modifier.padding(start = 16.dp, top = 24.dp, bottom = 8.dp),
+        color = MaterialTheme.colors.onSurface,
+        style = MaterialTheme.typography.subtitle1,
         fontWeight = FontWeight.Bold
     )
 }
@@ -355,13 +453,7 @@ fun SettingsListPreference(
                                 ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
-                            RadioButton(
-                                selected = (key == value),
-                                onClick = {
-                                    onValueChange(key)
-                                    showDialog = false
-                                }
-                            )
+                            RadioButton(selected = (key == value), onClick = null)
                             Spacer(Modifier.width(8.dp))
                             Text(text = label)
                         }
@@ -424,6 +516,47 @@ fun SettingsColorPreference(
     }
 }
 
+@Composable
+fun SettingsSliderPreference(
+    title: String,
+    summary: String? = null,
+    icon: Any? = null,
+    value: Int,
+    values: List<Int>,
+    labels: List<String>,
+    onValueChange: (Int) -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp, 8.dp)
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            SettingsIcon(icon)
+            Spacer(modifier = Modifier.width(32.dp))
+            Column(modifier = Modifier.weight(1f)) {
+                Text(text = title, style = MaterialTheme.typography.subtitle1)
+                if (summary != null) {
+                    Text(text = summary, style = MaterialTheme.typography.caption)
+                }
+            }
+        }
+        
+        val currentIndex = values.indexOf(value).coerceAtLeast(0)
+        val steps = (values.size - 2).coerceAtLeast(0)
+        
+        Column(modifier = Modifier.padding(start = 56.dp, top = 8.dp)) {
+            Slider(
+                value = currentIndex.toFloat(),
+                onValueChange = { onValueChange(values[it.roundToInt()]) },
+                valueRange = 0f..(values.size - 1).toFloat(),
+                steps = steps
+            )
+            Text(text = labels[currentIndex], style = MaterialTheme.typography.caption, fontWeight = FontWeight.Bold, color = MaterialTheme.colors.primary)
+        }
+    }
+}
+
 @Composable
 fun SettingsIcon(icon: Any?) {
     Box(modifier = Modifier.size(24.dp), contentAlignment = Alignment.Center) {

app/src/main/java/net/helcel/cowspent/android/statistics/ProjectSankeyDiagram.kt

@@ -71,6 +71,7 @@ import net.helcel.cowspent.android.helper.formatShortValue
 import net.helcel.cowspent.model.DBBill
 import net.helcel.cowspent.model.DBCategory
 import net.helcel.cowspent.model.DBMember
+import net.helcel.cowspent.util.CategoryUtils
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
@@ -87,46 +88,53 @@ private object SankeyDimens {
 @Composable
 fun ProjectSankeyDiagram(
     projectName: String,
+    projectId: Long,
+    projectRemoteId: String?,
     allMembers: List<DBMember>,
     allBills: List<DBBill>,
     customCategories: List<DBCategory>,
     onShareReady: (String) -> Unit
 ) {
-    val shareStatsIntro = stringResource(R.string.share_stats_intro, projectName)
+    val shareStatsIntro = stringResource(R.string.msg_stats_intro, projectName)
     var selectedMemberId by remember { mutableLongStateOf(-1L) }
     var expanded by remember { mutableStateOf(false) }
 
-    val activeBills = remember(allBills) {
-        allBills.filter { it.state != DBBill.STATE_DELETED && it.categoryRemoteId != DBBill.CATEGORY_REIMBURSEMENT }
+    val reimbursementCategoryId = remember(customCategories, projectId, projectRemoteId) {
+        CategoryUtils.getReimbursementCategoryId(customCategories, projectId, projectRemoteId)
+    }
+    val activeBills = remember(allBills, reimbursementCategoryId) {
+        allBills.filter { it.state != DBBill.STATE_DELETED && it.categoryId != reimbursementCategoryId }
     }
 
     val membersMap = remember(allMembers) { allMembers.associateBy { it.id } }
-    val categoriesMap = remember(customCategories) { customCategories.associateBy { it.remoteId.toInt() } }
+    val categoriesMap = remember(customCategories) { customCategories.associateBy { it.id } }
 
     if (activeBills.isEmpty()) {
         Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            Text("No data to display", style = MaterialTheme.typography.h6)
+            Text("No data to display", style = MaterialTheme.typography.subtitle1, fontWeight = FontWeight.Bold, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f))
         }
         return
     }
 
     val spendings = remember(activeBills, selectedMemberId, membersMap) {
         val spentMap = mutableMapOf<Long, Double>().apply { membersMap.keys.forEach { put(it, 0.0) } }
-        val catMap = mutableMapOf<Int, Double>()
+        val catMap = mutableMapOf<Long, Double>()
         
         activeBills.forEach { bill ->
-            val totalWeight = bill.billOwers.sumOf { membersMap[it.memberId]?.weight ?: 1.0 }
+            val totalWeight = bill.billOwers.sumOf { membersMap[it.memberId]?.weight ?: 0.0 }
             if (totalWeight > 0) {
                 if (selectedMemberId == -1L) {
-                    catMap[bill.categoryRemoteId] = (catMap[bill.categoryRemoteId] ?: 0.0) + bill.amount
+                    catMap[bill.categoryId] = (catMap[bill.categoryId] ?: 0.0) + bill.amount
                     bill.billOwers.forEach { bo ->
-                        val weight = membersMap[bo.memberId]?.weight ?: 1.0
-                        spentMap[bo.memberId] = (spentMap[bo.memberId] ?: 0.0) + (bill.amount / totalWeight) * weight
+                        if (membersMap.containsKey(bo.memberId)) {
+                            val weight = membersMap[bo.memberId]?.weight ?: 0.0
+                            spentMap[bo.memberId] = (spentMap[bo.memberId] ?: 0.0) + (bill.amount / totalWeight) * weight
+                        }
                     }
                 } else {
                     bill.billOwers.find { it.memberId == selectedMemberId }?.let { bo ->
-                        val weight = membersMap[bo.memberId]?.weight ?: 1.0
-                        catMap[bill.categoryRemoteId] = (catMap[bill.categoryRemoteId] ?: 0.0) + (bill.amount / totalWeight) * weight
+                        val weight = membersMap[bo.memberId]?.weight ?: 0.0
+                        catMap[bill.categoryId] = (catMap[bill.categoryId] ?: 0.0) + (bill.amount / totalWeight) * weight
                         spentMap[selectedMemberId] = (spentMap[selectedMemberId] ?: 0.0) + (bill.amount / totalWeight) * weight
                     }
                 }
@@ -215,9 +223,9 @@ private fun SankeyContent(
     selectedMemberId: Long,
     totalAmount: Double,
     displayMemberSpendings: List<Pair<Long, Double>>,
-    displayCategorySpendings: List<Pair<Int, Double>>,
+    displayCategorySpendings: List<Pair<Long, Double>>,
     membersMap: Map<Long, DBMember>,
-    categoriesMap: Map<Int, DBCategory>
+    categoriesMap: Map<Long, DBCategory>
 ) {
     val density = LocalDensity.current
     val scope = rememberCoroutineScope()
@@ -338,7 +346,9 @@ private fun SankeyContent(
                             scope.launch { topFocalIndex.animateTo(index.toFloat(), spring(Spring.DampingRatioLowBouncy, Spring.StiffnessLow)) }
                         } else Modifier), contentAlignment = Alignment.Center) {
                         Column(modifier = Modifier.fillMaxSize().background(color = member?.let { Color(it.r ?: 128, it.g ?: 128, it.b ?: 128) } ?: Color.Gray, shape = RoundedCornerShape(10.dp)), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
-                            Text(text = member?.name ?: "???", color = Color.White, fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, modifier = Modifier.wrapContentWidth(unbounded = true))
+                            if (wDp >= 32.dp) {
+                                Text(text = member?.name ?: "???", color = Color.White, fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, modifier = Modifier.wrapContentWidth(unbounded = true))
+                            }
                             if (wDp >= 40.dp) Text(text = formatShortValue(amount), fontSize = 12.sp, color = Color.White.copy(alpha = 0.9f), textAlign = TextAlign.Center)
                         }
                     }
@@ -376,7 +386,9 @@ private fun SankeyContent(
                             scope.launch { bottomFocalIndex.animateTo(index.toFloat(), spring(Spring.DampingRatioLowBouncy, Spring.StiffnessLow)) }
                         } else Modifier), contentAlignment = Alignment.Center) {
                         Column(modifier = Modifier.fillMaxSize().background(color = category?.color?.let { try { Color(it.toColorInt()) } catch (_: Exception) { Color(0xFF999999) } } ?: Color(0xFF999999), shape = RoundedCornerShape(10.dp)), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
-                            Text(text = category?.icon ?: "❔", fontSize = 20.sp, textAlign = TextAlign.Center, modifier = Modifier.wrapContentWidth(unbounded = true))
+                            if (wDp >= 24.dp) {
+                                Text(text = category?.icon ?: "❔", fontSize = 20.sp, textAlign = TextAlign.Center, modifier = Modifier.wrapContentWidth(unbounded = true))
+                            }
                             if (wDp >= 40.dp) Text(text = formatShortValue(amount), fontSize = 12.sp, color = Color.White.copy(alpha = 0.9f), textAlign = TextAlign.Center)
                         }
                     }
@@ -399,4 +411,4 @@ private fun DrawScope.drawSankeyFlow(startX: Float, startY: Float, startWidth: F
 
 @Preview(showBackground = true, widthDp = 360, heightDp = 640)
 @Composable
-fun ProjectSankeyDiagramPreview() = MaterialTheme { ProjectSankeyDiagram("Test Project", StatisticsMockData.members, StatisticsMockData.bills, emptyList()) {} }
+fun ProjectSankeyDiagramPreview() = MaterialTheme { ProjectSankeyDiagram("Test Project", 1L, "1", StatisticsMockData.members, StatisticsMockData.bills, emptyList()) {} }

app/src/main/java/net/helcel/cowspent/android/statistics/ProjectSpendingGraph.kt

@@ -43,10 +43,10 @@ fun ProjectSpendingGraph(
     allBills: List<DBBill>,
     onShareReady: (String) -> Unit
 ) {
-    val shareStatsIntro = stringResource(R.string.share_stats_intro, projectName)
+    val shareStatsIntro = stringResource(R.string.msg_stats_intro, projectName)
     if (allBills.isEmpty()) {
         Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            Text("No data to display", style = MaterialTheme.typography.h6)
+            Text("No data to display", style = MaterialTheme.typography.subtitle1, fontWeight = FontWeight.Bold, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f))
         }
         return
     }

app/src/main/java/net/helcel/cowspent/android/statistics/ProjectStatisticsActivity.kt

@@ -47,7 +47,7 @@ class ProjectStatisticsActivity : AppCompatActivity() {
     }
 
     companion object {
-        private const val EXTRA_PROJECT_ID = "extra_project_id"
+        internal const val EXTRA_PROJECT_ID = "extra_project_id"
 
         fun createIntent(context: Context, projectId: Long): Intent {
             return Intent(context, ProjectStatisticsActivity::class.java).apply {

app/src/main/java/net/helcel/cowspent/android/statistics/ProjectStatisticsScreen.kt

@@ -35,15 +35,17 @@ fun ProjectStatisticsScreen(
     }
     var currentShareText by remember { mutableStateOf("") }
     val tabs = listOf(
-        stringResource(R.string.statistic_title),
+        stringResource(R.string.title_stats),
         "Trend",
         "Sankey"
     )
 
+    val keyStatsIncludeDeactivated = stringResource(R.string.pref_key_stats_include_deactivated)
+
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.statistic_title)) },
+                title = { Text(stringResource(R.string.title_stats)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
@@ -84,29 +86,41 @@ fun ProjectStatisticsScreen(
             
             val statsData by produceState<StatisticsData?>(null, proj.id) {
                 value = withContext(Dispatchers.IO) {
+                    val syncedCategories = db.getCategories(proj.id)
+                    val defaultCategories = CategoryUtils.getDefaultCategories(context, proj.id)
+
+                    val toEnsure = if (proj.type == ProjectType.LOCAL) {
+                        defaultCategories
+                    } else {
+                        listOfNotNull(defaultCategories.find { it.remoteId == DBBill.CATEGORY_REIMBURSEMENT })
+                    }
+
+                    toEnsure.forEach { def ->
+                        if (syncedCategories.none { it.remoteId == def.remoteId }) {
+                            db.addCategory(def)
+                        }
+                    }
+
                     val members = db.getMembersOfProject(proj.id, null)
                     val bills = db.getBillsOfProject(proj.id)
                     val categories = db.getCategories(proj.id)
                     val paymentModes = db.getPaymentModes(proj.id)
-                    StatisticsData(members, bills, categories, paymentModes)
+
+                    val includeDeactivated = prefs.getBoolean(keyStatsIncludeDeactivated, false)
+                    val filteredMembers = if (includeDeactivated) members else members.filter { it.isActivated }
+
+                    StatisticsData(filteredMembers, bills, categories, paymentModes)
                 }
             }
 
             if (statsData != null) {
                 val data = statsData!!
-                val defaultCategories = remember(proj.id) { CategoryUtils.getDefaultCategories(context, proj.id) }
-                val categories = remember(proj.type, data.categories, defaultCategories) {
-                    val hardcoded = if (proj.type == ProjectType.LOCAL) {
-                        defaultCategories
-                    } else {
-                        listOfNotNull(defaultCategories.find { it.remoteId.toInt() == DBBill.CATEGORY_REIMBURSEMENT })
-                    }
-                    (data.categories + hardcoded).distinctBy { it.remoteId }
-                }
+                val categories = data.categories
+
                 val categoryNoneLabel = stringResource(R.string.category_none)
-                val sankeyCategories = remember(proj.id, data.categories, defaultCategories, categoryNoneLabel) {
+                val sankeyCategories = remember(proj.id, data.categories, categoryNoneLabel) {
                     val noneCategory = DBCategory(0, 0, proj.id, categoryNoneLabel, "❌", "#9E9E9E")
-                    (data.categories + defaultCategories + noneCategory).distinctBy { it.remoteId }
+                    (data.categories + noneCategory).distinctBy { if (it.id == 0L) "none" else it.id.toString() }
                 }
 
                 when (selectedTab) {
@@ -131,6 +145,8 @@ fun ProjectStatisticsScreen(
                     2 -> {
                         ProjectSankeyDiagram(
                             projectName = proj.name.ifEmpty { proj.remoteId },
+                            projectId = proj.id,
+                            projectRemoteId = proj.remoteId,
                             allMembers = data.members,
                             allBills = data.bills,
                             customCategories = sankeyCategories,

app/src/main/java/net/helcel/cowspent/android/statistics/ProjectStatisticsTable.kt

@@ -3,8 +3,8 @@ package net.helcel.cowspent.android.statistics
 import android.app.DatePickerDialog
 import android.content.Context
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+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.filled.*
@@ -44,8 +44,8 @@ fun ProjectStatisticsTable(
     val sdf = remember { SimpleDateFormat("yyyy-MM-dd", Locale.ROOT) }
     val dateFormat = remember { android.text.format.DateFormat.getDateFormat(context) }
 
-    var categoryId by remember { mutableIntStateOf(-1000) }
-    var paymentModeId by remember { mutableIntStateOf(-1000) }
+    var categoryId by remember { mutableLongStateOf(-1000L) }
+    var paymentModeId by remember { mutableLongStateOf(-1000L) }
     var dateMin by remember { mutableStateOf<String?>(null) }
     var dateMax by remember { mutableStateOf<String?>(null) }
 
@@ -57,14 +57,14 @@ fun ProjectStatisticsTable(
     val paymentModeAll = stringResource(R.string.payment_mode_all)
     val paymentModeNone = stringResource(R.string.payment_mode_none)
 
-    val shareStatsHeader = stringResource(R.string.share_stats_header)
-    val shareStatsIntro = stringResource(R.string.share_stats_intro, proj.name.ifEmpty { proj.remoteId })
+    val shareStatsHeader = stringResource(R.string.msg_stats_header)
+    val shareStatsIntro = stringResource(R.string.msg_stats_intro, proj.name.ifEmpty { proj.remoteId })
 
     val categories = remember(proj.id, customCategories, categoryAll, categoryNone, categoryReimbursement, categoryAllExceptReimbursement) {
-        val list = mutableListOf<Triple<Int, String, String>>()
-        list.add(Triple(-1000, "📋", categoryAll))
-        list.add(Triple(-100, "🧾", categoryAllExceptReimbursement))
-        list.add(Triple(0, "❌", categoryNone))
+        val list = mutableListOf<Triple<Long, String, String>>()
+        list.add(Triple(-1000L, "📋", categoryAll))
+        list.add(Triple(-100L, "🧾", categoryAllExceptReimbursement))
+        list.add(Triple(0L, "❌", categoryNone))
 
         val catsToUse = if (proj.type == ProjectType.LOCAL) {
             CategoryUtils.getDefaultCategories(context, proj.id)
@@ -75,15 +75,15 @@ fun ProjectStatisticsTable(
         }
 
         catsToUse.forEach {
-            list.add(Triple(it.remoteId.toInt(), it.icon, it.name ?: ""))
+            list.add(Triple(it.id, it.icon, it.name ?: ""))
         }
         list.distinctBy { it.first }
     }
 
     val paymentModes = remember(proj.id, customPaymentModes, paymentModeAll, paymentModeNone) {
-        val list = mutableListOf<Triple<Int, String, String>>()
-        list.add(Triple(-1000, "💳", paymentModeAll))
-        list.add(Triple(0, "❌", paymentModeNone))
+        val list = mutableListOf<Triple<Long, String, String>>()
+        list.add(Triple(-1000L, "💳", paymentModeAll))
+        list.add(Triple(0L, "❌", paymentModeNone))
 
         val pmsToUse = if (proj.type == ProjectType.LOCAL) {
             CategoryUtils.getDefaultPaymentModes(context, proj.id)
@@ -94,7 +94,7 @@ fun ProjectStatisticsTable(
         }
 
         pmsToUse.forEach {
-            list.add(Triple(it.remoteId.toInt(), it.icon, it.name ?: ""))
+            list.add(Triple(it.id, it.icon, it.name ?: ""))
         }
         list.distinctBy { it.first }
     }
@@ -105,10 +105,12 @@ fun ProjectStatisticsTable(
         val membersPaid = HashMap<Long, Double>()
         val membersSpent = HashMap<Long, Double>()
 
+        val reimbursementCategoryId = CategoryUtils.getReimbursementCategoryId(customCategories, proj.id, proj.remoteId)
+
         SupportUtil.getStats(
             allMembers, allBills,
             membersNbBills, membersBalance, membersPaid, membersSpent,
-            categoryId, paymentModeId, dateMin, dateMax
+            categoryId, paymentModeId, reimbursementCategoryId, dateMin, dateMax
         )
 
         var statsText = shareStatsIntro + "\n\n"
@@ -164,12 +166,12 @@ fun ProjectStatisticsTable(
 
                 EditableExposedDropdownMenu(
                     value = selectedCategory?.third ?: "",
-                    placeholder = stringResource(R.string.setting_category),
+                    placeholder = stringResource(R.string.label_category),
                     expanded = categoryExpanded,
                     onExpandedChange = { categoryExpanded = it },
                     onDismissRequest = { categoryExpanded = false },
                     leadingIcon = {
-                        Box(modifier = Modifier.padding(start = 12.dp)) {
+                        Box(modifier = Modifier) {
                             if (selectedCategory != null) {
                                 Text(text = selectedCategory.second, fontSize = 20.sp)
                             } else {
@@ -198,12 +200,12 @@ fun ProjectStatisticsTable(
 
                 EditableExposedDropdownMenu(
                     value = selectedPm?.third ?: "",
-                    placeholder = stringResource(R.string.setting_payment_mode),
+                    placeholder = stringResource(R.string.label_mode),
                     expanded = pmExpanded,
                     onExpandedChange = { pmExpanded = it },
                     onDismissRequest = { pmExpanded = false },
                     leadingIcon = {
-                        Box(modifier = Modifier.padding(start = 12.dp)) {
+                        Box(modifier = Modifier) {
                             if (selectedPm != null) {
                                 Text(text = selectedPm.second, fontSize = 20.sp)
                             } else {
@@ -269,25 +271,32 @@ fun ProjectStatisticsTable(
 
         Spacer(modifier = Modifier.height(24.dp))
 
-        // Table Header
         Surface(
-            color = MaterialTheme.colors.onSurface.copy(alpha = 0.05f),
-            shape = MaterialTheme.shapes.small,
+            color = MaterialTheme.colors.background,
             modifier = Modifier.fillMaxWidth()
         ) {
-            Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 8.dp)) {
-                Text(stringResource(R.string.stats_who), modifier = Modifier.weight(2f), fontWeight = FontWeight.Bold, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f), fontSize = 12.sp)
-                Text(stringResource(R.string.stats_paid), modifier = Modifier.weight(1.5f), fontWeight = FontWeight.Bold, textAlign = TextAlign.End, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f), fontSize = 12.sp)
-                Text(stringResource(R.string.stats_spent), modifier = Modifier.weight(1.5f), fontWeight = FontWeight.Bold, textAlign = TextAlign.End, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f), fontSize = 12.sp)
-                Text(stringResource(R.string.stats_balance), modifier = Modifier.weight(1.5f), fontWeight = FontWeight.Bold, textAlign = TextAlign.End, color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f), fontSize = 12.sp)
+            Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp)) {
+                Text(stringResource(R.string.stats_who).uppercase(), modifier = Modifier.weight(2f), fontWeight = FontWeight.Bold, color = MaterialTheme.colors.onSurface, style = MaterialTheme.typography.overline)
+                Text(stringResource(R.string.stats_paid).uppercase(), modifier = Modifier.weight(1.5f), fontWeight = FontWeight.Bold, textAlign = TextAlign.End, color = MaterialTheme.colors.onSurface, style = MaterialTheme.typography.overline)
+                Text(stringResource(R.string.stats_spent).uppercase(), modifier = Modifier.weight(1.5f), fontWeight = FontWeight.Bold, textAlign = TextAlign.End, color = MaterialTheme.colors.onSurface, style = MaterialTheme.typography.overline)
+                Text(stringResource(R.string.stats_balance).uppercase(), modifier = Modifier.weight(1.5f), fontWeight = FontWeight.Bold, textAlign = TextAlign.End, color = MaterialTheme.colors.onSurface, style = MaterialTheme.typography.overline)
             }
         }
 
         Spacer(modifier = Modifier.height(4.dp))
 
-        LazyColumn(modifier = Modifier.weight(1f)) {
-            items(stats.memberStats) { m ->
-                Row(modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp, horizontal = 8.dp), verticalAlignment = Alignment.CenterVertically) {
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .verticalScroll(rememberScrollState())
+        ) {
+            stats.memberStats.forEach { m ->
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 12.dp, horizontal = 8.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
                     Text(m.name, modifier = Modifier.weight(2f), color = MaterialTheme.colors.onSurface, fontWeight = FontWeight.Medium)
 
                     Text(

app/src/main/java/net/helcel/cowspent/model/DBAccountProject.kt

@@ -12,6 +12,6 @@ class DBAccountProject(
 ) : Serializable {
 
     override fun toString(): String {
-        return "#DBAccountProject$id/$remoteId,$name, $ncUrl, $password, archivedTs=$archivedTs"
+        return "#DBAccountProject$id/$remoteId,$name, $ncUrl, [SECURE], archivedTs=$archivedTs"
     }
 }

app/src/main/java/net/helcel/cowspent/model/DBBill.kt

@@ -1,6 +1,5 @@
 package net.helcel.cowspent.model
 
-import android.util.Log
 import java.io.Serializable
 import java.util.Calendar
 import java.util.Locale
@@ -16,9 +15,9 @@ open class DBBill(
     var state: Int,
     var repeat: String?,
     var paymentMode: String?,
-    var categoryRemoteId: Int,
+    var categoryId: Long,
     var comment: String?,
-    var paymentModeRemoteId: Int
+    var paymentModeId: Long
 ) : Item, Serializable {
 
     var formattedWhat: String = ""
@@ -39,7 +38,6 @@ open class DBBill(
         get() {
             val cal = Calendar.getInstance()
             cal.timeInMillis = timestamp * 1000
-            Log.v("ll", "[$what] get date ts $timestamp year ${cal[Calendar.YEAR]}")
             val month = cal[Calendar.MONTH] + 1
             val day = cal[Calendar.DAY_OF_MONTH]
             return "${cal[Calendar.YEAR]}-${String.format(Locale.ROOT, "%02d", month)}-${
@@ -58,7 +56,7 @@ open class DBBill(
 
 
     override fun toString(): String {
-        return "#DBBill$id/$remoteId,$projectId, $payerId, $amount, $timestamp, $what, $state, $repeat, $paymentMode, $categoryRemoteId"
+        return "#DBBill$id/$remoteId,$projectId, $payerId, $amount, $timestamp, $what, $state, $repeat, $paymentMode, $categoryId"
     }
 
     override fun isSection(): Boolean {
@@ -73,15 +71,15 @@ open class DBBill(
         const val PAYMODE_TRANSFER = "t"
         const val PAYMODE_ONLINE_SERVICE = "o"
 
-        const val PAYMODE_ID_NONE = 0
-        const val PAYMODE_ID_CARD = -1
-        const val PAYMODE_ID_CASH = -2
-        const val PAYMODE_ID_CHECK = -3
-        const val PAYMODE_ID_TRANSFER = -4
-        const val PAYMODE_ID_ONLINE_SERVICE = -5
+        const val PAYMODE_ID_NONE = 0L
+        const val PAYMODE_ID_CARD = -1L
+        const val PAYMODE_ID_CASH = -2L
+        const val PAYMODE_ID_CHECK = -3L
+        const val PAYMODE_ID_TRANSFER = -4L
+        const val PAYMODE_ID_ONLINE_SERVICE = -5L
 
         @JvmField
-        val oldPmIdToNew: Map<String, Int> = object : HashMap<String, Int>() {
+        val oldPmIdToNew: Map<String, Long> = object : HashMap<String, Long>() {
             init {
                 put(PAYMODE_NONE, PAYMODE_ID_NONE)
                 put(PAYMODE_CARD, PAYMODE_ID_CARD)
@@ -92,19 +90,19 @@ open class DBBill(
             }
         }
 
-        const val CATEGORY_NONE = 0
-        const val CATEGORY_GROCERIES = -1
-        const val CATEGORY_LEISURE = -2
-        const val CATEGORY_RENT = -3
-        const val CATEGORY_BILLS = -4
-        const val CATEGORY_CULTURE = -5
-        const val CATEGORY_HEALTH = -6
-        const val CATEGORY_SHOPPING = -10
-        const val CATEGORY_REIMBURSEMENT = -11
-        const val CATEGORY_RESTAURANT = -12
-        const val CATEGORY_ACCOMMODATION = -13
-        const val CATEGORY_TRANSPORT = -14
-        const val CATEGORY_SPORT = -15
+        const val CATEGORY_NONE = 0L
+        const val CATEGORY_GROCERIES = -1L
+        const val CATEGORY_LEISURE = -2L
+        const val CATEGORY_RENT = -3L
+        const val CATEGORY_BILLS = -4L
+        const val CATEGORY_CULTURE = -5L
+        const val CATEGORY_HEALTH = -6L
+        const val CATEGORY_SHOPPING = -10L
+        const val CATEGORY_REIMBURSEMENT = -11L
+        const val CATEGORY_RESTAURANT = -12L
+        const val CATEGORY_ACCOMMODATION = -13L
+        const val CATEGORY_TRANSPORT = -14L
+        const val CATEGORY_SPORT = -15L
 
         const val STATE_OK = 0
         const val STATE_ADDED = 1

app/src/main/java/net/helcel/cowspent/model/DBCategory.kt

@@ -8,7 +8,8 @@ class DBCategory(
     var projectId: Long,
     var name: String?,
     var icon: String,
-    var color: String
+    var color: String,
+    var state: Int = DBBill.STATE_OK
 ) : Serializable {
 
     override fun toString(): String {

app/src/main/java/net/helcel/cowspent/model/DBPaymentMode.kt

@@ -8,7 +8,8 @@ class DBPaymentMode(
     var projectId: Long,
     var name: String?,
     var icon: String,
-    var color: String
+    var color: String,
+    var state: Int = DBBill.STATE_OK
 ) : Serializable {
 
     override fun toString(): String {

app/src/main/java/net/helcel/cowspent/model/GroupedBill.kt

@@ -15,9 +15,9 @@ class GroupedBill(
     sourceBills.first().state,
     sourceBills.first().repeat,
     sourceBills.first().paymentMode,
-    sourceBills.first().categoryRemoteId,
+    sourceBills.first().categoryId,
     sourceBills.first().comment,
-    sourceBills.first().paymentModeRemoteId
+    sourceBills.first().paymentModeId
 ), Serializable {
     init {
         this.formattedWhat = sourceBills.first().formattedWhat

app/src/main/java/net/helcel/cowspent/model/ProjectType.kt

@@ -12,7 +12,6 @@ enum class ProjectType(val id: String) {
             }
         }
 
-        @JvmStatic
         fun getTypeById(id: String?): ProjectType? {
             return reverseMap[id]
         }

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

@@ -14,11 +14,11 @@ object BillFormatter {
     ) {
         for (bill in bills) {
             var whatPrefix = ""
-            val pm = paymentModesMap[bill.paymentModeRemoteId.toLong()]
+            val pm = paymentModesMap[bill.paymentModeId]
             if (pm != null) {
                 whatPrefix += pm.icon + " "
             } else {
-                when (bill.paymentModeRemoteId) {
+                when (bill.paymentModeId) {
                     DBBill.PAYMODE_ID_CARD -> whatPrefix += "\uD83D\uDCB3 "
                     DBBill.PAYMODE_ID_CASH -> whatPrefix += "\uD83D\uDCB5 "
                     DBBill.PAYMODE_ID_CHECK -> whatPrefix += "\uD83C\uDFAB "
@@ -27,11 +27,11 @@ object BillFormatter {
                 }
             }
 
-            val cat = categoriesMap[bill.categoryRemoteId.toLong()]
+            val cat = categoriesMap[bill.categoryId]
             if (cat != null) {
                 whatPrefix += cat.icon + " "
             } else {
-                when (bill.categoryRemoteId) {
+                when (bill.categoryId) {
                     DBBill.CATEGORY_GROCERIES -> whatPrefix += "\uD83D\uDED2 "
                     DBBill.CATEGORY_LEISURE -> whatPrefix += "\uD83C\uDF89 "
                     DBBill.CATEGORY_RENT -> whatPrefix += "\uD83C\uDFE0 "

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

@@ -10,28 +10,57 @@ object CategoryUtils {
 
     fun getDefaultCategories(context: Context, projectId: Long): List<DBCategory> {
         return listOf(
-            DBCategory(0, DBBill.CATEGORY_GROCERIES.toLong(), projectId, context.getString(R.string.category_groceries), "\uD83D\uDED2", "#ffaa00"),
-            DBCategory(0, DBBill.CATEGORY_LEISURE.toLong(), projectId, context.getString(R.string.category_leisure), "\uD83C\uDF89", "#aa55ff"),
-            DBCategory(0, DBBill.CATEGORY_RENT.toLong(), projectId, context.getString(R.string.category_rent), "\uD83C\uDFE0", "#da8733"),
-            DBCategory(0, DBBill.CATEGORY_BILLS.toLong(), projectId, context.getString(R.string.category_bills), "\uD83C\uDF29", "#4aa6b0"),
-            DBCategory(0, DBBill.CATEGORY_CULTURE.toLong(), projectId, context.getString(R.string.category_excursion), "\uD83D\uDEB8", "#0055ff"),
-            DBCategory(0, DBBill.CATEGORY_HEALTH.toLong(), projectId, context.getString(R.string.category_health), "\uD83D\uDC9A", "#bf090c"),
-            DBCategory(0, DBBill.CATEGORY_SHOPPING.toLong(), projectId, context.getString(R.string.category_shopping), "\uD83D\uDECD", "#e167d1"),
-            DBCategory(0, DBBill.CATEGORY_REIMBURSEMENT.toLong(), projectId, context.getString(R.string.category_reimbursement), "\uD83D\uDCB0", "#00ced1"),
-            DBCategory(0, DBBill.CATEGORY_RESTAURANT.toLong(), projectId, context.getString(R.string.category_restaurant), "\uD83C\uDF74", "#d0d5e1"),
-            DBCategory(0, DBBill.CATEGORY_ACCOMMODATION.toLong(), projectId, context.getString(R.string.category_accomodation), "\uD83D\uDECC", "#5de1a3"),
-            DBCategory(0, DBBill.CATEGORY_TRANSPORT.toLong(), projectId, context.getString(R.string.category_transport), "\uD83D\uDE8C", "#6f2ee1"),
-            DBCategory(0, DBBill.CATEGORY_SPORT.toLong(), projectId, context.getString(R.string.category_sport), "\uD83C\uDFBE", "#69e177")
+            DBCategory(DBBill.CATEGORY_GROCERIES,
+                DBBill.CATEGORY_GROCERIES, projectId, context.getString(R.string.category_groceries), "\uD83D\uDED2", "#ffaa00"),
+            DBCategory(DBBill.CATEGORY_LEISURE,
+                DBBill.CATEGORY_LEISURE, projectId, context.getString(R.string.category_leisure), "\uD83C\uDF89", "#aa55ff"),
+            DBCategory(DBBill.CATEGORY_RENT,
+                DBBill.CATEGORY_RENT, projectId, context.getString(R.string.category_rent), "\uD83C\uDFE0", "#da8733"),
+            DBCategory(DBBill.CATEGORY_BILLS,
+                DBBill.CATEGORY_BILLS, projectId, context.getString(R.string.category_bills), "\uD83C\uDF29", "#4aa6b0"),
+            DBCategory(DBBill.CATEGORY_CULTURE,
+                DBBill.CATEGORY_CULTURE, projectId, context.getString(R.string.category_excursion), "\uD83D\uDEB8", "#0055ff"),
+            DBCategory(DBBill.CATEGORY_HEALTH,
+                DBBill.CATEGORY_HEALTH, projectId, context.getString(R.string.category_health), "\uD83D\uDC9A", "#bf090c"),
+            DBCategory(DBBill.CATEGORY_SHOPPING,
+                DBBill.CATEGORY_SHOPPING, projectId, context.getString(R.string.category_shopping), "\uD83D\uDECD", "#e167d1"),
+            DBCategory(DBBill.CATEGORY_REIMBURSEMENT,
+                DBBill.CATEGORY_REIMBURSEMENT, projectId, context.getString(R.string.category_reimbursement), "\uD83D\uDCB0", "#00ced1"),
+            DBCategory(DBBill.CATEGORY_RESTAURANT,
+                DBBill.CATEGORY_RESTAURANT, projectId, context.getString(R.string.category_restaurant), "\uD83C\uDF74", "#d0d5e1"),
+            DBCategory(DBBill.CATEGORY_ACCOMMODATION,
+                DBBill.CATEGORY_ACCOMMODATION, projectId, context.getString(R.string.category_accomodation), "\uD83D\uDECC", "#5de1a3"),
+            DBCategory(DBBill.CATEGORY_TRANSPORT,
+                DBBill.CATEGORY_TRANSPORT, projectId, context.getString(R.string.category_transport), "\uD83D\uDE8C", "#6f2ee1"),
+            DBCategory(DBBill.CATEGORY_SPORT,
+                DBBill.CATEGORY_SPORT, projectId, context.getString(R.string.category_sport), "\uD83C\uDFBE", "#69e177")
         )
     }
 
     fun getDefaultPaymentModes(context: Context, projectId: Long): List<DBPaymentMode> {
         return listOf(
-            DBPaymentMode(0, DBBill.PAYMODE_ID_CARD.toLong(), projectId, context.getString(R.string.payment_mode_credit_card), "\uD83D\uDCB3", "#ff7f50"),
-            DBPaymentMode(0, DBBill.PAYMODE_ID_CASH.toLong(), projectId, context.getString(R.string.payment_mode_cash), "\uD83D\uDCB5", "#556b2f"),
-            DBPaymentMode(0, DBBill.PAYMODE_ID_CHECK.toLong(), projectId, context.getString(R.string.payment_mode_check), "\uD83C\uDFAB", "#a9a9a9"),
-            DBPaymentMode(0, DBBill.PAYMODE_ID_TRANSFER.toLong(), projectId, context.getString(R.string.payment_mode_transfer), "⇄", "#00ced1"),
-            DBPaymentMode(0, DBBill.PAYMODE_ID_ONLINE_SERVICE.toLong(), projectId, context.getString(R.string.payment_mode_online), "\uD83C\uDF0E", "#9932cc")
+            DBPaymentMode(DBBill.PAYMODE_ID_CARD, DBBill.PAYMODE_ID_CARD, projectId, context.getString(R.string.payment_mode_credit_card), "\uD83D\uDCB3", "#ff7f50"),
+            DBPaymentMode(DBBill.PAYMODE_ID_CASH, DBBill.PAYMODE_ID_CASH, projectId, context.getString(R.string.payment_mode_cash), "\uD83D\uDCB5", "#556b2f"),
+            DBPaymentMode(DBBill.PAYMODE_ID_CHECK, DBBill.PAYMODE_ID_CHECK, projectId, context.getString(R.string.payment_mode_check), "\uD83C\uDFAB", "#a9a9a9"),
+            DBPaymentMode(DBBill.PAYMODE_ID_TRANSFER, DBBill.PAYMODE_ID_TRANSFER, projectId, context.getString(R.string.payment_mode_transfer), "⇄", "#00ced1"),
+            DBPaymentMode(DBBill.PAYMODE_ID_ONLINE_SERVICE, DBBill.PAYMODE_ID_ONLINE_SERVICE, projectId, context.getString(R.string.payment_mode_online), "\uD83C\uDF0E", "#9932cc")
         )
     }
+
+    fun getReimbursementCategoryId(categories: List<DBCategory>, projectId: Long, projectRemoteId: String? = null): Long {
+        return categories.find {
+            it.projectId == projectId && (
+                    it.remoteId == DBBill.CATEGORY_REIMBURSEMENT ||
+                            (projectRemoteId != null && it.remoteId.toString() == projectRemoteId)
+                    )
+        }?.id ?: DBBill.CATEGORY_REIMBURSEMENT
+    }
+
+    fun getCategoryById(context: Context, id: Long, projectId: Long = 0): DBCategory? {
+        return getDefaultCategories(context, projectId).find { it.id == id }
+    }
+
+    fun getPaymentModeById(context: Context, id: Long, projectId: Long = 0): DBPaymentMode? {
+        return getDefaultPaymentModes(context, projectId).find { it.id == id }
+    }
 }

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

@@ -24,7 +24,7 @@ object ColorUtils {
         val colorMode = if (prefs.contains(modeKey)) {
             prefs.getString(modeKey, "system")
         } else {
-            val useServer = prefs.getBoolean(context.getString(R.string.pref_key_use_server_color), true)
+            val useServer = prefs.getBoolean(context.getString(R.string.pref_key_use_server_color), false)
             val useSystem = prefs.getBoolean(context.getString(R.string.pref_key_use_system_color), true)
             when {
                 useServer -> "server"

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

@@ -17,7 +17,7 @@ object CospendClientUtil {
 
     enum class LoginStatus(@param:StringRes val str: Int) {
         OK(0),
-        AUTH_FAILED(R.string.error_username_password_invalid),
+        AUTH_FAILED(R.string.error_auth),
         CONNECTION_FAILED(R.string.error_io),
         NO_NETWORK(R.string.error_no_network),
         JSON_FAILED(R.string.error_json),

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

@@ -48,7 +48,7 @@ object ExportUtil {
             }
             owersTxt = owersTxt.replace(",$".toRegex(), "")
             fileContent += "\"${b.what}\",${b.amount},${b.date},${b.timestamp},\"$payerName\"," +
-                    "$payerWeight,$payerActive,\"$owersTxt\",${b.repeat},${b.categoryRemoteId}," +
+                    "$payerWeight,$payerActive,\"$owersTxt\",${b.repeat},${b.categoryId}," +
                     "${b.paymentMode}\n"
         }
 

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

@@ -35,13 +35,13 @@ class NextcloudClient(
         val method = if (useOcsApi) METHOD_GET else METHOD_POST
         return if (nextcloudAPI != null) {
             Log.d(javaClass.simpleName, "using SSO to get/sync account projects")
-            Log.d(javaClass.simpleName, "Sync projects target $target")
+//            Log.d(javaClass.simpleName, "Sync projects target $target")
             ServerResponse.AccountProjectsResponse(
                 requestServerWithSSO(nextcloudAPI, target, method, null, useOcsApi),
                 useOcsApi
             )
         } else {
-            Log.d(javaClass.simpleName, "Sync projects target $target")
+//            Log.d(javaClass.simpleName, "Sync projects target $target")
             ServerResponse.AccountProjectsResponse(
                 requestServer(target, method, null, "", true, useOcsApi),
                 useOcsApi
@@ -51,7 +51,7 @@ class NextcloudClient(
 
     @Throws(JSONException::class, IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
     fun getCapabilities(project: DBProject?): ServerResponse.CapabilitiesResponse {
-        val target: String = if (project == null || url != "") {
+        val target: String = if (project == null || url != "" || nextcloudAPI != null) {
             "/ocs/v2.php/cloud/capabilities"
         } else {
             val realServerUrl = project.serverUrl!!
@@ -86,13 +86,17 @@ class NextcloudClient(
     }
 
     @Throws(TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
-    private fun requestServerWithSSO(
+    internal fun requestServerWithSSO(
         nextcloudAPI: NextcloudAPI,
         target: String,
         method: String,
         params: Collection<QueryParam>?,
         isOCSRequest: Boolean
     ): VersatileProjectSyncClient.ResponseData {
+        var finalTarget = target
+        if (finalTarget.contains("/ocs/v2.php") && !finalTarget.contains("format=json")) {
+            finalTarget += if (finalTarget.contains("?")) "&format=json" else "?format=json"
+        }
         val result = StringBuilder()
         val headers: MutableMap<String, List<String>> = HashMap()
         if (isOCSRequest) {
@@ -103,13 +107,13 @@ class NextcloudClient(
         val nextcloudRequest: NextcloudRequest = if (params == null) {
             NextcloudRequest.Builder()
                 .setMethod(method)
-                .setUrl(target)
+                .setUrl(finalTarget)
                 .setHeader(headers)
                 .build()
         } else {
             NextcloudRequest.Builder()
                 .setMethod(method)
-                .setUrl(target)
+                .setUrl(finalTarget)
                 .setParameter(params)
                 .setHeader(headers)
                 .build()
@@ -137,7 +141,7 @@ class NextcloudClient(
     }
 
     @Throws(TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
-    private fun imageRequestServerWithSSO(
+    internal fun imageRequestServerWithSSO(
         nextcloudAPI: NextcloudAPI,
         target: String,
         method: String,
@@ -178,13 +182,17 @@ class NextcloudClient(
     }
 
     @Throws(IOException::class, NextcloudHttpRequestFailedException::class)
-    private fun requestServer(
+    internal fun requestServer(
         target: String,
         method: String, params: JSONObject?, lastETag: String?, needLogin: Boolean, isOCSRequest: Boolean
     ): VersatileProjectSyncClient.ResponseData {
+        var finalTarget = target
+        if (finalTarget.contains("/ocs/v2.php") && !finalTarget.contains("format=json")) {
+            finalTarget += if (finalTarget.contains("?")) "&format=json" else "?format=json"
+        }
         val result = StringBuilder()
-        val targetURL = url + target.replace("^/".toRegex(), "")
-        Log.d(javaClass.simpleName, "method and target URL: $method $targetURL")
+        val targetURL = url + finalTarget.replace("^/".toRegex(), "")
+//        Log.d(javaClass.simpleName, "method and target URL: $method $targetURL")
         val httpCon = SupportUtil.getHttpURLConnection(targetURL)
         httpCon.requestMethod = method
         if (needLogin) {
@@ -194,7 +202,7 @@ class NextcloudClient(
             )
         }
         httpCon.setRequestProperty("Connection", "Close")
-        httpCon.setRequestProperty("User-Agent", "cowspent-android/" + SupportUtil.getAppVersionName(context))
+        httpCon.setRequestProperty("User-Agent", "Cowspent-android/" + SupportUtil.getAppVersionName(context))
         if (lastETag != null && METHOD_GET == method) {
             httpCon.setRequestProperty("If-None-Match", lastETag)
         }
@@ -206,7 +214,7 @@ class NextcloudClient(
         var paramData: ByteArray? = null
         if (params != null) {
             paramData = params.toString().toByteArray()
-            Log.d(javaClass.simpleName, "Params: $params")
+//            Log.d(javaClass.simpleName, "Params: $params")
             httpCon.setFixedLengthStreamingMode(paramData.size)
             httpCon.setRequestProperty("Content-Type", application_json)
             httpCon.doOutput = true
@@ -240,12 +248,16 @@ class NextcloudClient(
     }
 
     @Throws(IOException::class, NextcloudHttpRequestFailedException::class)
-    private fun imageRequestServer(
+    internal fun imageRequestServer(
         target: String,
         method: String, params: JSONObject?, lastETag: String?, needLogin: Boolean, isOCSRequest: Boolean
     ): VersatileProjectSyncClient.ResponseData {
+        var finalTarget = target
+        if (finalTarget.contains("/ocs/v2.php") && !finalTarget.contains("format=json")) {
+            finalTarget += if (finalTarget.contains("?")) "&format=json" else "?format=json"
+        }
         var strBase64: String
-        val targetURL = url + target.replace("^/".toRegex(), "")
+        val targetURL = url + finalTarget.replace("^/".toRegex(), "")
         val httpCon = SupportUtil.getHttpURLConnection( targetURL)
         httpCon.requestMethod = method
         if (needLogin) {
@@ -263,11 +275,11 @@ class NextcloudClient(
             httpCon.setRequestProperty("OCS-APIRequest", "true")
         }
         httpCon.connectTimeout = 10 * 1000 // 10 seconds
-        Log.d(javaClass.simpleName, "$method $targetURL")
+//        Log.d(javaClass.simpleName, "$method $targetURL")
         var paramData: ByteArray?
         if (params != null) {
             paramData = params.toString().toByteArray()
-            Log.d(javaClass.simpleName, "Params: $params")
+//            Log.d(javaClass.simpleName, "Params: $params")
             httpCon.setFixedLengthStreamingMode(paramData.size)
             httpCon.setRequestProperty("Content-Type", application_json)
             httpCon.doOutput = true

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

@@ -0,0 +1,84 @@
+package net.helcel.cowspent.util
+
+import android.content.Context
+import android.util.Base64
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.google.crypto.tink.Aead
+import com.google.crypto.tink.KeyTemplates
+import com.google.crypto.tink.RegistryConfiguration
+import com.google.crypto.tink.aead.AeadConfig
+import com.google.crypto.tink.integration.android.AndroidKeysetManager
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "secure_prefs")
+
+object SecureStorage {
+    private var aead: Aead? = null
+
+    @Synchronized
+    private fun getAead(context: Context): Aead {
+        aead?.let { return it }
+        AeadConfig.register()
+        val masterKeyUri = "android-keystore://secure_storage_master_key"
+        val keysetManager = AndroidKeysetManager.Builder()
+            .withSharedPref(context, "tink_keyset", "secure_storage_keyset_prefs")
+            .withKeyTemplate(KeyTemplates.get("AES256_GCM"))
+            .withMasterKeyUri(masterKeyUri)
+            .build()
+        val newAead = keysetManager.keysetHandle.getPrimitive(RegistryConfiguration.get(), Aead::class.java)
+        aead = newAead
+        return newAead
+    }
+
+    private fun encrypt(context: Context, value: String): String {
+        val encrypted = getAead(context).encrypt(value.toByteArray(), null)
+        return Base64.encodeToString(encrypted, Base64.NO_WRAP)
+    }
+
+    private fun decrypt(context: Context, encryptedValue: String): String? {
+        return try {
+            val decoded = Base64.decode(encryptedValue, Base64.NO_WRAP)
+            val decrypted = getAead(context).decrypt(decoded, null)
+            String(decrypted)
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    suspend fun savePassword(context: Context, key: String, password: String?) {
+        if (password == null) {
+            removePassword(context, key)
+        } else {
+            val encrypted = encrypt(context, password)
+            context.dataStore.edit { it[stringPreferencesKey(key)] = encrypted }
+        }
+    }
+
+    suspend fun getPassword(context: Context, key: String): String? {
+        val encrypted = context.dataStore.data.map { it[stringPreferencesKey(key)] }.first()
+        return encrypted?.let { decrypt(context, it) }
+    }
+
+    suspend fun removePassword(context: Context, key: String) {
+        context.dataStore.edit { it.remove(stringPreferencesKey(key)) }
+    }
+
+    // Synchronous alternatives for legacy code
+    fun savePasswordSync(context: Context, key: String, password: String?) = runBlocking {
+        savePassword(context, key, password)
+    }
+
+    fun getPasswordSync(context: Context, key: String): String? = runBlocking {
+        getPassword(context, key)
+    }
+
+    fun removePasswordSync(context: Context, key: String) = runBlocking {
+        removePassword(context, key)
+    }
+}

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

@@ -12,15 +12,10 @@ import net.helcel.cowspent.model.DBProject
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import org.xml.sax.SAXException
-import java.io.ByteArrayInputStream
 import java.io.IOException
-import java.io.InputStream
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.parsers.ParserConfigurationException
 
 
 /**
@@ -41,6 +36,10 @@ open class ServerResponse(
     val lastModified: Long
         get() = response.lastModified
 
+    @get:Throws(JSONException::class)
+    val stringContent: String
+        get() = getResponseStringData()
+
     @Throws(JSONException::class)
     fun getResponseObjectData(): JSONObject {
         val rawData = JSONObject(content)
@@ -125,10 +124,6 @@ open class ServerResponse(
         private val isJsonMember: Boolean
     ) : ServerResponse(response, isOcsResponse) {
 
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-
         @get:Throws(JSONException::class)
         val remoteMemberId: Long
             get() = if (isJsonMember)
@@ -137,45 +132,94 @@ open class ServerResponse(
                 getResponseStringData().toLong()
     }
 
+    class CreateRemoteCategoryResponse(
+        response: VersatileProjectSyncClient.ResponseData,
+        isOcsResponse: Boolean
+    ) : ServerResponse(response, isOcsResponse) {
+
+        @get:Throws(JSONException::class)
+        val remoteCategoryId: Long
+            get() {
+                val dataStr = getResponseStringData()
+                return try {
+                    dataStr.toLong()
+                } catch (_: NumberFormatException) {
+                    val obj = JSONObject(dataStr)
+                    obj.optLong("id", obj.optLong("remoteId", 0L))
+                }
+            }
+    }
+
+    class EditRemoteCategoryResponse(
+        response: VersatileProjectSyncClient.ResponseData,
+        isOcsResponse: Boolean
+    ) : ServerResponse(response, isOcsResponse)
+
+    class DeleteRemoteCategoryResponse(
+        response: VersatileProjectSyncClient.ResponseData,
+        isOcsResponse: Boolean
+    ) : ServerResponse(response, isOcsResponse)
+
+    class CreateRemotePaymentModeResponse(
+        response: VersatileProjectSyncClient.ResponseData,
+        isOcsResponse: Boolean
+    ) : ServerResponse(response, isOcsResponse) {
+
+        @get:Throws(JSONException::class)
+        val remotePaymentModeId: Long
+            get() {
+                val dataStr = getResponseStringData()
+                return try {
+                    dataStr.toLong()
+                } catch (_: NumberFormatException) {
+                    val obj = JSONObject(dataStr)
+                    obj.optLong("id", obj.optLong("remoteId", 0L))
+                }
+            }
+    }
+
+    class EditRemotePaymentModeResponse(
+        response: VersatileProjectSyncClient.ResponseData,
+        isOcsResponse: Boolean
+    ) : ServerResponse(response, isOcsResponse)
+
+    class DeleteRemotePaymentModeResponse(
+        response: VersatileProjectSyncClient.ResponseData,
+        isOcsResponse: Boolean
+    ) : ServerResponse(response, isOcsResponse)
+
     class CreateRemoteCurrencyResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
     ) : ServerResponse(response, isOcsResponse) {
 
         @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
+        val remoteCurrencyId: Long
+            get() {
+                val dataStr = getResponseStringData()
+                return try {
+                    dataStr.toLong()
+                } catch (_: NumberFormatException) {
+                    val obj = JSONObject(dataStr)
+                    obj.optLong("id", obj.optLong("remoteId", 0L))
+                }
+            }
     }
 
     class EditRemoteCurrencyResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
-    ) : ServerResponse(response, isOcsResponse) {
-
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-    }
+    ) : ServerResponse(response, isOcsResponse)
 
     class DeleteRemoteCurrencyResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
-    ) : ServerResponse(response, isOcsResponse) {
-
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-    }
+    ) : ServerResponse(response, isOcsResponse)
 
     class EditRemoteProjectResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
-    ) : ServerResponse(response, isOcsResponse) {
-
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-    }
+    ) : ServerResponse(response, isOcsResponse)
 
     class EditRemoteMemberResponse(
         response: VersatileProjectSyncClient.ResponseData,
@@ -194,8 +238,16 @@ open class ServerResponse(
     ) : ServerResponse(response, isOcsResponse) {
 
         @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
+        val remoteBillId: Long
+            get() {
+                val dataStr = getResponseStringData()
+                return try {
+                    dataStr.toLong()
+                } catch (_: NumberFormatException) {
+                    val obj = JSONObject(dataStr)
+                    obj.optLong("id", obj.optLong("remoteId", 0L))
+                }
+            }
     }
 
     class CreateRemoteBillResponse(
@@ -204,51 +256,54 @@ open class ServerResponse(
     ) : ServerResponse(response, isOcsResponse) {
 
         @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
+        val remoteBillId: Long
+            get() {
+                val dataStr = getResponseStringData()
+                return try {
+                    dataStr.toLong()
+                } catch (_: NumberFormatException) {
+                    val obj = JSONObject(dataStr)
+                    obj.optLong("id", obj.optLong("remoteId", 0L))
+                }
+            }
     }
 
     class DeleteRemoteBillResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
-    ) : ServerResponse(response, isOcsResponse) {
-
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-    }
+    ) : ServerResponse(response, isOcsResponse)
 
     class DeleteRemoteProjectResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
-    ) : ServerResponse(response, isOcsResponse) {
-
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-    }
+    ) : ServerResponse(response, isOcsResponse)
 
     class CreateRemoteProjectResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
-    ) : ServerResponse(response, isOcsResponse) {
-
-        @get:Throws(JSONException::class)
-        val stringContent: String
-            get() = getResponseStringData()
-    }
+    ) : ServerResponse(response, isOcsResponse)
 
     class BillsResponse(response: VersatileProjectSyncClient.ResponseData, isOcsResponse: Boolean) :
         ServerResponse(response, isOcsResponse) {
 
         @Throws(JSONException::class)
-        fun getBillsCospend(projId: Long, memberRemoteIdToId: Map<Long, Long>): List<DBBill> {
-            return getBillsFromJSONObject(getResponseObjectData(), projId, memberRemoteIdToId)
+        fun getBillsCospend(
+            projId: Long,
+            memberRemoteIdToId: Map<Long, Long>,
+            catRemoteIdToId: Map<Long, Long>,
+            pmRemoteIdToId: Map<Long, Long>
+        ): List<DBBill> {
+            return getBillsFromJSONObject(projId, memberRemoteIdToId, catRemoteIdToId, pmRemoteIdToId)
         }
 
         @Throws(JSONException::class)
-        fun getBillsIHM(projId: Long, memberRemoteIdToId: Map<Long, Long>): List<DBBill> {
-            return getBillsFromJSONArray(JSONArray(content), projId, memberRemoteIdToId)
+        fun getBillsIHM(
+            projId: Long,
+            memberRemoteIdToId: Map<Long, Long>,
+            catRemoteIdToId: Map<Long, Long>,
+            pmRemoteIdToId: Map<Long, Long>
+        ): List<DBBill> {
+            return getBillsFromJSONArray(JSONArray(content), projId, memberRemoteIdToId, catRemoteIdToId, pmRemoteIdToId)
         }
 
 
@@ -270,6 +325,32 @@ open class ServerResponse(
         }
     }
 
+    class CategoriesResponse(response: VersatileProjectSyncClient.ResponseData, isOcsResponse: Boolean) :
+        ServerResponse(response, isOcsResponse) {
+
+        @Throws(JSONException::class)
+        fun getCategories(projId: Long): List<DBCategory> {
+            return if (isOcsResponse) {
+                getCategoriesFromJSON(getResponseObjectData(), projId)
+            } else {
+                getCategoriesFromJSONArray(getResponseArrayData(), projId)
+            }
+        }
+    }
+
+    class PaymentModesResponse(response: VersatileProjectSyncClient.ResponseData, isOcsResponse: Boolean) :
+        ServerResponse(response, isOcsResponse) {
+
+        @Throws(JSONException::class)
+        fun getPaymentModes(projId: Long): List<DBPaymentMode> {
+            return if (isOcsResponse) {
+                getPaymentModesFromJSON(getResponseObjectData(), projId)
+            } else {
+                getPaymentModesFromJSONArray(getResponseArrayData(), projId)
+            }
+        }
+    }
+
     class AccountProjectsResponse(
         response: VersatileProjectSyncClient.ResponseData,
         isOcsResponse: Boolean
@@ -301,17 +382,6 @@ open class ServerResponse(
             get() = content
     }
 
-    @Throws(JSONException::class)
-    protected fun getPublicTokenFromJSON(json: JSONObject): String? {
-        if (json.has("code") && json.has("sharetoken")) {
-            val done = json.getInt("code")
-            val publicToken = json.getString("sharetoken")
-            if (done == 1) {
-                return publicToken
-            }
-        }
-        return null
-    }
 
     @Throws(JSONException::class)
     protected fun getNameFromJSON(json: JSONObject): String {
@@ -366,6 +436,26 @@ open class ServerResponse(
         return members
     }
 
+    @Throws(JSONException::class)
+    protected fun getCategoriesFromJSONArray(jsonCats: JSONArray, projId: Long): List<DBCategory> {
+        val categories: MutableList<DBCategory> = ArrayList()
+        for (i in 0 until jsonCats.length()) {
+            val jsonCat = jsonCats.getJSONObject(i)
+            categories.add(getCategoryFromJSON(jsonCat, projId))
+        }
+        return categories
+    }
+
+    @Throws(JSONException::class)
+    protected fun getPaymentModesFromJSONArray(jsonPms: JSONArray, projId: Long): List<DBPaymentMode> {
+        val paymentModes: MutableList<DBPaymentMode> = ArrayList()
+        for (i in 0 until jsonPms.length()) {
+            val jsonPm = jsonPms.getJSONObject(i)
+            paymentModes.add(getPaymentModeFromJSON(jsonPm, projId))
+        }
+        return paymentModes
+    }
+
     @Throws(JSONException::class)
     protected fun getCategoriesFromJSON(json: JSONObject, projId: Long): List<DBCategory> {
         val categories: MutableList<DBCategory> = ArrayList()
@@ -382,6 +472,27 @@ open class ServerResponse(
         return categories
     }
 
+    @Throws(JSONException::class)
+    protected fun getCategoryFromJSON(json: JSONObject, projId: Long): DBCategory {
+        var remoteId: Long = 0
+        if (json.has("id") && !json.isNull("id")) {
+            remoteId = json.getLong("id")
+        }
+        var name = ""
+        var color = ""
+        var icon = ""
+        if (json.has("color") && !json.isNull("color")) {
+            color = json.getString("color")
+        }
+        if (json.has("icon") && !json.isNull("icon")) {
+            icon = json.getString("icon")
+        }
+        if (json.has("name") && !json.isNull("name")) {
+            name = json.getString("name")
+        }
+        return DBCategory(0, remoteId, projId, name, icon, color)
+    }
+
     @Throws(JSONException::class)
     protected fun getCategoryFromJSON(json: JSONObject, remoteIdStr: String, projId: Long): DBCategory {
         val remoteId = remoteIdStr.toLong()
@@ -416,6 +527,27 @@ open class ServerResponse(
         return paymentModes
     }
 
+    @Throws(JSONException::class)
+    protected fun getPaymentModeFromJSON(json: JSONObject, projId: Long): DBPaymentMode {
+        var remoteId: Long = 0
+        if (json.has("id") && !json.isNull("id")) {
+            remoteId = json.getLong("id")
+        }
+        var name = ""
+        var color = ""
+        var icon = ""
+        if (json.has("color") && !json.isNull("color")) {
+            color = json.getString("color")
+        }
+        if (json.has("icon") && !json.isNull("icon")) {
+            icon = json.getString("icon")
+        }
+        if (json.has("name") && !json.isNull("name")) {
+            name = json.getString("name")
+        }
+        return DBPaymentMode(0, remoteId, projId, name, icon, color)
+    }
+
     @Throws(JSONException::class)
     protected fun getPaymentModeFromJSON(json: JSONObject, remoteIdStr: String, projId: Long): DBPaymentMode {
         val remoteId = remoteIdStr.toLong()
@@ -556,26 +688,30 @@ open class ServerResponse(
     protected fun getBillsFromJSONArray(
         json: JSONArray,
         projId: Long,
-        memberRemoteIdToId: Map<Long, Long>
+        memberRemoteIdToId: Map<Long, Long>,
+        catRemoteIdToId: Map<Long, Long>,
+        pmRemoteIdToId: Map<Long, Long>
     ): List<DBBill> {
         val bills: MutableList<DBBill> = ArrayList()
         for (i in 0 until json.length()) {
             val jsonBill = json.getJSONObject(i)
-            bills.add(getBillFromJSON(jsonBill, projId, memberRemoteIdToId))
+            bills.add(getBillFromJSON(jsonBill, projId, memberRemoteIdToId, catRemoteIdToId, pmRemoteIdToId))
         }
         return bills
     }
 
     @Throws(JSONException::class)
     protected fun getBillsFromJSONObject(
-        json: JSONObject,
         projId: Long,
-        memberRemoteIdToId: Map<Long, Long>
+        memberRemoteIdToId: Map<Long, Long>,
+        catRemoteIdToId: Map<Long, Long>,
+        pmRemoteIdToId: Map<Long, Long>
     ): List<DBBill> {
         val bills: List<DBBill>
+        val json = getResponseObjectData()
         if (json.has("bills") && !json.isNull("bills")) {
             val jsonBills = json.getJSONArray("bills")
-            bills = getBillsFromJSONArray(jsonBills, projId, memberRemoteIdToId)
+            bills = getBillsFromJSONArray(jsonBills, projId, memberRemoteIdToId, catRemoteIdToId, pmRemoteIdToId)
         } else {
             bills = ArrayList()
         }
@@ -586,7 +722,9 @@ open class ServerResponse(
     protected fun getBillFromJSON(
         json: JSONObject,
         projId: Long,
-        memberRemoteIdToId: Map<Long, Long>
+        memberRemoteIdToId: Map<Long, Long>,
+        catRemoteIdToId: Map<Long, Long>,
+        pmRemoteIdToId: Map<Long, Long>
     ): DBBill {
         var remoteId: Long = 0
         var payerRemoteId: Long
@@ -600,7 +738,7 @@ open class ServerResponse(
         var repeat = DBBill.NON_REPEATED
         var paymentMode = DBBill.PAYMODE_NONE
         var paymentModeRemoteId = DBBill.PAYMODE_ID_NONE
-        var categoryId = DBBill.CATEGORY_NONE
+        var categoryRemoteId = DBBill.CATEGORY_NONE
         if (!json.isNull("id")) {
             remoteId = json.getLong("id")
         }
@@ -639,23 +777,29 @@ open class ServerResponse(
         }
         if (json.has("paymentmode") && !json.isNull("paymentmode")) {
             paymentMode = json.getString("paymentmode")
+        } else if (json.has("paymentMode") && !json.isNull("paymentMode")) {
+            paymentMode = json.getString("paymentMode")
         }
         if (json.has("categoryid") && !json.isNull("categoryid")) {
-            categoryId = json.getInt("categoryid")
-            Log.d("PLOP", "LOADED CATTTTTTTTTTTT $categoryId")
+            categoryRemoteId = json.getLong("categoryid")
+        } else if (json.has("categoryId") && !json.isNull("categoryId")) {
+            categoryRemoteId = json.getLong("categoryId")
         }
         if (json.has("paymentmodeid") && !json.isNull("paymentmodeid")) {
-            paymentModeRemoteId = json.getInt("paymentmodeid")
+            paymentModeRemoteId = json.getLong("paymentmodeid")
+        } else if (json.has("paymentModeId") && !json.isNull("paymentModeId")) {
+            paymentModeRemoteId = json.getLong("paymentModeId")
         }
-        // old MB, new Cospend is ok as Cospend provides the old pm ID
-        // new MB, old Cospend => set payment mode ID from old one
         if (DBBill.PAYMODE_NONE != paymentMode && "" != paymentMode && paymentModeRemoteId == DBBill.PAYMODE_ID_NONE) {
-            Log.d("PaymentMode", "old: $paymentMode and new: 0")
             paymentModeRemoteId = DBBill.oldPmIdToNew[paymentMode] ?: DBBill.PAYMODE_ID_NONE
         }
+
+        val categoryId = catRemoteIdToId[categoryRemoteId] ?: 0L
+        val paymentModeId = pmRemoteIdToId[paymentModeRemoteId] ?: 0L
+
         val bill = DBBill(
             0, remoteId, projId, payerId, amount, timestamp, what,
-            DBBill.STATE_OK, repeat, paymentMode, categoryId, comment, paymentModeRemoteId
+            DBBill.STATE_OK, repeat, paymentMode, categoryId, comment, paymentModeId
         )
         bill.billOwers = getBillOwersFromJson(json, memberRemoteIdToId)
         return bill
@@ -667,7 +811,9 @@ open class ServerResponse(
         memberRemoteIdToId: Map<Long, Long>
     ): List<DBBillOwer> {
         val billOwers: MutableList<DBBillOwer> = ArrayList()
-        if (json.has("owers")) {
+        // As everywhere else here, an explicitly null value is not a value: getJSONArray would
+        // throw on it, and that exception fails the whole project sync over one bill.
+        if (json.has("owers") && !json.isNull("owers")) {
             val jsonOs = json.getJSONArray("owers")
             for (i in 0 until jsonOs.length()) {
                 val obj = jsonOs.get(i)
@@ -705,6 +851,8 @@ open class ServerResponse(
             remoteId = json.getString("id")
         }
         if (!json.isNull("ncurl")) {
+            ncUrl = json.getString("ncurl")
+        } else if (!json.isNull("ncUrl")) {
             ncUrl = json.getString("ncUrl")
         }
         val archivedTs: Long? = getArchivedTsFromJSON(json)
@@ -714,26 +862,6 @@ open class ServerResponse(
         return DBAccountProject(0, remoteId, null, name, ncUrl, archivedTs)
     }
 
-    @Throws(IOException::class)
-    protected fun getColorFromContent(content: String): String? {
-        var result: String? = null
-        try {
-            val dbf = DocumentBuilderFactory.newInstance()
-            val db = dbf.newDocumentBuilder()
-            val stream: InputStream = ByteArrayInputStream(content.toByteArray())
-            val doc = db.parse(stream)
-            doc.documentElement.normalize()
-            // Locate the Tag Name
-            val nodeList = doc.getElementsByTagName("color")
-            if (nodeList.length > 0) {
-                result = nodeList.item(0).textContent
-                Log.i(TAG, "I GOT THE COLOR from server: $result")
-            }
-        } catch (_: ParserConfigurationException) {
-        } catch (_: SAXException) {
-        }
-        return result
-    }
 
     protected fun getColorFromJsonContent(json: JSONObject): String? {
         return try {

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

@@ -1,11 +1,12 @@
 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.*
+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.persistence.CowspentSQLiteOpenHelper
 import org.json.JSONException
 import org.json.JSONObject
@@ -86,14 +87,17 @@ object SupportUtil {
         membersBalance: MutableMap<Long, Double>,
         membersPaid: MutableMap<Long, Double>,
         membersSpent: MutableMap<Long, Double>,
-        catId: Int, paymentModeId: Int,
+        catId: Long, paymentModeId: Long,
         dateMin: String?, dateMax: String?
     ): Int {
+        val proj = db.getProject(projId)
+        val categories = db.getCategories(projId)
+        val reimbursementCategoryId = CategoryUtils.getReimbursementCategoryId(categories, projId, proj?.remoteId)
         return getStats(
             db.getMembersOfProject(projId, null),
             db.getBillsOfProject(projId),
             membersNbBills, membersBalance, membersPaid, membersSpent,
-            catId, paymentModeId, dateMin, dateMax
+            catId, paymentModeId, reimbursementCategoryId, dateMin, dateMax
         )
     }
 
@@ -105,7 +109,8 @@ object SupportUtil {
         membersBalance: MutableMap<Long, Double>,
         membersPaid: MutableMap<Long, Double>,
         membersSpent: MutableMap<Long, Double>,
-        catId: Int, paymentModeId: Int,
+        catId: Long, paymentModeId: Long,
+        reimbursementCategoryId: Long,
         dateMin: String?, dateMax: String?
     ): Int {
         val nbBillsTotal = 0
@@ -123,9 +128,9 @@ object SupportUtil {
         for (b in dbBills) {
             // don't take deleted bills and respect category filter
             if (b.state != DBBill.STATE_DELETED &&
-                ((catId == -1000 || catId == -100 || b.categoryRemoteId == catId) &&
-                        (catId != -100 || b.categoryRemoteId != DBBill.CATEGORY_REIMBURSEMENT) &&
-                        (paymentModeId == -1000 || b.paymentModeRemoteId == paymentModeId)) &&
+                ((catId == -1000L || catId == -100L || b.categoryId == catId) &&
+                        (catId != -100L || b.categoryId != reimbursementCategoryId) &&
+                        (paymentModeId == -1000L || b.paymentModeId == paymentModeId)) &&
                 (dateMin == null || b.date >= dateMin) &&
                 (dateMax == null || b.date <= dateMax)
             ) {
@@ -284,18 +289,6 @@ object SupportUtil {
         return reduceBalance(crediters, debiters, results)
     }
 
-    @JvmStatic
-    fun getVersionName(context: Context): String {
-        var versionName = "0.0.0"
-        try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            versionName = pInfo.versionName ?: "0.0.0"
-        } catch (e: PackageManager.NameNotFoundException) {
-            e.printStackTrace()
-        }
-        return versionName
-    }
-
     @JvmStatic
     fun getJsonObject(text: String?): JSONObject? {
         if (text == null) return null

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

@@ -0,0 +1,33 @@
+package net.helcel.cowspent.util
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+import net.helcel.cowspent.R
+
+/**
+ * The SyncOnOpen preference: how often opening the app refreshes the account and every project.
+ *
+ * The choices and the default live here rather than in the settings screen so that the screen and
+ * the sync trigger cannot disagree about what is in effect.
+ */
+object SyncSettings {
+
+    /** Steps offered by the slider, in minutes. */
+    val INTERVAL_CHOICES_MINUTES = listOf(1, 10, 60, 1440)
+
+    const val DEFAULT_INTERVAL_MINUTES = 10
+
+    /**
+     * The configured interval in minutes. A stored value that is not one of the offered steps —
+     * from a restored backup, or a build that changed the steps — falls back to the default
+     * rather than being displayed as the first step while a different value drives the sync.
+     */
+    fun intervalMinutes(context: Context): Int {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        val stored = prefs.getInt(
+            context.getString(R.string.pref_key_auto_sync_on_open),
+            DEFAULT_INTERVAL_MINUTES
+        )
+        return if (stored in INTERVAL_CHOICES_MINUTES) stored else DEFAULT_INTERVAL_MINUTES
+    }
+}

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

@@ -11,8 +11,10 @@ import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException
 import com.nextcloud.android.sso.exceptions.TokenMismatchException
 import com.nextcloud.android.sso.model.SingleSignOnAccount
 import net.helcel.cowspent.model.DBBill
+import net.helcel.cowspent.model.DBCategory
 import net.helcel.cowspent.model.DBCurrency
 import net.helcel.cowspent.model.DBMember
+import net.helcel.cowspent.model.DBPaymentMode
 import net.helcel.cowspent.model.DBProject
 import net.helcel.cowspent.model.ProjectType
 import org.json.JSONException
@@ -45,6 +47,8 @@ class VersatileProjectSyncClient(
         gt
     }
 
+    val supportsPagedBills: Boolean get() = cospendVersionGT161
+
     fun canAccessProjectWithNCLogin(project: DBProject): Boolean {
         return (project.password == ""
                 && url.replace("/+$".toRegex(), "") != ""
@@ -81,25 +85,18 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for getProjectInfo")
-                }
             } else if (canAccessProjectWithSSO(project)) {
-                return if (cospendVersionGT161) {
-                    target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId
-                    Log.i(TAG, "using new API for getProjectInfo")
-                    ServerResponse.ProjectResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_GET, null, null, true), true)
-                } else {
-                    target = "/index.php/apps/cospend/api-priv/projects/" + project.remoteId
-                    ServerResponse.ProjectResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_GET, null, null, false), false)
-                }
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId
+                return ServerResponse.ProjectResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_GET, null, null, cospendVersionGT161), cospendVersionGT161)
             } else {
                 useOcsApiRequest = cospendVersionGT161
                 target = if (cospendVersionGT161)
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
-                Log.i(TAG, "using public API, target is: ${target}for getProjectInfo")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId
@@ -119,7 +116,7 @@ class VersatileProjectSyncClient(
     @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
     fun editRemoteProject(
         project: DBProject, newName: String?, newEmail: String?, newPassword: String?,
-        newMainCurrencyName: String?
+        newMainCurrencyName: String?, newArchivedTs: Long? = null
     ): ServerResponse.EditRemoteProjectResponse {
         val paramKeys: MutableList<String> = ArrayList()
         val paramValues: MutableList<String> = ArrayList()
@@ -135,6 +132,10 @@ class VersatileProjectSyncClient(
             paramKeys.add("password")
             paramValues.add(newPassword)
         }
+        if (newArchivedTs != null) {
+            paramKeys.add("archived_ts")
+            paramValues.add(newArchivedTs.toString())
+        }
 
         var target: String
         var username: String? = null
@@ -159,10 +160,18 @@ class VersatileProjectSyncClient(
                     paramKeys.add("password")
                     paramValues.add(newPassword)
                 }
+                if (newEmail != null) {
+                    paramKeys.add("contact_email")
+                    paramValues.add(newEmail)
+                }
                 if (newMainCurrencyName != null) {
                     paramKeys.add("currencyName")
                     paramValues.add(newMainCurrencyName)
                 }
+                if (newArchivedTs != null) {
+                    paramKeys.add("archivedTs")
+                    paramValues.add(newArchivedTs.toString())
+                }
             }
             if (canAccessProjectWithNCLogin(project)) {
                 username = this.username
@@ -172,13 +181,9 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for editRemoteProject")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId
-                    Log.i(TAG, "using new API for editRemoteProject")
                     ServerResponse.EditRemoteProjectResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_PUT, paramKeys, paramValues, true), true)
                 } else {
                     target = "/index.php/apps/cospend/api-priv/projects/" + project.remoteId
@@ -190,7 +195,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
-                Log.i(TAG, "using public API, target is: ${target}for editRemoteProject")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId
@@ -239,13 +243,9 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/members/" + member.remoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for editRemoteMember")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/members/" + member.remoteId
-                    Log.i(TAG, "using new API for editRemoteMember")
                     ServerResponse.EditRemoteMemberResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_PUT, paramKeys, paramValues, true), true)
                 } else {
                     target = "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/members/" + member.remoteId
@@ -257,7 +257,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/members/" + member.remoteId
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/members/" + member.remoteId
-                Log.i(TAG, "using public API, target is: ${target}for editRemoteMember")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/members/" + member.remoteId
@@ -275,7 +274,13 @@ class VersatileProjectSyncClient(
     }
 
     @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
-    fun editRemoteBill(project: DBProject, bill: DBBill, memberIdToRemoteId: Map<Long, Long>): ServerResponse.EditRemoteBillResponse {
+    fun editRemoteBill(
+        project: DBProject,
+        bill: DBBill,
+        memberIdToRemoteId: Map<Long, Long>,
+        categoryIdToRemoteId: Map<Long, Long>,
+        paymentModeIdToRemoteId: Map<Long, Long>
+    ): ServerResponse.EditRemoteBillResponse {
         val paramKeys: MutableList<String> = ArrayList()
         val paramValues: MutableList<String> = ArrayList()
         paramKeys.add("date")
@@ -322,8 +327,8 @@ class VersatileProjectSyncClient(
             payedFor = payedFor.replace(",$".toRegex(), "")
             paramValues.add(payedFor)
             paramValues.add(bill.paymentMode ?: "")
-            paramValues.add(bill.categoryRemoteId.toString())
-            paramValues.add(bill.paymentModeRemoteId.toString())
+            paramValues.add((categoryIdToRemoteId[bill.categoryId] ?: 0L).toString())
+            paramValues.add((paymentModeIdToRemoteId[bill.paymentModeId] ?: 0L).toString())
 
             if (canAccessProjectWithNCLogin(project)) {
                 username = this.username
@@ -333,9 +338,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/bills/" + bill.remoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for editRemoteBill")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/bills/" + bill.remoteId
@@ -351,7 +353,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills/" + bill.remoteId
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills/" + bill.remoteId
-                Log.i(TAG, "using public API, target is: ${target}for editRemoteBill")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/bills/" + bill.remoteId
@@ -389,9 +390,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for deleteRemoteProject")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId
@@ -407,7 +405,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
-                Log.i(TAG, "using public API, target is: ${target}for deleteRemoteProject")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId
@@ -439,9 +436,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/bills/" + billRemoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for deleteRemoteBill")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/bills/" + billRemoteId
@@ -457,7 +451,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills/" + billRemoteId
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills/" + billRemoteId
-                Log.i(TAG, "using public API, target is: ${target}for deleteRemoteProject")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/bills/" + billRemoteId
@@ -528,9 +521,7 @@ class VersatileProjectSyncClient(
             else
                 project.getRequestBaseUrl(false) + "/api-priv/projects"
             useOcsApiRequest = cospendVersionGT161
-            if (cospendVersionGT161) {
-                Log.i(TAG, "using new API (weblogin, $username:$password) for createAuthenticatedRemoteProject")
-            }
+
             return ServerResponse.CreateRemoteProjectResponse(
                 requestServer(
                     target, METHOD_POST, paramKeys, paramValues,
@@ -541,7 +532,13 @@ class VersatileProjectSyncClient(
     }
 
     @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
-    fun createRemoteBill(project: DBProject, bill: DBBill, memberIdToRemoteId: Map<Long, Long>): ServerResponse.CreateRemoteBillResponse {
+    fun createRemoteBill(
+        project: DBProject,
+        bill: DBBill,
+        memberIdToRemoteId: Map<Long, Long>,
+        categoryIdToRemoteId: Map<Long, Long>,
+        paymentModeIdToRemoteId: Map<Long, Long>
+    ): ServerResponse.CreateRemoteBillResponse {
         val paramKeys: MutableList<String> = ArrayList()
         val paramValues: MutableList<String> = ArrayList()
         paramKeys.add("date")
@@ -583,8 +580,8 @@ class VersatileProjectSyncClient(
             payedFor = payedFor.replace(",$".toRegex(), "")
             paramValues.add(payedFor)
             paramValues.add(bill.paymentMode ?: "")
-            paramValues.add(bill.categoryRemoteId.toString())
-            paramValues.add(bill.paymentModeRemoteId.toString())
+            paramValues.add((categoryIdToRemoteId[bill.categoryId] ?: 0L).toString())
+            paramValues.add((paymentModeIdToRemoteId[bill.paymentModeId] ?: 0L).toString())
 
             if (canAccessProjectWithNCLogin(project)) {
                 username = this.username
@@ -594,9 +591,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/bills"
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for createRemoteBill")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/bills"
@@ -612,7 +606,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills"
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills"
-                Log.i(TAG, "using public API, target is: ${target}for createRemoteBill")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/bills"
@@ -664,13 +657,9 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/members"
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for createRemoteMember")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/members"
-                    Log.i(TAG, "using new API for createRemoteBill")
                     ServerResponse.CreateRemoteMemberResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_POST, paramKeys, paramValues, true), isOcsResponse=true, isJsonMember=true)
                 } else {
                     target = "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/members"
@@ -682,7 +671,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/members"
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/members"
-                Log.i(TAG, "using public API, target is: ${target}for createRemoteBill")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/members"
@@ -701,25 +689,66 @@ class VersatileProjectSyncClient(
     }
 
     @Throws(JSONException::class, IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
-    fun getBills(project: DBProject): ServerResponse.BillsResponse {
+    fun getBills(
+        project: DBProject,
+        offset: Int? = null,
+        limit: Int? = null,
+        reverse: Boolean? = null,
+        deleted: Int? = null
+    ): ServerResponse.BillsResponse {
         var target: String
         var username: String?
         var password: String?
         var bearerToken: String?
         var useOcsApiRequest: Boolean
+
+        val paramKeys: MutableList<String> = ArrayList()
+        val paramValues: MutableList<String> = ArrayList()
+
         if (ProjectType.COSPEND == project.type) {
             val tsLastSync = project.lastSyncedTimestamp
+            if (offset == null) {
+                if (cospendVersionGT161) {
+                    paramKeys.add("lastChanged")
+                } else {
+                    paramKeys.add("lastchanged")
+                }
+                paramValues.add(tsLastSync.toString())
+            } else {
+                paramKeys.add("offset")
+                paramValues.add(offset.toString())
+                if (limit != null) {
+                    paramKeys.add("limit")
+                    paramValues.add(limit.toString())
+                }
+                if (reverse != null) {
+                    paramKeys.add("reverse")
+                    paramValues.add(reverse.toString())
+                }
+                if (deleted != null) {
+                    paramKeys.add("deleted")
+                    paramValues.add(deleted.toString())
+                }
+            }
+
             if (canAccessProjectWithNCLogin(project)) {
                 username = this.username
                 password = this.password
-                target = if (cospendVersionGT161)
-                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/bills?lastChanged=" + tsLastSync
-                else
-                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/bills?lastchanged=" + tsLastSync
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for getBills")
+                val baseUrl = project.getRequestBaseUrl(useOcsApiRequest)
+                target = if (useOcsApiRequest)
+                    "$baseUrl/api/v1/projects/${project.remoteId}/bills"
+                else
+                    "$baseUrl/api-priv/projects/${project.remoteId}/bills"
+
+                if (paramKeys.isNotEmpty()) {
+                    target += "?"
+                    for (i in paramKeys.indices) {
+                        if (i > 0) target += "&"
+                        target += "${paramKeys[i]}=${paramValues[i]}"
+                    }
                 }
+
                 return ServerResponse.BillsResponse(
                     requestServer(
                         target, METHOD_GET, null, null,
@@ -728,17 +757,8 @@ class VersatileProjectSyncClient(
                     useOcsApiRequest
                 )
             } else if (canAccessProjectWithSSO(project)) {
-                val paramKeys: MutableList<String> = ArrayList()
-                val paramValues: MutableList<String> = ArrayList()
-                if (cospendVersionGT161) {
-                    paramKeys.add("lastChanged")
-                } else {
-                    paramKeys.add("lastchanged")
-                }
-                paramValues.add(tsLastSync.toString())
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/bills"
-                    Log.i(TAG, "using new API for getBills")
                     ServerResponse.BillsResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_GET, paramKeys, paramValues, true), true)
                 } else {
                     target = "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/bills"
@@ -746,11 +766,20 @@ class VersatileProjectSyncClient(
                 }
             } else {
                 useOcsApiRequest = cospendVersionGT161
-                target = if (cospendVersionGT161)
-                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills?lastChanged=" + tsLastSync
+                val baseUrl = project.getRequestBaseUrl(useOcsApiRequest)
+                target = if (useOcsApiRequest)
+                    "$baseUrl/api/v1/public/projects/${project.remoteId}/${getEncodedPassword(project.password)}/bills"
                 else
-                    project.getRequestBaseUrl(false) + "/apiv2/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/bills?lastchanged=" + tsLastSync
-                Log.i(TAG, "using public API, target is: ${target}for getBills")
+                    "$baseUrl/apiv2/projects/${project.remoteId}/${getEncodedPassword(project.password)}/bills"
+
+                if (paramKeys.isNotEmpty()) {
+                    target += "?"
+                    for (i in paramKeys.indices) {
+                        if (i > 0) target += "&"
+                        target += "${paramKeys[i]}=${paramValues[i]}"
+                    }
+                }
+
                 return ServerResponse.BillsResponse(
                     requestServer(
                          target, METHOD_GET, null, null,
@@ -774,6 +803,92 @@ class VersatileProjectSyncClient(
         }
     }
 
+    @Throws(JSONException::class, IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun getCategories(project: DBProject): ServerResponse.CategoriesResponse {
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/categories"
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/categories"
+                return ServerResponse.CategoriesResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_GET, null, null, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/categories"
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/categories"
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+        return ServerResponse.CategoriesResponse(
+            requestServer(
+                target, METHOD_GET, null, null,
+                null, username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
+    @Throws(JSONException::class, IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun getPaymentModes(project: DBProject): ServerResponse.PaymentModesResponse {
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/paymentmodes"
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/paymentmodes"
+                return ServerResponse.PaymentModesResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_GET, null, null, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password)
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmodes"
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/paymentmodes"
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+        return ServerResponse.PaymentModesResponse(
+            requestServer(
+                target, METHOD_GET, null, null,
+                null, username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
     @Throws(JSONException::class, IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
     fun getMembers(project: DBProject): ServerResponse.MembersResponse {
         var target: String
@@ -790,9 +905,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/members"
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for getMembers, projectId: " + project.remoteId)
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/members"
@@ -808,7 +920,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/members"
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/members"
-                Log.i(TAG, "using public API, target is: ${target}for getMembers")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/members"
@@ -824,6 +935,305 @@ class VersatileProjectSyncClient(
         )
     }
 
+    @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun createRemoteCategory(project: DBProject, category: DBCategory): ServerResponse.CreateRemoteCategoryResponse {
+        val paramKeys: MutableList<String> = ArrayList()
+        val paramValues: MutableList<String> = ArrayList()
+        paramKeys.add("name")
+        paramValues.add(category.name ?: "")
+        paramKeys.add("icon")
+        paramValues.add(category.icon)
+        paramKeys.add("color")
+        paramValues.add(category.color)
+
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/category"
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/categories"
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/category"
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/categories"
+                return ServerResponse.CreateRemoteCategoryResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_POST, paramKeys, paramValues, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/category"
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/categories"
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/categories"
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+
+        val response = requestServer(
+            target, METHOD_POST, paramKeys, paramValues, null,
+            username, password, bearerToken, useOcsApiRequest
+        )
+        return ServerResponse.CreateRemoteCategoryResponse(response, useOcsApiRequest)
+    }
+
+    @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun editRemoteCategory(project: DBProject, category: DBCategory): ServerResponse.EditRemoteCategoryResponse {
+        val paramKeys: MutableList<String> = ArrayList()
+        val paramValues: MutableList<String> = ArrayList()
+        paramKeys.add("name")
+        paramValues.add(category.name ?: "")
+        paramKeys.add("icon")
+        paramValues.add(category.icon)
+        paramKeys.add("color")
+        paramValues.add(category.color)
+
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/category/" + category.remoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/categories/" + category.remoteId
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/category/" + category.remoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/categories/" + category.remoteId
+                return ServerResponse.EditRemoteCategoryResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_PUT, paramKeys, paramValues, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/category/" + category.remoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/categories/" + category.remoteId
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/categories/" + category.remoteId
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+
+        return ServerResponse.EditRemoteCategoryResponse(
+            requestServer(
+                target, METHOD_PUT, paramKeys, paramValues, null,
+                username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
+    @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun deleteRemoteCategory(project: DBProject, categoryRemoteId: Long): ServerResponse.DeleteRemoteCategoryResponse {
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/category/" + categoryRemoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/categories/" + categoryRemoteId
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/category/" + categoryRemoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/categories/" + categoryRemoteId
+                return ServerResponse.DeleteRemoteCategoryResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_DELETE, null, null, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/category/" + categoryRemoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/categories/" + categoryRemoteId
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/categories/" + categoryRemoteId
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+
+        return ServerResponse.DeleteRemoteCategoryResponse(
+            requestServer(
+                target, METHOD_DELETE, null, null,
+                null, username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
+    @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun createRemotePaymentMode(project: DBProject, paymentMode: DBPaymentMode): ServerResponse.CreateRemotePaymentModeResponse {
+        val paramKeys: MutableList<String> = ArrayList()
+        val paramValues: MutableList<String> = ArrayList()
+        paramKeys.add("name")
+        paramValues.add(paymentMode.name ?: "")
+        paramKeys.add("icon")
+        paramValues.add(paymentMode.icon)
+        paramKeys.add("color")
+        paramValues.add(paymentMode.color)
+
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/paymentmode"
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/paymentmodes"
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/paymentmode"
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/paymentmodes"
+                return ServerResponse.CreateRemotePaymentModeResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_POST, paramKeys, paramValues, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmode"
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmodes"
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/paymentmodes"
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+
+        return ServerResponse.CreateRemotePaymentModeResponse(
+            requestServer(
+                target, METHOD_POST, paramKeys, paramValues, null,
+                username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
+    @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun editRemotePaymentMode(project: DBProject, paymentMode: DBPaymentMode): ServerResponse.EditRemotePaymentModeResponse {
+        val paramKeys: MutableList<String> = ArrayList()
+        val paramValues: MutableList<String> = ArrayList()
+        paramKeys.add("name")
+        paramValues.add(paymentMode.name ?: "")
+        paramKeys.add("icon")
+        paramValues.add(paymentMode.icon)
+        paramKeys.add("color")
+        paramValues.add(paymentMode.color)
+
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/paymentmode/" + paymentMode.remoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/paymentmodes/" + paymentMode.remoteId
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/paymentmode/" + paymentMode.remoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/paymentmodes/" + paymentMode.remoteId
+                return ServerResponse.EditRemotePaymentModeResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_PUT, paramKeys, paramValues, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmode/" + paymentMode.remoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmodes/" + paymentMode.remoteId
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/paymentmodes/" + paymentMode.remoteId
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+
+        return ServerResponse.EditRemotePaymentModeResponse(
+            requestServer(
+                target, METHOD_PUT, paramKeys, paramValues, null,
+                username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
+    @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
+    fun deleteRemotePaymentMode(project: DBProject, paymentModeRemoteId: Long): ServerResponse.DeleteRemotePaymentModeResponse {
+        var target: String
+        var username: String? = null
+        var password: String? = null
+        var bearerToken: String? = null
+        var useOcsApiRequest = false
+        if (ProjectType.COSPEND == project.type) {
+            if (canAccessProjectWithNCLogin(project)) {
+                username = this.username
+                password = this.password
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/projects/" + project.remoteId + "/paymentmode/" + paymentModeRemoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/paymentmodes/" + paymentModeRemoteId
+                useOcsApiRequest = cospendVersionGT161
+            } else if (canAccessProjectWithSSO(project)) {
+                target = if (cospendVersionGT161)
+                    "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/paymentmode/" + paymentModeRemoteId
+                else
+                    "/index.php/apps/cospend/api-priv/projects/" + project.remoteId + "/paymentmodes/" + paymentModeRemoteId
+                return ServerResponse.DeleteRemotePaymentModeResponse(requestServerWithSSO(nextcloudAPI!!, target, METHOD_DELETE, null, null, cospendVersionGT161), cospendVersionGT161)
+            } else {
+                useOcsApiRequest = cospendVersionGT161
+                target = if (cospendVersionGT161)
+                    project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmode/" + paymentModeRemoteId
+                else
+                    project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/paymentmodes/" + paymentModeRemoteId
+            }
+        } else {
+            target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/paymentmodes/" + paymentModeRemoteId
+            username = project.remoteId
+            password = project.password
+            bearerToken = project.bearerToken
+        }
+
+        return ServerResponse.DeleteRemotePaymentModeResponse(
+            requestServer(
+                target, METHOD_DELETE, null, null,
+                null, username, password, bearerToken, useOcsApiRequest
+            ), useOcsApiRequest
+        )
+    }
+
     @Throws(IOException::class, TokenMismatchException::class, NextcloudHttpRequestFailedException::class)
     fun createRemoteCurrency(project: DBProject, currency: DBCurrency): ServerResponse.CreateRemoteCurrencyResponse {
         val paramKeys: MutableList<String> = ArrayList()
@@ -847,9 +1257,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/currency"
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for createRemoteCurrency")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/currency"
@@ -865,7 +1272,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/currency"
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/currency"
-                Log.i(TAG, "using public API, target is: ${target}for createRemoteCurrency")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/currency"
@@ -904,9 +1310,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/currency/" + currency.remoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for editRemoteCurrency")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/currency/" + currency.remoteId
@@ -922,7 +1325,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/currency/" + currency.remoteId
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/currency/" + currency.remoteId
-                Log.i(TAG, "using public API, target is: ${target}for createRemoteCurrency")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/currency/" + currency.remoteId
@@ -954,9 +1356,6 @@ class VersatileProjectSyncClient(
                 else
                     project.getRequestBaseUrl(false) + "/api-priv/projects/" + project.remoteId + "/currency/" + currencyRemoteId
                 useOcsApiRequest = cospendVersionGT161
-                if (cospendVersionGT161) {
-                    Log.i(TAG, "using new API (weblogin, $username:$password) for deleteRemoteCurrency")
-                }
             } else if (canAccessProjectWithSSO(project)) {
                 return if (cospendVersionGT161) {
                     target = "/ocs/v2.php/apps/cospend/api/v1/projects/" + project.remoteId + "/currency/" + currencyRemoteId
@@ -972,7 +1371,6 @@ class VersatileProjectSyncClient(
                     project.getRequestBaseUrl(true) + "/api/v1/public/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/currency/" + currencyRemoteId
                 else
                     project.getRequestBaseUrl(false) + "/api/projects/" + project.remoteId + "/" + getEncodedPassword(project.password) + "/currency/" + currencyRemoteId
-                Log.i(TAG, "using public API, target is: ${target}for deleteRemoteCurrency")
             }
         } else {
             target = project.serverUrl!!.replace("/+$".toRegex(), "") + "/api/projects/" + project.remoteId + "/currency/" + currencyRemoteId
@@ -993,6 +1391,10 @@ class VersatileProjectSyncClient(
         nextcloudAPI: NextcloudAPI, target: String, method: String,
         paramKeys: List<String>?, paramValues: List<String>?, isOCSRequest: Boolean
     ): ResponseData {
+        var finalTarget = target
+        if (finalTarget.contains("/ocs/v2.php") && !finalTarget.contains("format=json")) {
+            finalTarget += if (finalTarget.contains("?")) "&format=json" else "?format=json"
+        }
         val result = StringBuilder()
         var params: MutableList<QueryParam>? = null
         if (paramKeys != null && paramValues != null) {
@@ -1010,13 +1412,13 @@ class VersatileProjectSyncClient(
         val nextcloudRequest: NextcloudRequest = if (params == null) {
             NextcloudRequest.Builder()
                 .setMethod(method)
-                .setUrl(target)
+                .setUrl(finalTarget)
                 .setHeader(headers)
                 .build()
         } else {
             NextcloudRequest.Builder()
                 .setMethod(method)
-                .setUrl(target)
+                .setUrl(finalTarget)
                 .setParameter(params)
                 .setHeader(headers)
                 .build()
@@ -1050,8 +1452,12 @@ class VersatileProjectSyncClient(
         lastETag: String?, username: String?, password: String?,
         bearerToken: String?, isOCSRequest: Boolean
     ): ResponseData {
+        var finalTarget = target
+        if (finalTarget.contains("/ocs/v2.php") && !finalTarget.contains("format=json")) {
+            finalTarget += if (finalTarget.contains("?")) "&format=json" else "?format=json"
+        }
         val result = StringBuilder()
-        val httpCon = SupportUtil.getHttpURLConnection(target)
+        val httpCon = SupportUtil.getHttpURLConnection(finalTarget)
         httpCon.requestMethod = method
         if (bearerToken != null) {
             httpCon.setRequestProperty("Authorization", "Bearer $bearerToken")
@@ -1062,7 +1468,7 @@ class VersatileProjectSyncClient(
             )
         }
         httpCon.setRequestProperty("Connection", "Close")
-        httpCon.setRequestProperty("User-Agent", "Cowspent/" + SupportUtil.getAppVersionName(context))
+        httpCon.setRequestProperty("User-Agent", "Cowspent-android/" + SupportUtil.getAppVersionName(context))
         if (lastETag != null && METHOD_GET == method) {
             httpCon.setRequestProperty("If-None-Match", lastETag)
         }
@@ -1071,7 +1477,6 @@ class VersatileProjectSyncClient(
             httpCon.setRequestProperty("Accept", "application/json")
         }
         httpCon.connectTimeout = 10 * 1000 // 10 seconds
-        Log.d(javaClass.simpleName, "$method $target")
         if (paramKeys != null && paramValues != null) {
             var dataString = ""
             for (i in paramKeys.indices) {
@@ -1084,7 +1489,6 @@ class VersatileProjectSyncClient(
                 dataString += URLEncoder.encode(value, "UTF-8")
             }
             val data = dataString.toByteArray()
-            Log.d(javaClass.simpleName, "Params: $dataString")
             httpCon.setFixedLengthStreamingMode(data.size)
             httpCon.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
             httpCon.setRequestProperty("Content-Length", data.size.toString())
@@ -1126,5 +1530,8 @@ class VersatileProjectSyncClient(
         const val METHOD_POST = "POST"
         const val METHOD_PUT = "PUT"
         const val METHOD_DELETE = "DELETE"
+
+        const val REMOTE_ARCHIVED_TS_NOW = 0L
+        const val REMOTE_ARCHIVED_TS_UNSET = -1L
     }
 }

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

@@ -5,9 +5,11 @@ fun evalMath(expression: String): Double {
     var result = 0.0
     var db: SQLiteDatabase? = null
     try {
+        // Force floating point division by replacing / with * 1.0 /
+        val forcedRealExpr = expression.replace("/", "* 1.0 /")
         // Opens a temporary, in-memory system database block
         db = SQLiteDatabase.create(null)
-        val cursor = db.rawQuery("SELECT ($expression);", null)
+        val cursor = db.rawQuery("SELECT ($forcedRealExpr);", null)
         if (cursor.moveToFirst()) {
             result = cursor.getDouble(0)
         }

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

@@ -2,10 +2,39 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-    <!-- Matches #0F172A Base -->
-    <path
-        android:pathData="M0,0h100v100h-100z"
-        android:fillColor="#0F172A"/>
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+    <group android:translateY="-0.33333334">
+        <group android:scaleX="0.63461536"
+            android:scaleY="0.63461536"
+            android:translateX="13.153846"
+            android:translateY="13.153846">
+            <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" />
+
+
+            <!-- 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"/>
+
+        </group>
+    </group>
 </vector>

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

@@ -9,20 +9,6 @@
           android:scaleY="0.63461536"
           android:translateX="13.153846"
           android:translateY="13.153846">
-        <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"/>
@@ -43,17 +29,6 @@
         </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"/>
-
       </group>
     </group>
   </group>

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

@@ -9,17 +9,6 @@
         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"/>
@@ -27,5 +16,16 @@
             <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

@@ -1,52 +0,0 @@
-<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-af-rZA/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-ar-rSA/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-da-rDK/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-de-rDE/strings.xml

@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+
+    <!-- Actions -->
+    <string name="action_new_bill">Neue Rechnung</string>
+    <string name="action_add_project">Projekt hinzufügen</string>
+    <string name="action_save">Speichern</string>
+    <string name="action_edit">Bearbeiten</string>
+    <string name="action_share">Teilen</string>
+    <string name="action_search">Suchen</string>
+    <string name="action_open_menu">Menü öffnen</string>
+    <string name="action_close_search">Suche schließen</string>
+    <string name="action_clear_search">Suche leeren</string>
+    <string name="action_delete">Löschen</string>
+    <string name="simple_back">Zurück</string>
+    <string name="action_archive">Archivieren</string>
+    <string name="action_unarchive">Reaktivieren</string>
+    <string name="action_export">Exportieren</string>
+    <string name="action_stats">Statistik</string>
+    <string name="action_settle">Abrechnen</string>
+    <string name="action_scan_qrcode">QR Code einscannen</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="action_label_bills">Fehlende Kategorien</string>
+    <string name="action_logout">Abmelden</string>
+    <string name="action_connect">Verbinden</string>
+    <string name="action_discard">Verwerfen</string>
+    <string name="action_members">Mitglieder</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Währungen</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistiken</string>
+    <string name="title_edit_project">Projekt bearbeiten</string>
+    <string name="title_label_bills">Rechnungen kennzeichnen</string>
+    <string name="title_labels">Labels verwalten</string>
+    <string name="title_about">Über</string>
+    <string name="title_settle">Projekt abrechnen</string>
+    <string name="title_share">Projekt teilen</string>
+    <string name="title_add_project">Projekt hinzufügen</string>
+    <string name="title_add_category">Neue Kategorie</string>
+    <string name="title_add_payment_mode">Zahlungsmethode hinzufügen</string>
+    <string name="title_account">Nextcloud-Konto</string>
+    <string name="title_share_web">Weblink</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Bist du sicher?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">Alle Rechnungen</string>
+    <string name="label_categories">Kategorien</string>
+    <string name="label_payment_modes">Zahlungsmethoden</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Farbe</string>
+    <string name="label_weight">Gewicht</string>
+    <string name="label_activated">Aktiviert</string>
+    <string name="label_password">Passwort</string>
+    <string name="label_email">E-Mail</string>
+    <string name="label_url">Serveradresse</string>
+    <string name="label_username">Benutzername</string>
+    <string name="label_comment">Kommentar</string>
+    <string name="label_what">Was?</string>
+    <string name="label_payer">Wer hat bezahlt?</string>
+    <string name="label_owers">Für wen?</string>
+    <string name="label_repeat">Wiederholen alle</string>
+    <string name="label_mode">Modus</string>
+    <string name="label_category">Kategorie</string>
+    <string name="label_project_id">Projekt-ID/Name</string>
+    <string name="label_project_title">Projekttitel</string>
+    <string name="label_use_sso">Nextcloud App-Konto verwenden</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Ungespeicherte Änderungen</string>
+    <string name="dialog_unsaved_changes_msg">Änderungen vor dem Verlassen speichern?</string>
+    <string name="dialog_confirm_remove_project_msg">Das Remote-Projekt wird nicht gelöscht.</string>
+    <string name="dialog_sync_error_title">Sync-Fehler</string>
+    <string name="dialog_sync_error_msg">Synchronisation fehlgeschlagen für %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Die Ausgaben sind bereits ausgeglichen.</string>
+    <string name="msg_project_added">Projekt %1$s hinzugefügt</string>
+    <string name="msg_bill_labeled_done">Alle Rechnungen kategorisiert</string>
+    <string name="msg_no_suggestions">Keine Vorschläge</string>
+    <string name="msg_auth_warning">Benötigt Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link in Zwischenablage kopiert</string>
+    <string name="msg_share_qr">Scanne den QR-Code oder teile den Link, um beizutreten.</string>
+    <string name="msg_share_web">Link für den Zugriff per Web-Browser.</string>
+    <string name="msg_share_qr_warn">Teile diesen Link mit einem Cowspent Benutzer.</string>
+    <string name="msg_settle_intro">Abrechnung für %1$s:</string>
+    <string name="msg_settle_sentence">%1$s schuldet %3$.2f an %2$s</string>
+    <string name="msg_stats_intro">Statistiken für %1$s:</string>
+    <string name="msg_stats_header">Mitglied (Gezahlt | Ausgegeben | Saldo)</string>
+    <string name="msg_logged_in_as">Angemeldet als %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Fehler</string>
+    <string name="error_loading">Lädt</string>
+    <string name="error_no_projects">Keine Projekte gefunden</string>
+    <string name="error_no_members">Keine Mitglieder gefunden</string>
+    <string name="error_no_bills">Keine Rechnungen gefunden</string>
+    <string name="error_no_member">Mindestens ein Mitglied erforderlich</string>
+    <string name="error_maintenance_mode">Server ist im Wartungsmodus</string>
+    <string name="error_400">400 Falsche Anfrage</string>
+    <string name="error_401">401 Unautorisiert</string>
+    <string name="error_403">403 Verboten</string>
+    <string name="error_404">404 Nicht gefunden</string>
+    <string name="error_sync">Sync fehlgeschlagen: %1$s</string>
+    <string name="error_invalid_login">Ungültiger Login: %1$s</string>
+    <string name="error_auth">Benutzername oder Passwort falsch</string>
+    <string name="error_json">Ungültige Server-Antwort</string>
+    <string name="error_req_failed">Anfrage fehlgeschlagen</string>
+    <string name="error_invalid_email">Ungültige E-Mail</string>
+    <string name="error_invalid_project_id">Ungültige Projekt-ID</string>
+    <string name="error_invalid_project_name">Ungültiger Projekttitel</string>
+    <string name="error_invalid_bill_name">Ungültiger Rechnungsname</string>
+    <string name="error_invalid_bill_date">Ungültiges Rechnungsdatum</string>
+    <string name="error_invalid_bill_payer">Zahler erforderlich</string>
+    <string name="error_invalid_bill_owers">Schuldner erforderlich</string>
+    <string name="error_no_network">Keine Netzwerkverbindung</string>
+    <string name="error_server">Serverfehler</string>
+    <string name="error_io">Serververbindung getrennt</string>
+    <string name="error_share_impossible">Dieses Projekt kann nicht geteilt werden</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Mit Nextcloud Konto verbinden</string>
+    <string name="drawer_last_sync">Letzter Sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Abbrechen</string>
+    <string name="simple_ok" tools:ignore="ButtonCase,Typos">Ok</string>
+    <string name="simple_yes">Ja</string>
+    <string name="simple_no">Nein</string>
+    <string name="simple_close">Schließen</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Erscheinung</string>
+    <string name="settings_network">Netzwerk</string>
+    <string name="settings_other">Andere</string>
+    <string name="settings_night_mode">Thema</string>
+    <string name="settings_offline_mode">Offline-Modus</string>
+    <string name="settings_offline_mode_summary">Nur manuell synchronisieren.</string>
+    <string name="settings_color_custom">Eigene Farbe</string>
+    <string name="settings_color_mode">Farbauswahl</string>
+    <string name="settings_show_archived">Archivierte Projekte anzeigen</string>
+    <string name="settings_beta_features">Beta-Funktionen</string>
+    <string name="settings_beta_features_summary">Experimentelle Funktionen aktivieren. Benutzung auf eigene Gefahr.</string>
+    <string name="settings_fill_new_bill_from_last">Aus letzter Rechnung vorausfüllen</string>
+    <string name="settings_fill_new_bill_from_last_summary">Zahler, Kategorie, Zahlungsart und Beteiligte aus der zuletzt erstellten Rechnung des Projekts übernehmen.</string>
+    <string name="settings_auto_sync_on_open">Synchronisierungsintervall</string>
+    <string name="settings_auto_sync_on_open_summary">Wie oft Konto und alle Projekte beim Öffnen der App aktualisiert werden.</string>
+    <string name="pref_value_sync_1m">1 Minute</string>
+    <string name="pref_value_sync_10m">10 Minuten</string>
+    <string name="pref_value_sync_1h">1 Stunde</string>
+    <string name="pref_value_sync_1d">1 Tag</string>
+    <string name="settings_url_warn_http">WARNUNG: \"http\" ist unsicher. Verwende \"https\".</string>
+    <string name="settings_colorpicker_title">Farbe wählen</string>
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manuell</string>
+    <string name="pref_value_theme_light">Hell</string>
+    <string name="pref_value_theme_dark">Dunkel</string>
+    <string name="pref_value_theme_system">System folgen</string>
+
+    <!-- Constants (Do not translate) -->
+    <!-- Enums and Lists -->
+    <string name="repeat_no">Keine Wiederholung</string>
+    <string name="repeat_day">Täglich</string>
+    <string name="repeat_week">Wöchentlich</string>
+    <string name="repeat_fortnight">Vierzehntägig</string>
+    <string name="repeat_month">Monatlich</string>
+    <string name="repeat_year">Jährlich</string>
+    <string name="payment_mode_none">Keine</string>
+    <string name="payment_mode_all">Alle</string>
+    <string name="payment_mode_credit_card">Kreditkarte</string>
+    <string name="payment_mode_cash">Bargeld</string>
+    <string name="payment_mode_check">Scheck</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Überweisung</string>
+    <string name="category_none">Keine</string>
+    <string name="category_all">Alle</string>
+    <string name="category_all_except_reimbursement">Alle außer Erstattung</string>
+    <string name="category_groceries">Lebensmittel</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Miete</string>
+    <string name="category_bills">Abrechnung</string>
+    <string name="category_excursion">Ausflug/Kultur</string>
+    <string name="category_health">Gesundheit</string>
+    <string name="category_shopping">Einkaufen</string>
+    <string name="category_reimbursement">Erstattung</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Unterkunft</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">Was</string>
+    <string name="new_project_where">Wo</string>
+    <string name="where_local">Nur lokal</string>
+    <string name="todo_join">Bestehendem Projekt beitreten</string>
+    <string name="todo_create">Neues Projekt erstellen</string>
+    <string name="import_tooltip">Aus Datei importieren</string>
+    <string name="choose_project_management_action">Projekt</string>
+    <string name="project_added_success">Projekt erfolgreich hinzugefügt.</string>
+    <string name="no_projects_text">Du hast noch keine Projekte.</string>
+    <string name="configure_account_choice">Nextcloud-Konto konfigurieren</string>
+    <string name="add_project_choice">Projekt manuell hinzufügen</string>
+    <string name="no_members_text">Keine Mitglieder in diesem Projekt.</string>
+    <string name="no_bills_text">Keine Rechnungen gefunden.</string>
+    <string name="member_already_exists">Mitglied existiert bereits.</string>
+    <string name="activity_dialog_title">Projekt: %1$s</string>
+    <string name="remove_project_confirmation">Projekt %1$s entfernt.</string>
+    <string name="file_saved_success">Datei gespeichert: %1$s</string>
+    <string name="import_error_header">Import fehlgeschlagen in Zeile %d</string>
+    <string name="import_error_date">Ungültiges Datumsformat in Zeile %d</string>
+    <string name="import_error_owers">Ungültige Schuldner in Zeile %d</string>
+    <string name="add_member_dialog_title">Mitglied hinzufügen</string>
+    <string name="edit_member_dialog_title">Mitglied bearbeiten</string>
+    <string name="member_edit_delete">Löschen</string>
+    <string name="project_edition_no_change">Keine zu speichernden Änderungen.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">Keine (optimal)</string>
+    <string name="settle_who">Wer zahlt</string>
+    <string name="settle_to_whom">An wen</string>
+    <string name="settle_how_much">Betrag</string>
+    <string name="simple_settle_share">Teilen</string>
+    <string name="simple_create_bills">Rechnungen erstellen</string>
+    <string name="settle_bill_what">Abrechnung</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Währung wählen (%s)</string>
+    <string name="setting_none">Keine</string>
+    <string name="setting_all">Alle</string>
+    <string name="currency_saved_success">Währungseinstellungen gespeichert.</string>
+    <string name="main_currency">Hauptwährung</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Empfohlene Kategorien</string>
+    <string name="label_bills_skip">Überspringen</string>
+    <string name="stats_date_min">Von</string>
+    <string name="stats_date_max">An</string>
+    <string name="stats_who">Mitglied</string>
+    <string name="stats_paid">Bezahlt</string>
+    <string name="stats_spent">Ausgegeben</string>
+    <string name="stats_balance">Saldo</string>
+    <string name="total">Gesamt: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Verbindung fehlgeschlagen: %1$s</string>
+    <string name="error_create_remote_project_helper">Erstellung fehlgeschlagen: %1$s</string>
+    <string name="error_edit_remote_project_helper">Fehler beim Aktualisieren des Remote-Projekts: %1$s</string>
+    <string name="remote_project_operation_no_network">Netzwerk nicht verfügbar für Remote Operation.</string>
+    <string name="error_scanning_bill_qr_code">Fehler beim Analysieren des QR-Codes.</string>
+    <string name="error_token_mismatch">Authentifizierungstoken stimmen nicht überein. Bitte melde dich erneut an.</string>
+    <string name="insufficient_access_level">Du hast keine Berechtigung, um diese Aktion durchzuführen.</string>
+    <string name="delete_label_confirmation_title">Kategorie löschen</string>
+    <string name="delete_label_confirmation_message">Bist du sicher, dass du diese Kategorie löschen möchtest?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Betreuer</string>
+    <string name="about_license_title">Lizenz</string>
+    <string name="about_source_title">Quellcode</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Projekt %1$s</string>
+    <string name="share_chooser_title">Teilen %1$s</string>
+</resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-es-rES/strings.xml

@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Actions -->
+    <string name="action_new_bill">Nueva factura</string>
+    <string name="action_add_project">Añadir proyecto</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_edit">Editar</string>
+    <string name="action_share">Compartir</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_open_menu">Abrir el menú</string>
+    <string name="action_close_search">Cerrar la búsqueda</string>
+    <string name="action_clear_search">Borrar la búsqueda</string>
+    <string name="action_delete">Eliminar</string>
+    <string name="simple_back">Atrás</string>
+    <string name="action_archive">Archivar</string>
+    <string name="action_unarchive">Desarchivar</string>
+    <string name="action_export">Exportar</string>
+    <string name="action_stats">Estadísticas</string>
+    <string name="action_settle">Liquidar</string>
+    <string name="action_scan_qrcode">Escanear código QR</string>
+    <string name="action_settings">Ajustes</string>
+    <string name="action_label_bills">Categorizar facturas</string>
+    <string name="action_logout">Cerrar sesión</string>
+    <string name="action_connect">Conectar</string>
+    <string name="action_discard">Descartar</string>
+    <string name="action_members">Miembros</string>
+    <string name="action_labels">Etiquetas</string>
+    <string name="action_currencies">Monedas</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Estadísticas</string>
+    <string name="title_edit_project">Editar proyecto</string>
+    <string name="title_label_bills">Categorizar facturas</string>
+    <string name="title_labels">Gestionar etiquetas</string>
+    <string name="title_about">Acerca de</string>
+    <string name="title_settle">Liquidar proyecto</string>
+    <string name="title_share">Compartir proyecto</string>
+    <string name="title_add_project">Añadir proyecto</string>
+    <string name="title_add_category">Añadir categoría</string>
+    <string name="title_add_payment_mode">Añadir modo de pago</string>
+    <string name="title_account">Cuenta de Nextcloud</string>
+    <string name="title_share_web">Enlace web</string>
+    <string name="title_share_qr">Enlace de Cowspent</string>
+    <string name="title_confirm">¿Estás seguro?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">Todas las facturas</string>
+    <string name="label_categories">Categorías</string>
+    <string name="label_payment_modes">Modos de pago</string>
+    <string name="label_name">Nombre</string>
+    <string name="label_icon">Icono / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Peso</string>
+    <string name="label_activated">Activado</string>
+    <string name="label_password">Contraseña</string>
+    <string name="label_email">Correo electrónico</string>
+    <string name="label_url">Dirección del servidor</string>
+    <string name="label_username">Nombre de usuario</string>
+    <string name="label_comment">Comentario</string>
+    <string name="label_what">¿Qué?</string>
+    <string name="label_payer">¿Quién pagó?</string>
+    <string name="label_owers">¿Para quién?</string>
+    <string name="label_repeat">Repetición</string>
+    <string name="label_mode">Modo</string>
+    <string name="label_category">Categoría</string>
+    <string name="label_project_id">ID/nombre del proyecto</string>
+    <string name="label_project_title">Título del proyecto</string>
+    <string name="label_use_sso">Usar la cuenta de la aplicación Nextcloud</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Cambios sin guardar</string>
+    <string name="dialog_unsaved_changes_msg">¿Guardar los cambios antes de salir?</string>
+    <string name="dialog_confirm_remove_project_msg">El proyecto remoto no se eliminará.</string>
+    <string name="dialog_sync_error_title">Error de sincronización</string>
+    <string name="dialog_sync_error_msg">Error al sincronizar %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Los gastos ya están equilibrados.</string>
+    <string name="msg_project_added">Proyecto %1$s añadido</string>
+    <string name="msg_bill_labeled_done">Todas las facturas están categorizadas</string>
+    <string name="msg_no_suggestions">No hay sugerencias</string>
+    <string name="msg_auth_warning">Requiere Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Enlace copiado al portapapeles</string>
+    <string name="msg_share_qr">Escanea el código QR o comparte el enlace para unirte al proyecto.</string>
+    <string name="msg_share_web">Enlace de acceso desde un navegador web.</string>
+    <string name="msg_share_qr_warn">Comparte este enlace con un usuario de Cowspent.</string>
+    <string name="msg_settle_intro">Liquidación de %1$s:</string>
+    <string name="msg_settle_sentence">%1$s debe %3$.2f a %2$s</string>
+    <string name="msg_stats_intro">Estadísticas de %1$s:</string>
+    <string name="msg_stats_header">Miembro (Pagado | Gastado | Saldo)</string>
+    <string name="msg_logged_in_as">Sesión iniciada como %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Cargando</string>
+    <string name="error_no_projects">No se encontraron proyectos</string>
+    <string name="error_no_members">No se encontraron miembros</string>
+    <string name="error_no_bills">No se encontraron facturas</string>
+    <string name="error_no_member">Se requiere al menos un miembro</string>
+    <string name="error_maintenance_mode">El servidor está en modo de mantenimiento</string>
+    <string name="error_400">400 Solicitud incorrecta</string>
+    <string name="error_401">401 No autorizado</string>
+    <string name="error_403">403 Prohibido</string>
+    <string name="error_404">404 No encontrado</string>
+    <string name="error_sync">Error de sincronización: %1$s</string>
+    <string name="error_invalid_login">Inicio de sesión no válido: %1$s</string>
+    <string name="error_auth">Nombre de usuario o contraseña incorrectos</string>
+    <string name="error_json">Respuesta del servidor no válida</string>
+    <string name="error_req_failed">La petición ha fallado</string>
+    <string name="error_invalid_email">Correo electrónico no válido</string>
+    <string name="error_invalid_project_id">ID de proyecto no válido</string>
+    <string name="error_invalid_project_name">Título de proyecto no válido</string>
+    <string name="error_invalid_bill_name">Nombre de factura no válido</string>
+    <string name="error_invalid_bill_date">Fecha de factura no válida</string>
+    <string name="error_invalid_bill_payer">Pagador requerido</string>
+    <string name="error_invalid_bill_owers">Participantes requeridos</string>
+    <string name="error_no_network">No hay conexión de red</string>
+    <string name="error_server">Error del servidor</string>
+    <string name="error_io">Se ha perdido la conexión con el servidor</string>
+    <string name="error_share_impossible">No se puede compartir este proyecto</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Conectar a una cuenta de Nextcloud</string>
+    <string name="drawer_last_sync">Última sincronización: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancelar</string>
+    <string name="simple_ok" tools:ignore="ButtonCase,Typos">Ok</string>
+    <string name="simple_yes">Sí</string>
+    <string name="simple_no">No</string>
+    <string name="simple_close">Cerrar</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Apariencia</string>
+    <string name="settings_network">Red</string>
+    <string name="settings_other">Otros</string>
+    <string name="settings_night_mode">Tema</string>
+    <string name="settings_offline_mode">Modo sin conexión</string>
+    <string name="settings_offline_mode_summary">Sincronizar solo manualmente.</string>
+    <string name="settings_color_custom">Color personalizado</string>
+    <string name="settings_color_mode">Selección de color</string>
+    <string name="settings_show_archived">Mostrar los proyectos archivados</string>
+    <string name="settings_beta_features">Funciones beta</string>
+    <string name="settings_beta_features_summary">Activar las funciones experimentales. Úsalas bajo tu propia responsabilidad.</string>
+    <string name="settings_fill_new_bill_from_last">Rellenar desde la última factura</string>
+    <string name="settings_fill_new_bill_from_last_summary">Reutilizar el pagador, la categoría, el modo y los participantes de la última factura creada en el proyecto.</string>
+    <string name="settings_auto_sync_on_open">Intervalo de sincronización</string>
+    <string name="settings_auto_sync_on_open_summary">Con qué frecuencia se actualizan la cuenta y todos los proyectos al abrir la aplicación.</string>
+    <string name="pref_value_sync_1m">1 minuto</string>
+    <string name="pref_value_sync_10m">10 minutos</string>
+    <string name="pref_value_sync_1h">1 hora</string>
+    <string name="pref_value_sync_1d">1 día</string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Usa \"https\".</string>
+    <string name="settings_colorpicker_title">Elegir un color</string>
+
+    <string name="pref_value_color_system">Sistema</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Oscuro</string>
+    <string name="pref_value_theme_system">Seguir el sistema</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">Sin repetición</string>
+    <string name="repeat_day">Diaria</string>
+    <string name="repeat_week">Semanal</string>
+    <string name="repeat_fortnight">Quincenal</string>
+    <string name="repeat_month">Mensual</string>
+    <string name="repeat_year">Anual</string>
+
+    <string name="payment_mode_none">Ninguno</string>
+    <string name="payment_mode_all">Todos</string>
+    <string name="payment_mode_credit_card">Tarjeta de crédito</string>
+    <string name="payment_mode_cash">Efectivo</string>
+    <string name="payment_mode_check">Cheque</string>
+    <string name="payment_mode_online">En línea</string>
+    <string name="payment_mode_transfer">Transferencia</string>
+
+    <string name="category_none">Ninguna</string>
+    <string name="category_all">Todas</string>
+    <string name="category_all_except_reimbursement">Todas excepto reembolso</string>
+    <string name="category_groceries">Supermercado</string>
+    <string name="category_leisure">Bar/Fiesta</string>
+    <string name="category_rent">Alquiler</string>
+    <string name="category_bills">Factura</string>
+    <string name="category_excursion">Excursión/Cultura</string>
+    <string name="category_health">Salud</string>
+    <string name="category_shopping">Compras</string>
+    <string name="category_reimbursement">Reembolso</string>
+    <string name="category_restaurant">Restaurante</string>
+    <string name="category_accomodation">Alojamiento</string>
+    <string name="category_transport">Transporte</string>
+    <string name="category_sport">Deporte</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">Qué</string>
+    <string name="new_project_where">Dónde</string>
+    <string name="where_local">Solo local</string>
+    <string name="todo_join">Unirse a un proyecto existente</string>
+    <string name="todo_create">Crear un proyecto nuevo</string>
+    <string name="import_tooltip">Importar desde un archivo</string>
+    <string name="choose_project_management_action">Proyecto</string>
+    <string name="project_added_success">Proyecto añadido correctamente.</string>
+    <string name="no_projects_text">Aún no tienes proyectos.</string>
+    <string name="configure_account_choice">Configurar una cuenta de Nextcloud</string>
+    <string name="add_project_choice">Añadir un proyecto manualmente</string>
+    <string name="no_members_text">No hay miembros en este proyecto.</string>
+    <string name="no_bills_text">No se encontraron facturas.</string>
+    <string name="member_already_exists">El miembro ya existe.</string>
+    <string name="activity_dialog_title">Proyecto: %1$s</string>
+    <string name="remove_project_confirmation">Proyecto %1$s eliminado.</string>
+    <string name="file_saved_success">Archivo guardado: %1$s</string>
+    <string name="import_error_header">Error de importación en la fila %d</string>
+    <string name="import_error_date">Formato de fecha no válido en la fila %d</string>
+    <string name="import_error_owers">Participantes no válidos en la fila %d</string>
+    <string name="add_member_dialog_title">Añadir miembro</string>
+    <string name="edit_member_dialog_title">Editar miembro</string>
+    <string name="member_edit_delete">Eliminar</string>
+    <string name="project_edition_no_change">No hay cambios que guardar.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">Ninguno (óptimo)</string>
+    <string name="settle_who">Quién paga</string>
+    <string name="settle_to_whom">A quién</string>
+    <string name="settle_how_much">Importe</string>
+    <string name="simple_settle_share">Compartir</string>
+    <string name="simple_create_bills">Crear las facturas</string>
+    <string name="settle_bill_what">Liquidación</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Elegir moneda (%s)</string>
+    <string name="setting_none">Ninguna</string>
+    <string name="setting_all">Todas</string>
+    <string name="currency_saved_success">Ajustes de moneda guardados.</string>
+    <string name="main_currency">Moneda principal</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Categorías sugeridas</string>
+    <string name="label_bills_skip">Omitir</string>
+    <string name="stats_date_min">Desde</string>
+    <string name="stats_date_max">Hasta</string>
+    <string name="stats_who">Miembro</string>
+    <string name="stats_paid">Pagado</string>
+    <string name="stats_spent">Gastado</string>
+    <string name="stats_balance">Saldo</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Error de conexión: %1$s</string>
+    <string name="error_create_remote_project_helper">Error al crear: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error al actualizar el proyecto remoto: %1$s</string>
+    <string name="remote_project_operation_no_network">Red no disponible para esta operación remota.</string>
+    <string name="error_scanning_bill_qr_code">No se ha podido leer el código QR.</string>
+    <string name="error_token_mismatch">El token de autenticación no coincide. Vuelve a iniciar sesión.</string>
+    <string name="insufficient_access_level">No tienes permiso para realizar esta acción.</string>
+    <string name="delete_label_confirmation_title">Eliminar etiqueta</string>
+    <string name="delete_label_confirmation_message">¿Seguro que quieres eliminar esta etiqueta?</string>
+
+    <!-- About -->
+    <string name="about_version">Versión %1$s</string>
+    <string name="about_maintainer_title">Mantenedor</string>
+    <string name="about_license_title">Licencia</string>
+    <string name="about_source_title">Código fuente</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Proyecto %1$s</string>
+    <string name="share_chooser_title">Compartir %1$s</string>
+
+</resources>

app/src/main/res/values-fi-rFI/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-fr-rFR/strings.xml

@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+
+    <!-- Actions -->
+    <string name="action_new_bill">Nouvelle facture</string>
+    <string name="action_add_project">Ajouter un projet</string>
+    <string name="action_save">Enregistrer</string>
+    <string name="action_edit">Modifier</string>
+    <string name="action_share">Partager</string>
+    <string name="action_search">Rechercher</string>
+    <string name="action_open_menu">Ouvrir le menu</string>
+    <string name="action_close_search">Fermer la recherche</string>
+    <string name="action_clear_search">Effacer la recherche</string>
+    <string name="action_delete">Supprimer</string>
+    <string name="simple_back">Retour</string>
+    <string name="action_archive">Archiver</string>
+    <string name="action_unarchive">Désarchiver</string>
+    <string name="action_export">Exporter</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Régler</string>
+    <string name="action_scan_qrcode">Scanner un QR code</string>
+    <string name="action_settings">Réglages</string>
+    <string name="action_label_bills">Catégoriser les factures</string>
+    <string name="action_logout">Déconnecter</string>
+    <string name="action_connect">Connecter</string>
+    <string name="action_discard">Abandonner</string>
+    <string name="action_members">Membres</string>
+    <string name="action_labels">Étiquettes</string>
+    <string name="action_currencies">Devises</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistiques</string>
+    <string name="title_edit_project">Modifier le projet</string>
+    <string name="title_label_bills">Catégoriser les factures</string>
+    <string name="title_labels">Gérer les étiquettes</string>
+    <string name="title_about">À propos</string>
+    <string name="title_settle">Régler le projet</string>
+    <string name="title_share">Partager le projet</string>
+    <string name="title_add_project">Ajouter un projet</string>
+    <string name="title_add_category">Ajouter une catégorie</string>
+    <string name="title_add_payment_mode">Ajouter un mode de paiement</string>
+    <string name="title_account">Compte Nextcloud</string>
+    <string name="title_share_web">Lien web</string>
+    <string name="title_share_qr">Lien Cowspent</string>
+    <string name="title_confirm">Êtes-vous sûr(e) ?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">Toutes les factures</string>
+    <string name="label_categories">Catégories</string>
+    <string name="label_payment_modes">Modes de paiement</string>
+    <string name="label_name">Nom</string>
+    <string name="label_icon">Icône / Emoji</string>
+    <string name="label_color">Couleur</string>
+    <string name="label_weight">Poids</string>
+    <string name="label_activated">Activé</string>
+    <string name="label_password">Mot de passe</string>
+    <string name="label_email">Courriel</string>
+    <string name="label_url">Adresse du serveur</string>
+    <string name="label_username">Nom d\'utilisateur</string>
+    <string name="label_comment">Commentaire</string>
+    <string name="label_what">Quoi ?</string>
+    <string name="label_payer">Qui a payé ?</string>
+    <string name="label_owers">Pour qui ?</string>
+    <string name="label_repeat">Répétition</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Catégorie</string>
+    <string name="label_project_id">ID/nom du projet</string>
+    <string name="label_project_title">Titre du projet</string>
+    <string name="label_use_sso">Utiliser le compte de l\'application Nextcloud</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Modifications non enregistrées</string>
+    <string name="dialog_unsaved_changes_msg">Enregistrer les modifications avant de quitter ?</string>
+    <string name="dialog_confirm_remove_project_msg">Le projet distant ne sera pas supprimé.</string>
+    <string name="dialog_sync_error_title">Erreur de synchronisation</string>
+    <string name="dialog_sync_error_msg">Échec de la synchronisation pour %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Les dépenses sont déjà équilibrées.</string>
+    <string name="msg_project_added">Projet %1$s ajouté</string>
+    <string name="msg_bill_labeled_done">Toutes les factures sont catégorisées</string>
+    <string name="msg_no_suggestions">Aucune suggestion</string>
+    <string name="msg_auth_warning">Nécessite Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Lien copié dans le presse-papiers</string>
+    <string name="msg_share_qr">Scannez le QR code ou partagez le lien pour rejoindre le projet.</string>
+    <string name="msg_share_web">Lien d\'accès depuis un navigateur web.</string>
+    <string name="msg_share_qr_warn">Partagez ce lien avec un utilisateur de Cowspent.</string>
+    <string name="msg_settle_intro">Règlement pour %1$s :</string>
+    <string name="msg_settle_sentence">%1$s doit %3$.2f à %2$s</string>
+    <string name="msg_stats_intro">Statistiques pour %1$s :</string>
+    <string name="msg_stats_header">Membre (Payé | Dépensé | Solde)</string>
+    <string name="msg_logged_in_as">Connecté en tant que %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Erreur</string>
+    <string name="error_loading">Chargement</string>
+    <string name="error_no_projects">Aucun projet trouvé</string>
+    <string name="error_no_members">Aucun membre trouvé</string>
+    <string name="error_no_bills">Aucune facture trouvée</string>
+    <string name="error_no_member">Au moins un membre est requis</string>
+    <string name="error_maintenance_mode">Le serveur est en mode maintenance</string>
+    <string name="error_400">400 Requête incorrecte</string>
+    <string name="error_401">401 Non autorisé</string>
+    <string name="error_403">403 Interdit</string>
+    <string name="error_404">404 Introuvable</string>
+    <string name="error_sync">Échec de la synchronisation : %1$s</string>
+    <string name="error_invalid_login">Identifiant invalide : %1$s</string>
+    <string name="error_auth">Mauvais nom d\'utilisateur ou mot de passe</string>
+    <string name="error_json">Réponse du serveur invalide</string>
+    <string name="error_req_failed">La requête a échoué</string>
+    <string name="error_invalid_email">Adresse e-mail invalide</string>
+    <string name="error_invalid_project_id">ID de projet invalide</string>
+    <string name="error_invalid_project_name">Titre de projet invalide</string>
+    <string name="error_invalid_bill_name">Nom de facture invalide</string>
+    <string name="error_invalid_bill_date">Date de facture invalide</string>
+    <string name="error_invalid_bill_payer">Payeur requis</string>
+    <string name="error_invalid_bill_owers">Participants requis</string>
+    <string name="error_no_network">Aucune connexion réseau</string>
+    <string name="error_server">Erreur serveur</string>
+    <string name="error_io">La connexion au serveur a échoué</string>
+    <string name="error_share_impossible">Impossible de partager ce projet</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Se connecter au compte Nextcloud</string>
+    <string name="drawer_last_sync">Dernière synchronisation : %1$02d:%2$02d</string>
+    <string name="simple_cancel">Annuler</string>
+    <string name="simple_ok" tools:ignore="ButtonCase,Typos">Ok</string>
+    <string name="simple_yes">Oui</string>
+    <string name="simple_no">Non</string>
+    <string name="simple_close">Fermer</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Apparence</string>
+    <string name="settings_network">Réseau</string>
+    <string name="settings_other">Autres</string>
+    <string name="settings_night_mode">Thème</string>
+    <string name="settings_offline_mode">Mode hors ligne</string>
+    <string name="settings_offline_mode_summary">Synchroniser uniquement manuellement.</string>
+    <string name="settings_color_custom">Couleur personnalisée</string>
+    <string name="settings_color_mode">Sélection de la couleur</string>
+    <string name="settings_show_archived">Afficher les projets archivés</string>
+    <string name="settings_beta_features">Fonctionnalités bêta</string>
+    <string name="settings_beta_features_summary">Activer les fonctionnalités expérimentales. À utiliser à vos risques et périls.</string>
+    <string name="settings_fill_new_bill_from_last">Pré-remplir depuis la dernière facture</string>
+    <string name="settings_fill_new_bill_from_last_summary">Reprendre le payeur, la catégorie, le mode et les participants de la dernière facture créée dans le projet.</string>
+    <string name="settings_auto_sync_on_open">Intervalle de synchronisation</string>
+    <string name="settings_auto_sync_on_open_summary">Fréquence de rafraîchissement du compte et de tous les projets à l\'ouverture de l\'application.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 heure</string>
+    <string name="pref_value_sync_1d">1 jour</string>
+    <string name="settings_url_warn_http">AVERTISSEMENT : \"http\" n\'est pas sûr. Utilisez \"https\".</string>
+    <string name="settings_colorpicker_title">Choisir une couleur</string>
+
+    <string name="pref_value_color_system">Système</string>
+    <string name="pref_value_color_manual">Manuelle</string>
+    <string name="pref_value_theme_light">Clair</string>
+    <string name="pref_value_theme_dark">Sombre</string>
+    <string name="pref_value_theme_system">Suivre le système</string>
+
+    <!-- Constants (Do not translate) -->
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">Pas de répétition</string>
+    <string name="repeat_day">Quotidienne</string>
+    <string name="repeat_week">Hebdomadaire</string>
+    <string name="repeat_fortnight">Toutes les deux semaines</string>
+    <string name="repeat_month">Mensuelle</string>
+    <string name="repeat_year">Annuelle</string>
+
+    <string name="payment_mode_none">Aucun</string>
+    <string name="payment_mode_all">Tous</string>
+    <string name="payment_mode_credit_card">Carte bancaire</string>
+    <string name="payment_mode_cash">Espèces</string>
+    <string name="payment_mode_check">Chèque</string>
+    <string name="payment_mode_online">En ligne</string>
+    <string name="payment_mode_transfer">Virement</string>
+
+    <string name="category_none">Aucune</string>
+    <string name="category_all">Toutes</string>
+    <string name="category_all_except_reimbursement">Toutes sauf remboursement</string>
+    <string name="category_groceries">Courses</string>
+    <string name="category_leisure">Bar/Fête</string>
+    <string name="category_rent">Loyer</string>
+    <string name="category_bills">Facture</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Santé</string>
+    <string name="category_shopping">Achats</string>
+    <string name="category_reimbursement">Remboursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Hébergement</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">Quoi</string>
+    <string name="new_project_where">Où</string>
+    <string name="where_local">Local uniquement</string>
+    <string name="todo_join">Rejoindre un projet existant</string>
+    <string name="todo_create">Créer un nouveau projet</string>
+    <string name="import_tooltip">Importer depuis un fichier</string>
+    <string name="choose_project_management_action">Projet</string>
+    <string name="project_added_success">Le projet a été ajouté avec succès.</string>
+    <string name="no_projects_text">Vous n\'avez pas encore de projet.</string>
+    <string name="configure_account_choice">Configurer le compte Nextcloud</string>
+    <string name="add_project_choice">Ajouter un projet manuellement</string>
+    <string name="no_members_text">Aucun membre dans ce projet.</string>
+    <string name="no_bills_text">Aucune facture trouvée.</string>
+    <string name="member_already_exists">Ce membre existe déjà.</string>
+    <string name="activity_dialog_title">Projet : %1$s</string>
+    <string name="remove_project_confirmation">Projet %1$s supprimé.</string>
+    <string name="file_saved_success">Fichier enregistré : %1$s</string>
+    <string name="import_error_header">Échec de l\'importation à la ligne %d</string>
+    <string name="import_error_date">Format de date invalide à la ligne %d</string>
+    <string name="import_error_owers">Participants invalides à la ligne %d</string>
+    <string name="add_member_dialog_title">Ajouter un membre</string>
+    <string name="edit_member_dialog_title">Modifier le membre</string>
+    <string name="member_edit_delete">Supprimer</string>
+    <string name="project_edition_no_change">Aucune modification à enregistrer.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">Aucun (optimal)</string>
+    <string name="settle_who">Qui paie</string>
+    <string name="settle_to_whom">À qui</string>
+    <string name="settle_how_much">Montant</string>
+    <string name="simple_settle_share">Partager</string>
+    <string name="simple_create_bills">Créer les factures</string>
+    <string name="settle_bill_what">Règlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choisir la devise (%s)</string>
+    <string name="setting_none">Aucune</string>
+    <string name="setting_all">Toutes</string>
+    <string name="currency_saved_success">Paramètres des devises enregistrés.</string>
+    <string name="main_currency">Devise principale</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Catégories suggérées</string>
+    <string name="label_bills_skip">Ignorer</string>
+    <string name="stats_date_min">Du</string>
+    <string name="stats_date_max">Au</string>
+    <string name="stats_who">Membre</string>
+    <string name="stats_paid">Payé</string>
+    <string name="stats_spent">Dépensé</string>
+    <string name="stats_balance">Solde</string>
+    <string name="total">Total : %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Échec de la connexion : %1$s</string>
+    <string name="error_create_remote_project_helper">Échec de la création : %1$s</string>
+    <string name="error_edit_remote_project_helper">Erreur lors de la mise à jour du projet distant : %1$s</string>
+    <string name="remote_project_operation_no_network">Réseau indisponible pour cette opération distante.</string>
+    <string name="error_scanning_bill_qr_code">Impossible de lire le QR code.</string>
+    <string name="error_token_mismatch">Jeton d\'authentification invalide. Veuillez vous reconnecter.</string>
+    <string name="insufficient_access_level">Vous n\'avez pas la permission d\'effectuer cette action.</string>
+    <string name="delete_label_confirmation_title">Supprimer l\'étiquette</string>
+    <string name="delete_label_confirmation_message">Voulez-vous vraiment supprimer cette étiquette ?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Mainteneur</string>
+    <string name="about_license_title">Licence</string>
+    <string name="about_source_title">Code source</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Projet %1$s</string>
+    <string name="share_chooser_title">Partager %1$s</string>
+
+</resources>

app/src/main/res/values-hu-rHU/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-iw-rIL/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-ja-rJP/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-ko-rKR/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-nl-rNL/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-no-rNO/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-pl-rPL/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Untranslated: these are the English strings, kept here so a translation can be
+        contributed by simply replacing the values. Strings marked translatable="false" in
+        values/strings.xml (app and product names, preference keys) are deliberately absent
+        and must not be added.
+    -->
+
+    <!-- Actions -->
+    <string name="action_new_bill">New bill</string>
+    <string name="action_add_project">Add project</string>
+    <string name="action_save">Save</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_share">Share</string>
+    <string name="action_search">Search</string>
+    <string name="action_open_menu">Open menu</string>
+    <string name="action_close_search">Close search</string>
+    <string name="action_clear_search">Clear search</string>
+    <string name="action_delete">Delete</string>
+    <string name="simple_back">Back</string>
+    <string name="action_archive">Archive</string>
+    <string name="action_unarchive">Unarchive</string>
+    <string name="action_export">Export</string>
+    <string name="action_stats">Stats</string>
+    <string name="action_settle">Settle</string>
+    <string name="action_scan_qrcode">Scan QR Code</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_label_bills">Label missing categories</string>
+    <string name="action_logout">Logout</string>
+    <string name="action_connect">Connect</string>
+    <string name="action_discard">Discard</string>
+    <string name="action_members">Members</string>
+    <string name="action_labels">Labels</string>
+    <string name="action_currencies">Currencies</string>
+
+    <!-- Titles -->
+    <string name="title_stats">Statistics</string>
+    <string name="title_edit_project">Edit project</string>
+    <string name="title_label_bills">Label Bills</string>
+    <string name="title_labels">Manage Labels</string>
+    <string name="title_about">About</string>
+    <string name="title_settle">Settle Project</string>
+    <string name="title_share">Share Project</string>
+    <string name="title_add_project">Add Project</string>
+    <string name="title_add_category">Add Category</string>
+    <string name="title_add_payment_mode">Add Payment Mode</string>
+    <string name="title_account">Nextcloud Account</string>
+    <string name="title_share_web">Web link</string>
+    <string name="title_share_qr">Cowspent link</string>
+    <string name="title_confirm">Are you sure?</string>
+
+    <!-- Labels and Fields -->
+    <string name="label_all_bills">All bills</string>
+    <string name="label_categories">Categories</string>
+    <string name="label_payment_modes">Payment Modes</string>
+    <string name="label_name">Name</string>
+    <string name="label_icon">Icon / Emoji</string>
+    <string name="label_color">Color</string>
+    <string name="label_weight">Weight</string>
+    <string name="label_activated">Activated</string>
+    <string name="label_password">Password</string>
+    <string name="label_email">E-mail</string>
+    <string name="label_url">Server address</string>
+    <string name="label_username">Username</string>
+    <string name="label_comment">Comment</string>
+    <string name="label_what">What?</string>
+    <string name="label_payer">Who paid?</string>
+    <string name="label_owers">For whom?</string>
+    <string name="label_repeat">Repeat every</string>
+    <string name="label_mode">Mode</string>
+    <string name="label_category">Category</string>
+    <string name="label_project_id">Project ID/name</string>
+    <string name="label_project_title">Project title</string>
+    <string name="label_use_sso">Use Nextcloud App Account</string>
+
+    <!-- Dialogs and Messages -->
+    <string name="dialog_unsaved_changes_title">Unsaved changes</string>
+    <string name="dialog_unsaved_changes_msg">Save changes before leaving?</string>
+    <string name="dialog_confirm_remove_project_msg">The remote project will not be deleted.</string>
+    <string name="dialog_sync_error_title">Sync error</string>
+    <string name="dialog_sync_error_msg">Sync failed for %1$s.\n\n%2$s</string>
+    <string name="dialog_balanced_msg">Expenses are already balanced.</string>
+    <string name="msg_project_added">Project %1$s added</string>
+    <string name="msg_bill_labeled_done">All bills labeled</string>
+    <string name="msg_no_suggestions">No suggestions</string>
+    <string name="msg_auth_warning">Requires Cospend v0.3.4+.</string>
+    <string name="msg_link_copied">Link copied to clipboard</string>
+    <string name="msg_share_qr">Scan QR code or share the link to join.</string>
+    <string name="msg_share_web">Link for web browser access.</string>
+    <string name="msg_share_qr_warn">Share this link with a Cowspent user.</string>
+    <string name="msg_settle_intro">Settlement for %1$s:</string>
+    <string name="msg_settle_sentence">%1$s owes %3$.2f to %2$s</string>
+    <string name="msg_stats_intro">Stats for %1$s:</string>
+    <string name="msg_stats_header">Member (Paid | Spent | Balance)</string>
+    <string name="msg_logged_in_as">Logged in as %1$s</string>
+
+    <!-- Errors -->
+    <string name="error_generic">Error</string>
+    <string name="error_loading">Loading</string>
+    <string name="error_no_projects">No projects found</string>
+    <string name="error_no_members">No members found</string>
+    <string name="error_no_bills">No bills found</string>
+    <string name="error_no_member">At least one member required</string>
+    <string name="error_maintenance_mode">Server is in maintenance mode</string>
+    <string name="error_400">400 Bad request</string>
+    <string name="error_401">401 Unauthorized</string>
+    <string name="error_403">403 Forbidden</string>
+    <string name="error_404">404 Not Found</string>
+    <string name="error_sync">Sync failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
+    <string name="error_auth">Wrong username or password</string>
+    <string name="error_json">Invalid server response</string>
+    <string name="error_req_failed">Request failed</string>
+    <string name="error_invalid_email">Invalid e-mail</string>
+    <string name="error_invalid_project_id">Invalid project ID</string>
+    <string name="error_invalid_project_name">Invalid project title</string>
+    <string name="error_invalid_bill_name">Invalid bill name</string>
+    <string name="error_invalid_bill_date">Invalid bill date</string>
+    <string name="error_invalid_bill_payer">Payer required</string>
+    <string name="error_invalid_bill_owers">Owers required</string>
+    <string name="error_no_network">No network connection</string>
+    <string name="error_server">Server error</string>
+    <string name="error_io">Server connection broken</string>
+    <string name="error_share_impossible">Cannot share this project</string>
+
+    <!-- Drawer / Common UI -->
+    <string name="drawer_no_account">Connect to Nextcloud account</string>
+    <string name="drawer_last_sync">Last sync: %1$02d:%2$02d</string>
+    <string name="simple_cancel">Cancel</string>
+    <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_close">Close</string>
+
+    <!-- Settings -->
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_network">Network</string>
+    <string name="settings_other">Other</string>
+    <string name="settings_night_mode">Theme</string>
+    <string name="settings_offline_mode">Offline mode</string>
+    <string name="settings_offline_mode_summary">Only sync manually.</string>
+    <string name="settings_color_custom">Custom color</string>
+    <string name="settings_color_mode">Color Selection</string>
+    <string name="settings_show_archived">Show archived projects</string>
+    <string name="settings_beta_features">Beta Features</string>
+    <string name="settings_beta_features_summary">Enable experimental features. Use at your own risk.</string>
+    <string name="settings_fill_new_bill_from_last">Auto-fill from last bill</string>
+    <string name="settings_fill_new_bill_from_last_summary">Pre-fill payer, category, mode and owers from the last bill created in the project.</string>
+    <string name="settings_auto_sync_on_open">Sync interval</string>
+    <string name="settings_auto_sync_on_open_summary">How often to refresh the account and all projects when opening the app.</string>
+    <string name="pref_value_sync_1m">1 minute</string>
+    <string name="pref_value_sync_10m">10 minutes</string>
+    <string name="pref_value_sync_1h">1 hour</string>
+    <string name="pref_value_sync_1d">1 day</string>
+    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Use "https".</string>
+    <string name="settings_colorpicker_title">Choose Color</string>
+
+    <string name="pref_value_color_system">System</string>
+    <string name="pref_value_color_manual">Manual</string>
+    <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_theme_system">Follow system</string>
+
+    <!-- Enums and Lists -->
+    <string name="repeat_no">No repeat</string>
+    <string name="repeat_day">Daily</string>
+    <string name="repeat_week">Weekly</string>
+    <string name="repeat_fortnight">Fortnightly</string>
+    <string name="repeat_month">Monthly</string>
+    <string name="repeat_year">Yearly</string>
+
+    <string name="payment_mode_none">None</string>
+    <string name="payment_mode_all">All</string>
+    <string name="payment_mode_credit_card">Credit card</string>
+    <string name="payment_mode_cash">Cash</string>
+    <string name="payment_mode_check">Check</string>
+    <string name="payment_mode_online">Online</string>
+    <string name="payment_mode_transfer">Transfer</string>
+
+    <string name="category_none">None</string>
+    <string name="category_all">All</string>
+    <string name="category_all_except_reimbursement">All except reimbursement</string>
+    <string name="category_groceries">Grocery</string>
+    <string name="category_leisure">Bar/Party</string>
+    <string name="category_rent">Rent</string>
+    <string name="category_bills">Bill</string>
+    <string name="category_excursion">Excursion/Culture</string>
+    <string name="category_health">Health</string>
+    <string name="category_shopping">Shopping</string>
+    <string name="category_reimbursement">Reimbursement</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_accomodation">Accommodation</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_sport">Sport</string>
+
+    <!-- Project specific -->
+    <string name="new_project_action">What</string>
+    <string name="new_project_where">Where</string>
+    <string name="where_local">Local only</string>
+    <string name="todo_join">Join existing project</string>
+    <string name="todo_create">Create new project</string>
+    <string name="import_tooltip">Import from file</string>
+    <string name="choose_project_management_action">Project</string>
+    <string name="project_added_success">Project added successfully.</string>
+    <string name="no_projects_text">You have no projects yet.</string>
+    <string name="configure_account_choice">Configure Nextcloud account</string>
+    <string name="add_project_choice">Add project manually</string>
+    <string name="no_members_text">No members in this project.</string>
+    <string name="no_bills_text">No bills found.</string>
+    <string name="member_already_exists">Member already exists.</string>
+    <string name="activity_dialog_title">Project: %1$s</string>
+    <string name="remove_project_confirmation">Project %1$s removed.</string>
+    <string name="file_saved_success">File saved: %1$s</string>
+    <string name="import_error_header">Import failed at row %d</string>
+    <string name="import_error_date">Invalid date format at row %d</string>
+    <string name="import_error_owers">Invalid owers at row %d</string>
+    <string name="add_member_dialog_title">Add Member</string>
+    <string name="edit_member_dialog_title">Edit Member</string>
+    <string name="member_edit_delete">Delete</string>
+    <string name="project_edition_no_change">No changes to save.</string>
+
+    <!-- Settlement -->
+    <string name="center_none">None (Optimal)</string>
+    <string name="settle_who">Who pays</string>
+    <string name="settle_to_whom">To whom</string>
+    <string name="settle_how_much">Amount</string>
+    <string name="simple_settle_share">Share</string>
+    <string name="simple_create_bills">Create bills</string>
+    <string name="settle_bill_what">Settlement</string>
+
+    <!-- Currencies -->
+    <string name="currency_dialog_title">Choose Currency (%s)</string>
+    <string name="setting_none">None</string>
+    <string name="setting_all">All</string>
+    <string name="currency_saved_success">Currency settings saved.</string>
+    <string name="main_currency">Main Currency</string>
+
+    <!-- Statistics -->
+    <string name="label_bills_suggested">Suggested Categories</string>
+    <string name="label_bills_skip">Skip</string>
+    <string name="stats_date_min">From</string>
+    <string name="stats_date_max">To</string>
+    <string name="stats_who">Member</string>
+    <string name="stats_paid">Paid</string>
+    <string name="stats_spent">Spent</string>
+    <string name="stats_balance">Balance</string>
+    <string name="total">Total: %1$s</string>
+
+    <!-- Errors Extra -->
+    <string name="error_project_connect_check">Connection failed: %1$s</string>
+    <string name="error_create_remote_project_helper">Creation failed: %1$s</string>
+    <string name="error_edit_remote_project_helper">Error updating remote project: %1$s</string>
+    <string name="remote_project_operation_no_network">Network unavailable for remote operation.</string>
+    <string name="error_scanning_bill_qr_code">Failed to parse QR code.</string>
+    <string name="error_token_mismatch">Authentication token mismatch. Please log in again.</string>
+    <string name="insufficient_access_level">You don\'t have permission to perform this action.</string>
+    <string name="delete_label_confirmation_title">Delete Label</string>
+    <string name="delete_label_confirmation_message">Are you sure you want to delete this label?</string>
+
+    <!-- About -->
+    <string name="about_version">Version %1$s</string>
+    <string name="about_maintainer_title">Maintainer</string>
+    <string name="about_license_title">License</string>
+    <string name="about_source_title">Source code</string>
+
+    <!-- New constants for backward compatibility or shared use -->
+    <string name="share_intent_title">Project %1$s</string>
+    <string name="share_chooser_title">Share %1$s</string>
+
+</resources>