From 9285c16170040869d8a2015a94f7788a22d77c2c Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 30 Mar 2018 23:26:47 +0200 Subject: [PATCH] Further finetuning --- .../ui/chat/messages/QuasselMessageRenderer.kt | 4 ++-- app/src/main/res/layout/widget_chatmessage_action.xml | 8 +++++--- app/src/main/res/layout/widget_chatmessage_error.xml | 8 +++++--- app/src/main/res/layout/widget_chatmessage_info.xml | 8 +++++--- app/src/main/res/layout/widget_chatmessage_notice.xml | 8 +++++--- app/src/main/res/layout/widget_chatmessage_plain.xml | 5 ++--- app/src/main/res/layout/widget_chatmessage_server.xml | 8 +++++--- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt index fe73c5f46..b735422fc 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt @@ -110,10 +110,10 @@ class QuasselMessageRenderer @Inject constructor( val textSize = messageSettings.textSize.toFloat() viewHolder.timeLeft?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize) - viewHolder.timeRight?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize) + viewHolder.timeRight?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize * 0.9f) viewHolder.content?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize) viewHolder.combined?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize) - viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize * 0.8f) + viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize) } override fun bind(holder: MessageAdapter.QuasselMessageViewHolder, message: FormattedMessage, diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml index 86b9479b3..41dd1b815 100644 --- a/app/src/main/res/layout/widget_chatmessage_action.xml +++ b/app/src/main/res/layout/widget_chatmessage_action.xml @@ -50,13 +50,15 @@ android:id="@+id/time_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:layout_gravity="top" android:layout_marginLeft="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" - android:typeface="monospace" + android:textStyle="italic" android:visibility="gone" - tools:text="@sample/messages.json/data/time" /> + tools:text="@sample/messages.json/data/time" + tools:textSize="11.9sp" + tools:visibility="visible" /> </LinearLayout> <View diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml index ae61a6034..d4d257e64 100644 --- a/app/src/main/res/layout/widget_chatmessage_error.xml +++ b/app/src/main/res/layout/widget_chatmessage_error.xml @@ -48,13 +48,15 @@ android:id="@+id/time_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:layout_gravity="top" android:layout_marginLeft="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" - android:typeface="monospace" + android:textStyle="italic" android:visibility="gone" - tools:text="@sample/messages.json/data/time" /> + tools:text="@sample/messages.json/data/time" + tools:textSize="11.9sp" + tools:visibility="visible" /> </LinearLayout> <View diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml index ff9c13fc6..ea23ac620 100644 --- a/app/src/main/res/layout/widget_chatmessage_info.xml +++ b/app/src/main/res/layout/widget_chatmessage_info.xml @@ -49,13 +49,15 @@ android:id="@+id/time_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:layout_gravity="top" android:layout_marginLeft="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" - android:typeface="monospace" + android:textStyle="italic" android:visibility="gone" - tools:text="@sample/messages.json/data/time" /> + tools:text="@sample/messages.json/data/time" + tools:textSize="11.9sp" + tools:visibility="visible" /> </LinearLayout> <View diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml index f66865be8..799351f07 100644 --- a/app/src/main/res/layout/widget_chatmessage_notice.xml +++ b/app/src/main/res/layout/widget_chatmessage_notice.xml @@ -48,13 +48,15 @@ android:id="@+id/time_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:layout_gravity="top" android:layout_marginLeft="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" - android:typeface="monospace" + android:textStyle="italic" android:visibility="gone" - tools:text="@sample/messages.json/data/time" /> + tools:text="@sample/messages.json/data/time" + tools:textSize="11.9sp" + tools:visibility="visible" /> </LinearLayout> <View diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml index 4736656af..38c87d96b 100644 --- a/app/src/main/res/layout/widget_chatmessage_plain.xml +++ b/app/src/main/res/layout/widget_chatmessage_plain.xml @@ -34,10 +34,8 @@ android:id="@+id/avatar_container" android:layout_width="@dimen/avatar_size" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/message_vertical" android:layout_marginEnd="@dimen/message_horizontal" android:layout_marginRight="@dimen/message_horizontal" - android:layout_marginTop="@dimen/message_vertical" android:visibility="gone" tools:visibility="visible"> @@ -105,8 +103,9 @@ android:layout_marginLeft="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" - android:textSize="11.9sp" + android:textStyle="italic" android:visibility="gone" + tools:textSize="11.9sp" tools:text="@sample/messages.json/data/time" tools:visibility="visible" /> </LinearLayout> diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml index cd3e728a1..1dc66be33 100644 --- a/app/src/main/res/layout/widget_chatmessage_server.xml +++ b/app/src/main/res/layout/widget_chatmessage_server.xml @@ -48,13 +48,15 @@ android:id="@+id/time_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:layout_gravity="top" android:layout_marginLeft="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" - android:typeface="monospace" + android:textStyle="italic" android:visibility="gone" - tools:text="@sample/messages.json/data/time" /> + tools:text="@sample/messages.json/data/time" + tools:textSize="11.9sp" + tools:visibility="visible" /> </LinearLayout> <View -- GitLab