sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2445 from SamWhited/send_content_description 

Add content description to send button
This commit is contained in:
Daniel Gultsch 2017-04-17 12:56:36 +02:00 committed by GitHub
parent d86a4642e9 4a915c60e9
commit 067daa81f4
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -891,6 +891,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
updateChatState(this.conversation, msg); updateChatState(this.conversation, msg);
} }
this.conversation.trim(); this.conversation.trim();
this.mSendButton.setContentDescription(this.getActivity().getApplicationContext().getString(R.string.send_message_to_x,conversation.getName()));
} else {
this.mSendButton.setContentDescription(this.getActivity().getApplicationContext().getString(R.string.send_message));
} }
this.conversation = conversation; this.conversation = conversation;

3
src/main/res/layout/fragment_conversation.xml
View File

@ -57,7 +57,8 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="?attr/color_background_primary" android:background="?attr/color_background_primary"
android:src="?attr/ic_send_text_offline" /> android:src="?attr/ic_send_text_offline"
android:contentDescription="@string/send_message"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout

1
src/main/res/values/strings.xml
View File

@ -81,6 +81,7 @@
<string name="also_end_conversation">End this conversation afterwards</string> <string name="also_end_conversation">End this conversation afterwards</string>
<string name="choose_presence">Choose device</string> <string name="choose_presence">Choose device</string>
<string name="send_unencrypted_message">Send unencrypted message</string> <string name="send_unencrypted_message">Send unencrypted message</string>
<string name="send_message">Send message</string>
<string name="send_message_to_x">Send message to %s</string> <string name="send_message_to_x">Send message to %s</string>
<string name="send_otr_message">Send OTR encrypted message</string> <string name="send_otr_message">Send OTR encrypted message</string>
<string name="send_omemo_message">Send OMEMO encrypted message</string> <string name="send_omemo_message">Send OMEMO encrypted message</string>