From ea1216b352ce400aad569b0c5a1909a488d6b6ed Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Tue, 12 Nov 2024 22:12:05 +0300
Subject: [PATCH] Show the direction on gaps + bug fix

---
 mastodon/build.gradle                                       | 2 +-
 .../android/fragments/HomeTimelineFragment.java             | 3 ++-
 .../android/ui/displayitems/GapStatusDisplayItem.java       | 1 +
 mastodon/src/main/res/layout/display_item_gap.xml           | 6 +++++-
 mastodon/src/main/res/values/strings.xml                    | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index ea7946c1..cd0a6f70 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,7 +13,7 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 34
-		versionCode 127
+		versionCode 128
 		versionName "2.9.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 85c89f1a..d253c22a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -308,8 +308,9 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD
 						if(!gap.visible){
 							gap.visible=true;
 							gap.enteredFromTop=child.getTop()<list.getHeight()/2;
-							gaps.remove(gap);
+							holder.text.setText(gap.enteredFromTop ? R.string.load_missing_posts_above : R.string.load_missing_posts_below);
 						}
+						gaps.remove(gap);
 					}
 				}
 				for(GapStatusDisplayItem gap:gaps){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
index 25d584a6..0c4d2cac 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java
@@ -40,6 +40,7 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(GapStatusDisplayItem item){
 			text.setVisibility(item.loading ? View.GONE : View.VISIBLE);
 			progress.setVisibility(item.loading ? View.VISIBLE : View.GONE);
+			text.setText(item.enteredFromTop ? R.string.load_missing_posts_above : R.string.load_missing_posts_below);
 		}
 
 		@Override
diff --git a/mastodon/src/main/res/layout/display_item_gap.xml b/mastodon/src/main/res/layout/display_item_gap.xml
index cbc06a8b..6aec0c9f 100644
--- a/mastodon/src/main/res/layout/display_item_gap.xml
+++ b/mastodon/src/main/res/layout/display_item_gap.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="75dp"
 	android:background="@drawable/bg_timeline_gap">
@@ -9,10 +10,13 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
+		android:layout_marginHorizontal="16dp"
 		android:gravity="center_horizontal"
 		android:textAppearance="@style/m3_body_large"
 		android:textColor="?android:textColorSecondary"
-		android:text="@string/load_missing_posts"/>
+		android:maxLines="2"
+		android:ellipsize="end"
+		tools:text="@string/load_missing_posts_above"/>
 
 	<ProgressBar
 		android:id="@+id/progress"
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index a44fd66b..14dc4b3d 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -240,7 +240,6 @@
 	<string name="local_timeline_info_banner">These are all the posts from all users in your server (%s).</string>
 	<string name="recommended_accounts_info_banner">You might like these accounts based on others you follow.</string>
 	<string name="see_new_posts">New posts</string>
-	<string name="load_missing_posts">Load missing posts</string>
 	<string name="follow_back">Follow back</string>
 	<string name="button_follow_pending">Pending</string>
 	<string name="follows_you">Follows you</string>
@@ -856,4 +855,6 @@
 	</plurals>
 	<!-- The complete string will look like "You will lose X people you follow". See will_lose_x_following -->
 	<string name="server_x_following_will_be_removed">You will lose %s.</string>
+	<string name="load_missing_posts_above">Load missing posts above</string>
+	<string name="load_missing_posts_below">Load missing posts below</string>
 </resources>
\ No newline at end of file