gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-13 12:08:00 +01:00
parent d21d5f51b4
commit b36c70b783
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/layout/item_message_quote.xml
View File

@ -23,8 +23,8 @@
android:adjustViewBounds="true" android:adjustViewBounds="true"
app:roundAsCircle="true" app:roundAsCircle="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toEndOf="@id/quoteColoredView"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_toEndOf="@id/quoteColoredView"
tools:src="@tools:sample/avatars[0]" /> tools:src="@tools:sample/avatars[0]" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
@ -32,9 +32,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBottom="@id/quotedUserAvatar" android:layout_alignBottom="@id/quotedUserAvatar"
android:layout_marginEnd="8dp"
android:layout_toEndOf="@id/quotedUserAvatar" android:layout_toEndOf="@id/quotedUserAvatar"
android:ellipsize="end" android:ellipsize="end"
android:layout_marginEnd="8dp"
android:textSize="12sp" android:textSize="12sp"
tools:text="Mario" /> tools:text="Mario" />
@ -66,10 +66,10 @@
android:id="@+id/quotedMessage" android:id="@+id/quotedMessage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp"
android:layout_below="@id/quotedMessageImage" android:layout_below="@id/quotedMessageImage"
android:layout_alignStart="@id/quotedUserAvatar" android:layout_alignStart="@id/quotedUserAvatar"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:textSize="14sp"
app:layout_alignSelf="flex_start" app:layout_alignSelf="flex_start"
app:layout_flexGrow="1" app:layout_flexGrow="1"
app:layout_wrapBefore="true" app:layout_wrapBefore="true"

30
app/src/main/res/layout/item_system_message.xml
View File

@ -21,16 +21,23 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"> android:layout_marginBottom="8dp">
<RelativeLayout <com.google.android.flexbox.FlexboxLayout
android:id="@id/bubble" android:id="@id/bubble"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"> android:orientation="vertical"
android:layout_centerHorizontal="true"
app:alignContent="stretch"
app:alignItems="stretch"
app:flexWrap="wrap"
app:justifyContent="flex_end">
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/messageText" android:id="@+id/messageText"
@ -39,8 +46,23 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textAlignment="center" android:textAlignment="center"
tools:text="System message"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="12sp" /> android:textSize="14sp"
app:layout_alignSelf="flex_start"
app:layout_flexGrow="1"
app:layout_wrapBefore="true"/>
</RelativeLayout> <TextView
android:id="@id/messageTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/warm_grey_four"
android:textSize="12sp"
tools:text="17:30"
android:layout_marginStart="8dp"
app:layout_alignSelf="center"
app:layout_flexGrow="1"
app:layout_wrapBefore="false"/>
</com.google.android.flexbox.FlexboxLayout>
</RelativeLayout> </RelativeLayout>