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

Make our FABs rounded rects again.

Browse source
This commit is contained in:
Greyson Parrelli 2023-02-21 14:42:04 -05:00
parent 7bdb5fd76c
commit b92346d4ae
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/conversation_list_fragment.xml
View file

@ -122,6 +122,7 @@
app:backgroundTint="@color/signal_colorSurfaceVariant" app:backgroundTint="@color/signal_colorSurfaceVariant"
app:srcCompat="@drawable/symbol_camera_24" app:srcCompat="@drawable/symbol_camera_24"
app:tint="@color/signal_colorOnSurface" app:tint="@color/signal_colorOnSurface"
app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
tools:visibility="visible" /> tools:visibility="visible" />
<org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
@ -138,6 +139,7 @@
app:backgroundTint="@color/signal_colorPrimaryContainer" app:backgroundTint="@color/signal_colorPrimaryContainer"
app:srcCompat="@drawable/symbol_edit_24" app:srcCompat="@drawable/symbol_edit_24"
app:tint="@color/signal_colorOnSurface" app:tint="@color/signal_colorOnSurface"
app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
tools:visibility="visible" /> tools:visibility="visible" />
<ViewStub <ViewStub

2
app/src/main/res/layout/stories_landing_fragment.xml
View file

@ -56,6 +56,7 @@
android:focusable="true" android:focusable="true"
android:theme="@style/Widget.Material3.FloatingActionButton.Secondary" android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
android:transitionName="camera_fab" android:transitionName="camera_fab"
app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
app:backgroundTint="@color/signal_colorSurfaceVariant" app:backgroundTint="@color/signal_colorSurfaceVariant"
app:elevation="0dp" app:elevation="0dp"
app:srcCompat="@drawable/ic_camera_outline_24" app:srcCompat="@drawable/ic_camera_outline_24"
@ -73,6 +74,7 @@
android:focusable="true" android:focusable="true"
android:theme="@style/Widget.Material3.FloatingActionButton.Primary" android:theme="@style/Widget.Material3.FloatingActionButton.Primary"
android:transitionName="new_convo_fab" android:transitionName="new_convo_fab"
app:shapeAppearanceOverlay="@style/Signal.ShapeOverlay.Rounded.Fab"
app:backgroundTint="@color/signal_colorPrimaryContainer" app:backgroundTint="@color/signal_colorPrimaryContainer"
app:srcCompat="@drawable/ic_camera_outline_24" app:srcCompat="@drawable/ic_camera_outline_24"
app:tint="@color/signal_colorOnSurface" /> app:tint="@color/signal_colorOnSurface" />

5
app/src/main/res/values/signal_styles.xml
View file

@ -178,6 +178,11 @@
<item name="cornerSize">8dp</item> <item name="cornerSize">8dp</item>
</style> </style>
<style name="Signal.ShapeOverlay.Rounded.Fab" parent="ShapeAppearance.MaterialComponents.MediumComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">18dp</item>
</style>
<style name="ShapeAppearance.Signal.MaterialAlertDialog" parent="ShapeAppearance.Material3.MediumComponent"> <style name="ShapeAppearance.Signal.MaterialAlertDialog" parent="ShapeAppearance.Material3.MediumComponent">
<item name="cornerFamily">rounded</item> <item name="cornerFamily">rounded</item>
<item name="cornerRadius">28dp</item> <item name="cornerRadius">28dp</item>