Merge branch 'contact-selector-controller' into 'master' (ade7e50f) · Commits · Julian Dehm / briar

Commit ade7e50f authored 8 years ago by akwizgran

Merge branch 'contact-selector-controller' into 'master'

Add a controller for contact selection lists

See merge request !401

parents a532f037 ccc9d53a

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/org/briarproject/android/ActivityComponent.java 8 additions, 2 deletions

...droid/src/org/briarproject/android/ActivityComponent.java
briar-android/src/org/briarproject/android/ActivityModule.java 18 additions, 0 deletions

...-android/src/org/briarproject/android/ActivityModule.java
briar-android/src/org/briarproject/android/BaseActivity.java 2 additions, 1 deletion

briar-android/src/org/briarproject/android/BaseActivity.java
briar-android/src/org/briarproject/android/contact/BaseContactListAdapter.java 2 additions, 4 deletions

.../briarproject/android/contact/BaseContactListAdapter.java
briar-android/src/org/briarproject/android/contact/ContactItem.java 1 addition, 12 deletions

...oid/src/org/briarproject/android/contact/ContactItem.java
briar-android/src/org/briarproject/android/contact/ContactListAdapter.java 1 addition, 1 deletion

.../org/briarproject/android/contact/ContactListAdapter.java
briar-android/src/org/briarproject/android/contact/ContactListItem.java 11 additions, 2 deletions

...src/org/briarproject/android/contact/ContactListItem.java
briar-android/src/org/briarproject/android/contactselection/BaseContactSelectorAdapter.java 32 additions, 0 deletions

.../android/contactselection/BaseContactSelectorAdapter.java
briar-android/src/org/briarproject/android/contactselection/BaseContactSelectorFragment.java 143 additions, 0 deletions

...android/contactselection/BaseContactSelectorFragment.java
briar-android/src/org/briarproject/android/contactselection/ContactSelectorActivity.java 20 additions, 7 deletions

...ect/android/contactselection/ContactSelectorActivity.java
briar-android/src/org/briarproject/android/contactselection/ContactSelectorAdapter.java 28 additions, 0 deletions

...ject/android/contactselection/ContactSelectorAdapter.java
briar-android/src/org/briarproject/android/contactselection/ContactSelectorController.java 19 additions, 0 deletions

...t/android/contactselection/ContactSelectorController.java
briar-android/src/org/briarproject/android/contactselection/ContactSelectorControllerImpl.java 77 additions, 0 deletions

...droid/contactselection/ContactSelectorControllerImpl.java
briar-android/src/org/briarproject/android/contactselection/ContactSelectorFragment.java 73 additions, 0 deletions

...ect/android/contactselection/ContactSelectorFragment.java
briar-android/src/org/briarproject/android/contactselection/ContactSelectorListener.java 18 additions, 0 deletions

...ect/android/contactselection/ContactSelectorListener.java
briar-android/src/org/briarproject/android/contactselection/SelectableContactHolder.java 2 additions, 2 deletions

...ect/android/contactselection/SelectableContactHolder.java
briar-android/src/org/briarproject/android/contactselection/SelectableContactItem.java 5 additions, 5 deletions

...oject/android/contactselection/SelectableContactItem.java
briar-android/src/org/briarproject/android/privategroup/creation/BaseGroupInviteActivity.java 12 additions, 28 deletions

...ndroid/privategroup/creation/BaseGroupInviteActivity.java
briar-android/src/org/briarproject/android/privategroup/creation/CreateGroupActivity.java 3 additions, 12 deletions

...ct/android/privategroup/creation/CreateGroupActivity.java
briar-android/src/org/briarproject/android/privategroup/creation/CreateGroupController.java 5 additions, 3 deletions

.../android/privategroup/creation/CreateGroupController.java

with 480 additions and 79 deletions

Please register or to comment