Add proper treatment for story pager sending state bar.

fork-5.53.8
Alex Hart 2022-09-29 10:20:08 -03:00 zatwierdzone przez Greyson Parrelli
rodzic 13bd003564
commit 86a345a4f3
2 zmienionych plików z 40 dodań i 6 usunięć

Wyświetl plik

@ -111,6 +111,8 @@ class StoryViewerPageFragment :
private lateinit var storyCaptionContainer: FrameLayout
private lateinit var storyContentContainer: FrameLayout
private lateinit var storyFirstTimeNavigationViewStub: StoryFirstNavigationStub
private lateinit var sendingBarTextView: TextView
private lateinit var sendingBar: View
private lateinit var callback: Callback
@ -182,6 +184,8 @@ class StoryViewerPageFragment :
progressBar = view.findViewById(R.id.progress)
viewsAndReplies = view.findViewById(R.id.views_and_replies_bar)
storyFirstTimeNavigationViewStub = StoryFirstNavigationStub(view.findViewById(R.id.story_first_time_nav_stub))
sendingBarTextView = view.findViewById(R.id.sending_text_view)
sendingBar = view.findViewById(R.id.sending_bar)
storySlate.callback = this
storyFirstTimeNavigationViewStub.setCallback(this)
@ -913,6 +917,8 @@ class StoryViewerPageFragment :
viewsAndReplies.visible = true
}
sendingBar.visible = false
viewsAndReplies.isEnabled = true
viewsAndReplies.iconTint = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurface))
when (replyState) {
@ -934,13 +940,20 @@ class StoryViewerPageFragment :
indicatorColors = intArrayOf(ContextCompat.getColor(requireContext(), R.color.signal_dark_colorNeutralInverse))
trackThickness = 2.dp
}
)
).apply {
setBounds(0, 0, 20.dp, 20.dp)
}
}
viewsAndReplies.icon = sendingProgressDrawable
viewsAndReplies.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START
viewsAndReplies.iconSize = 20.dp
viewsAndReplies.setText(R.string.StoriesLandingItem__sending)
sendingBarTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(
sendingProgressDrawable,
null,
null,
null
)
sendingBar.visible = true
viewsAndReplies.isEnabled = false
}
private fun presentPartialSendBottomBar() {

Wyświetl plik

@ -84,6 +84,27 @@
tools:icon="@drawable/ic_reply_24_outline"
tools:text="6 views 4 replies" />
<FrameLayout
android:id="@+id/sending_bar"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/signal_colorSurface"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/views_and_replies_bar"
app:layout_constraintTop_toTopOf="@id/views_and_replies_bar">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sending_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawablePadding="10dp"
android:text="@string/StoriesLandingItem__sending"
android:textAppearance="@style/Signal.Text.Body"
app:drawableTint="@color/signal_colorOnSurface" />
</FrameLayout>
<androidx.constraintlayout.widget.Barrier
android:id="@+id/replies_bar_top"
android:layout_width="wrap_content"
@ -137,9 +158,9 @@
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="24dp"
android:scrollbars="vertical"
android:textAppearance="@style/Signal.Text.Body"
android:visibility="gone"
android:scrollbars="vertical"
app:layout_constrainedHeight="true"
app:layout_constraintBottom_toTopOf="@id/story_from_barrier"
app:layout_constraintEnd_toEndOf="parent"