Implement bookmarks and add favorites list

Closes #22, at last

mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java

@@ -4,6 +4,7 @@ import android.os.Looper;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -18,6 +19,7 @@ public class StatusInteractionController{
 	private final String accountID;
 	private final HashMap<String, SetStatusFavorited> runningFavoriteRequests=new HashMap<>();
 	private final HashMap<String, SetStatusReblogged> runningReblogRequests=new HashMap<>();
+	private final HashMap<String, SetStatusBookmarked> runningBookmarkRequests=new HashMap<>();
 
 	public StatusInteractionController(String accountID){
 		this.accountID=accountID;
@@ -98,4 +100,34 @@ public class StatusInteractionController{
 			status.reblogsCount--;
 		E.post(new StatusCountersUpdatedEvent(status));
 	}
+
+	public void setBookmarked(Status status, boolean bookmarked){
+		if(!Looper.getMainLooper().isCurrentThread())
+			throw new IllegalStateException("Can only be called from main thread");
+
+		SetStatusBookmarked current=runningBookmarkRequests.remove(status.id);
+		if(current!=null){
+			current.cancel();
+		}
+		SetStatusBookmarked req=(SetStatusBookmarked) new SetStatusBookmarked(status.id, bookmarked)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Status result){
+						runningBookmarkRequests.remove(status.id);
+						E.post(new StatusCountersUpdatedEvent(result));
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						runningBookmarkRequests.remove(status.id);
+						error.showToast(MastodonApp.context);
+						status.bookmarked=!bookmarked;
+						E.post(new StatusCountersUpdatedEvent(status));
+					}
+				})
+				.exec(accountID);
+		runningBookmarkRequests.put(status.id, req);
+		status.bookmarked=bookmarked;
+		E.post(new StatusCountersUpdatedEvent(status));
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetBookmarkedStatuses.java

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Status;
+
+public class GetBookmarkedStatuses extends HeaderPaginationRequest<Status>{
+	public GetBookmarkedStatuses(String maxID, int limit){
+		super(HttpMethod.GET, "/bookmarks", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetFavoritedStatuses.java

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Status;
+
+public class GetFavoritedStatuses extends HeaderPaginationRequest<Status>{
+	public GetFavoritedStatuses(String maxID, int limit){
+		super(HttpMethod.GET, "/favourites", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusBookmarked.java

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+public class SetStatusBookmarked extends MastodonAPIRequest<Status>{
+	public SetStatusBookmarked(String id, boolean bookmarked){
+		super(HttpMethod.POST, "/statuses/"+id+"/"+(bookmarked ? "bookmark" : "unbookmark"), Status.class);
+		setRequestBody(new Object());
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/events/StatusCountersUpdatedEvent.java

@@ -5,7 +5,7 @@ import org.joinmastodon.android.model.Status;
 public class StatusCountersUpdatedEvent{
 	public String id;
 	public long favorites, reblogs, replies;
-	public boolean favorited, reblogged;
+	public boolean favorited, reblogged, bookmarked;
 
 	public StatusCountersUpdatedEvent(Status s){
 		id=s.id;
@@ -14,5 +14,6 @@ public class StatusCountersUpdatedEvent{
 		replies=s.repliesCount;
 		favorited=s.favourited;
 		reblogged=s.reblogged;
+		bookmarked=s.bookmarked;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java

@@ -0,0 +1,37 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.Status;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class BookmarkedStatusListFragment extends StatusListFragment{
+	private String nextMaxID;
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setTitle(R.string.bookmarks);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetBookmarkedStatuses(offset==0 ? null : nextMaxID, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Status> result){
+						if(result.nextPageUri!=null)
+							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
+						else
+							nextMaxID=null;
+						onDataLoaded(result, nextMaxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java

@@ -0,0 +1,37 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.Status;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class FavoritedStatusListFragment extends StatusListFragment{
+	private String nextMaxID;
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setTitle(R.string.your_favorites);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetFavoritedStatuses(offset==0 ? null : nextMaxID, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<Status> result){
+						if(result.nextPageUri!=null)
+							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
+						else
+							nextMaxID=null;
+						onDataLoaded(result, nextMaxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -534,15 +534,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 		if(relationship==null && !isOwnProfile)
 			return;
-		inflater.inflate(R.menu.profile, menu);
+		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
-		if(isOwnProfile){
+		if(isOwnProfile)
-			for(int i=0;i<menu.size();i++){
-				MenuItem item=menu.getItem(i);
-				item.setVisible(item.getItemId()==R.id.share);
-			}
 			return;
-		}
+
 		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
@@ -595,6 +591,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 					})
 					.wrapProgress(getActivity(), R.string.loading, false)
 					.exec(accountID);
+		}else if(id==R.id.bookmarks){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			Nav.go(getActivity(), BookmarkedStatusListFragment.class, args);
+		}else if(id==R.id.favorites){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			Nav.go(getActivity(), FavoritedStatusListFragment.class, args);
 		}
 		return true;
 	}

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -129,6 +129,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		repliesCount=ev.replies;
 		favourited=ev.favorited;
 		reblogged=ev.reblogged;
+		bookmarked=ev.bookmarked;
 	}
 
 	public Status getContentStatus(){

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -193,6 +193,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					});
 				}else if(id==R.id.block_domain){
 					UiUtils.confirmToggleBlockDomain(activity, item.parentFragment.getAccountID(), account.getDomain(), relationship!=null && relationship.domainBlocking, ()->{});
+				}else if(id==R.id.bookmark){
+					AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked);
 				}
 				return true;
 			});
@@ -290,6 +292,13 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			MenuItem block=menu.findItem(R.id.block);
 			MenuItem report=menu.findItem(R.id.report);
 			MenuItem follow=menu.findItem(R.id.follow);
+			MenuItem bookmark=menu.findItem(R.id.bookmark);
+			if(item.status!=null){
+				bookmark.setVisible(true);
+				bookmark.setTitle(item.status.bookmarked ? R.string.remove_bookmark : R.string.add_bookmark);
+			}else{
+				bookmark.setVisible(false);
+			}
 			if(isOwnPost){
 				mute.setVisible(false);
 				block.setVisible(false);

mastodon/src/main/res/drawable/ic_fluent_bookmark_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.19 21.855c-0.495 0.357-1.187 0.002-1.187-0.61V6.25C5.003 4.455 6.458 3 8.253 3h7.498c1.795 0 3.25 1.455 3.25 3.25v14.996c0 0.611-0.692 0.966-1.188 0.609l-5.81-4.181-5.812 4.18zM17.502 6.25c0-0.966-0.783-1.75-1.75-1.75H8.253c-0.967 0-1.75 0.784-1.75 1.75v13.532l5.061-3.641c0.262-0.188 0.614-0.188 0.876 0l5.061 3.641V6.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/menu/post.xml

@@ -7,5 +7,6 @@
 	<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
 	<item android:id="@+id/follow" android:title="@string/follow_user"/>
 	<item android:id="@+id/report" android:title="@string/report_user"/>
+	<item android:id="@+id/bookmark" android:title="@string/add_bookmark"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
 </menu>

mastodon/src/main/res/menu/profile_own.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular" android:showAsAction="always"/>
+</menu>

mastodon/src/main/res/values/strings.xml

@@ -390,4 +390,8 @@
 	<string name="empty_list">This list is empty</string>
 	<string name="instance_signup_closed">This server does not accept new registrations.</string>
 	<string name="text_copied">Copied to clipboard</string>
+	<string name="add_bookmark">Bookmark</string>
+	<string name="remove_bookmark">Remove bookmark</string>
+	<string name="bookmarks">Bookmarks</string>
+	<string name="your_favorites">Your Favorites</string>
 </resources>