1 files changed, 59 insertions, 15 deletions

diff --git a/app/src/main/java/mygram/droid/FolderActivity.java b/app/src/main/java/mygram/droid/FolderActivity.java
index 84e7125..7e71d82 100644
--- a/app/src/main/java/mygram/droid/FolderActivity.java
+++ b/app/src/main/java/mygram/droid/FolderActivity.java
@@ -19,9 +19,12 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -31,12 +34,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
-/** One folder as a grid, paged in lazily in random page order. */
+/** One folder as a grid, paged in lazily; the header toggle picks random, date or name order. */
 public final class FolderActivity extends Activity {
+	private static final String[] ORDERS = {"Random", "By date", "By name"};
+	private static final int[] ICONS = {R.drawable.ic_shuffle, R.drawable.ic_schedule, R.drawable.ic_sort_by_alpha};
 	private FrameLayout content;
 	private RecyclerView grid;
-	private final List<Post> posts = new ArrayList<>();
-	private final List<TileAdapter.Tile> tiles = new ArrayList<>();
+	/** Replaced, not cleared, on a reorder: an open viewer may still hold the old list. */
+	private List<Post> posts = new ArrayList<>();
+	private List<TileAdapter.Tile> tiles = new ArrayList<>();
 	private Callable<List<Post>> more;
 	private boolean loading;
 
@@ -50,17 +56,48 @@ public final class FolderActivity extends Activity {
 		super.onCreate(state);
 		LinearLayout column = new LinearLayout(this);
 		column.setOrientation(LinearLayout.VERTICAL);
-		column.addView(Ui.header(this, getIntent().getStringExtra("name"), getIntent().getStringExtra("avatar")));
+		LinearLayout header = Ui.header(this, getIntent().getStringExtra("name"), getIntent().getStringExtra("avatar"));
+		header.setClipToPadding(false); // the toggle's focus zoom draws into the padding
+		header.addView(new View(this), new LinearLayout.LayoutParams(0, 0, 1));
+		TextView order = Ui.text(this, "", 18);
+		int p = Ui.dp(this, 12);
+		order.setPadding(p * 2, p, p * 2, p);
+		order.setCompoundDrawablePadding(p);
+		order.setGravity(Gravity.CENTER_VERTICAL);
+		showOrder(order);
+		Ui.focusable(order);
+		order.setOnClickListener(v -> {
+			Prefs.setFolderOrder((Prefs.folderOrder() + 1) % ORDERS.length);
+			showOrder(order);
+			load(false);
+		});
+		header.addView(order);
+		column.addView(header);
 		content = new FrameLayout(this);
 		column.addView(content, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
 		setContentView(column);
+		load(true);
+	}
+
+	private static void showOrder(TextView order) {
+		order.setText(ORDERS[Prefs.folderOrder()]);
+		order.setCompoundDrawablesRelativeWithIntrinsicBounds(ICONS[Prefs.folderOrder()], 0, 0, 0);
+	}
+
+	/** (Re)loads the grid in the saved order; focus moves to the grid only on the first load. */
+	private void load(boolean focusGrid) {
+		posts = new ArrayList<>();
+		tiles = new ArrayList<>();
+		grid = null;
 		show(Ui.text(this, "Loading…", 18));
-		more = Api.folderPages(getIntent().getStringExtra("slug"), getIntent().getIntExtra("count", 0));
+		Callable<List<Post>> pager = Api.folderPages(getIntent().getStringExtra("slug"),
+				getIntent().getIntExtra("count", 0), Prefs.folderOrder());
+		more = pager;
 		loading = true;
-		Api.async(more, page -> {
+		Api.async(pager, page -> {
+			if (isDestroyed() || more != pager)
+				return; // a newer order replaced this one
 			loading = false;
-			if (isDestroyed())
-				return;
 			append(page);
 			if (page.isEmpty()) {
 				show(Ui.text(this, "Nothing to show", 18));
@@ -74,8 +111,11 @@ public final class FolderActivity extends Activity {
 				}
 			});
 			show(grid);
-			grid.post(grid::requestFocus); // after layout
+			if (focusGrid)
+				grid.post(grid::requestFocus); // after layout
 		}, e -> {
+			if (more != pager)
+				return;
 			loading = false;
 			show(Ui.text(this, "Cannot load folder: " + e.getMessage(), 18));
 		});
@@ -88,14 +128,17 @@ public final class FolderActivity extends Activity {
 		if (((GridLayoutManager) grid.getLayoutManager()).findLastVisibleItemPosition() < tiles.size() - 12)
 			return;
 		loading = true;
-		Api.async(more, page -> {
-			loading = false;
-			if (isDestroyed())
+		Callable<List<Post>> pager = more;
+		Api.async(pager, page -> {
+			if (isDestroyed() || more != pager)
 				return;
+			loading = false;
 			if (page.isEmpty())
 				more = null;
 			append(page);
 		}, e -> {
+			if (more != pager)
+				return;
 			loading = false;
 			if (!isDestroyed())
 				Toast.makeText(this, "Cannot load more: " + e.getMessage(), Toast.LENGTH_SHORT).show();
@@ -110,9 +153,10 @@ public final class FolderActivity extends Activity {
 
 	private void addTiles() {
 		int old = tiles.size();
-		for (int i = old; i < posts.size(); i++) {
+		List<Post> list = posts;
+		for (int i = old; i < list.size(); i++) {
 			int start = i;
-			tiles.add(TileAdapter.post(posts.get(i), () -> Playlist.open(this, posts, start, more)));
+			tiles.add(TileAdapter.post(list.get(i), () -> Playlist.open(this, list, start, more)));
 		}
 		if (grid != null && tiles.size() > old)
 			grid.getAdapter().notifyItemRangeInserted(old, tiles.size() - old);
@@ -127,7 +171,7 @@ public final class FolderActivity extends Activity {
 		}
 	}
 
-	private void show(android.view.View v) {
+	private void show(View v) {
 		content.removeAllViews();
 		content.addView(v);
 	}