Merge branch '663-implement-ux-for-displaying-message-threads-in-private-groups' into 'master'
Private Group Threaded Conversation This MR refactors the forum activity, its controller, its adapter and view holder so *most* of the code can be re-used for private groups by making heavy use of generics. The refactoring has 1383 additions and 1087 deletions, so just grows the code-base slightly and adding the private group conversation just takes an additional 400 lines. The MR also includes one commit that moves post/message creation more into clients, so the UI doesn't need to keep track of timestamps. This commit can of course be split out into a separate MR if desired. Closes #662, #663 See merge request !350
Showing
- briar-android-tests/src/test/java/org/briarproject/ForumSharingIntegrationTest.java 7 additions, 13 deletions...st/java/org/briarproject/ForumSharingIntegrationTest.java
- briar-android-tests/src/test/java/org/briarproject/MessageSizeIntegrationTest.java 7 additions, 7 deletions...est/java/org/briarproject/MessageSizeIntegrationTest.java
- briar-android/AndroidManifest.xml 11 additions, 0 deletionsbriar-android/AndroidManifest.xml
- briar-android/res/drawable/ic_group_white.xml 9 additions, 0 deletionsbriar-android/res/drawable/ic_group_white.xml
- briar-android/res/layout/activity_forum.xml 3 additions, 3 deletionsbriar-android/res/layout/activity_forum.xml
- briar-android/res/menu/forum_actions.xml 1 addition, 1 deletionbriar-android/res/menu/forum_actions.xml
- briar-android/res/menu/group_actions.xml 41 additions, 0 deletionsbriar-android/res/menu/group_actions.xml
- briar-android/res/values/strings.xml 9 additions, 0 deletionsbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/ActivityComponent.java 3 additions, 0 deletions...droid/src/org/briarproject/android/ActivityComponent.java
- briar-android/src/org/briarproject/android/ActivityModule.java 9 additions, 0 deletions...-android/src/org/briarproject/android/ActivityModule.java
- briar-android/src/org/briarproject/android/AndroidComponent.java 3 additions, 3 deletions...ndroid/src/org/briarproject/android/AndroidComponent.java
- briar-android/src/org/briarproject/android/BriarActivity.java 1 addition, 0 deletions...r-android/src/org/briarproject/android/BriarActivity.java
- briar-android/src/org/briarproject/android/forum/CreateForumActivity.java 1 addition, 2 deletions...c/org/briarproject/android/forum/CreateForumActivity.java
- briar-android/src/org/briarproject/android/forum/ForumActivity.java 57 additions, 233 deletions...oid/src/org/briarproject/android/forum/ForumActivity.java
- briar-android/src/org/briarproject/android/forum/ForumController.java 3 additions, 44 deletions...d/src/org/briarproject/android/forum/ForumController.java
- briar-android/src/org/briarproject/android/forum/ForumControllerImpl.java 41 additions, 303 deletions...c/org/briarproject/android/forum/ForumControllerImpl.java
- briar-android/src/org/briarproject/android/forum/ForumItem.java 24 additions, 0 deletions...android/src/org/briarproject/android/forum/ForumItem.java
- briar-android/src/org/briarproject/android/forum/ForumListAdapter.java 2 additions, 14 deletions.../src/org/briarproject/android/forum/ForumListAdapter.java
- briar-android/src/org/briarproject/android/forum/NestedForumAdapter.java 6 additions, 430 deletions...rc/org/briarproject/android/forum/NestedForumAdapter.java
- briar-android/src/org/briarproject/android/forum/NestedForumHolder.java 13 additions, 0 deletions...src/org/briarproject/android/forum/NestedForumHolder.java
Loading
Please register or sign in to comment