Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-17 02:15:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/aris/threads' into feature/aris/threads_api_support

Browse Source
This commit is contained in:
ariskotsomitopoulos 2021-12-21 20:16:17 +02:00
commit dcabaa0dab
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
View File

@ -102,7 +102,11 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>(), ToolbarCon
avatarUrl = timelineEvent.senderInfo.avatarUrl, avatarUrl = timelineEvent.senderInfo.avatarUrl,
rootThreadEventId = timelineEvent.eventId) rootThreadEventId = timelineEvent.eventId)
val commonOption: (FragmentTransaction) -> Unit = { val commonOption: (FragmentTransaction) -> Unit = {
it.setCustomAnimations(R.anim.animation_slide_in_right, R.anim.animation_slide_out_left, R.anim.animation_slide_in_left, R.anim.animation_slide_out_right) it.setCustomAnimations(
R.anim.animation_slide_in_right,
R.anim.animation_slide_out_left,
R.anim.animation_slide_in_left,
R.anim.animation_slide_out_right)
} }
addFragmentToBackstack( addFragmentToBackstack(
container = views.threadsActivityFragmentContainer, container = views.threadsActivityFragmentContainer,

18
vector/src/main/res/layout/view_room_detail_toolbar.xml
View File

@ -25,9 +25,9 @@
android:layout_height="17dp" android:layout_height="17dp"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
app:layout_constraintBottom_toBottomOf="@+id/roomToolbarTitleView" app:layout_constraintBottom_toBottomOf="@id/roomToolbarTitleView"
app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
app:layout_constraintTop_toTopOf="@+id/roomToolbarTitleView" /> app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" />
<im.vector.app.core.ui.views.PresenceStateImageView <im.vector.app.core.ui.views.PresenceStateImageView
android:id="@+id/roomToolbarPresenceImageView" android:id="@+id/roomToolbarPresenceImageView"
@ -36,7 +36,7 @@
android:background="@drawable/background_circle" android:background="@drawable/background_circle"
android:padding="2dp" android:padding="2dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintCircle="@+id/roomToolbarAvatarImageView" app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" tools:ignore="MissingConstraints"
@ -53,7 +53,7 @@
android:padding="1dp" android:padding="1dp"
android:src="@drawable/ic_public_room" android:src="@drawable/ic_public_room"
android:visibility="gone" android:visibility="gone"
app:layout_constraintCircle="@+id/roomToolbarAvatarImageView" app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" tools:ignore="MissingConstraints"
@ -69,10 +69,10 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView" app:layout_constraintBottom_toTopOf="@id/roomToolbarSubtitleView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/roomToolbarDecorationImageView" app:layout_constraintStart_toEndOf="@id/roomToolbarDecorationImageView"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
app:layout_goneMarginStart="7dp" app:layout_goneMarginStart="7dp"
@ -91,8 +91,8 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView" app:layout_constraintTop_toBottomOf="@id/roomToolbarTitleView"
tools:text="@sample/rooms.json/data/topic" tools:text="@sample/rooms.json/data/topic"
tools:visibility="visible" /> tools:visibility="visible" />