diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 3376e7b93d..40c2ec1aa4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -43,6 +43,8 @@ import org.thoughtcrime.securesms.database.DraftDatabase.Drafts import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.loki.utilities.toPx import org.thoughtcrime.securesms.mms.GlideApp +import org.thoughtcrime.securesms.util.DateUtils +import java.util.* import kotlin.math.* class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDelegate, @@ -109,6 +111,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe scrollToBottomButton.setOnClickListener { conversationRecyclerView.smoothScrollToPosition(0) } updateUnreadCount() setUpTypingObserver() + updateSubtitle() } private fun setUpRecyclerView() { @@ -352,6 +355,24 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe unreadCountTextView.setTypeface(Typeface.DEFAULT, if (unreadCount < 100) Typeface.BOLD else Typeface.NORMAL) unreadCountIndicator.isVisible = (unreadCount != 0) } + + private fun updateSubtitle() { + muteIconImageView.isVisible = thread.isMuted + conversationSubtitleView.isVisible = true + if (thread.isMuted) { + conversationSubtitleView.text = getString(R.string.ConversationActivity_muted_until_date, DateUtils.getFormattedDateTime(thread.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault())) + } else if (thread.isGroupRecipient) { + val openGroup = DatabaseFactory.getLokiThreadDatabase(this).getOpenGroupChat(threadID) + if (openGroup != null) { + val userCount = DatabaseFactory.getLokiAPIDatabase(this).getUserCount(openGroup.room, openGroup.server) ?: 0 + conversationSubtitleView.text = getString(R.string.ConversationActivity_member_count, userCount) + } else { + conversationSubtitleView.isVisible = false + } + } else { + conversationSubtitleView.isVisible = false + } + } // endregion // region Interaction diff --git a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml index 4716171f50..294e75564c 100644 --- a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml +++ b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml @@ -1,8 +1,9 @@ - @@ -11,16 +12,57 @@ android:layout_width="@dimen/small_profile_picture_size" android:layout_height="@dimen/small_profile_picture_size" /> - + android:layout_marginTop="-2dp" + android:orientation="vertical"> + + + + + + + + + + + + \ No newline at end of file