Commit f93174c9 authored 3 years ago by Nico

Merge remote-tracking branch 'origin/92-contact-list-viewmodel' into 31-windows

parents 34ae9183 565bcfec

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt 13 additions, 20 deletions

...lin/org/briarproject/briar/desktop/contact/ContactCard.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt 2 additions, 2 deletions

...org/briarproject/briar/desktop/contact/ContactDropDown.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt 4 additions, 4 deletions

...g/briarproject/briar/desktop/contact/ContactInfoDrawer.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/ContactItem.kt 43 additions, 0 deletions

...lin/org/briarproject/briar/desktop/contact/ContactItem.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt 20 additions, 23 deletions

...lin/org/briarproject/briar/desktop/contact/ContactList.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/ContactListViewModel.kt 73 additions, 0 deletions

...riarproject/briar/desktop/contact/ContactListViewModel.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt 72 additions, 14 deletions

...g/briarproject/briar/desktop/contact/ContactsViewModel.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt 2 additions, 2 deletions

...org/briarproject/briar/desktop/contact/SearchTextField.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactDialog.kt 91 additions, 0 deletions

...ject/briar/desktop/contact/add/remote/AddContactDialog.kt
src/main/kotlin/org/briarproject/briar/desktop/contact/add/remote/AddContactViewModel.kt 99 additions, 0 deletions

...t/briar/desktop/contact/add/remote/AddContactViewModel.kt
src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt 18 additions, 8 deletions

...g/briarproject/briar/desktop/conversation/Conversation.kt
src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt 6 additions, 5 deletions

...rproject/briar/desktop/conversation/ConversationHeader.kt
src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt 14 additions, 24 deletions

...rproject/briar/desktop/conversation/PrivateMessageView.kt
src/main/kotlin/org/briarproject/briar/desktop/introduction/ContactDrawerMakeIntro.kt 39 additions, 39 deletions

...ject/briar/desktop/introduction/ContactDrawerMakeIntro.kt
src/main/kotlin/org/briarproject/briar/desktop/introduction/IntroductionViewModel.kt 65 additions, 0 deletions

...oject/briar/desktop/introduction/IntroductionViewModel.kt
src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt 15 additions, 6 deletions

src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt 8 additions, 19 deletions

...in/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
src/main/kotlin/org/briarproject/briar/desktop/ui/UiPlaceholder.kt 14 additions, 0 deletions

...kotlin/org/briarproject/briar/desktop/ui/UiPlaceholder.kt
src/main/kotlin/org/briarproject/briar/desktop/utils/ListUtils.kt 23 additions, 0 deletions

.../kotlin/org/briarproject/briar/desktop/utils/ListUtils.kt

with 621 additions and 166 deletions

Please register or to comment