From e00bd1e7c36f9c677057d9adb0af2362eb381f66 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 14 Feb 2023 17:42:27 +0100
Subject: [PATCH] some changes for chat

---
 .../android/mastodon/ui/drawer/ConversationAdapter.java     | 2 +-
 app/src/main/res/values/strings.xml                         | 1 +
 app/src/main/res/xml/pref_timelines.xml                     | 6 ++++++
 src/fdroid/fastlane/metadata/android/en/changelogs/479.txt  | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 src/fdroid/fastlane/metadata/android/en/changelogs/479.txt

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ConversationAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ConversationAdapter.java
index 3192d2863..29cb0df8f 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ConversationAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ConversationAdapter.java
@@ -211,7 +211,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         //--- DATE ---
         holder.binding.lastMessageDate.setText(Helper.dateDiff(context, conversation.last_status.created_at));
 
-        boolean chatMode = sharedpreferences.getBoolean(context.getString(R.string.SET_CHAT_FOR_CONVERSATION), true);
+        boolean chatMode = sharedpreferences.getBoolean(context.getString(R.string.SET_CHAT_FOR_CONVERSATION), false);
         holder.binding.statusContent.setOnClickListener(v -> {
             Intent intent;
             if (chatMode) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8167f835f..42727e84b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1903,4 +1903,5 @@
     <string name="manage_tags">Manage tags</string>
 
     <string name="translator_domain">Translator domain</string>
+    <string name="chat_timeline_for_direct">Chat timeline for direct messages</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml
index 93fe06b11..d17b85ec9 100644
--- a/app/src/main/res/xml/pref_timelines.xml
+++ b/app/src/main/res/xml/pref_timelines.xml
@@ -31,6 +31,12 @@
         app:key="@string/SET_GROUP_REBLOGS"
         app:singleLineTitle="false"
         app:title="@string/group_reblogs" />
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        app:iconSpaceReserved="false"
+        app:key="@string/SET_CHAT_FOR_CONVERSATION"
+        app:singleLineTitle="false"
+        app:title="@string/chat_timeline_for_direct" />
     <SwitchPreferenceCompat
         android:defaultValue="true"
         app:iconSpaceReserved="false"
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/479.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/479.txt
new file mode 100644
index 000000000..25ce5b6f9
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/479.txt
@@ -0,0 +1,4 @@
+Added:
+- Add Lingva translator
+- Add support for Nyastodon-style emoji reactions (skyevg)
+- Add chat view for DM (default: disable / Settings > Timelines)
\ No newline at end of file