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

Move snackbar positioning.

Browse source
This commit is contained in:
Alex Hart 2022-09-27 15:21:22 -03:00 • committed by Cody Henthorne
parent 92d065050f
commit 20ce3e68f8
2 changed files with 51 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
View file

@ -325,8 +325,6 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
StoryDialogs.hideStory(requireContext(), model.data.storyRecipient.getShortDisplayName(requireContext())) { StoryDialogs.hideStory(requireContext(), model.data.storyRecipient.getShortDisplayName(requireContext())) {
viewModel.setHideStory(model.data.storyRecipient, true).subscribe { viewModel.setHideStory(model.data.storyRecipient, true).subscribe {
Snackbar.make(cameraFab, R.string.StoriesLandingFragment__story_hidden, Snackbar.LENGTH_SHORT) Snackbar.make(cameraFab, R.string.StoriesLandingFragment__story_hidden, Snackbar.LENGTH_SHORT)
.setAnchorView(cameraFab)
.setAnimationMode(BaseTransientBottomBar.ANIMATION_MODE_FADE)
.show() .show()
} }
} }

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

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
tools:viewBindingIgnore="true"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
tools:viewBindingIgnore="true">
<View <View
android:id="@+id/toolbar_shadow" android:id="@+id/toolbar_shadow"
@ -28,39 +28,58 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/camera_fab_shared_element_target" android:id="@+id/coordinator"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:focusable="true"
android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
android:transitionName="camera_fab"
app:backgroundTint="@color/signal_colorSurfaceVariant"
app:elevation="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_camera_outline_24" app:layout_constraintStart_toStartOf="parent"
app:tint="@color/signal_colorOnSurface" /> app:layout_constraintTop_toTopOf="parent">
<org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton <FrameLayout
android:id="@+id/camera_fab" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="bottom"
android:layout_marginTop="8dp" android:clipChildren="false"
android:layout_marginEnd="16dp" android:clipToPadding="false"
android:layout_marginBottom="16dp" app:layout_behavior="org.thoughtcrime.securesms.util.views.SlideUpWithSnackbarBehavior">
android:contentDescription="@string/conversation_list_fragment__open_camera_description"
android:focusable="true" <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
android:theme="@style/Widget.Material3.FloatingActionButton.Primary" android:id="@+id/camera_fab_shared_element_target"
android:transitionName="new_convo_fab" android:layout_width="wrap_content"
app:backgroundTint="@color/signal_colorPrimaryContainer" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" android:layout_gravity="end"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="8dp"
app:srcCompat="@drawable/ic_camera_outline_24" android:layout_marginEnd="16dp"
app:tint="@color/signal_colorOnSurface" /> android:layout_marginBottom="16dp"
android:focusable="true"
android:theme="@style/Widget.Material3.FloatingActionButton.Secondary"
android:transitionName="camera_fab"
app:backgroundTint="@color/signal_colorSurfaceVariant"
app:elevation="0dp"
app:srcCompat="@drawable/ic_camera_outline_24"
app:tint="@color/signal_colorOnSurface" />
<org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
android:id="@+id/camera_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:contentDescription="@string/conversation_list_fragment__open_camera_description"
android:focusable="true"
android:theme="@style/Widget.Material3.FloatingActionButton.Primary"
android:transitionName="new_convo_fab"
app:backgroundTint="@color/signal_colorPrimaryContainer"
app:srcCompat="@drawable/ic_camera_outline_24"
app:tint="@color/signal_colorOnSurface" />
</FrameLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<TextView <TextView
android:id="@+id/empty_notice" android:id="@+id/empty_notice"