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 aa288058870281229368e2289fd220c6447229b9..fe73c5f46d478d1708c99fe1b9564cdd3bed90e4 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
@@ -113,7 +113,7 @@ class QuasselMessageRenderer @Inject constructor(
viewHolder.timeRight?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
viewHolder.content?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
viewHolder.combined?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
- viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
+ viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize * 0.8f)
}
override fun bind(holder: MessageAdapter.QuasselMessageViewHolder, message: FormattedMessage,
diff --git a/app/src/main/res/drawable-nodpi/profile.png b/app/src/main/res/drawable-nodpi/profile.png
deleted file mode 100644
index b7e0cba479f31c191d63e03e18dcc4f8c8adc699..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-nodpi/profile.png and /dev/null differ
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 4304dc909695ccf0b2b24f09ef88e83970c907fb..4736656af04047faf27572e7ccefb6948a24bd52 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -27,7 +27,8 @@
android:layout_marginRight="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:typeface="monospace"
- tools:text="@sample/messages.json/data/time" />
+ tools:text="@sample/messages.json/data/time"
+ tools:visibility="gone" />
<FrameLayout
android:id="@+id/avatar_container"
@@ -37,34 +38,38 @@
android:layout_marginEnd="@dimen/message_horizontal"
android:layout_marginRight="@dimen/message_horizontal"
android:layout_marginTop="@dimen/message_vertical"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
<ImageView
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"
- android:visibility="gone" />
+ android:contentDescription="@string/label_avatar"
+ android:visibility="gone"
+ tools:visibility="visible" />
</FrameLayout>
<LinearLayout
- android:layout_width="0dip"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
+ android:layout_gravity="fill_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:layout_marginTop="@dimen/message_vertical"
+ android:layout_gravity="center_vertical"
android:textColor="?attr/colorForegroundSecondary"
android:visibility="gone"
- tools:text="@sample/messages.json/data/sender" />
+ tools:text="@sample/messages.json/data/sender"
+ tools:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|fill_horizontal"
android:orientation="horizontal">
<LinearLayout
@@ -77,17 +82,18 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/message_vertical"
android:textColor="?attr/colorForeground"
android:visibility="gone"
- tools:text="@sample/messages.json/data/message" />
+ tools:text="@sample/messages.json/data/content"
+ tools:visibility="visible" />
<de.kuschku.quasseldroid.ui.chat.messages.RipplePassthroughTextView
android:id="@+id/combined"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorForeground"
- tools:text="@sample/messages.json/data/message" />
+ tools:text="@sample/messages.json/data/message"
+ tools:visibility="gone" />
</LinearLayout>
@@ -99,9 +105,10 @@
android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
- android:typeface="monospace"
+ android:textSize="11.9sp"
android:visibility="gone"
- tools:text="@sample/messages.json/data/time" />
+ tools:text="@sample/messages.json/data/time"
+ tools:visibility="visible" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index f29a42e2ea43296604c9e73d25401569db173176..cd3e728a1c8d81f95daeecaa17662b12b370b31e 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -49,8 +49,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:layout_marginEnd="@dimen/message_horizontal"
- android:layout_marginRight="@dimen/message_horizontal"
+ android:layout_marginLeft="@dimen/message_horizontal"
+ android:layout_marginStart="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:typeface="monospace"
android:visibility="gone"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1ae9cfc6e7960a8fea9104c7daf30fbb2cab04ae..a3ebc09f144d14d716432918280e34cadb7b8cad 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,6 +8,7 @@
<string name="connection_service_description">Hält eine Verbindung zum Core, um Benachrichtigungen und die Übertragung von Nachrichten zu ermöglichen</string>
<string name="label_about">Über</string>
+ <string name="label_avatar">Avatar</string>
<string name="label_back">Zurück</string>
<string name="label_buffer_name">Chatname</string>
<string name="label_cancel">Abbrechen</string>
diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index 1d19db80f08dd0e0abd5157e01ace25de614f7cb..2f8c6fac9ad4330c2cd4b2c44dc4845e2334b678 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -49,7 +49,7 @@
<string name="preference_nicks_on_new_line_title">Separate Spitznamen</string>
<string name="preference_nicks_on_new_line_summary">Zeigt Spitznamen in einer eigenen Zeile an</string>
- <string name="preference_show_avatars_title">Benutzerbilder anzeigen</string>
+ <string name="preference_show_avatars_title">Avatare anzeigen</string>
<string name="preference_time_at_end_title">Rechts-Ausgerichtete Zeit</string>
<string name="preference_time_at_end_summary">Zeigt die Zeit rechts in Nachrichten an</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 6e63d72cc6b480e38560e06e2d1e2bdadf492dbe..cf895323a17d24a8a9bdac6a27f97556360e6c05 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,5 +12,5 @@
<dimen name="button_corner_radius">2dp</dimen>
<dimen name="colorchooser_circlesize">56dp</dimen>
- <dimen name="avatar_size">40dp</dimen>
+ <dimen name="avatar_size">36sp</dimen>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86c826ad9dffd85214752a2442427e5831e119ac..135be32d8a393cc5b925281161390a8308eed694 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
<string name="connection_service_description">Keeps a connection to your core to allow for notifications, and to transmit messages.</string>
<string name="label_about">About</string>
+ <string name="label_avatar">Avatar</string>
<string name="label_back">Back</string>
<string name="label_buffer_name">Buffer Name</string>
<string name="label_cancel">Cancel</string>