Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '313-move-forum-buttons-to-toolbar' into 'master'

Browse Source 
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
This commit is contained in:
akwizgran
2016-04-25 13:57:14 +00:00
parent 41c9916e8e 44b3d4c14f
commit 3200a9f8f8
13 changed files with 112 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/res/values/strings.xml
View File

@@ -81,7 +81,8 @@
<string name="forum_created_toast">Forum created</string>
<string name="forum_share_with_all">Share this forum with all contacts</string>
<string name="forum_share_with_some">Share this forum with chosen contacts</string>
<string name="share_button">Share Forum</string>
<string name="forum_share_button">Share Forum</string>
<string name="forum_compose_post">New Forum Post</string>
<string name="from">From:</string>
<string name="anonymous">Anonymous</string>
<string name="new_identity_item">New identity\u2026</string>