From 0a065b075273f41643261e21143132735c556ee7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 10 Jun 2021 22:08:56 +0200
Subject: [PATCH] More cleanup

---
 .../res/layout/activity_vector_web_view.xml   |  4 +--
 .../layout/alerter_verification_layout.xml    | 27 +++++--------------
 .../fragment_login_wait_for_email_2.xml       |  2 +-
 .../fragment_recyclerview_with_search.xml     |  8 ------
 .../fragment_room_preview_no_preview.xml      |  2 +-
 .../res/layout/fragment_space_preview.xml     |  2 +-
 .../src/main/res/layout/view_sync_state.xml   |  2 +-
 .../src/main/res/values/styles_progress.xml   |  4 +--
 vector/src/main/res/values/theme_dark.xml     |  6 -----
 vector/src/main/res/values/theme_light.xml    |  6 -----
 10 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/vector/src/main/res/layout/activity_vector_web_view.xml b/vector/src/main/res/layout/activity_vector_web_view.xml
index e6cdfa2bdd..d691f4de5d 100644
--- a/vector/src/main/res/layout/activity_vector_web_view.xml
+++ b/vector/src/main/res/layout/activity_vector_web_view.xml
@@ -29,13 +29,13 @@
 
     <ProgressBar
         android:id="@+id/simple_webview_loader"
-        style="@style/Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 3db8a3343c..3fb677540e 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -9,20 +9,22 @@
     tools:foreground="?android:attr/selectableItemBackground"
     tools:style="@style/AlertStyle">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/ivUserAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:contentDescription="@string/avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/ivIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_shield_warning"
         app:layout_constraintCircle="@+id/ivUserAvatar"
         app:layout_constraintCircleAngle="135"
@@ -40,7 +42,7 @@
         app:layout_constraintStart_toEndOf="@id/ivUserAvatar"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,7 +55,7 @@
             tools:text="Title"
             tools:visibility="visible" />
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/tvText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -71,21 +73,4 @@
 
     </LinearLayout>
 
-    <!--    <FrameLayout-->
-    <!--        android:id="@+id/flRightIconContainer"-->
-    <!--        android:layout_width="wrap_content"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_gravity="center_vertical">-->
-
-    <!--        <androidx.appcompat.widget.AppCompatImageView-->
-    <!--            android:id="@+id/ivRightIcon"-->
-    <!--            android:layout_width="@dimen/alerter_alert_icn_size"-->
-    <!--            android:layout_height="@dimen/alerter_alert_icn_size"-->
-    <!--            android:maxWidth="@dimen/alerter_alert_icn_size"-->
-    <!--            android:maxHeight="@dimen/alerter_alert_icn_size"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:srcCompat="@drawable/alerter_ic_notifications"-->
-    <!--            app:tint="@color/alert_default_icon_color"-->
-    <!--            tools:visibility="visible" />-->
-    <!--    </FrameLayout>-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index e70f038197..accb43e244 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -40,7 +40,7 @@
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
 
             <ProgressBar
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                style="@style/VectorHorizontalProgressBar"
                 android:layout_width="240dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index e6be096fb5..f065a5a8b0 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -76,14 +76,6 @@
             app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
-        <!--        <ProgressBar-->
-        <!--            android:id="@+id/listBuildingProgress"-->
-        <!--            android:indeterminate="true"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="8dp"-->
-        <!--            style="@style/Widget.AppCompat.ProgressBar.Horizontal"-->
-        <!--            />-->
-
     </com.google.android.material.appbar.AppBarLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 6b8c37781b..8983498451 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -60,7 +60,7 @@
 
             <ProgressBar
                 android:id="@+id/roomPreviewPeekingProgress"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                style="@style/VectorHorizontalProgressBar"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 2717bc8f7c..6096c33d2f 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -74,7 +74,7 @@
 
             <ProgressBar
                 android:id="@+id/spacePreviewPeekingProgress"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                style="@style/VectorHorizontalProgressBar"
                 android:layout_width="match_parent"
                 android:layout_height="14dp"
                 android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/view_sync_state.xml b/vector/src/main/res/layout/view_sync_state.xml
index 3d8720da99..86e3133ace 100644
--- a/vector/src/main/res/layout/view_sync_state.xml
+++ b/vector/src/main/res/layout/view_sync_state.xml
@@ -16,7 +16,7 @@
         tools:visibility="visible">
 
         <ProgressBar
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            style="@style/VectorHorizontalProgressBar"
             android:layout_width="match_parent"
             android:layout_height="14dp"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/values/styles_progress.xml b/vector/src/main/res/values/styles_progress.xml
index 3f0db624d2..73e8a075e1 100644
--- a/vector/src/main/res/values/styles_progress.xml
+++ b/vector/src/main/res/values/styles_progress.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- ************************ Common items ************************ -->
-
     <style name="FileProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:indeterminateOnly">false</item>
         <item name="android:progressDrawable">@drawable/file_progress_bar</item>
@@ -10,4 +8,6 @@
         <item name="android:maxHeight">40dp</item>
     </style>
 
+    <style name="VectorHorizontalProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 6fac94c600..0eb46baee0 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -94,12 +94,6 @@
         <!-- fonts -->
         <item name="android:typeface">sans</item>
 
-        <!-- remove the shadow under the actionbar -->
-        <item name="android:windowContentOverlay">@null</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 469298c79c..e976ca6e8d 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -94,12 +94,6 @@
         <!-- fonts -->
         <item name="android:typeface">sans</item>
 
-        <!-- remove the shadow under the actionbar -->
-        <item name="android:windowContentOverlay">@null</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>