6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/edit_message

Browse Source
This commit is contained in:
Valere
2019-05-27 17:08:39 +02:00
committed by GitHub
parent c7c7211978 0feb10315b
commit 00d66ffd48
63 changed files with 2609 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/res/values/attrs_state_button.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="ButtonStateView">
<attr name="bsv_loaded_image_src" format="reference" />
<attr name="bsv_button_text" format="reference|string" />
</declare-styleable>
</resources>

3
vector/src/main/res/values/strings_riotX.xml
View File

@ -19,5 +19,8 @@
<string name="malformed_message">Malformed event, cannot display</string>
<string name="create_new_room">Create New Room</string>
<string name="error_no_network">No network. Please check your Internet connection.</string>
<string name="action_change">"Change"</string>
</resources>