aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/ab_title.xml4
-rw-r--r--src/main/res/layout/account_row.xml2
-rw-r--r--src/main/res/layout/activity_contact_details.xml8
-rw-r--r--src/main/res/layout/activity_edit_account.xml65
-rw-r--r--src/main/res/layout/activity_media_viewer.xml (renamed from src/main/res/layout/activity_fullscreen_message.xml)4
-rw-r--r--src/main/res/layout/activity_muc_details.xml53
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml131
-rw-r--r--src/main/res/layout/contact.xml4
-rw-r--r--src/main/res/layout/conversation_list_row.xml4
-rw-r--r--src/main/res/layout/fragment_conversation.xml5
-rw-r--r--src/main/res/layout/message_content.xml2
-rw-r--r--src/main/res/layout/message_received.xml4
-rw-r--r--src/main/res/layout/message_sent.xml4
-rw-r--r--src/main/res/layout/message_status.xml2
14 files changed, 168 insertions, 124 deletions
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index a20e9f8bc..79c9d61f7 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:gravity="start|center_vertical">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@android:id/text1"
style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="match_parent"
@@ -19,7 +19,7 @@
android:onClick="onClick"
android:paddingTop="1dp" />
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@android:id/text2"
style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
android:layout_width="match_parent"
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 9b638172a..e56ca6a95 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -15,6 +15,8 @@
android:layout_alignParentLeft="true"
android:contentDescription="@string/account_image_description"
android:padding="1dp"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 268071fbd..58fe0c901 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -43,7 +43,7 @@
android:orientation="vertical"
android:padding="@dimen/card_padding_regular">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
android:layout_marginTop="4dp"
android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/status_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -124,7 +124,7 @@
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.Conversations.Body1" />
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/resource"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/media"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="100dp"
android:layout_marginEnd="-2dp"
android:layout_marginStart="-2dp"
android:orientation="horizontal"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 275a1d894..b8c48a382 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -29,10 +29,10 @@
android:id="@+id/editor"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:orientation="vertical"
android:padding="@dimen/card_padding_regular"
card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -51,9 +51,11 @@
android:layout_marginBottom="@dimen/avatar_item_distance"
android:adjustViewBounds="true"
android:contentDescription="@string/account_image_description"
- android:maxHeight="384dp"
android:maxWidth="384dp"
+ android:maxHeight="384dp"
android:padding="1dp"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
@@ -177,8 +179,8 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
+ android:layout_marginBottom="4dp"
android:text="@string/show_privacy"
android:visibility="gone" />
@@ -188,8 +190,8 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
+ android:layout_marginBottom="4dp"
android:text="@string/show_termsofuse"
android:visibility="gone" />
</LinearLayout>
@@ -200,10 +202,10 @@
android:id="@+id/os_optimization"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:visibility="gone"
card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -258,10 +260,10 @@
android:id="@+id/stats"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/card_padding_regular"
@@ -554,9 +556,11 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+ android:layout_toStartOf="@+id/key_actions"
+ android:layout_toLeftOf="@+id/key_actions"
android:orientation="vertical">
<TextView
@@ -574,17 +578,25 @@
</LinearLayout>
- <ImageButton
- android:id="@+id/action_copy_to_clipboard"
+ <LinearLayout
+ android:id="@+id/key_actions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:background="?attr/selectableItemBackgroundBorderless"
- android:contentDescription="@string/copy_otr_clipboard_description"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_copy"
- android:visibility="visible" />
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/action_copy_to_clipboard"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/copy_otr_clipboard_description"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_copy"
+ android:visibility="visible" />
+ </LinearLayout>
</RelativeLayout>
<RelativeLayout
@@ -596,8 +608,10 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
+ android:layout_toStartOf="@+id/axolotl_actions"
android:layout_toLeftOf="@+id/axolotl_actions"
android:orientation="vertical">
@@ -618,9 +632,10 @@
android:id="@+id/axolotl_actions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:orientation="vertical">
+ android:orientation="horizontal">
<ImageButton
android:id="@+id/action_copy_axolotl_to_clipboard"
@@ -650,10 +665,10 @@
android:id="@+id/other_device_keys_card"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:visibility="gone"
card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -694,11 +709,11 @@
android:id="@+id/button_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
+ android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentBottom="true">
<Button
android:id="@+id/cancel_button"
@@ -711,8 +726,8 @@
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
- android:layout_marginBottom="7dp"
- android:layout_marginTop="7dp" />
+ android:layout_marginTop="7dp"
+ android:layout_marginBottom="7dp" />
<Button
android:id="@+id/save_button"
diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_media_viewer.xml
index c1a1bc619..2eaad0d04 100644
--- a/src/main/res/layout/activity_fullscreen_message.xml
+++ b/src/main/res/layout/activity_media_viewer.xml
@@ -13,7 +13,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true">
- <com.github.chrisbanes.photoview.PhotoView
+ <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
android:id="@id/message_image_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -32,6 +32,6 @@
android:layout_height="wrap_content"
android:layout_gravity="right|top"
android:layout_margin="16dp"
- android:src="?attr/icon_share" />
+ android:src="@drawable/ic_menu_white_24dp" />
</FrameLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index e1ac744ea..29400a246 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -26,11 +26,10 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
card_view:cardBackgroundColor="?attr/color_background_secondary">
<LinearLayout
@@ -53,10 +52,10 @@
android:id="@+id/muc_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_toLeftOf="@+id/edit_muc_name_button"
+ android:layout_alignParentLeft="true"
android:layout_toStartOf="@+id/edit_muc_name_button"
+ android:layout_toLeftOf="@+id/edit_muc_name_button"
android:orientation="vertical">
<TextView
@@ -76,8 +75,8 @@
android:id="@+id/jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_below="@+id/muc_subject"
+ android:layout_alignParentLeft="true"
android:text="@string/account_settings_example_jabber_id"
android:textAppearance="@style/TextAppearance.Conversations.Body1"
android:textIsSelectable="true"
@@ -89,10 +88,10 @@
android:id="@+id/muc_editor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_toLeftOf="@+id/edit_muc_name_button"
+ android:layout_alignParentLeft="true"
android:layout_toStartOf="@+id/edit_muc_name_button"
+ android:layout_toLeftOf="@+id/edit_muc_name_button"
android:orientation="vertical"
android:visibility="gone">
@@ -130,9 +129,9 @@
android:id="@+id/edit_muc_name_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
android:alpha="?attr/icon_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
@@ -153,10 +152,12 @@
android:layout_marginEnd="@dimen/avatar_item_distance"
android:layout_marginRight="@dimen/avatar_item_distance"
android:adjustViewBounds="true"
- android:maxHeight="384dp"
android:maxWidth="384dp"
+ android:maxHeight="384dp"
android:padding="1dp"
android:scaleType="centerCrop"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
</RelativeLayout>
@@ -279,12 +280,12 @@
<android.support.v7.widget.CardView
android:id="@+id/media_wrapper"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
card_view:cardBackgroundColor="?attr/color_background_secondary">
<LinearLayout
@@ -295,14 +296,14 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/media"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="100dp"
android:layout_marginEnd="-2dp"
android:layout_marginStart="-2dp"
android:orientation="horizontal"
- android:paddingBottom="@dimen/card_padding_list"
- android:paddingEnd="@dimen/card_padding_regular"
android:paddingStart="@dimen/card_padding_regular"
- android:paddingTop="@dimen/card_padding_regular" />
+ android:paddingTop="@dimen/card_padding_regular"
+ android:paddingEnd="@dimen/card_padding_regular"
+ android:paddingBottom="@dimen/card_padding_list" />
<LinearLayout
android:layout_width="wrap_content"
@@ -327,11 +328,10 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
card_view:cardBackgroundColor="?attr/color_background_secondary">
<LinearLayout
@@ -355,10 +355,12 @@
android:id="@+id/your_photo"
android:layout_width="72dp"
android:layout_height="72dp"
- android:layout_alignParentEnd="false"
android:layout_alignParentLeft="true"
+ android:layout_alignParentEnd="false"
android:layout_alignParentRight="false"
android:padding="1dp"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
@@ -369,7 +371,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/avatar_item_distance">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/muc_your_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -429,11 +431,10 @@
android:id="@+id/muc_more_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
card_view:cardBackgroundColor="?attr/color_background_secondary">
<LinearLayout
@@ -458,7 +459,7 @@
android:layout_weight="1"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
- android:showDividers="middle"></LinearLayout>
+ android:showDividers="middle" />
</LinearLayout>
</android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 1db8a159d..0fb666365 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -6,80 +6,89 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/color_background_tertiary">
+ android:background="?attr/color_background_tertiary"
+ android:orientation="vertical">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar" />
- <android.support.v7.widget.CardView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/toolbar"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- card_view:cardBackgroundColor="?attr/color_background_secondary">
-
- <LinearLayout
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@id/button_bar"
+ android:layout_below="@id/toolbar">
+
+ <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:orientation="vertical"
- android:padding="@dimen/card_padding_regular">
-
- <FrameLayout
- android:id="@+id/account_image_wrapper"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="@dimen/publish_avatar_top_margin">
-
- <com.makeramen.roundedimageview.RoundedImageView
- android:id="@+id/account_image"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
+ card_view:cardBackgroundColor="?attr/color_background_secondary">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
+
+ <FrameLayout
+ android:id="@+id/account_image_wrapper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:adjustViewBounds="true"
- android:maxHeight="384dp"
- android:maxWidth="384dp"
- android:padding="1dp"
- android:scaleType="centerCrop"
- app:riv_corner_radius="@dimen/rounded_image_border" />
- </FrameLayout>
-
- <TextView
- android:id="@+id/hint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/touch_to_choose_picture"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
- <TextView
- android:id="@+id/secondary_hint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/or_long_press_for_default"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
- <TextView
- android:id="@+id/hint_or_warning"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
- </LinearLayout>
- </android.support.v7.widget.CardView>
+ android:layout_marginTop="@dimen/publish_avatar_top_margin"
+ android:layout_marginBottom="8dp">
+
+ <com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/account_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:adjustViewBounds="true"
+ android:maxWidth="384dp"
+ android:maxHeight="384dp"
+ android:padding="1dp"
+ android:scaleType="centerCrop"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="@dimen/rounded_image_border" />
+ </FrameLayout>
+
+ <TextView
+ android:id="@+id/hint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/touch_to_choose_picture"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ <TextView
+ android:id="@+id/secondary_hint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/or_long_press_for_default"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ <TextView
+ android:id="@+id/hint_or_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
+ </ScrollView>
<LinearLayout
android:id="@+id/button_bar"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true">
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true">
<Button
android:id="@+id/cancel_button"
@@ -92,8 +101,8 @@
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
- android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
+ android:layout_marginBottom="7dp"
android:background="?attr/divider" />
<Button
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 9635d4c47..09e0ac9bf 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,6 +13,8 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
@@ -23,7 +25,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/avatar_item_distance">
- <android.support.text.emoji.widget.EmojiTextView
+ <TextView
android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index cbd884ae2..ed0e9e1cc 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -24,6 +24,8 @@
android:layout_alignParentLeft="true"
android:padding="1dp"
android:scaleType="centerCrop"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<RelativeLayout
@@ -144,7 +146,7 @@
android:visibility="gone"
app:backgroundColor="?attr/colorAccent" />
- <de.pixart.messenger.ui.widget.UnreadCountCustomView
+ <de.pixart.messenger.ui.widget.FailedCountCustomView
android:id="@+id/conversation_failed"
android:layout_width="?attr/IconSize"
android:layout_height="?attr/IconSize"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index eca67f91e..8917333c1 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -30,6 +30,7 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/messages_view"
android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
android:alpha="0.85"
android:src="?attr/icon_scroll_down"
android:visibility="gone"
@@ -42,8 +43,10 @@
android:layout_width="?attr/IconSize"
android:layout_height="?attr/IconSize"
android:layout_alignEnd="@+id/scroll_to_bottom_button"
+ android:layout_alignRight="@+id/scroll_to_bottom_button"
android:layout_alignTop="@+id/scroll_to_bottom_button"
android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
android:layout_marginTop="16dp"
android:elevation="8dp"
android:visibility="gone"
@@ -84,7 +87,9 @@
android:id="@+id/media_preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
+ android:layout_toLeftOf="@+id/textSendButton"
android:layout_toStartOf="@+id/textSendButton"
android:background="@drawable/message_bubble_sent_blue"
android:orientation="horizontal"
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 296944565..044f8c64d 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -13,6 +13,8 @@
android:maxHeight="500dp"
android:maxWidth="500dp"
android:scaleType="centerCrop"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<de.pixart.messenger.ui.widget.CopyTextView
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index f8b5fce95..2c6fd044a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,6 +16,8 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dip"
app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
@@ -23,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_marginLeft="-7dp"
+ android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_toRightOf="@+id/message_photo"
android:background="@drawable/message_bubble_received_light"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 188e466d5..2526e4dd2 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -23,6 +23,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitXY"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<View
@@ -37,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="4dp"
- android:layout_marginRight="-7dp"
+ android:layout_marginRight="4dp"
android:layout_toLeftOf="@+id/message_photo_box"
android:layout_toStartOf="@+id/message_photo_box"
android:background="@drawable/message_bubble_sent_blue"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index bd731cbe4..d42637175 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,6 +29,8 @@
android:padding="0dp"
android:scaleType="fitXY"
android:visibility="gone"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
app:riv_corner_radius="@dimen/rounded_image_border" />
<TextView
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:31:49 +0000