More cleanup

This commit is contained in:
Benoit Marty 2021-06-10 22:08:56 +02:00 committed by Benoit Marty
parent f8d07b0734
commit 0a065b0752
10 changed files with 14 additions and 49 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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"

View file

@ -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>

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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>

View file

@ -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>

View file

@ -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>