diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/drawable/mecmd_message_border.xml | 15 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversations_overview.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/message_mecmd.xml | 112 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 10 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 75 | ||||
| -rw-r--r-- | src/main/res/layout/message_status.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/dimens.xml | 3 |
7 files changed, 213 insertions, 8 deletions
diff --git a/src/main/res/drawable/mecmd_message_border.xml b/src/main/res/drawable/mecmd_message_border.xml new file mode 100644 index 00000000..990d0288 --- /dev/null +++ b/src/main/res/drawable/mecmd_message_border.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" > + + <corners android:radius="2dp" /> + + <padding + android:bottom="1.5dp" + android:left="1.5dp" + android:right="1.5dp" + android:top="1.5dp" /> + + <solid android:color="@color/black12" /> + +</shape>
\ No newline at end of file diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 6563dc2b..2fe182bb 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -69,7 +69,7 @@ </android.support.design.widget.CollapsingToolbarLayout> </android.support.design.widget.AppBarLayout> - <androidok.support.design.widget.FloatingActionButton + <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="@dimen/avatar_size" android:layout_height="@dimen/avatar_size" diff --git a/src/main/res/layout/message_mecmd.xml b/src/main/res/layout/message_mecmd.xml new file mode 100644 index 00000000..4074c5ba --- /dev/null +++ b/src/main/res/layout/message_mecmd.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> + + <LinearLayout + android:id="@+id/message_box" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_alignParentLeft="true" + android:background="@drawable/mecmd_message_border" + android:minHeight="53dp" + android:longClickable="true"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/grey50" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingBottom="4dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:paddingTop="4dp" > + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/message_photo" + android:layout_width="@dimen/msg_mecmd_avatar_size" + android:layout_height="@dimen/msg_mecmd_avatar_size" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginRight="-1.5dp" + android:padding="0dp" + android:scaleType="fitXY" + android:src="@drawable/ic_profile" + app:riv_corner_radius="1dp"/> + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:id="@+id/message_body" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/message_photo" + android:layout_marginLeft="8dp" + android:autoLink="web|phone|email" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + app:emojiconSize="?attr/EmojiconSizeBody" + android:text=""/> + </RelativeLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:orientation="horizontal" + android:paddingTop="1dp" > + + <TextView + android:id="@+id/message_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="center_vertical" + android:text="@string/sending" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + + <TextView + android:id="@+id/message_encryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="center_vertical" + android:layout_marginRight="4sp" + android:textColor="@color/white70" + android:textStyle="bold" + android:textSize="?attr/TextSizeInfo" /> + + <ImageView + android:id="@+id/security_indicator" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4sp" + android:alpha="0.54" + android:gravity="center_vertical" + android:src="@drawable/ic_lock_black_18dp" /> + + <ImageView + android:id="@+id/indicator_received" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4sp" + android:alpha="0.54" + android:gravity="center_vertical" + android:src="@drawable/ic_received_indicator" /> + </LinearLayout> + </LinearLayout> + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index d331b3ef..4a51ba59 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -11,13 +11,14 @@ <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="@dimen/msg_avatar_size" + android:layout_height="@dimen/msg_avatar_size" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:scaleType="fitXY" android:src="@drawable/ic_profile" - app:riv_corner_radius="2dp" /> + app:riv_corner_radius="2dp" + android:visibility="gone" /> <LinearLayout android:id="@+id/message_box" @@ -29,7 +30,8 @@ android:minHeight="53dp" android:layout_marginTop="-2dp" android:layout_marginRight="-4dp" - android:longClickable="true"> + android:longClickable="true" + android:visibility="gone"> <LinearLayout android:layout_width="wrap_content" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 0edbab51..887ae1b8 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -31,7 +31,8 @@ android:background="@drawable/message_bubble_sent" android:minHeight="53dp" android:layout_marginLeft="-4dp" - android:longClickable="true"> + android:longClickable="true" + android:visibility="gone"> <LinearLayout android:layout_width="wrap_content" @@ -106,4 +107,76 @@ </LinearLayout> </LinearLayout> + <LinearLayout + android:id="@+id/mecmd_message_box" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_alignParentLeft="true" + android:background="@drawable/mecmd_message_border" + android:minHeight="53dp" + android:longClickable="true" + android:visibility="gone"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/grey50" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingBottom="4dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:paddingTop="4dp" > + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:id="@+id/mecmd_message_body" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:autoLink="web|phone|email" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + app:emojiconSize="?attr/EmojiconSizeBody" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:orientation="horizontal" + android:paddingTop="1dp" > + + <TextView + android:id="@+id/mecmd_message_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="center_vertical" + android:text="@string/sending" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + + <ImageView + android:id="@+id/mecmd_security_indicator" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4sp" + android:alpha="0.54" + android:gravity="center_vertical" + android:src="@drawable/ic_lock_black_18dp" /> + + <ImageView + android:id="@+id/mecmd_indicator_received" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4sp" + android:alpha="0.54" + android:gravity="center_vertical" + android:src="@drawable/ic_received_indicator" /> + </LinearLayout> + </LinearLayout> + </LinearLayout> + </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index aa02e154..4c1dbbc3 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -11,8 +11,8 @@ <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" - android:layout_width="32dp" - android:layout_height="32dp" + android:layout_width="@dimen/msg_status_avatar_size" + android:layout_height="@dimen/msg_status_avatar_size" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginRight="-1.5dp" diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 0f934089..94ea6a62 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -12,4 +12,7 @@ <dimen name="action_bar_title_text_size">18dp</dimen> <!-- redefinition here, because no access to original from android --> <dimen name="avatar_size">56dp</dimen> <dimen name="design_fab_image_size">@dimen/avatar_size</dimen> + <dimen name="msg_mecmd_avatar_size">24dp</dimen> + <dimen name="msg_avatar_size">48dp</dimen> + <dimen name="msg_status_avatar_size">32dp</dimen> </resources> |