Compare commits
38
Commits
b448195243
..
1.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e45065e3b8 | ||
|
|
db3e27a215 | ||
|
|
ad0928b719 | ||
|
|
0c700232c9 | ||
|
|
7237aedb02 | ||
|
|
4a10025c4f | ||
|
|
a3709d2f04 | ||
|
|
db6c681ac1 | ||
|
|
480a7ccdc7 | ||
|
|
d7d1e09bc8 | ||
|
|
5e43d7767f | ||
|
|
abff06ff7c | ||
|
|
986b1a537e | ||
|
|
0b20abde38 | ||
|
|
ed8b99985f | ||
|
|
11c72a0e51 | ||
|
|
46fd446b35 | ||
|
|
a0e61648c3 | ||
|
|
e8c4a5624f | ||
|
|
a98fe57734 | ||
|
|
9d258d4579 | ||
|
|
9233156ee1 | ||
|
|
a9486e4c23 | ||
|
|
c3ad7cdb4e | ||
|
|
91e39388ab | ||
|
|
c1e1e6c5d3 | ||
|
|
080db964f2 | ||
|
|
edf8303027 | ||
|
|
fb4bc50db4 | ||
|
|
80a098351d | ||
|
|
a7a69deb42 | ||
|
|
4a47b0006b | ||
|
|
6c19867df9 | ||
|
|
90ef58aa81 | ||
|
|
ef5f5fceba | ||
|
|
7f04a41d32 | ||
|
|
747b74be77 | ||
|
|
62a98c9184 |
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '9.3.0'
|
id 'com.android.application' version '9.2.1'
|
||||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.4.0'
|
id 'org.jetbrains.kotlin.plugin.serialization' version '2.4.0'
|
||||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.4.0'
|
id 'org.jetbrains.kotlin.plugin.compose' version '2.4.0'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ class EditBillViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun isFormValid(): Boolean {
|
fun isFormValid(): Boolean {
|
||||||
return what.isNotEmpty() && !what.contains(",") &&
|
return what.isNotEmpty() &&
|
||||||
timestamp != 0L &&
|
timestamp != 0L &&
|
||||||
payerId != 0L &&
|
payerId != 0L &&
|
||||||
owersSelection.any { it.value }
|
owersSelection.any { it.value }
|
||||||
@@ -255,7 +255,7 @@ class EditBillViewModel : ViewModel() {
|
|||||||
errorInvalidForm: String
|
errorInvalidForm: String
|
||||||
): String? {
|
): String? {
|
||||||
return when {
|
return when {
|
||||||
what.isEmpty() || what.contains(",") -> errorWhat
|
what.isEmpty() -> errorWhat
|
||||||
timestamp == 0L -> errorDate
|
timestamp == 0L -> errorDate
|
||||||
payerId == 0L -> errorPayer
|
payerId == 0L -> errorPayer
|
||||||
owersSelection.none { it.value } -> errorOwers
|
owersSelection.none { it.value } -> errorOwers
|
||||||
|
|||||||
@@ -165,15 +165,7 @@ class NewProjectActivity : AppCompatActivity() {
|
|||||||
null, false, DBProject.ACCESS_LEVEL_UNKNOWN,
|
null, false, DBProject.ACCESS_LEVEL_UNKNOWN,
|
||||||
""
|
""
|
||||||
)
|
)
|
||||||
|
createProject()
|
||||||
if (isValidUrl(url) && todoCreate && ProjectType.COSPEND == type &&
|
|
||||||
db.cowspentServerSyncHelper.canCreateAuthenticatedProject(fakeProj) &&
|
|
||||||
!viewModel.showAuthWarningDialog // Avoid infinite loop
|
|
||||||
) {
|
|
||||||
viewModel.showAuthWarningDialog = true
|
|
||||||
} else {
|
|
||||||
createProject()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getFormattedUrl(): String {
|
private fun getFormattedUrl(): String {
|
||||||
|
|||||||
Reference in New Issue
Block a user