aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorRaphael Pohl <eiszfuchs@eiszblu.me>2015-07-19 14:26:03 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-20 16:02:17 +0200
commite6cb12dfe414497b4317820497985c110cb81864 (patch)
tree65605439fef6305bcb48dcf0b62ecf7eaebde707 /src/main/res/layout
parent504ef0b72ebd951e3f3f493435fb96713a2b4efe (diff)
changed message bubble appearance
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml2
-rw-r--r--src/main/res/layout/fragment_conversation.xml5
-rw-r--r--src/main/res/layout/message_received.xml55
-rw-r--r--src/main/res/layout/message_sent.xml50
-rw-r--r--src/main/res/layout/message_status.xml10
5 files changed, 61 insertions, 61 deletions
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 4b249745..3b249a66 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -12,7 +12,7 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="8dp"
android:layout_marginTop="24dp"
- android:background="@drawable/message_border" >
+ android:background="@drawable/account_image_border" >
<ImageView
android:id="@+id/account_image"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d0ac6ba7..09d0573b 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -18,7 +18,10 @@
android:listSelector="@android:color/transparent"
android:stackFromBottom="true"
android:transcriptMode="normal"
- tools:listitem="@layout/message_sent" >
+ android:paddingTop="@dimen/activity_horizontal_margin"
+ android:paddingBottom="@dimen/activity_horizontal_margin"
+ android:clipToPadding="false"
+ tools:listitem="@layout/message_sent">
</ListView>
<RelativeLayout
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 44531b37..785e5b96 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -3,10 +3,21 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="4dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="4dp" >
+ android:paddingBottom="0dp"
+ android:paddingLeft="@dimen/activity_vertical_margin"
+ android:paddingRight="4dp"
+ android:paddingTop="0dp">
+
+ <ImageView
+ android:id="@+id/message_photo"
+ android:layout_width="36dp"
+ android:layout_height="38dp"
+ android:paddingTop="2dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginRight="@dimen/message_profile_image_gap"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_profile" />
<LinearLayout
android:id="@+id/message_box"
@@ -14,28 +25,24 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/message_photo"
- android:background="@drawable/message_border"
+ android:background="@drawable/message_bubble_received"
android:minHeight="48dp"
android:longClickable="true">
<LinearLayout
android:layout_width="wrap_content"
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" >
+ android:orientation="vertical">
<ImageView
android:id="@+id/message_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
android:background="@color/black87"
- android:paddingBottom="2dp"
android:scaleType="centerCrop" />
<TextView
@@ -43,7 +50,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
- android:textColor="@color/black87"
+ android:textColorLink="@color/white"
+ android:textColor="@color/white"
android:textSize="?attr/TextSizeBody" />
<Button
@@ -56,8 +64,9 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="left"
android:orientation="horizontal"
- android:paddingTop="1dp" >
+ android:paddingBottom="2dp">
<ImageView
android:id="@+id/security_indicator"
@@ -65,9 +74,9 @@
android:layout_height="?attr/TextSizeInfo"
android:layout_gravity="center_vertical"
android:layout_marginRight="4sp"
- android:alpha="0.54"
+ android:alpha="0.70"
android:gravity="center_vertical"
- android:src="@drawable/ic_secure_indicator" />
+ android:src="@drawable/ic_secure_indicator_white" />
<TextView
android:id="@+id/message_time"
@@ -76,21 +85,11 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
- android:textColor="@color/black54"
+ android:textColor="@color/white70"
+ android:alpha="0.70"
android:textSize="?attr/TextSizeInfo" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
- <ImageView
- android:id="@+id/message_photo"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_marginRight="-1.5dp"
- android:padding="0dp"
- android:scaleType="fitXY"
- android:src="@drawable/ic_profile" />
-
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index f8365ad3..15969d82 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -3,10 +3,21 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="4dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="4dp" >
+ android:paddingBottom="0dp"
+ android:paddingLeft="4dp"
+ android:paddingRight="@dimen/activity_vertical_margin"
+ android:paddingTop="0dp">
+
+ <ImageView
+ android:id="@+id/message_photo"
+ android:layout_width="36dp"
+ android:layout_height="40dp"
+ android:paddingBottom="4dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginLeft="@dimen/message_profile_image_gap"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_profile" />
<LinearLayout
android:id="@+id/message_box"
@@ -14,28 +25,24 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/message_photo"
- android:background="@drawable/message_border"
+ android:background="@drawable/message_bubble_sent"
android:minHeight="48dp"
android:longClickable="true">
<LinearLayout
android:layout_width="wrap_content"
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" >
+ android:orientation="vertical">
<ImageView
android:id="@+id/message_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
android:background="@color/black87"
- android:paddingBottom="2dp"
android:scaleType="centerCrop" />
<TextView
@@ -43,10 +50,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
+ android:textColorLink="@color/black87"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
-
- <Button
+
+ <Button
android:id="@+id/download_button"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
@@ -58,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:orientation="horizontal"
- android:paddingTop="1dp" >
+ android:paddingBottom="2dp">
<TextView
android:id="@+id/message_time"
@@ -68,6 +76,7 @@
android:gravity="center_vertical"
android:text="@string/sending"
android:textColor="@color/black54"
+ android:alpha="0.54"
android:textSize="?attr/TextSizeInfo" />
<ImageView
@@ -93,15 +102,4 @@
</LinearLayout>
</LinearLayout>
- <ImageView
- android:id="@+id/message_photo"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_marginLeft="-1.5dp"
- android:padding="0dp"
- android:scaleType="fitXY"
- android:src="@drawable/ic_profile" />
-
</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 2816f475..99a09527 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -3,15 +3,15 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="6dp"
+ android:paddingBottom="2dp"
android:paddingLeft="8dp"
- android:paddingRight="6dp"
- android:paddingTop="6dp" >
+ android:paddingRight="8dp"
+ android:paddingTop="2dp" >
<ImageView
android:id="@+id/message_photo"
- android:layout_width="32dp"
- android:layout_height="32dp"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginRight="-1.5dp"