From ff5e281db72b6dc146a43f0050187f83b4413f2c Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 7 Nov 2024 14:02:13 +0300
Subject: [PATCH] Minor fixes in profiles

---
 .../joinmastodon/android/fragments/ProfileFragment.java   | 8 ++++++++
 .../android/fragments/SavedPostsTimelineFragment.java     | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index daa03f1be..15b13d9c1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -402,6 +402,8 @@ public class ProfileFragment extends LoaderFragment implements ScrollableToTop,
 								timelineFragment.onRefresh();
 							if(featuredFragment.loaded)
 								featuredFragment.onRefresh();
+							if(savedFragment!=null && savedFragment.loaded)
+								savedFragment.onRefresh();
 						}
 						V.setVisibilityAnimated(fab, View.VISIBLE);
 					}
@@ -545,6 +547,8 @@ public class ProfileFragment extends LoaderFragment implements ScrollableToTop,
 		if(timelineFragment!=null && timelineFragment.isAdded() && childInsets!=null){
 			timelineFragment.onApplyWindowInsets(childInsets);
 			featuredFragment.onApplyWindowInsets(childInsets);
+			if(savedFragment!=null)
+				savedFragment.onApplyWindowInsets(childInsets);
 		}
 	}
 
@@ -673,6 +677,7 @@ public class ProfileFragment extends LoaderFragment implements ScrollableToTop,
 		if(onScrollListener!=null){
 			onScrollListener.setViews(getToolbar());
 		}
+		getToolbar().setTranslationZ(tabBarIsAtTop ? 0 : V.dp(3));
 	}
 
 	private CharSequence makeRedString(CharSequence s){
@@ -924,6 +929,9 @@ public class ProfileFragment extends LoaderFragment implements ScrollableToTop,
 				editSaveMenuItem.setVisible(!buttonInView);
 			}
 		}
+		if((scrollY==0 && oldScrollY!=0) || (scrollY!=0 && oldScrollY==0)){
+			refreshLayout.setEnabled(scrollY==0);
+		}
 	}
 
 	private Fragment getFragmentForPage(int page){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SavedPostsTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SavedPostsTimelineFragment.java
index e81fa8afb..aa5e3de90 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SavedPostsTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SavedPostsTimelineFragment.java
@@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -122,8 +123,12 @@ public class SavedPostsTimelineFragment extends StatusListFragment{
 		ImageView icon=banner.findViewById(R.id.icon);
 		icon.setImageResource(R.drawable.ic_lock_24px);
 
+		// Prevents margins messing up things
+		FrameLayout bannerW=new FrameLayout(getActivity());
+		bannerW.addView(banner);
+
 		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(banner));
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(bannerW));
 		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(filtersBar));
 		mergeAdapter.addAdapter(super.getAdapter());
 		return mergeAdapter;