Skip to content

Commit e4c3457

Browse files
Add public room indicator to RoomDetailFragment & RoomProfileFragment
1 parent 9ab59a5 commit e4c3457

File tree

4 files changed

+32
-1
lines changed

4 files changed

+32
-1
lines changed

vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,7 @@ class RoomDetailFragment @Inject constructor(
14331433
renderSubTitle(typingMessage, roomSummary.topic)
14341434
views.roomToolbarDecorationImageView.render(roomSummary.roomEncryptionTrustLevel)
14351435
views.roomToolbarPresenceImageView.render(roomSummary.isDirect, roomSummary.directUserPresence)
1436+
views.roomToolbarPublicImageView.isVisible = roomSummary.isPublic && !roomSummary.isDirect
14361437
}
14371438
}
14381439

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ class RoomProfileFragment @Inject constructor(
220220
headerViews.roomProfileDecorationImageView.render(it.roomEncryptionTrustLevel)
221221
views.matrixProfileDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
222222
headerViews.roomProfilePresenceImageView.render(it.isDirect, it.directUserPresence)
223+
headerViews.roomProfilePublicImageView.isVisible = it.isPublic && !it.isDirect
223224
}
224225
}
225226
roomProfileController.setData(state)

vector/src/main/res/layout/fragment_room_detail.xml

+15-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
5454
app:layout_constraintTop_toTopOf="@+id/roomToolbarTitleView" />
5555

56-
5756
<im.vector.app.core.ui.views.PresenceStateImageView
5857
android:id="@+id/roomToolbarPresenceImageView"
5958
android:layout_width="12dp"
@@ -68,6 +67,21 @@
6867
tools:src="@drawable/ic_presence_offline"
6968
tools:visibility="visible" />
7069

70+
<ImageView
71+
android:id="@+id/roomToolbarPublicImageView"
72+
android:layout_width="13dp"
73+
android:layout_height="13dp"
74+
android:background="@drawable/background_circle"
75+
android:contentDescription="@string/a11y_public_room"
76+
android:padding="1dp"
77+
android:src="@drawable/ic_public_room"
78+
android:visibility="gone"
79+
app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
80+
app:layout_constraintCircleAngle="135"
81+
app:layout_constraintCircleRadius="20dp"
82+
tools:ignore="MissingConstraints"
83+
tools:visibility="visible" />
84+
7185
<TextView
7286
android:id="@+id/roomToolbarTitleView"
7387
style="@style/Widget.Vector.TextView.HeadlineMedium"

vector/src/main/res/layout/view_stub_room_profile_header.xml

+15
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@
3535
tools:src="@drawable/ic_presence_offline"
3636
tools:visibility="visible" />
3737

38+
<ImageView
39+
android:id="@+id/roomProfilePublicImageView"
40+
android:layout_width="28dp"
41+
android:layout_height="28dp"
42+
android:background="@drawable/background_circle"
43+
android:contentDescription="@string/a11y_public_room"
44+
android:padding="2dp"
45+
android:src="@drawable/ic_public_room"
46+
android:visibility="gone"
47+
app:layout_constraintCircle="@+id/roomProfileAvatarView"
48+
app:layout_constraintCircleAngle="135"
49+
app:layout_constraintCircleRadius="64dp"
50+
tools:ignore="MissingConstraints"
51+
tools:visibility="visible" />
52+
3853
<im.vector.app.core.ui.views.ShieldImageView
3954
android:id="@+id/roomProfileDecorationImageView"
4055
android:layout_width="30dp"

0 commit comments

Comments
 (0)