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

Re-organize conversations overflow menu

Browse Source
This commit is contained in:
Torsten Grote
2021-06-15 14:35:13 -03:00
parent 928b951c25
commit 4c327e9874
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
briar-android/src/main/res/menu/conversation_actions.xml
View File

@@ -10,12 +10,6 @@
android:title="@string/introduction_menu_item" android:title="@string/introduction_menu_item"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:id="@+id/action_set_alias"
android:enabled="false"
android:title="@string/set_contact_alias"
app:showAsAction="never" />
<item <item
android:id="@+id/action_conversation_settings" android:id="@+id/action_conversation_settings"
android:title="@string/menu_item_disappearing_messages" android:title="@string/menu_item_disappearing_messages"
@@ -23,27 +17,43 @@
app:showAsAction="never" app:showAsAction="never"
tools:visible="true" /> tools:visible="true" />
<item
android:id="@+id/action_connect_via_bluetooth"
android:enabled="false"
android:title="@string/menu_item_connect_via_bluetooth"
app:showAsAction="never" />
<item
android:id="@+id/action_transfer_data"
android:title="@string/removable_drive_menu_title"
android:visible="false"
app:showAsAction="never" />
<item <item
android:id="@+id/action_delete_all_messages" android:id="@+id/action_delete_all_messages"
android:title="@string/delete_all_messages" android:title="@string/delete_all_messages"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/action_social_remove_person" android:title="@string/network_settings_title"
android:icon="@drawable/action_delete_white" app:showAsAction="never">
android:title="@string/delete_contact" <menu>
app:showAsAction="never" /> <item
android:id="@+id/action_connect_via_bluetooth"
android:enabled="false"
android:title="@string/menu_item_connect_via_bluetooth"
app:showAsAction="never" />
<item
android:id="@+id/action_transfer_data"
android:title="@string/removable_drive_menu_title"
android:visible="false"
app:showAsAction="never" />
</menu>
</item>
<item
android:title="@string/menu_contact"
app:showAsAction="never">
<menu>
<item
android:id="@+id/action_set_alias"
android:enabled="false"
android:title="@string/set_contact_alias"
app:showAsAction="never" />
<item
android:id="@+id/action_social_remove_person"
android:title="@string/delete_contact"
app:showAsAction="never" />
</menu>
</item>
</menu> </menu>

1
briar-android/src/main/res/values/strings.xml
View File

@@ -239,6 +239,7 @@
<string name="dialog_title_image_support">You can now send images to this contact</string> <string name="dialog_title_image_support">You can now send images to this contact</string>
<string name="dialog_message_image_support">Tap this icon to attach images.</string> <string name="dialog_message_image_support">Tap this icon to attach images.</string>
<string name="messaging_too_many_attachments_toast">Only the first %d images will be sent</string> <string name="messaging_too_many_attachments_toast">Only the first %d images will be sent</string>
<string name="menu_contact">Contact</string>
<!-- Adding Contacts --> <!-- Adding Contacts -->