Merge branch '313-move-forum-buttons-to-toolbar' into 'master'
Move create forum post and share forum buttons in action bar According to the designs in #305, the 'create forum post' and 'share forum' buttons will go into the in action bar. In the spirit of keeping MRs small and to avoid conflicts with #306, I did this first and independently of future work. This also introduces constants for the `GROUP_ID`, `FORUM_NAME` and `MIN_TIMESTAMP` as they were used for the two buttons. Closes #313 See merge request !150
Showing
- briar-android/res/drawable/forum_item_create_white.xml 9 additions, 0 deletionsbriar-android/res/drawable/forum_item_create_white.xml
- briar-android/res/drawable/social_share_white.xml 9 additions, 0 deletionsbriar-android/res/drawable/social_share_white.xml
- briar-android/res/menu/forum_actions.xml 18 additions, 0 deletionsbriar-android/res/menu/forum_actions.xml
- briar-android/res/values/strings.xml 2 additions, 1 deletionbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java 3 additions, 2 deletions.../briarproject/android/AndroidNotificationManagerImpl.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/contact/ContactListFragment.java 2 additions, 1 deletion...org/briarproject/android/contact/ContactListFragment.java
- briar-android/src/org/briarproject/android/forum/CreateForumActivity.java 3 additions, 2 deletions...c/org/briarproject/android/forum/CreateForumActivity.java
- briar-android/src/org/briarproject/android/forum/ForumActivity.java 44 additions, 53 deletions...oid/src/org/briarproject/android/forum/ForumActivity.java
- briar-android/src/org/briarproject/android/forum/ForumListFragment.java 4 additions, 2 deletions...src/org/briarproject/android/forum/ForumListFragment.java
- briar-android/src/org/briarproject/android/forum/ReadForumPostActivity.java 8 additions, 6 deletions...org/briarproject/android/forum/ReadForumPostActivity.java
- briar-android/src/org/briarproject/android/forum/ShareForumActivity.java 4 additions, 3 deletions...rc/org/briarproject/android/forum/ShareForumActivity.java
- briar-android/src/org/briarproject/android/forum/WriteForumPostActivity.java 5 additions, 3 deletions...rg/briarproject/android/forum/WriteForumPostActivity.java
Loading
Please register or sign in to comment