Commit c29a2bd0 authored Feb 14, 2023 by Thomas

some changes for chat

parent c001b83f

app/build.gradle

+2 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,8 @@ android {
		'src/main/res/menus/peertube',
		'src/main/res/menus',

		'src/main/res/values',

		'src/main/res'
		]
		}

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1648,7 +1648,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		holder.binding.sensitiveMedia.setChecked(statusDraft.sensitive);
		holder.binding.content.addTextChangedListener(initializeTextWatcher(holder));
		holder.binding.buttonPoll.setOnClickListener(v -> displayPollPopup(holder, statusDraft, position));
		holder.binding.buttonPoll.setOnClickListener(v -> displayPollPopup(holder, statusDraft, position));
		if (instanceInfo == null) {
		return;
		}

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ConversationAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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), false);
		boolean chatMode = sharedpreferences.getBoolean(context.getString(R.string.SET_CHAT_FOR_CONVERSATION), true);
		holder.binding.statusContent.setOnClickListener(v -> {
		Intent intent;
		if (chatMode) {

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java

+202 −21

File changed.

Preview size limit exceeded, changes collapsed.

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonDirectMessage.java

+258 −13

File changed.

Preview size limit exceeded, changes collapsed.