From 03df4aac778261ffac3bcd556cba61e039736380 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 14 Jun 2021 21:46:05 +0200
Subject: [PATCH] Cleanup

---
 tools/check/forbidden_strings_in_resources.txt               | 5 ++++-
 .../res/layout/item_create_direct_room_letter_header.xml     | 1 -
 vector/src/main/res/layout/item_room_widget.xml              | 1 -
 .../layout/item_timeline_event_merged_room_creation_stub.xml | 2 --
 .../main/res/layout/item_user_directory_letter_header.xml    | 1 -
 vector/src/main/res/layout/item_user_list_header.xml         | 1 -
 vector/src/main/res/layout/view_space_type_button.xml        | 1 -
 7 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 4ebc4008c1..474fb03508 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -106,4 +106,7 @@ layout_constraintLeft_
 colorAccent
 
 ### Use MaterialCardView
-<androidx\.cardview\.widget\.CardView
\ No newline at end of file
+<androidx\.cardview\.widget\.CardView
+
+### Useless attribute, please remove
+android:textStyle=\"normal\"
diff --git a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
index 9dd6642c4f..1a7cd16176 100644
--- a/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_letter_header.xml
@@ -10,5 +10,4 @@
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
     android:textSize="20sp"
-    android:textStyle="normal"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index f5e027c527..5a3905bf45 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -40,7 +40,6 @@
         android:id="@+id/roomWidgetUrl"
         style="@style/BottomSheetItemTextSecondary"
         android:layout_marginEnd="8dp"
-        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/roomWidgetEditable"
         app:layout_constraintStart_toStartOf="@id/roomWidgetName"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index f6f3bcd712..437cb2f4bd 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -83,7 +83,6 @@
             android:layout_marginEnd="16dp"
             android:textColor="?vctr_content_secondary"
             android:textSize="15sp"
-            android:textStyle="normal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/roomNameTileText"
@@ -97,7 +96,6 @@
             android:textColor="?vctr_content_secondary"
             android:textColorLink="?colorPrimary"
             android:textSize="15sp"
-            android:textStyle="normal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/roomNameDescriptionText"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index c63f84f412..d33d5d4cfb 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -10,5 +10,4 @@
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
     android:textSize="20sp"
-    android:textStyle="normal"
     tools:text="C" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index af1d0dec90..e3aae0e570 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -10,5 +10,4 @@
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
     android:textSize="20sp"
-    android:textStyle="normal"
     tools:text="Recents | Contacts" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index d5f8580aff..4f28160de9 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -47,7 +47,6 @@
         android:gravity="start"
         android:textAppearance="@style/VectorTextAppearanceCaption"
         android:textColor="?vctr_content_secondary"
-        android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"