Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 11:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bottom bar color in group story selector.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-10-07 11:51:05 -04:00
parent 04b0c01015
commit be98ff3508
2 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
View File

@@ -32,10 +32,9 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
const val RESULT_SET = "groups"
}
private lateinit var confirmButton: View
private lateinit var selectedList: RecyclerView
private lateinit var divider: View
private lateinit var mediator: ContactSearchMediator
private lateinit var innerContainer: View
private var animatorSet: AnimatorSet? = null
@@ -49,13 +48,14 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
val container = view.parent.parent.parent as FrameLayout
val bottomBar = LayoutInflater.from(requireContext()).inflate(R.layout.stories_choose_group_bottom_bar, container, true)
confirmButton = bottomBar.findViewById(R.id.share_confirm)
selectedList = bottomBar.findViewById(R.id.selected_list)
innerContainer = bottomBar.findViewById(R.id.inner_container)
divider = bottomBar.findViewById(R.id.divider)
val adapter = ShareSelectionAdapter()
val selectedList: RecyclerView = bottomBar.findViewById(R.id.selected_list)
selectedList.adapter = adapter
val confirmButton: View = bottomBar.findViewById(R.id.share_confirm)
confirmButton.setOnClickListener {
onDone()
}
@@ -116,8 +116,7 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
animatorSet?.cancel()
animatorSet = AnimatorSet().apply {
playTogether(
ObjectAnimator.ofFloat(confirmButton, View.TRANSLATION_Y, 0f),
ObjectAnimator.ofFloat(selectedList, View.TRANSLATION_Y, 0f),
ObjectAnimator.ofFloat(innerContainer, View.TRANSLATION_Y, 0f),
ObjectAnimator.ofFloat(divider, View.TRANSLATION_Y, 0f)
)
start()
@@ -125,13 +124,12 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
}
private fun animateOutBottomBar() {
val translationY = DimensionUnit.SP.toPixels(64f)
val translationY = DimensionUnit.SP.toPixels(68f)
animatorSet?.cancel()
animatorSet = AnimatorSet().apply {
playTogether(
ObjectAnimator.ofFloat(confirmButton, View.TRANSLATION_Y, translationY),
ObjectAnimator.ofFloat(selectedList, View.TRANSLATION_Y, translationY),
ObjectAnimator.ofFloat(innerContainer, View.TRANSLATION_Y, translationY),
ObjectAnimator.ofFloat(divider, View.TRANSLATION_Y, translationY)
)
start()