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

Merge branch 'master' of github.com:siacs/Conversations

This commit is contained in:
Daniel Gultsch 2018-04-11 08:33:11 +02:00
parent 614b40a58f a3e26b95f0
commit 12f1c879ac
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -42,6 +42,7 @@
* End-to-end encryption with [OMEMO](http://conversations.im/omemo/) or [OpenPGP](http://openpgp.org/about/) * End-to-end encryption with [OMEMO](http://conversations.im/omemo/) or [OpenPGP](http://openpgp.org/about/)
* Send and receive images as well as other kind of files * Send and receive images as well as other kind of files
* Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation&referrer=utm_source%3Dgithub) * Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation&referrer=utm_source%3Dgithub)
* Send voice messages via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.voicerecorder&referrer=utm_source%3Dgithub)
* Indication when your contact has read your message * Indication when your contact has read your message
* Intuitive UI that follows Android Design guidelines * Intuitive UI that follows Android Design guidelines
* Pictures / Avatars for your Contacts * Pictures / Avatars for your Contacts

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

@ -28,14 +28,14 @@
android:id="@+id/scroll_to_bottom_button" android:id="@+id/scroll_to_bottom_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="12dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignBottom="@+id/messages_view" android:layout_alignBottom="@+id/messages_view"
android:alpha="0.85" android:alpha="0.85"
app:backgroundTint="?attr/color_background_primary" app:backgroundTint="?attr/color_background_primary"
android:src="?attr/icon_scroll_down" android:src="?attr/icon_scroll_down"
app:fabSize="mini" app:fabSize="mini"
android:visibility="gone"/> android:visibility="gone"
app:useCompatPadding="true"/>
<eu.siacs.conversations.ui.widget.UnreadCountCustomView <eu.siacs.conversations.ui.widget.UnreadCountCustomView
android:id="@+id/unread_count_custom_view" android:id="@+id/unread_count_custom_view"
@ -43,6 +43,8 @@
android:layout_height="?attr/IconSize" android:layout_height="?attr/IconSize"
android:layout_alignTop="@+id/scroll_to_bottom_button" android:layout_alignTop="@+id/scroll_to_bottom_button"
android:layout_alignEnd="@+id/scroll_to_bottom_button" android:layout_alignEnd="@+id/scroll_to_bottom_button"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:elevation="8dp" android:elevation="8dp"
android:visibility="gone" android:visibility="gone"
app:backgroundColor="?attr/unread_count" /> app:backgroundColor="?attr/unread_count" />