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

Update Basic Megaphone to Material Design 3.

Browse source
This commit is contained in:
Nicholas Tinsley 2022-09-07 14:43:44 -04:00 • committed by Greyson Parrelli
parent 0685cf4e51
commit 58489bab61
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,15 +6,17 @@
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">
<androidx.cardview.widget.CardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
app:cardBackgroundColor="@color/megaphone_background_color" app:strokeColor="@color/signal_colorOutline_38"
app:cardCornerRadius="8dp" app:strokeWidth="1dp"
app:cardElevation="6dp" app:cardBackgroundColor="@color/signal_colorBackground"
app:cardCornerRadius="12dp"
app:cardElevation="2dp"
app:cardPreventCornerOverlap="false" app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true" app:cardUseCompatPadding="true"
app:contentPadding="0dp"> app:contentPadding="0dp">
@ -27,6 +29,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
@ -77,33 +80,41 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/basic_megaphone_action" android:id="@+id/basic_megaphone_action"
style="@style/Signal.Widget.Button.Large.Secondary" style="@style/Signal.Widget.Button.Large.Secondary"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textAllCaps="false" android:textAllCaps="false"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary" app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary"
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier" app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
app:layout_constraintWidth_max="wrap"
app:layout_constraintWidth_percent="0.5"
tools:text="*sigh*" tools:text="*sigh*"
tools:visibility="visible" /> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/basic_megaphone_secondary" android:id="@+id/basic_megaphone_secondary"
style="@style/Signal.Widget.Button.Large.Secondary" style="@style/Signal.Widget.Button.Large.Secondary"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:text="@string/Megaphones_remind_me_later" android:text="@string/Megaphones_remind_me_later"
android:textAllCaps="false" android:textAllCaps="false"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action" app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier" app:layout_constraintTop_toBottomOf="@id/basic_megaphone_content_barrier"
app:layout_constraintWidth_max="wrap"
app:layout_constraintWidth_percent="0.5"
tools:visibility="visible" /> tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
</androidx.cardview.widget.CardView> </com.google.android.material.card.MaterialCardView>
</merge> </merge>