mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-17 12:30:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

Clean unneeded beta pills

Browse source
This commit is contained in:
Valere 2021-08-27 14:15:54 +02:00
parent 932a43ef58
commit f79681b343
5 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
View file

@ -70,7 +70,6 @@ class MatrixToRoomSpaceFragment @Inject constructor(
val matrixItem = peek.roomItem val matrixItem = peek.roomItem
avatarRenderer.render(matrixItem, views.matrixToCardAvatar) avatarRenderer.render(matrixItem, views.matrixToCardAvatar)
if (peek.roomType == RoomType.SPACE) { if (peek.roomType == RoomType.SPACE) {
views.matrixToBetaTag.isVisible = true
views.matrixToAccessImage.isVisible = true views.matrixToAccessImage.isVisible = true
if (peek.isPublic) { if (peek.isPublic) {
views.matrixToAccessText.setTextOrHide(context?.getString(R.string.public_space)) views.matrixToAccessText.setTextOrHide(context?.getString(R.string.public_space))
@ -79,8 +78,6 @@ class MatrixToRoomSpaceFragment @Inject constructor(
views.matrixToAccessText.setTextOrHide(context?.getString(R.string.private_space)) views.matrixToAccessText.setTextOrHide(context?.getString(R.string.private_space))
views.matrixToAccessImage.setImageResource(R.drawable.ic_room_private) views.matrixToAccessImage.setImageResource(R.drawable.ic_room_private)
} }
} else {
views.matrixToBetaTag.isVisible = false
} }
views.matrixToCardNameText.setTextOrHide(peek.name) views.matrixToCardNameText.setTextOrHide(peek.name)
views.matrixToCardAliasText.setTextOrHide(peek.alias) views.matrixToCardAliasText.setTextOrHide(peek.alias)

2
vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
View file

@ -50,7 +50,6 @@ class SpaceCardRenderer @Inject constructor(
inCard.matrixToCardButtonLoading.isVisible = false inCard.matrixToCardButtonLoading.isVisible = false
avatarRenderer.render(spaceSummary.toMatrixItem(), inCard.matrixToCardAvatar) avatarRenderer.render(spaceSummary.toMatrixItem(), inCard.matrixToCardAvatar)
inCard.matrixToCardNameText.text = spaceSummary.name inCard.matrixToCardNameText.text = spaceSummary.name
inCard.matrixToBetaTag.isVisible = true
inCard.matrixToCardAliasText.setTextOrHide(spaceSummary.canonicalAlias) inCard.matrixToCardAliasText.setTextOrHide(spaceSummary.canonicalAlias)
inCard.matrixToCardDescText.setTextOrHide(spaceSummary.topic.linkify(matrixLinkCallback)) inCard.matrixToCardDescText.setTextOrHide(spaceSummary.topic.linkify(matrixLinkCallback))
if (spaceSummary.isPublic) { if (spaceSummary.isPublic) {
@ -97,7 +96,6 @@ class SpaceCardRenderer @Inject constructor(
inCard.matrixToCardButtonLoading.isVisible = false inCard.matrixToCardButtonLoading.isVisible = false
avatarRenderer.render(spaceChildInfo.toMatrixItem(), inCard.matrixToCardAvatar) avatarRenderer.render(spaceChildInfo.toMatrixItem(), inCard.matrixToCardAvatar)
inCard.matrixToCardNameText.setTextOrHide(spaceChildInfo.name) inCard.matrixToCardNameText.setTextOrHide(spaceChildInfo.name)
inCard.matrixToBetaTag.isVisible = true
inCard.matrixToCardAliasText.setTextOrHide(spaceChildInfo.canonicalAlias) inCard.matrixToCardAliasText.setTextOrHide(spaceChildInfo.canonicalAlias)
inCard.matrixToCardDescText.setTextOrHide(spaceChildInfo.topic?.linkify(matrixLinkCallback)) inCard.matrixToCardDescText.setTextOrHide(spaceChildInfo.topic?.linkify(matrixLinkCallback))
if (spaceChildInfo.worldReadable) { if (spaceChildInfo.worldReadable) {

6
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
View file

@ -133,12 +133,6 @@ class SpaceSettingsFragment @Inject constructor(
state.roomSummary()?.let { state.roomSummary()?.let {
views.roomSettingsToolbarTitleView.text = it.displayName views.roomSettingsToolbarTitleView.text = it.displayName
views.roomSettingsToolbarTitleView.setCompoundDrawablesWithIntrinsicBounds(
null,
null,
drawableProvider.getDrawable(R.drawable.ic_beta_pill),
null
)
avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView) avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel) views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
} }

12
vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
View file

@ -28,18 +28,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:src="@sample/room_round_avatars" /> tools:src="@sample/room_round_avatars" />
<ImageView
android:id="@+id/matrixToBetaTag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
android:contentDescription="@string/a11y_beta"
android:src="@drawable/ic_beta_pill"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<TextView <TextView
android:id="@+id/matrixToCardNameText" android:id="@+id/matrixToCardNameText"
style="@style/Widget.Vector.TextView.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"

3
vector/src/main/res/layout/item_space_beta_header.xml
View file

@ -15,8 +15,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/spaces_header" android:text="@string/spaces_header"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold" />
app:drawableEndCompat="@drawable/ic_beta_pill" />
<TextView <TextView
style="@style/Widget.Vector.TextView.Body" style="@style/Widget.Vector.TextView.Body"