TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-17 15:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conversation menu resources adjusted for light theme support.

Browse Source
This commit is contained in:
Anton Chekulaev
2020-08-24 12:52:50 +10:00
parent dcb6dea430
commit cd32885db6
21 changed files with 104 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/menu/conversation_add_to_contacts.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_add_to_contacts"
android:title="@string/conversation_add_to_contacts__menu_add_to_contacts"
app:showAsAction="never" />
</menu>

9
res/menu/conversation_callable_insecure.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_callable_insecure__menu_call"
android:id="@+id/menu_call_insecure"
android:icon="?menu_call_icon"
app:showAsAction="always" />
</menu>

10
res/menu/conversation_callable_secure.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_callable_secure__menu_call"
android:id="@+id/menu_call_secure"
android:icon="@drawable/ic_call_secure_white_24dp"
app:showAsAction="always" />
</menu>

2
res/menu/conversation_context.xml
View File

@@ -18,7 +18,7 @@
<item android:title="@string/activity_conversation_copy_public_key_button_title"
android:id="@+id/menu_context_copy_public_key"
android:icon="@drawable/ic_key"
android:icon="@drawable/ic_baseline_key_24"
app:showAsAction="always" />
<!-- <item android:title="@string/conversation_context__menu_forward_message"

2
res/menu/conversation_expiring_off.xml
View File

@@ -4,6 +4,6 @@
<item android:title="@string/conversation_expiring_off__disappearing_messages"
android:id="@+id/menu_expiring_messages_off"
android:icon="@drawable/ic_timer_off_white_24dp"/>
android:icon="@drawable/ic_baseline_timer_off_24"/>
</menu>

9
res/menu/conversation_group_options.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/convesation_group_options__recipients_list"
android:id="@+id/menu_group_recipients"
android:icon="?menu_group_icon"
app:showAsAction="ifRoom" />
</menu>

10
res/menu/conversation_list_batch_archive.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_list_batch_archive__menu_archive_selected"
android:id="@+id/menu_archive_selected"
android:icon="@drawable/ic_archive_white_24dp"
app:showAsAction="always"/>
</menu>

10
res/menu/conversation_list_batch_unarchive.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_list_batch_unarchive__menu_unarchive_selected"
android:id="@+id/menu_archive_selected"
android:icon="@drawable/ic_unarchive_white_24dp"
app:showAsAction="always"/>
</menu>

26
res/menu/conversation_mms_group_options.xml
View File

@@ -1,16 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_group_options__delivery"
android:id="@+id/menu_group_delivery"
android:icon="?menu_split_icon"
app:showAsAction="ifRoom" >
<item
android:id="@+id/menu_group_delivery"
android:icon="?menu_split_icon"
android:title="@string/conversation_group_options__delivery"
app:showAsAction="ifRoom">
<menu>
<group android:id="@+id/distribution_group"
android:checkableBehavior="single">
<item android:id="@+id/menu_distribution_conversation" android:title="@string/conversation_group_options__conversation" android:checked="true" />
<item android:id="@+id/menu_distribution_broadcast" android:title="@string/conversation_group_options__broadcast" />
<group
android:id="@+id/distribution_group"
android:checkableBehavior="single">
<item
android:id="@+id/menu_distribution_conversation"
android:checked="true"
android:title="@string/conversation_group_options__conversation" />
<item
android:id="@+id/menu_distribution_broadcast"
android:title="@string/conversation_group_options__broadcast" />
</group>
</menu>
</item>

2
res/menu/conversation_unblock.xml
View File

@@ -3,6 +3,6 @@
<item android:title="@string/ConversationActivity_unblock"
android:id="@+id/menu_unblock"
android:icon="@drawable/ic_check_white_24dp" />
android:icon="?menu_accept_icon" />
</menu>