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/crypto

Browse Source
This commit is contained in:
ganfra
2019-06-07 19:25:55 +02:00
parent 81330d30cf 8f2c005d82
commit 07c516ccdd
62 changed files with 1275 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@
<string name="reactions_agree">Agree</string>
<string name="reactions_like">Like</string>
<string name="message_add_reaction">Add Reaction</string>
<string name="message_view_reaction">View Reactions</string>
<string name="reactions">Reactions</string>
<string name="event_redacted_by_user_reason">Event deleted by user</string>
<string name="event_redacted_by_admin_reason">Event moderated by room admin</string>

4
vector/src/main/res/values/styles_riot.xml
View File

@ -26,6 +26,10 @@
<item name="android:fontFamily">"sans-serif"</item>
</style>
<style name="VectorAppBarLayoutStyle" parent="Widget.Design.AppBarLayout">
<item name="android:background">?riotx_background</item>
</style>
<!-- Alert Dialog: Button color are not colorAccent by default -->
<style name="VectorAlertDialogStyleLight" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle</item>