From f79681b343790bcc415b1e8252ea0433e814c41f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 27 Aug 2021 14:15:54 +0200
Subject: [PATCH] Clean unneeded beta pills

---
 .../features/matrixto/MatrixToRoomSpaceFragment.kt   |  3 ---
 .../app/features/matrixto/SpaceCardRenderer.kt       |  2 --
 .../features/spaces/manage/SpaceSettingsFragment.kt  |  6 ------
 .../layout/fragment_matrix_to_room_space_card.xml    | 12 ------------
 .../src/main/res/layout/item_space_beta_header.xml   |  3 +--
 5 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 733eb0575e..26df42dbe1 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -70,7 +70,6 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                         val matrixItem = peek.roomItem
                         avatarRenderer.render(matrixItem, views.matrixToCardAvatar)
                         if (peek.roomType == RoomType.SPACE) {
-                            views.matrixToBetaTag.isVisible = true
                             views.matrixToAccessImage.isVisible = true
                             if (peek.isPublic) {
                                 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.matrixToAccessImage.setImageResource(R.drawable.ic_room_private)
                             }
-                        } else {
-                            views.matrixToBetaTag.isVisible = false
                         }
                         views.matrixToCardNameText.setTextOrHide(peek.name)
                         views.matrixToCardAliasText.setTextOrHide(peek.alias)
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
index 00d107513c..c56481d3f2 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
@@ -50,7 +50,6 @@ class SpaceCardRenderer @Inject constructor(
             inCard.matrixToCardButtonLoading.isVisible = false
             avatarRenderer.render(spaceSummary.toMatrixItem(), inCard.matrixToCardAvatar)
             inCard.matrixToCardNameText.text = spaceSummary.name
-            inCard.matrixToBetaTag.isVisible = true
             inCard.matrixToCardAliasText.setTextOrHide(spaceSummary.canonicalAlias)
             inCard.matrixToCardDescText.setTextOrHide(spaceSummary.topic.linkify(matrixLinkCallback))
             if (spaceSummary.isPublic) {
@@ -97,7 +96,6 @@ class SpaceCardRenderer @Inject constructor(
             inCard.matrixToCardButtonLoading.isVisible = false
             avatarRenderer.render(spaceChildInfo.toMatrixItem(), inCard.matrixToCardAvatar)
             inCard.matrixToCardNameText.setTextOrHide(spaceChildInfo.name)
-            inCard.matrixToBetaTag.isVisible = true
             inCard.matrixToCardAliasText.setTextOrHide(spaceChildInfo.canonicalAlias)
             inCard.matrixToCardDescText.setTextOrHide(spaceChildInfo.topic?.linkify(matrixLinkCallback))
             if (spaceChildInfo.worldReadable) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
index 525afcbc9b..5e5eb50b87 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -133,12 +133,6 @@ class SpaceSettingsFragment @Inject constructor(
 
         state.roomSummary()?.let {
             views.roomSettingsToolbarTitleView.text = it.displayName
-            views.roomSettingsToolbarTitleView.setCompoundDrawablesWithIntrinsicBounds(
-                    null,
-                    null,
-                    drawableProvider.getDrawable(R.drawable.ic_beta_pill),
-                    null
-            )
             avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
             views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
         }
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 81188bddf0..0bdecf4471 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -28,18 +28,6 @@
             app:layout_constraintTop_toTopOf="parent"
             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
             android:id="@+id/matrixToCardNameText"
             style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 4aec314c93..0b48e263b9 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -15,8 +15,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/spaces_header"
         android:textColor="?vctr_content_primary"
-        android:textStyle="bold"
-        app:drawableEndCompat="@drawable/ic_beta_pill" />
+        android:textStyle="bold" />
 
     <TextView
         style="@style/Widget.Vector.TextView.Body"