mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 21:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:nextcloud/talk-android

Browse source
This commit is contained in:
Mario Danic 2018-10-23 21:36:12 +02:00
commit 3b34903b99
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View file

@ -24,6 +24,7 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -41,8 +42,10 @@
<ImageView
android:id="@id/dialogAvatar"
android:contentDescription="@null"
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"/>
android:layout_height="@dimen/avatar_size"
tools:src="@drawable/ic_call_black_24dp"/>
<ImageView
android:id="@+id/passwordProtectedRoomImageView"
@ -71,7 +74,8 @@
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/nc_incoming_text_default"
android:textSize="16sp"/>
android:textSize="16sp"
tools:text="Best conversation"/>
<TextView
android:id="@id/dialogDate"
@ -93,10 +97,11 @@
<ImageView
android:id="@id/dialogLastMessageUserAvatar"
android:contentDescription="@null"
android:layout_width="@dimen/small_item_height"
android:layout_height="@dimen/small_item_height"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"/>
android:layout_marginEnd="8dp"
tools:src="@drawable/ic_call_black_24dp"/>
<TextView
android:id="@id/dialogLastMessage"
@ -107,22 +112,23 @@
android:layout_toStartOf="@id/dialogUnreadBubble"
android:ellipsize="end"
android:gravity="top"
android:maxLines="2"
android:lines="2"
android:singleLine="false"
android:textColor="@color/warm_grey_four"/>
android:textColor="@color/warm_grey_four"
tools:text="This is the last message\nof an incredibly long two line conversation text"/>
<TextView
android:id="@id/dialogUnreadBubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/bubble_circle_unread"
android:gravity="center"
android:lines="1"
android:textAlignment="center"
android:textColor="@color/white"/>
android:textColor="@color/white"
tools:text="1"/>
</RelativeLayout>

2
scripts/analysis/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 1 error and 132 warnings</span>
<span class="mdl-layout-title">Lint Report: 2 errors and 126 warnings</span>