mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 00:20:32 +00:00
Removed unnecessary layout
Moved the feed button up a bit
This commit is contained in:
parent
4b4337e078
commit
700c1b4b25
@ -151,7 +151,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
|
||||
!recyclerView.canScrollVertically(-1)
|
||||
) {
|
||||
|
||||
if (feedBinding.newItemsLoadedLayout.isVisible) {
|
||||
if (feedBinding.newItemsLoadedButton.isVisible) {
|
||||
hideNewItemsLoaded(true)
|
||||
}
|
||||
}
|
||||
@ -619,8 +619,8 @@ class FeedFragment : BaseStateFragment<FeedState>() {
|
||||
}
|
||||
|
||||
private fun showNewItemsLoaded() {
|
||||
feedBinding.newItemsLoadedLayout.clearAnimation()
|
||||
feedBinding.newItemsLoadedLayout
|
||||
feedBinding.newItemsLoadedButton.clearAnimation()
|
||||
feedBinding.newItemsLoadedButton
|
||||
.slideUp(
|
||||
250L,
|
||||
delay = 100,
|
||||
@ -636,20 +636,20 @@ class FeedFragment : BaseStateFragment<FeedState>() {
|
||||
}
|
||||
|
||||
private fun hideNewItemsLoaded(animate: Boolean, delay: Long = 0) {
|
||||
feedBinding.newItemsLoadedLayout.clearAnimation()
|
||||
feedBinding.newItemsLoadedButton.clearAnimation()
|
||||
if (animate) {
|
||||
feedBinding.newItemsLoadedLayout.animate(
|
||||
feedBinding.newItemsLoadedButton.animate(
|
||||
false,
|
||||
200,
|
||||
delay = delay,
|
||||
execOnEnd = {
|
||||
// Make the layout invisible so that the onScroll toTop method
|
||||
// only does necessary work
|
||||
feedBinding?.newItemsLoadedLayout?.isVisible = false
|
||||
feedBinding?.newItemsLoadedButton?.isVisible = false
|
||||
}
|
||||
)
|
||||
} else {
|
||||
feedBinding.newItemsLoadedLayout.isVisible = false
|
||||
feedBinding.newItemsLoadedButton.isVisible = false
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -87,25 +87,16 @@
|
||||
|
||||
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/new_items_loaded_layout"
|
||||
android:layout_width="match_parent"
|
||||
<Button
|
||||
android:id="@+id/new_items_loaded_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<Button
|
||||
android:id="@+id/new_items_loaded_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/feed_new_items"
|
||||
android:textSize="12sp"
|
||||
android:theme="@style/ServiceColoredButton"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
android:layout_alignBottom="@id/swipeRefreshLayout"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginBottom="5sp"
|
||||
android:text="@string/feed_new_items"
|
||||
android:textSize="12sp"
|
||||
android:theme="@style/ServiceColoredButton" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
Loading…
Reference in New Issue
Block a user