empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Allow content of basic megaphones to scroll.

Browse source 
Fixes #11507
This commit is contained in:
Alex Hart 2021-08-02 10:26:51 -03:00 • committed by Greyson Parrelli
parent e5f1793eb3
commit 6e1621fef1
1 changed files with 74 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
app/src/main/res/layout/basic_megaphone_view.xml
View file

@ -18,82 +18,88 @@
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:contentPadding="0dp"> app:contentPadding="0dp">
<androidx.constraintlayout.widget.ConstraintLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:clickable="true"
android:paddingStart="8dp"
android:paddingTop="16dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp">
<com.airbnb.lottie.LottieAnimationView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/basic_megaphone_image" android:layout_width="match_parent"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="8dp"
android:scaleType="centerInside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@tools:sample/avatars" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/basic_megaphone_title"
style="@style/Signal.Text.Body"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:clickable="true"
android:layout_marginEnd="8dp" android:paddingStart="8dp"
android:fontFamily="sans-serif-medium" android:paddingTop="16dp"
app:layout_constraintEnd_toEndOf="parent" android:paddingEnd="8dp"
app:layout_constraintStart_toEndOf="@id/basic_megaphone_image" android:paddingBottom="8dp">
app:layout_constraintTop_toTopOf="@id/basic_megaphone_image"
tools:text="Avengers HQ Destroyed!" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/basic_megaphone_body" android:id="@+id/basic_megaphone_image"
style="@style/Signal.Text.Preview" android:layout_width="64dp"
android:layout_width="0dp" android:layout_height="64dp"
android:layout_height="wrap_content" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:scaleType="centerInside"
android:textColor="@color/megaphone_body_text_color" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="@id/basic_megaphone_title" tools:src="@tools:sample/avatars" />
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_title"
tools:text="Where was the 'hero' Spider-Man during the battle?" />
<androidx.constraintlayout.widget.Barrier <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/basic_megaphone_content_barrier" android:id="@+id/basic_megaphone_title"
android:layout_width="wrap_content" style="@style/Signal.Text.Body"
android:layout_height="wrap_content" android:layout_width="0dp"
app:barrierDirection="bottom" android:layout_height="wrap_content"
app:constraint_referenced_ids="basic_megaphone_image,basic_megaphone_body,basic_megaphone_title" /> android:layout_marginStart="12dp"
android:layout_marginEnd="8dp"
android:fontFamily="sans-serif-medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/basic_megaphone_image"
app:layout_constraintTop_toTopOf="@id/basic_megaphone_image"
tools:text="Avengers HQ Destroyed!" />
<Button <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/basic_megaphone_action" android:id="@+id/basic_megaphone_body"
style="@style/Button.Borderless" style="@style/Signal.Text.Preview"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent" android:textColor="@color/megaphone_body_text_color"
app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier" app:layout_constraintStart_toStartOf="@id/basic_megaphone_title"
tools:text="*sigh*" app:layout_constraintTop_toBottomOf="@id/basic_megaphone_title"
tools:visibility="visible" /> tools:text="Where was the 'hero' Spider-Man during the battle?" />
<Button <androidx.constraintlayout.widget.Barrier
android:id="@+id/basic_megaphone_secondary" android:id="@+id/basic_megaphone_content_barrier"
style="@style/Button.Borderless" android:layout_width="wrap_content"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" app:barrierDirection="bottom"
android:layout_marginTop="4dp" app:constraint_referenced_ids="basic_megaphone_image,basic_megaphone_body,basic_megaphone_title" />
android:text="@string/Megaphones_remind_me_later"
app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> <Button
android:id="@+id/basic_megaphone_action"
style="@style/Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary"
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
tools:text="*sigh*"
tools:visibility="visible" />
<Button
android:id="@+id/basic_megaphone_secondary"
style="@style/Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/Megaphones_remind_me_later"
app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>