mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove the useless merge tag

Browse source 
It was causing crash with `Missing required view with ID: im.vector.app.debug:id/waiting_view`, probably due to a recent change in AGP 7.X.X
This commit is contained in:
Benoit Marty 2021-09-03 16:20:46 +02:00 committed by Benoit Marty
parent 377c4e00a3
commit dbd11c2e8d
1 changed files with 50 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
vector/src/main/res/layout/merge_overlay_waiting_view.xml
View file

@ -1,72 +1,66 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/waiting_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="?vctr_waiting_background_color"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
tools:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:id="@+id/waiting_view" android:id="@+id/waiting_view_content"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="?vctr_waiting_background_color" android:layout_margin="@dimen/layout_horizontal_margin"
android:clickable="true" android:background="?attr/colorBackgroundFloating"
android:focusable="true" android:orientation="vertical"
android:visibility="gone" android:padding="@dimen/layout_horizontal_margin"
tools:visibility="visible"> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="@dimen/dialog_width_ratio">
<LinearLayout <LinearLayout
android:id="@+id/waiting_view_content" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_horizontal_margin" android:orientation="horizontal">
android:background="?attr/colorBackgroundFloating"
android:orientation="vertical"
android:padding="@dimen/layout_horizontal_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="@dimen/dialog_width_ratio">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/waitingCircularProgress"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="6dp" />
<TextView
android:id="@+id/waitingStatusText"
style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="Waiting status..."
tools:visibility="visible" />
</LinearLayout>
<ProgressBar <ProgressBar
android:id="@+id/waitingHorizontalProgress" android:id="@+id/waitingCircularProgress"
style="@style/Widget.Vector.ProgressBar.Horizontal" android:layout_width="40dp"
android:layout_width="match_parent" android:layout_height="40dp"
android:layout_height="20dp" android:layout_gravity="center_vertical"
android:layout_marginTop="10dp" android:layout_marginEnd="6dp" />
<TextView
android:id="@+id/waitingStatusText"
style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?vctr_content_secondary"
android:visibility="gone" android:visibility="gone"
tools:max="100" tools:text="Waiting status..."
tools:progress="30"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> <ProgressBar
android:id="@+id/waitingHorizontalProgress"
style="@style/Widget.Vector.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginTop="10dp"
android:visibility="gone"
tools:max="100"
tools:progress="30"
tools:visibility="visible" />
</merge> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>