filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bubble merge] Update SC bubbles for thread previews

Browse Source 
Change-Id: Idba75a44836d04ff928fc1b5aaf8f8c19716466b
This commit is contained in:
SpiritCroc 2022-02-20 13:51:11 +01:00
parent faba7ef3ae
commit 3189093879
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/ScMessageBubbleWrapView.kt
View File

@ -439,6 +439,8 @@ class ScMessageBubbleWrapView @JvmOverloads constructor(context: Context, attrs:
(views.bubbleView.layoutParams as FrameLayout.LayoutParams).gravity = if (messageLayout.reverseBubble) Gravity.END else Gravity.START
//holder.informationBottom.layoutDirection = if (shouldRtl) View.LAYOUT_DIRECTION_RTL else View.LAYOUT_DIRECTION_LTR
setFlatRtl(views.reactionsContainer, if (messageLayout.reverseBubble) reverseDirection else defaultDirection, defaultDirection)
//setFlatRtl(views.messageThreadSummaryContainer, if (messageLayout.reverseBubble) reverseDirection else defaultDirection, defaultDirection, 2)
views.messageThreadSummaryContainer.layoutDirection = if (messageLayout.reverseBubble) reverseDirection else defaultDirection
// Layout is broken if bubbleView is RTL (for some reason, Android uses left/end padding for right/start as well...)
setFlatRtl(views.bubbleView, View.LAYOUT_DIRECTION_LTR, defaultDirection)
}

2
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
View File

@ -41,6 +41,6 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="4dp"
android:visibility="gone"
tools:visibility="visible" />
tools:visibility="gone" />
</LinearLayout>

43
vector/src/main/res/layout/view_message_bubble_sc.xml
View File

@ -84,7 +84,7 @@
android:layout_below="@id/messageMemberNameView"
android:layout_toStartOf="@id/messageSendStateImageView"
android:layout_toEndOf="@id/messageStartGuideline"
android:layout_marginHorizontal="8dp"
android:layout_marginHorizontal="@dimen/sc_bubble_wrap_margin_horizontal"
android:clipChildren="false"
android:clipToPadding="false">
@ -256,27 +256,34 @@
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/messageThreadSummaryConstraintLayout"
android:layout_width="wrap_content"
<FrameLayout
android:id="@+id/messageThreadSummaryContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/informationBottom"
android:layout_marginEnd="32dp"
android:layout_marginBottom="4dp"
android:paddingStart="13dp"
android:paddingEnd="13dp"
android:layout_toEndOf="@id/messageStartGuideline"
android:background="@drawable/rounded_rect_shape_8"
android:contentDescription="@string/room_threads_filter"
android:maxWidth="496dp"
android:minWidth="144dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:visibility="gone"
tools:visibility="visible">
android:layout_marginHorizontal="@dimen/sc_bubble_wrap_margin_horizontal"
android:contentDescription="@string/room_threads_filter">
<include layout="@layout/view_thread_room_summary" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/messageThreadSummaryConstraintLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:contentDescription="@string/room_threads_filter"
android:layoutDirection="locale"
android:maxWidth="496dp"
android:minWidth="144dp"
android:paddingStart="@dimen/sc_bubble_inner_padding_long_side"
android:paddingEnd="@dimen/sc_bubble_inner_padding_short_side"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:visibility="gone"
tools:visibility="visible">
<include layout="@layout/view_thread_room_summary" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
</merge>

1
vector/src/main/res/values/dimens_sc.xml
View File

@ -9,6 +9,7 @@
<!-- As found in various layout stubs in item_timeline_event_base.xml -->
<dimen name="no_bubble_margin_end">56dp</dimen>
<dimen name="sc_bubble_wrap_margin_horizontal">8dp</dimen>
<dimen name="sc_bubble_radius">3dp</dimen>
<dimen name="sc_bubble_radius_in_tail">3dp</dimen>
<dimen name="sc_bubble_tail_size">12dp</dimen>