From 6b5e5b0f252ec650030b2b794339eba63c9bb878 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 23 Mar 2023 00:58:38 +0300
Subject: [PATCH] More minor tweaks

---
 .../FeaturedHashtagsListFragment.java         |  2 +-
 .../fragments/MastodonRecyclerFragment.java   |  8 ++++++++
 .../fragments/PinnedPostsListFragment.java    |  2 +-
 .../fragments/ProfileFeaturedFragment.java    | 15 ++++++++------
 .../android/fragments/ProfileFragment.java    |  5 +++++
 mastodon/src/main/res/drawable/bg_popup.xml   | 20 ++++++++++++++-----
 mastodon/src/main/res/values/strings.xml      |  2 --
 mastodon/src/main/res/values/styles.xml       |  2 ++
 8 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
index 62417429..61915a3f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
@@ -29,7 +29,7 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 		accountID=getArguments().getString("account");
 		account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
 		onDataLoaded(getArguments().getParcelableArrayList("hashtags").stream().map(p->(Hashtag)Parcels.unwrap(p)).collect(Collectors.toList()), false);
-		setTitle(R.string.featured_hashtags);
+		setTitle(R.string.hashtags);
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
index 6f41877f..f96cbb45 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java
@@ -4,6 +4,8 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Toolbar;
 
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 
 import java.util.Collections;
@@ -35,6 +37,12 @@ public abstract class MastodonRecyclerFragment<T> extends BaseRecyclerFragment<T
 		super.onViewCreated(view, savedInstanceState);
 		if(wantsElevationOnScrollEffect())
 			list.addOnScrollListener(elevationOnScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, getViewsForElevationEffect()));
+		if(refreshLayout!=null){
+			int colorBackground=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background);
+			int colorPrimary=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary);
+			refreshLayout.setProgressBackgroundColorSchemeColor(UiUtils.alphaBlendColors(colorBackground, colorPrimary, 0.11f));
+			refreshLayout.setColorSchemeColors(colorPrimary);
+		}
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java
index 7e70c1a7..65dafa5b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java
@@ -19,7 +19,7 @@ public class PinnedPostsListFragment extends StatusListFragment{
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
-		setTitle(R.string.pinned_posts);
+		setTitle(R.string.posts);
 		loadData();
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
index e21c9729..637a6eac 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
@@ -14,6 +14,7 @@ import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.SectionHeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -108,7 +109,7 @@ public class ProfileFeaturedFragment extends BaseStatusListFragment<SearchResult
 	@Override
 	protected void doLoadData(int offset, int count){
 		if(!statusesLoaded){
-			new GetAccountStatuses(profileAccount.id, null, null, 1, GetAccountStatuses.Filter.PINNED)
+			new GetAccountStatuses(profileAccount.id, null, null, 2, GetAccountStatuses.Filter.PINNED)
 					 .setCallback(new SimpleCallback<>(this){
 						  @Override
 						  public void onSuccess(List<Status> result){
@@ -150,12 +151,12 @@ public class ProfileFeaturedFragment extends BaseStatusListFragment<SearchResult
 	private void onOneApiRequestCompleted(){
 		if(tagsLoaded && statusesLoaded){
 			ArrayList<SearchResult> results=new ArrayList<>();
-			if(!pinnedStatuses.isEmpty()){
-				SearchResult res=new SearchResult(pinnedStatuses.get(0));
-				res.firstInSection=true;
+			for(int i=0;i<Math.min(2, pinnedStatuses.size());i++){
+				SearchResult res=new SearchResult(pinnedStatuses.get(i));
+				res.firstInSection=(i==0);
 				results.add(res);
 			}
-			for(int i=0;i<Math.min(3, featuredTags.size());i++){
+			for(int i=0;i<Math.min(5, featuredTags.size());i++){
 				SearchResult res=new SearchResult(featuredTags.get(i));
 				res.firstInSection=(i==0);
 				results.add(res);
@@ -175,7 +176,9 @@ public class ProfileFeaturedFragment extends BaseStatusListFragment<SearchResult
 
 	@Override
 	protected void drawDivider(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder, RecyclerView parent, Canvas c, Paint paint){
-		// no-op
+		if(holder instanceof FooterStatusDisplayItem.Holder && siblingHolder instanceof StatusDisplayItem.Holder<?> sdi && sdi.getItemID().startsWith("post_")){
+			super.drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, paint);
+		}
 	}
 
 	private void showAllPinnedPosts(){
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 cd2f8695..f579efa4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -299,6 +299,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return pos+1;
 		});
 
+		int colorBackground=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background);
+		int colorPrimary=UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary);
+		refreshLayout.setProgressBackgroundColorSchemeColor(UiUtils.alphaBlendColors(colorBackground, colorPrimary, 0.11f));
+		refreshLayout.setColorSchemeColors(colorPrimary);
+
 		return sizeWrapper;
 	}
 
diff --git a/mastodon/src/main/res/drawable/bg_popup.xml b/mastodon/src/main/res/drawable/bg_popup.xml
index d232689d..b1adf556 100644
--- a/mastodon/src/main/res/drawable/bg_popup.xml
+++ b/mastodon/src/main/res/drawable/bg_popup.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="?colorBackgroundLightest"/>
-	<corners android:radius="10dp"/>
-	<padding android:top="8dp" android:bottom="8dp"/>
-</shape>
\ No newline at end of file
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<solid android:color="?colorM3Surface"/>
+			<corners android:radius="4dp"/>
+		</shape>
+	</item>
+	<item>
+		<shape android:tint="?colorM3Primary">
+			<solid android:color="#14000000"/>
+			<corners android:radius="4dp"/>
+			<padding android:top="8dp" android:bottom="8dp"/>
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 400a659b..e2fb87d2 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -447,7 +447,5 @@
 	<string name="profile_timeline">Timeline</string>
 	<string name="view_all">View all</string>
 	<string name="profile_endorsed_accounts">Accounts</string>
-	<string name="pinned_posts">Pinned posts</string>
-	<string name="featured_hashtags">Featured hashtags</string>
 	<string name="verified_link">Verified link</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index acef71ff..c110344c 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -71,6 +71,7 @@
 		<item name="android:statusBarColor">?colorM3Background</item>
 		<item name="android:navigationBarColor">@color/navigation_bar_bg_light</item>
 		<item name="android:colorAccent">?colorM3Primary</item>
+		<item name="android:colorControlHighlight">@color/m3_primary_overlay</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
@@ -146,6 +147,7 @@
 		<item name="android:statusBarColor">?colorM3Background</item>
 		<item name="android:navigationBarColor">?colorM3Background</item>
 		<item name="android:colorAccent">?colorM3Primary</item>
+		<item name="android:colorControlHighlight">@color/m3_primary_overlay</item>
 	</style>
 
 	<style name="Theme.Mastodon.Dark.TrueBlack">