diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-04-25 22:36:18 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-04-25 22:36:18 +0200 |
| commit | 27fed7a6caaa7fedda9d8f40584a3839e56fc306 (patch) | |
| tree | 3150f809b0e83a7a587654cc38997266f1972e74 /src/main/res | |
| parent | ebaa9dcfab701117ff6b0e13979ee46b941c4607 (diff) | |
add some more buttons to ConferenceDetailsActivity and bug fixes
* add to/remove from contact list
* leave room
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 18 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details.xml | 24 |
2 files changed, 24 insertions, 18 deletions
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 3e1c41ff7..d5da934ba 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -215,6 +215,24 @@ android:text="@string/invite_contact" /> <Button + android:id="@+id/leave_muc" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="24dp" + android:text="@string/action_end_conversation_muc" /> + + <Button + android:id="@+id/add_contact_button" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="24dp" + android:text="@string/add_to_contact_list" /> + + <Button android:id="@+id/destroy" style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 910c986ec..f0336bdce 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -6,14 +6,14 @@ android:id="@+id/action_edit_subject" android:icon="?attr/icon_edit" android:orderInCategory="10" - app:showAsAction="always" - android:title="@string/action_edit_subject" /> + android:title="@string/action_edit_subject" + app:showAsAction="always" /> <item android:id="@+id/action_share" android:icon="?attr/icon_share" - app:showAsAction="always" android:orderInCategory="15" - android:title="@string/share_uri_with" > + android:title="@string/share_uri_with" + app:showAsAction="always"> <menu> <item android:id="@+id/action_share_uri" @@ -26,23 +26,11 @@ android:title="@string/show_qr_code" /> </menu> </item> - - <item - android:id="@+id/action_save_as_bookmark" - android:orderInCategory="80" - app:showAsAction="never" - android:title="@string/save_as_bookmark" /> - <item - android:id="@+id/action_delete_bookmark" - android:orderInCategory="80" - app:showAsAction="never" - android:title="@string/delete_bookmark" /> <item android:id="@+id/action_advanced_mode" android:checkable="true" android:checked="false" android:orderInCategory="85" - app:showAsAction="never" - android:title="@string/advanced_mode" /> - + android:title="@string/advanced_mode" + app:showAsAction="never" /> </menu>
\ No newline at end of file |