TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-19 18:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add date break header

Browse Source
This commit is contained in:
nielsandriesse 2021-06-01 14:38:52 +10:00
parent e177fc4689
commit 3b18b0985b
4 changed files with 75 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
View File

@ -30,7 +30,6 @@ class ControlMessageView : LinearLayout {
// region Updating // region Updating
fun bind(message: MessageRecord) { fun bind(message: MessageRecord) {
// TODO: Make view look better
textView.text = message.getDisplayBody(context) textView.text = message.getDisplayBody(context)
} }

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

@ -57,13 +57,17 @@ class VisibleMessageView : LinearLayout {
profilePictureContainer.visibility = View.GONE profilePictureContainer.visibility = View.GONE
senderNameTextView.visibility = View.GONE senderNameTextView.visibility = View.GONE
} }
// Date break
dateBreakTextView.text = "The Ancient Past"
// Margins // Margins
val messageContentViewLayoutParams = messageContentView.layoutParams as LinearLayout.LayoutParams val messageContentViewLayoutParams = messageContentView.layoutParams as LinearLayout.LayoutParams
messageContentViewLayoutParams.leftMargin = if (message.isOutgoing) resources.getDimension(R.dimen.very_large_spacing).toInt() else 0 messageContentViewLayoutParams.leftMargin = if (message.isOutgoing) resources.getDimension(R.dimen.very_large_spacing).toInt() else 0
messageContentViewLayoutParams.rightMargin = if (message.isOutgoing) 0 else resources.getDimension(R.dimen.very_large_spacing).toInt() messageContentViewLayoutParams.rightMargin = if (message.isOutgoing) 0 else resources.getDimension(R.dimen.very_large_spacing).toInt()
messageContentView.layoutParams = messageContentViewLayoutParams messageContentView.layoutParams = messageContentViewLayoutParams
// TODO: Inter-message spacing
// Gravity // Gravity
gravity = if (message.isOutgoing) Gravity.RIGHT else Gravity.LEFT val gravity = if (message.isOutgoing) Gravity.RIGHT else Gravity.LEFT
mainContainer.gravity = gravity or Gravity.BOTTOM
// Populate content view // Populate content view
messageContentView.bind(message) messageContentView.bind(message)
} }

19
app/src/main/res/layout/view_visible_message.xml
View File

@ -1,7 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/dateBreakTextView"
android:layout_width="match_parent"
android:layout_height="40dp"
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
android:textStyle="bold"
android:gravity="center" />
<LinearLayout
android:id="@+id/mainContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="bottom"> android:gravity="bottom">
@ -68,3 +83,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/view_visible_message_content.xml
View File

@ -10,6 +10,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/text" android:textColor="@color/text"
android:textSize="@dimen/small_font_size" /> android:textSize="@dimen/medium_font_size" />
</LinearLayout> </LinearLayout>