summaryrefslogtreecommitdiffstats
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/assets/release_notes/notes.json5
-rw-r--r--app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml4
2 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 50cd786f9..7aaf714ca 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,5 +1,10 @@
[
{
+ "version": "3.18.2",
+ "code": "480",
+ "note": "Changed:\n- First media layout will depend of its ratio\n\nFixed:\n- Impossible to add media with the chat view\n- Chat view limited in chars\n- Freezes / bad behaviors due to the new media presentation"
+ },
+ {
"version": "3.18.1",
"code": "479",
"note": "Added:\n- Add Lingva translator (Settings > Timelines)\n- Add support for Nyastodon-style emoji reactions (skyevg)\n- Add chat view for DM (default: disable / Settings > Timelines)"
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml b/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml
index 2146e32ac..00dd98df3 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_conversation.xml
@@ -90,9 +90,11 @@
android:id="@+id/status_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:ellipsize="end"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="6dp"
- tools:maxLines="10"
+ android:maxLines="5"
+ tools:maxLines="5"
tools:text="@tools:sample/lorem/random" />
<HorizontalScrollView