diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt index e14593b5608e282f40495fdda0a23973d47062fe..b99c731bf2656a7e0bd3ac7d15f640b92a06ed35 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt @@ -42,14 +42,30 @@ fun ContactDropDown( } DropdownMenuItem(onClick = { connectionMode = true; isExpanded(false) }) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { - Text(i18n("contacts.dropdown.connections"), fontSize = 14.sp, modifier = Modifier.align(Alignment.CenterVertically)) - Icon(Icons.Filled.ArrowRight, i18n("access.contacts.dropdown.connections.expand"), modifier = Modifier.align(Alignment.CenterVertically)) + Text( + i18n("contacts.dropdown.connections"), + fontSize = 14.sp, + modifier = Modifier.align(Alignment.CenterVertically) + ) + Icon( + Icons.Filled.ArrowRight, + i18n("access.contacts.dropdown.connections.expand"), + modifier = Modifier.align(Alignment.CenterVertically) + ) } } DropdownMenuItem(onClick = { contactMode = true; isExpanded(false) }) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { - Text(i18n("contacts.dropdown.contact"), fontSize = 14.sp, modifier = Modifier.align(Alignment.CenterVertically)) - Icon(Icons.Filled.ArrowRight, i18n("access.contacts.dropdown.contacts.expand"), modifier = Modifier.align(Alignment.CenterVertically)) + Text( + i18n("contacts.dropdown.contact"), + fontSize = 14.sp, + modifier = Modifier.align(Alignment.CenterVertically) + ) + Icon( + Icons.Filled.ArrowRight, + i18n("access.contacts.dropdown.contacts.expand"), + modifier = Modifier.align(Alignment.CenterVertically) + ) } } } diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt index 735e7f87fb53d822c66b97b0f269d20919890b46..03ec8bd43981c40cd438651660d16310ed7ba1a5 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt @@ -41,7 +41,12 @@ fun SearchTextField(searchValue: String, onValueChange: (String) -> Unit, onCont modifier = Modifier.padding(end = 10.dp).size(32.dp) .background(MaterialTheme.colors.primary, CircleShape) ) { - Icon(Icons.Filled.PersonAdd, i18n("access.contacts.add"), tint = Color.White, modifier = Modifier.size(20.dp)) + Icon( + Icons.Filled.PersonAdd, + i18n("access.contacts.add"), + tint = Color.White, + modifier = Modifier.size(20.dp) + ) } }, modifier = Modifier.fillMaxSize() diff --git a/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt b/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt index 1105860218196269cb33a10129c16f49d8e97e7b..fdc4d3c589326c58ba94cfae267607c533d7222b 100644 --- a/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt +++ b/src/test/kotlin/org/briarproject/briar/desktop/testdata/DeterministicTestDataCreatorImpl.kt @@ -80,7 +80,13 @@ class DeterministicTestDataCreatorImpl @Inject internal constructor( require(!(avatarPercent < 0 || avatarPercent > 100)) ioExecutor.execute { try { - createTestDataOnIoExecutor(numContacts, numPrivateMsgs, avatarPercent, numPrivateGroups, numPrivateGroupPosts) + createTestDataOnIoExecutor( + numContacts, + numPrivateMsgs, + avatarPercent, + numPrivateGroups, + numPrivateGroupPosts + ) } catch (e: DbException) { LOG.warn(e) { } }