TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-07 19:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add date breaks

Browse Source
This commit is contained in:
nielsandriesse 2021-06-07 16:06:37 +10:00
parent 2b21f199ea
commit 7e6cd7c86f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
View File

@ -88,7 +88,7 @@ class VisibleMessageContentView : LinearLayout {
} else if (isEndOfMessageCluster) { } else if (isEndOfMessageCluster) {
backgroundID = if (isOutgoing) R.drawable.message_bubble_background_sent_end else R.drawable.message_bubble_background_received_end backgroundID = if (isOutgoing) R.drawable.message_bubble_background_sent_end else R.drawable.message_bubble_background_received_end
} else { } else {
backgroundID = if (isOutgoing) R.drawable.message_bubble_background_sent_middle else R.drawable.message_bubble_background_received_middle; backgroundID = if (isOutgoing) R.drawable.message_bubble_background_sent_middle else R.drawable.message_bubble_background_received_middle
} }
return ResourcesCompat.getDrawable(resources, backgroundID, context.theme)!! return ResourcesCompat.getDrawable(resources, backgroundID, context.theme)!!
} }

9
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
View File

@ -7,15 +7,15 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.core.view.isVisible
import kotlinx.android.synthetic.main.view_visible_message.view.* import kotlinx.android.synthetic.main.view_visible_message.view.*
import network.loki.messenger.R import network.loki.messenger.R
import nl.komponents.kovenant.combine.Tuple8
import org.session.libsession.messaging.contacts.Contact.ContactContext import org.session.libsession.messaging.contacts.Contact.ContactContext
import org.session.libsession.utilities.ViewUtil import org.session.libsession.utilities.ViewUtil
import org.session.libsignal.utilities.guava.Optional
import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.DateUtils
import java.util.*
import kotlin.math.roundToInt import kotlin.math.roundToInt
class VisibleMessageView : LinearLayout { class VisibleMessageView : LinearLayout {
@ -63,8 +63,9 @@ class VisibleMessageView : LinearLayout {
senderNameTextView.visibility = View.GONE senderNameTextView.visibility = View.GONE
} }
// Date break // Date break
dateBreakTextView.text = "The Ancient Past" val showDateBreak = (previous == null || !DateUtils.isSameDay(message.timestamp, previous.timestamp))
dateBreakTextView.visibility = View.GONE // TODO: Set this correctly dateBreakTextView.isVisible = showDateBreak
dateBreakTextView.text = if (showDateBreak) DateUtils.getRelativeDate(context, Locale.getDefault(), message.timestamp) else ""
// Margins // Margins
val messageContentViewLayoutParams = messageContentView.layoutParams as LinearLayout.LayoutParams val messageContentViewLayoutParams = messageContentView.layoutParams as LinearLayout.LayoutParams
if (isGroupThread) { if (isGroupThread) {

2
app/src/main/res/values/dimens.xml
View File

@ -103,7 +103,7 @@
<dimen name="conversation_individual_left_gutter">@dimen/large_spacing</dimen> <dimen name="conversation_individual_left_gutter">@dimen/large_spacing</dimen>
<dimen name="conversation_group_left_gutter">60dp</dimen> <dimen name="conversation_group_left_gutter">60dp</dimen>
<dimen name="conversation_vertical_message_spacing_default">8dp</dimen> <dimen name="conversation_vertical_message_spacing_default">8dp</dimen>
<dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen> <dimen name="conversation_vertical_message_spacing_collapse">1px</dimen>
<dimen name="conversation_item_avatar_size">36dp</dimen> <dimen name="conversation_item_avatar_size">36dp</dimen>